[xine-cvs] CVS: gnome-xine/src noskin_window.c,1.68,1.69

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2220/src

Modified Files:
	noskin_window.c 
Log Message:
Allow the full-screen toolbar to gain focus. This fixes a problem with some
toolbar utilities which require a focus change before they re-hide their
windows.


Index: noskin_window.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/noskin_window.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- noskin_window.c	25 Jun 2005 19:17:50 -0000	1.68
+++ noskin_window.c	28 Jun 2005 18:20:50 -0000	1.69
@@ -523,7 +523,7 @@
 		    G_CALLBACK (window_toolbar_configure_cb), NULL);
 
   /* cope with window managers which allow other means of closing windows
-   * and/or which ignore the accept_focus hint
+   * and always pass focus from the toolbar to the video window
    */
   g_signal_connect (G_OBJECT (controlwindow), "unmap-event",
 		    G_CALLBACK (cw_show_cb), NULL);
@@ -534,8 +534,11 @@
   gtk_window_set_type_hint (GTK_WINDOW(controlwindow),
 			    GDK_WINDOW_TYPE_HINT_TOOLBAR);
   gtk_window_set_decorated (GTK_WINDOW(controlwindow), FALSE);
-  gtk_window_set_accept_focus (GTK_WINDOW(controlwindow), FALSE);
-  gtk_window_set_focus_on_map (GTK_WINDOW(controlwindow), FALSE);
+  /* I'd like to have the toolbar window not accept the input focus, but
+   * some programs show but don't re-hide their toolbars if that's so...
+   */
+  /* gtk_window_set_focus_on_map (GTK_WINDOW(controlwindow), FALSE); */
+  /* gtk_window_set_accept_focus (GTK_WINDOW(controlwindow), FALSE); */
   gtk_window_set_position (GTK_WINDOW(controlwindow), GTK_WIN_POS_NONE);
   gtk_window_set_skip_pager_hint (GTK_WINDOW(controlwindow), TRUE);
   gtk_window_set_skip_taskbar_hint (GTK_WINDOW(controlwindow), TRUE);