[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.14,1.15 ws.h,1.5,1.6

[Zoltan Ponekker]

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

Modified Files:
	ws.c ws.h 
Log Message:
fix skin changing, xv fullscreen redraw bug, etc.

Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ws.c	4 Sep 2001 16:04:04 -0000	1.14
+++ ws.c	5 Sep 2001 18:17:17 -0000	1.15
@@ -452,7 +452,7 @@
  win->Rolled=0;
  if ( D & wsShowWindow ) XMapWindow( wsDisplay,win->WindowID );
 
- wsCreateImage( win );
+ wsCreateImage( win,win->Width,win->Height );
 // --- End of creating --------------------------------------------------------------------------
 
  wsWindowList[wsWLCount++]=win;
@@ -1006,14 +1006,14 @@
  win->xImage=NULL;
 }
 
-void wsCreateImage( wsTWindow * win )
+void wsCreateImage( wsTWindow * win,int Width,int Height )
 {
  int CompletionType = -1;
  if ( wsUseXShm )
   {
    CompletionType=XShmGetEventBase( wsDisplay ) + ShmCompletion;
    win->xImage=XShmCreateImage( wsDisplay,win->VisualInfo.visual,
-                   win->Attribs.depth,ZPixmap,NULL,&win->Shminfo,win->Width,win->Height );
+                   win->Attribs.depth,ZPixmap,NULL,&win->Shminfo,Width,Height );
    if ( win->xImage == NULL )
     {
      fprintf( stderr,"[ws] shared memory extension error.\n" );
@@ -1046,7 +1046,7 @@
   else
    {
     win->xImage=XCreateImage( wsDisplay,win->VisualInfo.visual,win->Attribs.depth,
-                              ZPixmap,0,0,win->Width,win->Height,
+                              ZPixmap,0,0,Width,Height,
                               (wsDepthOnScreen == 3) ? 32 : wsDepthOnScreen,
                               0 );
     if ( ( win->xImage->data=malloc( win->xImage->bytes_per_line * win->xImage->height ) ) == NULL )
@@ -1060,8 +1060,8 @@
  win->ImageDatadw=(unsigned int *)win->xImage->data;
 }
 
-void wsResizeImage( wsTWindow * win )
-{ wsDestroyImage( win ); wsCreateImage( win ); }
+void wsResizeImage( wsTWindow * win,int Width,int Height )
+{ wsDestroyImage( win ); wsCreateImage( win,Width,Height ); }
 
 int wsGetOutMask( void )
 {

Index: ws.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ws.h	4 Sep 2001 16:04:04 -0000	1.5
+++ ws.h	5 Sep 2001 18:17:17 -0000	1.6
@@ -227,10 +227,10 @@
 // ----------------------------------------------------------------------------------------------
 // Image handling
 // ----------------------------------------------------------------------------------------------
-extern void wsCreateImage( wsTWindow * win );
+extern void wsCreateImage( wsTWindow * win,int Width,int Height );
 extern void wsConvert( wsTWindow * win,unsigned char * Image,unsigned int Size );
 extern void wsPutImage( wsTWindow * win );
-extern void wsResizeImage( wsTWindow * win );
+extern void wsResizeImage( wsTWindow * win,int Width,int Height );
 extern void wsDestroyImage( wsTWindow * win );
 extern int  wsGetOutMask( void );