[MPlayer-cvslog] r34546 - in trunk: DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/app.c gui/app.h gui/interface.c gui/ui/main.c gui/win32/skinload.c gui/win32/skinload.h

[ib]

Author: ib
Date: Thu Jan 12 15:21:55 2012
New Revision: 34546

Log:
Add user event evMenu.

(Unless the skin definable menu can't be properly handled with
mouse over and cursor keys, only the default menu will show up.)

Modified:
   trunk/gui/app.c
   trunk/gui/app.h
   trunk/gui/interface.c
   trunk/gui/ui/main.c
   trunk/gui/win32/skinload.c
   trunk/gui/win32/skinload.h

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/xml/de/skin.xml
   trunk/DOCS/xml/en/skin.xml

Modified: trunk/gui/app.c
==============================================================================
--- trunk/gui/app.c	Thu Jan 12 14:36:20 2012	(r34545)
+++ trunk/gui/app.c	Thu Jan 12 15:21:55 2012	(r34546)
@@ -79,6 +79,7 @@ static const evName evNames[] = {
     { evAbout,             "evAbout"             },
     { evPreferences,       "evPreferences"       },
     { evSkinBrowser,       "evSkinBrowser"       },
+    { evMenu,              "evMenu"              },
     { evIconify,           "evIconify"           },
     { evExit,              "evExit"              }
 };

Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h	Thu Jan 12 14:36:20 2012	(r34545)
+++ trunk/gui/app.h	Thu Jan 12 15:21:55 2012	(r34546)
@@ -68,6 +68,7 @@
 #define evAbout             12
 #define evPreferences       14
 #define evSkinBrowser       15
+#define evMenu              33
 
 #define evIconify           11
 #define evExit              1000

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Jan 12 14:36:20 2012	(r34545)
+++ trunk/gui/interface.c	Thu Jan 12 15:21:55 2012	(r34546)
@@ -383,7 +383,7 @@ int gui(int what, void *data)
     case GUI_RUN_MESSAGE:
         mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[interface] GUI_RUN_MESSAGE: %s\n", (const char *)data);
         msg = appFindMessage((const char *)data);
-        if (appFindItem(msg))
+        if ((msg == evMenu) || appFindItem(msg))
             uiEventHandling(msg, 0);
         break;
 

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Thu Jan 12 14:36:20 2012	(r34545)
+++ trunk/gui/ui/main.c	Thu Jan 12 15:21:55 2012	(r34546)
@@ -325,6 +325,15 @@ set_volume:
         break;
 
 
+   case evMenu:
+        /*if (guiApp.menuIsPresent)   NOTE TO MYSELF: Not before mouse over and
+         {                                            cursor keys will work there.
+          gtkShow( ivHidePopUpMenu,NULL );
+          uiShowMenu( 0,0 );
+         }
+        else*/ gtkShow( ivShowPopUpMenu,NULL );
+        break;
+
    case evIconify:
         switch ( iparam )
          {

Modified: trunk/gui/win32/skinload.c
==============================================================================
--- trunk/gui/win32/skinload.c	Thu Jan 12 14:36:20 2012	(r34545)
+++ trunk/gui/win32/skinload.c	Thu Jan 12 15:21:55 2012	(r34546)
@@ -85,6 +85,7 @@ static const evName evNames[] =
     {   evAbout,                "evAbout"               },
     {   evPreferences,          "evPreferences"         },
     {   evSkinBrowser,          "evSkinBrowser"         },
+    {   evMenu,                 "evMenu"                },
     {   evIconify,              "evIconify"             },
     {   evExit,                 "evExit"                }
 };

Modified: trunk/gui/win32/skinload.h
==============================================================================
--- trunk/gui/win32/skinload.h	Thu Jan 12 14:36:20 2012	(r34545)
+++ trunk/gui/win32/skinload.h	Thu Jan 12 15:21:55 2012	(r34546)
@@ -175,6 +175,7 @@ skin_t *loadskin(char *skindir, int desk
 #define evAbout             12
 #define evPreferences       14
 #define evSkinBrowser       15
+#define evMenu              33
 
 #define evIconify           11
 #define evExit              1000