[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.47,1.48 ws.h,1.18,1.19

[Zoltan Ponekker]

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

Modified Files:
	ws.c ws.h 
Log Message:


- add preferences support (first try)
- fix some playlist bug
- fix some equ bug
- fix some redraw bug
- fix dvd playing
- fix file open dialog box
- etc.

Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ws.c	5 Jul 2002 23:46:59 -0000	1.47
+++ ws.c	25 Jul 2002 20:26:38 -0000	1.48
@@ -293,7 +293,7 @@
   {
    case wsRGB32:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb32\n" );
-     wsConvFunc=BGR8880_to_RGB8880_c;
+     wsConvFunc=(void *)BGR8880_to_RGB8880_c;
      break;
    case wsBGR32:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr32\n" );
@@ -305,7 +305,7 @@
      break;
    case wsBGR24:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr24\n" );
-     wsConvFunc=BGR8880_to_BGR888_c;
+     wsConvFunc=(void *)BGR8880_to_BGR888_c;
      break;
    case wsRGB16:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb16\n" );
@@ -313,7 +313,7 @@
      break;
    case wsBGR16:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr16\n" );
-     wsConvFunc=BGR8880_to_BGR565_c;
+     wsConvFunc=(void *)BGR8880_to_BGR565_c;
      break;
    case wsRGB15:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to rgb15\n" );
@@ -321,7 +321,7 @@
      break;
    case wsBGR15:
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"rgb32 to bgr15\n" );
-     wsConvFunc=BGR8880_to_BGR555_c;
+     wsConvFunc=(void *)BGR8880_to_BGR555_c;
      break;
   }
  XSetErrorHandler( wsErrorHandler );
@@ -874,6 +874,7 @@
 {
  if ( win->ReDraw )
   {
+   win->State=wsWindowExpose;
    win->ReDraw( wsDisplay,win->WindowID );
    XFlush( wsDisplay );
   }

Index: ws.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ws.h	5 Jul 2002 23:46:59 -0000	1.18
+++ ws.h	25 Jul 2002 20:26:38 -0000	1.19
@@ -224,7 +224,7 @@
 extern void wsSetBackground( wsTWindow * win,int color );
 extern void wsSetForegroundRGB( wsTWindow * win,int r,int g,int b );
 extern void wsSetBackgroundRGB( wsTWindow * win,int r,int g,int b );
-#define wsClearWindow( win ); XClearWindow( wsDisplay,win.WindowID );
+#define wsClearWindow( win ) XClearWindow( wsDisplay,win.WindowID )
 extern void wsSetTitle( wsTWindow * win,char * name );
 extern void wsVisibleWindow( wsTWindow * win,int show );
 extern void wsWindowDecoration( wsTWindow * win,long d );