diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-09-05 18:17:22 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-09-05 18:17:22 +0000 |
commit | adc81aa70fb02d43e4e65c1c8ba9f5a992bd114f (patch) | |
tree | 46ce9e3be9c64776007d48474db6f861ba1901d9 /Gui/wm | |
parent | f0d53f735e85f621f8fc44aa52231c3af2c6da1b (diff) | |
download | mpv-adc81aa70fb02d43e4e65c1c8ba9f5a992bd114f.tar.bz2 mpv-adc81aa70fb02d43e4e65c1c8ba9f5a992bd114f.tar.xz |
fix skin changing, xv fullscreen redraw bug, etc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1859 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/wm')
-rw-r--r-- | Gui/wm/ws.c | 12 | ||||
-rw-r--r-- | Gui/wm/ws.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c index 910036a14b..aed376d2d9 100644 --- a/Gui/wm/ws.c +++ b/Gui/wm/ws.c @@ -452,7 +452,7 @@ void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,uns 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 @@ void wsDestroyImage( wsTWindow * win ) 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 @@ void wsCreateImage( wsTWindow * win ) 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 @@ void wsCreateImage( wsTWindow * win ) 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 ) { diff --git a/Gui/wm/ws.h b/Gui/wm/ws.h index f1d6fddc62..0a4ae445f2 100644 --- a/Gui/wm/ws.h +++ b/Gui/wm/ws.h @@ -227,10 +227,10 @@ extern void wsSetMousePosition( wsTWindow * win,int x, int y ); // ---------------------------------------------------------------------------------------------- // 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 ); |