From 78992c7fdc79320426223c7ab3160b17f56d125f Mon Sep 17 00:00:00 2001
From: nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 16 Sep 2006 15:25:31 +0000
Subject: [PATCH] report mouse coordinates after movement to dvdnav; this
 permits to enable button selection using the mouse; patch by Jonas Jermann
 and me

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19857 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mplayer.c              |  7 +++++++
 stream/stream_dvdnav.c | 14 ++++++++++++++
 stream/stream_dvdnav.h |  1 +
 3 files changed, 22 insertions(+)

diff --git a/mplayer.c b/mplayer.c
index 2e906cfbb5..50f5ebfe4d 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -5157,6 +5157,13 @@ if(step_sec>0) {
         pointer_x = cmd->args[0].v.i;
         pointer_y = cmd->args[1].v.i;
         rescale_input_coordinates(pointer_x, pointer_y, &dx, &dy);
+#ifdef USE_DVDNAV
+        if(stream->type == STREAMTYPE_DVDNAV && dx > 0.0 && dy > 0.0) {
+            pointer_x = (int) (dx * (double) sh_video->disp_w);
+            pointer_y = (int) (dy * (double) sh_video->disp_h);
+            mp_dvdnav_update_mouse_pos(stream, pointer_x, pointer_y, &button);
+        }
+#endif
         break;
     }
 #ifdef USE_DVDNAV
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 13179552f9..16da6bfc30 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -481,6 +481,20 @@ int mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button) {
   return reset;
 }
 
+void mp_dvdnav_update_mouse_pos(stream_t *stream, int32_t x, int32_t y, int* button) {
+  dvdnav_priv_t * dvdnav_priv=(dvdnav_priv_t*)stream->priv;
+  dvdnav_t *nav = dvdnav_priv->dvdnav;
+  dvdnav_status_t status;
+  pci_t *pci = dvdnav_get_current_nav_pci(nav);
+
+  if(!pci) return;
+
+  status = dvdnav_mouse_select(nav, pci, x, y);
+  if(status == DVDNAV_STATUS_OK) dvdnav_get_current_highlight(nav, button);
+  else *button = -1;
+}
+
+
 stream_info_t stream_info_dvdnav = {
   "DVDNAV stream",
   "null",
diff --git a/stream/stream_dvdnav.h b/stream/stream_dvdnav.h
index bae181c8b9..f3ff8a11da 100644
--- a/stream/stream_dvdnav.h
+++ b/stream/stream_dvdnav.h
@@ -44,5 +44,6 @@ int dvdnav_stream_sleeping(dvdnav_priv_t * dvdnav_priv);
 void dvdnav_stream_fullstart(dvdnav_priv_t *dvdnav_priv);
 unsigned int * dvdnav_stream_get_palette(dvdnav_priv_t * dvdnav_priv);
 int mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button);
+void mp_dvdnav_update_mouse_pos(stream_t *stream, int32_t x, int32_t y, int* button);
 
 #endif