# HG changeset patch
# User ib
# Date 1326378115 0
# Node ID 1e84148527ab6b850e0e60611d511015515a5fa6
# Parent  220497708307d7d844ec949f8ed1c6d8985607a1
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.)

diff -r 220497708307 -r 1e84148527ab DOCS/xml/de/skin.xml
--- a/DOCS/xml/de/skin.xml	Thu Jan 12 13:36:20 2012 +0000
+++ b/DOCS/xml/de/skin.xml	Thu Jan 12 14:21:55 2012 +0000
@@ -1301,6 +1301,15 @@
       </varlistentry>
 
       <varlistentry>
+        <term><emphasis role="bold">evMenu</emphasis></term>
+        <listitem>
+          <para>
+            Öffne das (Standard-)Menü.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><emphasis role="bold">evIconify</emphasis></term>
         <listitem>
           <para>
diff -r 220497708307 -r 1e84148527ab DOCS/xml/en/skin.xml
--- a/DOCS/xml/en/skin.xml	Thu Jan 12 13:36:20 2012 +0000
+++ b/DOCS/xml/en/skin.xml	Thu Jan 12 14:21:55 2012 +0000
@@ -1101,6 +1101,13 @@
 </varlistentry>
 
 <varlistentry>
+  <term><emphasis role="bold">evMenu</emphasis></term>
+  <listitem><para>
+  Open the (default) menu.
+  </para></listitem>
+</varlistentry>
+
+<varlistentry>
   <term><emphasis role="bold">evIconify</emphasis></term>
   <listitem><para>
   Iconify the window.
diff -r 220497708307 -r 1e84148527ab gui/app.c
--- a/gui/app.c	Thu Jan 12 13:36:20 2012 +0000
+++ b/gui/app.c	Thu Jan 12 14:21:55 2012 +0000
@@ -79,6 +79,7 @@
     { evAbout,             "evAbout"             },
     { evPreferences,       "evPreferences"       },
     { evSkinBrowser,       "evSkinBrowser"       },
+    { evMenu,              "evMenu"              },
     { evIconify,           "evIconify"           },
     { evExit,              "evExit"              }
 };
diff -r 220497708307 -r 1e84148527ab gui/app.h
--- a/gui/app.h	Thu Jan 12 13:36:20 2012 +0000
+++ b/gui/app.h	Thu Jan 12 14:21:55 2012 +0000
@@ -68,6 +68,7 @@
 #define evAbout             12
 #define evPreferences       14
 #define evSkinBrowser       15
+#define evMenu              33
 
 #define evIconify           11
 #define evExit              1000
diff -r 220497708307 -r 1e84148527ab gui/interface.c
--- a/gui/interface.c	Thu Jan 12 13:36:20 2012 +0000
+++ b/gui/interface.c	Thu Jan 12 14:21:55 2012 +0000
@@ -383,7 +383,7 @@
     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;
 
diff -r 220497708307 -r 1e84148527ab gui/ui/main.c
--- a/gui/ui/main.c	Thu Jan 12 13:36:20 2012 +0000
+++ b/gui/ui/main.c	Thu Jan 12 14:21:55 2012 +0000
@@ -325,6 +325,15 @@
         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 )
          {
diff -r 220497708307 -r 1e84148527ab gui/win32/skinload.c
--- a/gui/win32/skinload.c	Thu Jan 12 13:36:20 2012 +0000
+++ b/gui/win32/skinload.c	Thu Jan 12 14:21:55 2012 +0000
@@ -85,6 +85,7 @@
     {   evAbout,                "evAbout"               },
     {   evPreferences,          "evPreferences"         },
     {   evSkinBrowser,          "evSkinBrowser"         },
+    {   evMenu,                 "evMenu"                },
     {   evIconify,              "evIconify"             },
     {   evExit,                 "evExit"                }
 };
diff -r 220497708307 -r 1e84148527ab gui/win32/skinload.h
--- a/gui/win32/skinload.h	Thu Jan 12 13:36:20 2012 +0000
+++ b/gui/win32/skinload.h	Thu Jan 12 14:21:55 2012 +0000
@@ -175,6 +175,7 @@
 #define evAbout             12
 #define evPreferences       14
 #define evSkinBrowser       15
+#define evMenu              33
 
 #define evIconify           11
 #define evExit              1000