[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.h,1.3,1.4 mw.h,1.31,1.32 psignal.c,1.17,1.18 widgets.c,1.11,1.12 widgets.h,1.7,1.8

[Zoltan Ponekker]

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

Modified Files:
	mplayer.h mw.h psignal.c widgets.c widgets.h 
Log Message:
middle menu is working

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mplayer.h	16 Oct 2001 21:23:59 -0000	1.3
+++ mplayer.h	16 Nov 2001 23:17:52 -0000	1.4
@@ -11,6 +11,7 @@
 extern int             mainVisible;
 
 extern int             mplMainAutoPlay;
+extern int	       mplMiddleMenu;
 
 extern void mplInit( int argc,char* argv[], char *envp[], void* disp );
 extern void mplMsgHandle( int msg,float param );

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mw.h	14 Nov 2001 16:05:33 -0000	1.31
+++ mw.h	16 Nov 2001 23:17:52 -0000	1.32
@@ -5,7 +5,9 @@
 
 unsigned char * mplDrawBuffer = NULL;
 int             mplMainRender = 1;
+
 int             mplMainAutoPlay = 0;
+int		mplMiddleMenu = 0;
 
 int             mainVisible = 1;
 
@@ -380,7 +382,14 @@
           mplMainRender=1;
           mplMainAutoPlay=0;
           mplPlay();
+	  break;
          }
+	if ( mplMiddleMenu )
+	 {
+	  mplMiddleMenu=0;
+	  mplMsgHandle( gtkShMem->popupmenu,0 );
+	  break;
+	 }
         break;
 // --- system events
    case evNone:

Index: psignal.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/psignal.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- psignal.c	14 Nov 2001 16:04:09 -0000	1.17
+++ psignal.c	16 Nov 2001 23:17:52 -0000	1.18
@@ -127,10 +127,8 @@
 	gtk_main_quit();
         break;
    case evShowPopUpMenu:
-//	if ( gtkVisiblePopUpMenu ) gtk_widget_hide( PopUpMenu );
-//	gtk_widget_show( PopUpMenu );
+        gtkShMem->popupmenu=evNone;
         gtk_menu_popup( GTK_MENU( PopUpMenu ),NULL,NULL,NULL,NULL,0,0 );
-	gtkVisiblePopUpMenu=1;
 	break;
   }
  gtkShMem->message=0;
@@ -184,6 +182,10 @@
 	mplShMem->StreamType=STREAMTYPE_FILE;
         if ( mplMainAutoPlay ) mplGeneralTimer=1;
         break;
+   case evShowPopUpMenu:
+        fprintf( stderr,"[psignal] PopUpMenu: %d\n",gtkShMem->popupmenu );
+	mplMiddleMenu=1; mplGeneralTimer=1; 
+	break;
    case evMessageBox:
         if ( mplCriticalError )
          { gtkSendMessage( evExit ); exit( 1 ); }

Index: widgets.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- widgets.c	14 Nov 2001 16:04:09 -0000	1.11
+++ widgets.c	16 Nov 2001 23:17:52 -0000	1.12
@@ -40,7 +40,6 @@
 int             gtkVisibleMessageBox = 0;
 int             gtkVisibleAboutBox = 0;
 int             gtkVisibleOptions = 0;
-int             gtkVisiblePopUpMenu = 0;
 
 gtkCommStruct * gtkShMem;
 

Index: widgets.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- widgets.h	14 Nov 2001 16:05:33 -0000	1.7
+++ widgets.h	16 Nov 2001 23:17:52 -0000	1.8
@@ -52,6 +52,7 @@
  gtkSkinStruct         sb;
  gtkVisibleStruct      vs;
  gtkOptionsStruct      op;
+ int		       popupmenu;
 } gtkCommStruct;
 
 extern gtkCommStruct * gtkShMem;
@@ -77,7 +78,6 @@
 extern int             gtkVisibleMessageBox;
 extern int             gtkVisibleAboutBox;
 extern int             gtkVisibleOptions;
-extern int             gtkVisiblePopUpMenu;
 
 extern char          * sbMPlayerDirInHome;
 extern char          * sbMPlayerPrefixDir;