[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.24,1.25 ws.h,1.8,1.9

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/wm
In directory mplayer:/var/tmp.root/cvs-serv14790/Gui/wm

Modified Files:
	ws.c ws.h 
Log Message:
move bug meg fileload bug fixed asszem.

Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ws.c	12 Nov 2001 12:26:09 -0000	1.24
+++ ws.c	12 Nov 2001 15:16:13 -0000	1.25
@@ -107,7 +107,6 @@
 
 void wsWindowDecoration( wsTWindow * win,long d )
 {
-//XUnmapWindow( wsDisplay,win->WindowID );
  wsMotifHints=XInternAtom( wsDisplay,"_MOTIF_WM_HINTS",0 );
  if ( wsMotifHints != None )
   {
@@ -118,17 +117,6 @@
    XChangeProperty( wsDisplay,win->WindowID,wsMotifHints,wsMotifHints,32,
                     PropModeReplace,(unsigned char *)&wsMotifWmHints,5 );
   }
-//XMapWindow( wsDisplay,win->WindowID );
-// if ( d )
-//  {
-//   win->SizeHint.win_gravity=ForgetGravity;
-//  }
-//   else
-//    {
-//     win->SizeHint.win_gravity=StaticGravity;
-//    }
-// win->SizeHint.flags=PWinGravity;
-// XSetWMSizeHints( wsDisplay,win->WindowID,&win->SizeHint,win->AtomWMSizeHint );
 }
 
 // ----------------------------------------------------------------------------------------------
@@ -856,20 +844,24 @@
 // ----------------------------------------------------------------------------------------------
 //    Move window to x, y.
 // ----------------------------------------------------------------------------------------------
-void wsMoveWindow( wsTWindow * win,int x, int y )
+void wsMoveWindow( wsTWindow * win,int b,int x, int y )
 {
- switch ( x )
-  {
-   case -1: win->X=( wsMaxX / 2 ) - ( win->Width / 2 ); break;
-   case -2: win->X=wsMaxX - win->Width; break;
-   default: win->X=x; break;
-  }
- switch ( y )
+ if ( b )
   {
-   case -1: win->Y=( wsMaxY / 2 ) - ( win->Height / 2 ); break;
-   case -2: win->Y=wsMaxY - win->Height; break;
-   default: win->Y=y; break;
+   switch ( x )
+    {
+     case -1: win->X=( wsMaxX / 2 ) - ( win->Width / 2 ); break;
+     case -2: win->X=wsMaxX - win->Width; break;
+     default: win->X=x; break;
+    }
+   switch ( y )
+    {
+     case -1: win->Y=( wsMaxY / 2 ) - ( win->Height / 2 ); break;
+     case -2: win->Y=wsMaxY - win->Height; break;
+     default: win->Y=y; break;
+    }
   }
+  else { win->X=x; win->Y=y; }
 
  win->SizeHint.flags=PPosition | PWinGravity;
  win->SizeHint.x=win->X;

Index: ws.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ws.h	12 Nov 2001 12:26:09 -0000	1.8
+++ ws.h	12 Nov 2001 15:16:13 -0000	1.9
@@ -203,7 +203,7 @@
 // ----------------------------------------------------------------------------------------------
 extern void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,unsigned char D,char * label );
 extern void wsDestroyWindow( wsTWindow * win );
-extern void wsMoveWindow( wsTWindow * win,int x, int y );
+extern void wsMoveWindow( wsTWindow * win,int b,int x, int y );
 extern void wsResizeWindow( wsTWindow * win,int sx, int sy );
 extern void wsIconify( wsTWindow win );
 extern void wsMoveTopWindow( wsTWindow * win );