[xine-cvs] CVS: xine-ui/src/xitk main.c,1.87,1.88 videowin.c,1.96,1.97

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory usw-pr-cvs1:/tmp/cvs-serv8805

Modified Files:
	main.c videowin.c 
Log Message:
Fixed root window mode (don't allow window geom, exposure handling).


Index: main.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/main.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- main.c	1 May 2002 21:40:04 -0000	1.87
+++ main.c	3 May 2002 23:09:55 -0000	1.88
@@ -694,6 +694,16 @@
       exit(1);
     }
   }
+  
+  /* 
+   * Using root window mode don't allow
+   * window geometry, so, reset those params.
+   */
+  if(gGui->use_root_window) {
+    window_attribute.x     = window_attribute.y      = -8192;
+    window_attribute.width = window_attribute.height = -1;
+    window_attribute.borderless = 0;
+  }
 
   gGui->actions_on_start[aos] = ACTID_NOKEY;
 

Index: videowin.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/videowin.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- videowin.c	3 May 2002 14:44:54 -0000	1.96
+++ videowin.c	3 May 2002 23:09:55 -0000	1.97
@@ -194,7 +194,7 @@
 
     gVw->output_width    = gVw->fullscreen_width;
     gVw->output_height   = gVw->fullscreen_height;
-      
+    
     if(gGui->video_window == None) {
       XGCValues   gcv;
       
@@ -202,37 +202,35 @@
       gVw->visual          = gGui->visual;
       gVw->depth           = gGui->depth;
       gVw->colormap        = gGui->colormap;
-
+      
       attr.override_redirect = True;
       attr.background_pixel  = gGui->black.pixel;
       
       border_width = 0;
-
+      
       gGui->video_window = XCreateWindow(gGui->display, DefaultRootWindow(gGui->display),
 					 0, 0, gVw->fullscreen_width, gVw->fullscreen_height, 
 					 border_width, 
 					 CopyFromParent, CopyFromParent, CopyFromParent, 
 					 CWBackPixel | CWOverrideRedirect, &attr);
-/* fprintf (stderr, "***** XCreateWindow 1 visual %p id 0x%x depth %d\n", gVw->visual, gVw->visual->visualid, gVw->depth); */
       
       if(gGui->vo_driver)
 	gGui->vo_driver->gui_data_exchange (gGui->vo_driver,
 					    GUI_DATA_EX_DRAWABLE_CHANGED, 
 					    (void*)gGui->video_window);
+
+      XSelectInput(gGui->display, gGui->video_window, ExposureMask);
       
       XSetStandardProperties(gGui->display, gGui->video_window, 
 			     window_title, window_title, None, NULL, 0, 0);
       
-
+      
       gcv.foreground         = gGui->black.pixel;
       gcv.background         = gGui->black.pixel;
       gcv.graphics_exposures = False;
       gVw->gc = XCreateGC(gGui->display, gGui->video_window, 
 			  GCForeground | GCBackground | GCGraphicsExposures, &gcv);
-      
-      XSetStandardProperties(gGui->display, gGui->video_window, 
-			     window_title, window_title, None, NULL, 0, 0);
-      
+
       hint.flags  = USSize | USPosition | PPosition | PSize;
       hint.x      = 0;
       hint.y      = 0;