# HG changeset patch
# User ulion
# Date 1198304078 0
# Node ID 7ef04742572c0a6b6e273aa09260c1e7b54be125
# Parent  3086b6d39052a349e916658ade7767eebe58f3ef
OSD menu support mouse selection.

diff -r 3086b6d39052 -r 7ef04742572c command.c
--- a/command.c	Sat Dec 22 03:45:14 2007 +0000
+++ b/command.c	Sat Dec 22 06:14:38 2007 +0000
@@ -51,6 +51,10 @@
 #include "libass/ass.h"
 #include "libass/ass_mp.h"
 #endif
+#ifdef HAVE_MENU
+#include "m_struct.h"
+#include "libmenu/menu.h"
+#endif
 #ifdef HAVE_NEW_GUI
 #include "gui/interface.h"
 #endif
@@ -60,6 +64,8 @@
 
 #define ROUND(x) ((int)((x)<0 ? (x)-0.5 : (x)+0.5))
 
+extern int use_menu;
+
 static void rescale_input_coordinates(int ix, int iy, double *dx, double *dy)
 {
     //remove the borders, if any, and rescale to the range [0,1],[0,1]
@@ -2992,6 +2998,10 @@
 				    "Selected button number %d", button);
 		}
 #endif
+#ifdef HAVE_MENU
+		if (use_menu && dx >= 0.0 && dy >= 0.0)
+		    menu_update_mouse_pos(dx, dy);
+#endif
 	    }
 	    break;
 
diff -r 3086b6d39052 -r 7ef04742572c etc/menu.conf
--- a/etc/menu.conf	Sat Dec 22 03:45:14 2007 +0000
+++ b/etc/menu.conf	Sat Dec 22 06:14:38 2007 +0000
@@ -23,6 +23,8 @@
     <binding key="AR_MENU" cmd="menu cancel" />
     <binding key="AR_PREV_HOLD" cmd="menu home" />
     <binding key="AR_NEXT_HOLD" cmd="menu end" />
+    <binding key="MOUSE_BTN0" cmd="menu click" />
+    <binding key="MOUSE_BTN2" cmd="menu cancel" />
 </keybindings>
 <keybindings name="list" parent="default">
     <binding key="AR_PREV" cmd="menu pageup" />
diff -r 3086b6d39052 -r 7ef04742572c libmenu/menu.c
--- a/libmenu/menu.c	Sat Dec 22 03:45:14 2007 +0000
+++ b/libmenu/menu.c	Sat Dec 22 06:14:38 2007 +0000
@@ -68,6 +68,10 @@
   char* args;
 };
 
+double menu_mouse_x = -1.0;
+double menu_mouse_y = -1.0;
+int menu_mouse_pos_updated = 0;
+
 static struct MPContext *menu_ctx = NULL;
 static menu_def_t* menu_list = NULL;
 static int menu_count = 0;
@@ -324,6 +328,12 @@
     menu->draw(menu,mpi);
 }
 
+void menu_update_mouse_pos(double x, double y) {
+  menu_mouse_x = x;
+  menu_mouse_y = y;
+  menu_mouse_pos_updated = 1;
+}
+
 void menu_read_cmd(menu_t* menu,int cmd) {
   if(menu->read_cmd)
     menu->read_cmd(menu,cmd);
diff -r 3086b6d39052 -r 7ef04742572c libmenu/menu.h
--- a/libmenu/menu.h	Sat Dec 22 03:45:14 2007 +0000
+++ b/libmenu/menu.h	Sat Dec 22 06:14:38 2007 +0000
@@ -44,6 +44,7 @@
 #define MENU_CMD_END 8
 #define MENU_CMD_PAGE_UP 9
 #define MENU_CMD_PAGE_DOWN 10
+#define MENU_CMD_CLICK 11
 
 /// Global init/uninit
 int menu_init(struct MPContext *mpctx, char* cfg_file);
@@ -60,6 +61,9 @@
 //// Default implementation
 int menu_dflt_read_key(menu_t* menu,int cmd);
 
+/// Receive mouse position events.
+void menu_update_mouse_pos(double x, double y);
+
 /////////// Helpers
 
 #define MENU_TEXT_TOP	(1<<0)
diff -r 3086b6d39052 -r 7ef04742572c libmenu/menu_list.c
--- a/libmenu/menu_list.c	Sat Dec 22 03:45:14 2007 +0000
+++ b/libmenu/menu_list.c	Sat Dec 22 06:14:38 2007 +0000
@@ -18,6 +18,16 @@
 #define IMPL 1
 #include "menu_list.h"
 
+extern double menu_mouse_x;
+extern double menu_mouse_y;
+extern int menu_mouse_pos_updated;
+static int mouse_x;
+static int mouse_y;
+static int selection_x;
+static int selection_y;
+static int selection_w;
+static int selection_h;
+
 #define mpriv (menu->priv)
 
 void menu_list_draw(menu_t* menu,mp_image_t* mpi) {
@@ -127,9 +137,39 @@
   
   dx = x < 0 ? (mpi->w - need_w) / 2 : x;
   bx = x < 0 ? (mpi->w - bg_w) / 2 : x - mpriv->minb;
+
+  // If mouse moved, try to update selected menu item by the mouse position.
+  if (menu_mouse_pos_updated) {
+    mouse_x = menu_mouse_x * mpi->width;
+    mouse_y = menu_mouse_y * mpi->height;
+    if (mouse_x >= bx && mouse_x < bx + bg_w) {
+      int by = dy + y - mpriv->vspace / 2;
+      int max_by = dh + y + mpriv->vspace / 2;
+      if (mouse_y >= by && mouse_y < max_by) {
+        int cur_no = (mouse_y - by) / line_h;
+        list_entry_t* e = m;
+        for (i = 0; e != NULL; e = e->next) {
+          if (e->hide) continue;
+          if (i == cur_no) {
+            mpriv->current = e;
+            break;
+          }
+          ++i;
+        }
+      }
+    }
+    menu_mouse_pos_updated = 0;
+  }
+
   for( ; m != NULL && dy + vo_font->height < dh ; m = m->next ) {
     if(m->hide) continue;
     if(m == mpriv->current) {
+      // Record rectangle of current selection box.
+      selection_x = bx;
+      selection_y = dy + y - mpriv->vspace / 2;
+      selection_w = bg_w;
+      selection_h = line_h;
+
       if(mpriv->ptr_bg >= 0)
         menu_draw_box(mpi,mpriv->ptr_bg,mpriv->ptr_bg_alpha,
                       bx, dy + y - mpriv->vspace / 2,
@@ -211,6 +251,11 @@
     menu->show = 0;
     menu->cl = 1;
     break;
+  case MENU_CMD_CLICK:
+    if (mouse_x >= selection_x && mouse_x < selection_x + selection_w &&
+        mouse_y >= selection_y && mouse_y < selection_y + selection_h)
+      menu_read_cmd(menu, MENU_CMD_OK);
+    break;
   }    
 }
 
diff -r 3086b6d39052 -r 7ef04742572c libmenu/vf_menu.c
--- a/libmenu/vf_menu.c	Sat Dec 22 03:45:14 2007 +0000
+++ b/libmenu/vf_menu.c	Sat Dec 22 06:14:38 2007 +0000
@@ -81,6 +81,8 @@
       menu_read_cmd(priv->current,MENU_CMD_PAGE_UP);
     else if(strcmp(arg,"pagedown") == 0)
       menu_read_cmd(priv->current,MENU_CMD_PAGE_DOWN);
+    else if(strcmp(arg,"click") == 0)
+      menu_read_cmd(priv->current,MENU_CMD_CLICK);
     else if(strcmp(arg,"hide") == 0 || strcmp(arg,"toggle") == 0)
       priv->current->show = 0;
     else
diff -r 3086b6d39052 -r 7ef04742572c mplayer.c
--- a/mplayer.c	Sat Dec 22 03:45:14 2007 +0000
+++ b/mplayer.c	Sat Dec 22 06:14:38 2007 +0000
@@ -352,7 +352,7 @@
   NULL
 };
 static vf_instance_t* vf_menu = NULL;
-static int use_menu = 0;
+int use_menu = 0;
 static char* menu_cfg = NULL;
 static char* menu_root = "main";
 #endif