[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.166,1.167

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv10865

Modified Files:
	x11_common.c 
Log Message:
- win_gravity memorizing and restoring while switching fullscreen mode (by Adam Tla/lka)
- recommited without cosmetic changes (by me)


Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- x11_common.c	1 Apr 2004 20:59:07 -0000	1.166
+++ x11_common.c	3 Apr 2004 13:41:23 -0000	1.167
@@ -59,6 +59,7 @@
  
 int fs_layer=WIN_LAYER_ABOVE_DOCK;
 static int orig_layer=0;
+static int old_gravity = NorthWestGravity;
 
 int stop_xscreensaver=0;
 
@@ -810,6 +811,10 @@
 	    XFree( name );
 	   }
 	   break;
+      case MapNotify:
+		vo_hint.win_gravity = old_gravity;
+		XSetWMNormalHints( mDisplay,vo_window,&vo_hint );
+	   break;
      }
   }
   return ret;
@@ -1066,6 +1071,15 @@
    vo_fs=VO_TRUE;
    vo_old_x=vo_dx; vo_old_y=vo_dy; vo_old_width=vo_dwidth; vo_old_height=vo_dheight;
    x=0; y=0; w=vo_screenwidth; h=vo_screenheight;
+ 
+ }
+ {
+	long dummy;
+	XGetWMNormalHints(mDisplay, vo_window, &vo_hint, &dummy);
+	if (!(vo_hint.flags & PWinGravity))
+		old_gravity = NorthWestGravity;
+	else
+		old_gravity = vo_hint.win_gravity;
  }
  vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 0 : 1 );
  vo_x11_sizehint( x,y,w,h,0 );