[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.54,1.55

[Zoltan Ponekker]

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

Modified Files:
	ws.c 
Log Message:


- dvd aspect changing bug - fixed
- if codec is not found -> sig11 - fixed
- pp autoq handling bug - fixed
- some warning - fixed


Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ws.c	10 Oct 2002 14:06:49 -0000	1.54
+++ ws.c	16 Oct 2002 15:35:28 -0000	1.55
@@ -575,11 +575,11 @@
    case ClientMessage:
         if ( Event->xclient.message_type == wsWindowList[l]->AtomProtocols )
          {
-          if ( Event->xclient.data.l[0] == wsWindowList[l]->AtomDeleteWindow )
+          if ( (Atom)Event->xclient.data.l[0] == wsWindowList[l]->AtomDeleteWindow )
            { i=wsWindowClosed; goto expose; }
-          if ( Event->xclient.data.l[0] == wsWindowList[l]->AtomTakeFocus )
+          if ( (Atom)Event->xclient.data.l[0] == wsWindowList[l]->AtomTakeFocus )
            { i=wsWindowFocusIn;  wsWindowList[l]->Focused=wsFocused; goto expose; }
-          if ( Event->xclient.data.l[0] == wsWindowList[l]->AtomRolle )
+          if ( (Atom)Event->xclient.data.l[0] == wsWindowList[l]->AtomRolle )
            { mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[ws] rolled.\n" ); }
          } else {
 	   /* try to process DND events */
@@ -776,7 +776,7 @@
  Atom            type;
  int             format;
  unsigned long   nitems, bytesafter;
- unsigned char * args = NULL;
+ Atom          * args = NULL;
 
  if ( wsWMType == wsWMIceWM )
   {
@@ -792,7 +792,7 @@
  }
 					
  type=XInternAtom( wsDisplay,"_NET_SUPPORTED",False );
- if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
+ if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,(unsigned char **)&args ) && nitems > 0 )
   {
    int    i;
    XEvent e;
@@ -806,7 +806,7 @@
    
    e.xclient.data.l[1]=XInternAtom( wsDisplay,"_NET_WM_STATE_STAYS_ON_TOP",False );
    type=XInternAtom( wsDisplay,"_NET_WM_STATE_FULLSCREEN",False );
-   for ( i=0;i < nitems;i++ )
+   for ( i=0;(unsigned long)i < nitems;i++ )
     if ( args[i] == type ) { e.xclient.data.l[1]=XInternAtom( wsDisplay,"_NET_WM_STATE_FULLSCREEN",False ); break; }
 
    e.xclient.data.l[2]=0l;
@@ -818,7 +818,7 @@
    return;
   }
  type=XInternAtom( wsDisplay,"_WIN_SUPPORTING_WM_CHECK",False );
- if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
+ if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,(unsigned char **)&args ) && nitems > 0 )
   {
    XClientMessageEvent  xev;