CVS: rdesktop ewmhints.c,1.10.2.3,1.10.2.4 xproto.h,1.4.2.3,1.4.2.4 xwin.c,1.205.2.14,1.205.2.15

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6566

Modified Files:
      Tag: seamlessrdp-branch
	ewmhints.c xproto.h xwin.c 
Log Message:
Set _NET_WM_NAME

Index: ewmhints.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/ewmhints.c,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -C2 -d -r1.10.2.3 -r1.10.2.4
*** ewmhints.c	15 Mar 2006 15:10:21 -0000	1.10.2.3
--- ewmhints.c	15 Mar 2006 15:16:18 -0000	1.10.2.4
***************
*** 31,37 ****
  
  extern Display *g_display;
  static Atom g_net_wm_state_maximized_vert_atom, g_net_wm_state_maximized_horz_atom,
! 	g_net_wm_state_hidden_atom, g_net_wm_state_skip_taskbar_atom,
! 	g_net_wm_state_skip_pager_atom;
  Atom g_net_wm_state_atom, g_net_wm_desktop_atom;
  
--- 31,39 ----
  
  extern Display *g_display;
+ 
  static Atom g_net_wm_state_maximized_vert_atom, g_net_wm_state_maximized_horz_atom,
! 	g_net_wm_state_hidden_atom, g_net_wm_name_atom, g_utf8_string_atom,
! 	g_net_wm_state_skip_taskbar_atom, g_net_wm_state_skip_pager_atom;
! 
  Atom g_net_wm_state_atom, g_net_wm_desktop_atom;
  
***************
*** 171,174 ****
--- 173,177 ----
  ewmh_init()
  {
+ 	/* FIXME: Use XInternAtoms */
  	g_net_wm_state_maximized_vert_atom =
  		XInternAtom(g_display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
***************
*** 181,184 ****
--- 184,189 ----
  	g_net_wm_state_atom = XInternAtom(g_display, "_NET_WM_STATE", False);
  	g_net_wm_desktop_atom = XInternAtom(g_display, "_NET_WM_DESKTOP", False);
+ 	g_net_wm_name_atom = XInternAtom(g_display, "_NET_WM_NAME", False);
+ 	g_utf8_string_atom = XInternAtom(g_display, "UTF8_STRING", False);
  }
  
***************
*** 325,328 ****
--- 330,344 ----
  
  void
+ ewmh_set_wm_name(Window wnd, const char *title)
+ {
+ 	int len;
+ 
+ 	len = strlen(title);
+ 	XChangeProperty(g_display, wnd, g_net_wm_name_atom, g_utf8_string_atom,
+ 			8, PropModeReplace, (unsigned char *) title, len);
+ }
+ 
+ 
+ void
  ewmh_set_window_popup(Window wnd)
  {

Index: xproto.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xproto.h,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -d -r1.4.2.3 -r1.4.2.4
*** xproto.h	15 Mar 2006 15:10:21 -0000	1.4.2.3
--- xproto.h	15 Mar 2006 15:16:18 -0000	1.4.2.4
***************
*** 7,9 ****
--- 7,10 ----
  int ewmh_move_to_desktop(Window wnd, unsigned int desktop);
  int ewmh_get_window_desktop(Window wnd);
+ void ewmh_set_wm_name(Window wnd, const char *title);
  void ewmh_set_window_popup(Window wnd);

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.205.2.14
retrieving revision 1.205.2.15
diff -C2 -d -r1.205.2.14 -r1.205.2.15
*** xwin.c	15 Mar 2006 15:10:21 -0000	1.205.2.14
--- xwin.c	15 Mar 2006 15:16:18 -0000	1.205.2.15
***************
*** 3063,3066 ****
--- 3063,3067 ----
  
  	XStoreName(g_display, wnd, "SeamlessRDP");
+ 	ewmh_set_wm_name(wnd, "SeamlessRDP");
  
  	mwm_hide_decorations(wnd);
***************
*** 3194,3198 ****
--- 3195,3201 ----
  	}
  
+ 	/* FIXME: Might want to convert the name for non-EWMH WMs */
  	XStoreName(g_display, sw->wnd, title);
+ 	ewmh_set_wm_name(sw->wnd, title);
  }
  



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642