[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.15,1.16

[Zoltan Ponekker]

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

Modified Files:
	ws.c 
Log Message:
fix mwm bug's. faszom (C), and remove mixer.*

Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ws.c	5 Sep 2001 18:17:17 -0000	1.15
+++ ws.c	6 Sep 2001 09:36:48 -0000	1.16
@@ -374,15 +374,15 @@
  win->SizeHint.y=win->Y;
  win->SizeHint.width=win->Width;
  win->SizeHint.height=win->Height;
- if ( D & wsMaxSize )
+ if ( D & wsMinSize )
   {
-   win->SizeHint.flags|=PMaxSize;
+   win->SizeHint.flags|=PMinSize;
    win->SizeHint.min_width=win->Width;
    win->SizeHint.min_height=win->Height;
   }
- if ( D & wsMinSize )
+ if ( D & wsMaxSize )
   {
-   win->SizeHint.flags|=PMinSize;
+   win->SizeHint.flags|=PMaxSize;
    win->SizeHint.max_width=win->Width;
    win->SizeHint.max_height=win->Height;
   }
@@ -613,7 +613,7 @@
 
    case PropertyNotify:
 	break;
-//        fprintf(stderr,"[ws] PropertyNotify %s\n",XGetAtomName( wsDisplay,Event->xproperty.atom ) );
+        fprintf(stderr,"[ws] PropertyNotify %s\n",XGetAtomName( wsDisplay,Event->xproperty.atom ) );
         if ( Event->xproperty.atom == wsWindowList[l]->AtomRemote )
          {
           Atom            type;
@@ -709,18 +709,6 @@
    win->Width=win->OldWidth;
    win->Height=win->OldHeight;
    win->isFullScreen=False;
-   if ( win->Property & wsMaxSize )
-    {
-     win->SizeHint.flags|=PMaxSize;
-     win->SizeHint.max_width=win->Width;
-     win->SizeHint.max_height=win->Height;
-    }
-   if ( win->Property & wsMinSize )
-    {
-     win->SizeHint.flags|=PMinSize;
-     win->SizeHint.min_width=win->Width;
-     win->SizeHint.min_height=win->Height;
-    }
    decoration=win->Decorations;
    wsScreenSaverOn( wsDisplay );
   }
@@ -731,18 +719,6 @@
     win->X=0; win->Y=0;
     win->Width=wsMaxX; win->Height=wsMaxY;
     win->isFullScreen=True;
-//    if ( win->Property & wsMaxSize )
-//     {
-//      win->SizeHint.flags|=PMaxSize;
-//      win->SizeHint.min_width=0;
-//      win->SizeHint.min_height=0;
-//     }
-//    if ( win->Property & wsMinSize )
-//     {
-//      win->SizeHint.flags|=PMinSize;
-//      win->SizeHint.max_width=4096;
-//      win->SizeHint.max_height=4096;
-//     }
     wsScreenSaverOff( wsDisplay );
    }
 
@@ -751,6 +727,18 @@
  win->SizeHint.y=win->Y;
  win->SizeHint.width=win->Width;
  win->SizeHint.height=win->Height;
+ if ( win->Property & wsMaxSize )
+  {
+   win->SizeHint.flags|=PMaxSize;
+   win->SizeHint.max_width=win->Width;
+   win->SizeHint.max_height=win->Height;
+  }
+ if ( win->Property & wsMinSize )
+  {
+   win->SizeHint.flags|=PMinSize;
+   win->SizeHint.min_width=win->Width;
+   win->SizeHint.min_height=win->Height;
+  }
  XSetWMNormalHints( wsDisplay,win->WindowID,&win->SizeHint );
 
  XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height );