[Mplayer-cvslog] CVS: main/Gui/mplayer menu.h,1.4,1.5 mplayer.c,1.15,1.16 mw.h,1.29,1.30 play.c,1.38,1.39 play.h,1.12,1.13 sw.h,1.18,1.19
Zoltan Ponekker
pontscho at mplayer.dev.hu
Mon Nov 12 16:16:15 CET 2001
Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv14790/Gui/mplayer
Modified Files:
menu.h mplayer.c mw.h play.c play.h sw.h
Log Message:
move bug meg fileload bug fixed asszem.
Index: menu.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/menu.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- menu.h 17 Sep 2001 21:16:00 -0000 1.4
+++ menu.h 12 Nov 2001 15:16:13 -0000 1.5
@@ -79,7 +79,7 @@
mplMenuItem = 0;
- wsMoveWindow( &appMPlayer.menuWindow,x,y );
+ wsMoveWindow( &appMPlayer.menuWindow,False,x,y );
wsVisibleWindow( &appMPlayer.menuWindow,wsShowWindow );
wsMoveTopWindow( &appMPlayer.menuWindow );
}
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mplayer.c 16 Oct 2001 21:23:59 -0000 1.15
+++ mplayer.c 12 Nov 2001 15:16:13 -0000 1.16
@@ -50,14 +50,15 @@
void mplInit( int argc,char* argv[], char *envp[], void* disp )
{
int i;
- // allocates shmem to gtkShMem
- // fork() a process which runs gtkThreadProc() [gtkPID]
- gtkInit( argc,argv,envp );
- strcpy( gtkShMem->sb.name,skinName );
// allocates shmem to mplShMem
// init fields of this struct to default values
mplMPlayerInit( argc,argv,envp );
+
+ // allocates shmem to gtkShMem
+ // fork() a process which runs gtkThreadProc() [gtkPID]
+ gtkInit( argc,argv,envp );
+ strcpy( gtkShMem->sb.name,skinName );
message=mplErrorHandler; // error messagebox drawing function
Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mw.h 12 Nov 2001 12:26:09 -0000 1.29
+++ mw.h 12 Nov 2001 15:16:13 -0000 1.30
@@ -170,10 +170,6 @@
}
}
-// --- erosen ideiglenes.
- strcpy( gtkShMem->fs.filename,mplShMem->Filename );
-// ---
-
if ( mplMainRender )
{
memcpy( mplDrawBuffer,appMPlayer.main.Bitmap.Image,appMPlayer.main.Bitmap.ImageSize );
@@ -212,7 +208,7 @@
mplMainRender=0;
}
wsPutImage( &appMPlayer.mainWindow );
- XFlush( wsDisplay );
+// XFlush( wsDisplay );
}
#define IZE(x) printf("@@@ " x " @@@\n");
@@ -501,7 +497,7 @@
switch ( itemtype )
{
case itPLMButton:
- wsMoveWindow( &appMPlayer.mainWindow,RX - abs( sx ),RY - abs( sy ) );
+ wsMoveWindow( &appMPlayer.mainWindow,False,RX - abs( sx ),RY - abs( sy ) );
mplMainRender=0;
break;
case itPRMButton:
Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- play.c 24 Oct 2001 10:58:18 -0000 1.38
+++ play.c 12 Nov 2001 15:16:13 -0000 1.39
@@ -40,7 +40,7 @@
if ( appMPlayer.subWindow.isFullScreen )
{
wsResizeWindow( &appMPlayer.subWindow,sx,sy );
- wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
+ wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
wsWindowDecoration( &appMPlayer.subWindow,appMPlayer.subWindow.Decorations );
appMPlayer.subWindow.isFullScreen=0;
}
@@ -48,7 +48,7 @@
{
sx=appMPlayer.subWindow.Width; sy=appMPlayer.subWindow.Height;
wsResizeWindow( &appMPlayer.subWindow,wsMaxX,wsMaxY );
- wsMoveWindow( &appMPlayer.subWindow,0,0 );
+ wsMoveWindow( &appMPlayer.subWindow,True,0,0 );
wsWindowDecoration( &appMPlayer.subWindow,0 );
appMPlayer.subWindow.isFullScreen=1;
}
@@ -70,7 +70,7 @@
if ( !appMPlayer.subWindow.isFullScreen )
{
wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
- wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
+ wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
}
mplSubRender=1;
wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
@@ -183,7 +183,7 @@
if ( ( !appMPlayer.subWindow.isFullScreen )&&( !mplShMem->Playing ) )
{
wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
- wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
+ wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
}
wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
@@ -199,7 +199,7 @@
{ message( False,MSGTR_NEMDB ); return; }
wsVisibleWindow( &appMPlayer.mainWindow,wsHideWindow );
wsResizeWindow( &appMPlayer.mainWindow,appMPlayer.main.width,appMPlayer.main.height );
- wsMoveWindow( &appMPlayer.mainWindow,appMPlayer.main.x,appMPlayer.main.y );
+ wsMoveWindow( &appMPlayer.mainWindow,True,appMPlayer.main.x,appMPlayer.main.y );
wsResizeImage( &appMPlayer.mainWindow,appMPlayer.main.width,appMPlayer.main.height );
wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image );
mainVisible=1; mplMainRender=1; wsPostRedisplay( &appMPlayer.mainWindow );
@@ -222,6 +222,11 @@
if ( !appMPlayer.subWindow.isFullScreen )
{
wsResizeWindow( &appMPlayer.subWindow,width,height );
- wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
+ wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
}
+}
+
+void mplSetFileName( char * fname )
+{
+ if ( ( fname )&&( gtkShMem ) ) strcpy( gtkShMem->fs.filename,fname );
}
Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- play.h 25 Sep 2001 14:00:19 -0000 1.12
+++ play.h 12 Nov 2001 15:16:13 -0000 1.13
@@ -91,4 +91,6 @@
extern void ChangeSkin( void );
extern void EventHandling( void );
+extern void mplSetFileName( char * fname );
+
#endif
Index: sw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sw.h 12 Nov 2001 12:26:09 -0000 1.18
+++ sw.h 12 Nov 2001 15:16:13 -0000 1.19
@@ -54,7 +54,7 @@
{
case wsPLMouseButton:
mplSubMoved=1;
- if ( !appMPlayer.subWindow.isFullScreen ) wsMoveWindow( &appMPlayer.subWindow,RX - sx,RY - sy );
+ if ( !appMPlayer.subWindow.isFullScreen ) wsMoveWindow( &appMPlayer.subWindow,False,RX - sx,RY - sy );
break;
case wsPRMouseButton:
mplMenuMouseHandle( X,Y,RX,RY );
More information about the MPlayer-cvslog
mailing list