* added mouse management in the BeOS video output.

   Now DVD menus work thanks to libdvdplay.

diff --git a/modules/gui/beos/VideoOutput.cpp b/modules/gui/beos/VideoOutput.cpp
index 492257a806220616805ceb5e679349986f32e6d2..1add85a3a4151933b8a58a21b957f537b443f5c4 100644 (file)
--- a/modules/gui/beos/VideoOutput.cpp
+++ b/modules/gui/beos/VideoOutput.cpp
@@ -2,7 +2,7 @@
  * vout_beos.cpp: beos video output display method
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: VideoOutput.cpp,v 1.6 2002/11/22 19:37:25 titer Exp $
+ * $Id: VideoOutput.cpp,v 1.7 2002/12/03 02:00:37 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -169,7 +169,7 @@ VideoWindow::VideoWindow(int v_width, int v_height, BRect frame,
     p_vout = p_videoout;
     
     // create the view to do the display
-    view = new VLCView( Bounds() );
+    view = new VLCView( Bounds(), p_vout );
 
        // create background view
     BView *mainView =  new BackgroundView( Bounds(), view );
@@ -862,13 +862,14 @@ VideoWindow::_save_screen_shot( void* cookie )
 /*****************************************************************************
  * VLCView::VLCView
  *****************************************************************************/
-VLCView::VLCView(BRect bounds)
+VLCView::VLCView(BRect bounds, vout_thread_t *p_vout_instance )
        : BView(bounds, "video view", B_FOLLOW_NONE, B_WILL_DRAW | B_PULSE_NEEDED),
          fLastMouseMovedTime(system_time()),
          fCursorHidden(false),
          fCursorInside(false),
          fIgnoreDoubleClick(false)
 {
+    p_vout = p_vout_instance;
     SetViewColor(B_TRANSPARENT_32_BIT);
 }
 
@@ -899,6 +900,7 @@ VLCView::MouseDown(BPoint where)
 {
        VideoWindow* videoWindow = dynamic_cast<VideoWindow*>(Window());
        BMessage* msg = Window()->CurrentMessage();
+       msg->PrintToStream();
        int32 clicks;
        uint32 buttons;
        msg->FindInt32("clicks", &clicks);
@@ -995,6 +997,17 @@ VLCView::MouseDown(BPoint where)
        fCursorHidden = false;
 }
 
+/*****************************************************************************
+ * VLCVIew::MouseUp
+ *****************************************************************************/
+void
+VLCView::MouseUp( BPoint where )
+{
+    vlc_value_t val;
+    val.b_bool = VLC_TRUE;
+    var_Set( p_vout, "mouse-clicked", val );
+}
+
 /*****************************************************************************
  * VLCVIew::MouseMoved
  *****************************************************************************/
@@ -1004,6 +1017,18 @@ VLCView::MouseMoved(BPoint point, uint32 transit, const BMessage* dragMessage)
        fLastMouseMovedTime = system_time();
        fCursorHidden = false;
        fCursorInside = (transit == B_INSIDE_VIEW || transit == B_ENTERED_VIEW);
+       /* DVD navigation */
+       unsigned int i_width, i_height, i_x, i_y;
+    vout_PlacePicture( p_vout, (unsigned int)Bounds().Width(),
+                       (unsigned int)Bounds().Height(),
+                       &i_x, &i_y, &i_width, &i_height );
+       vlc_value_t val;
+       val.i_int = ( (int)point.x - i_x ) * p_vout->render.i_width / i_width;
+       var_Set( p_vout, "mouse-x", val );
+       val.i_int = ( (int)point.y - i_y ) * p_vout->render.i_height / i_height;
+       var_Set( p_vout, "mouse-y", val );
+       val.b_bool = VLC_TRUE;
+    var_Set( p_vout, "mouse-moved", val );
 }
 
 /*****************************************************************************

diff --git a/modules/gui/beos/VideoWindow.h b/modules/gui/beos/VideoWindow.h
index 75120fc32dbe9836515ba5cb39227f12b2dbee8e..396a79dac3c21385568ed0b8734b98f0a65338f5 100644 (file)
--- a/modules/gui/beos/VideoWindow.h
+++ b/modules/gui/beos/VideoWindow.h
@@ -2,7 +2,7 @@
  * VideoWindow.h: BeOS video window class prototype
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: VideoWindow.h,v 1.3 2002/10/28 16:55:05 titer Exp $
+ * $Id: VideoWindow.h,v 1.4 2002/12/03 02:00:38 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Tony Castley <tcastley@mail.powerup.com.au>
@@ -59,11 +59,12 @@ colorcombo colspace[]=
 class VLCView : public BView
 {
  public:
-                                                       VLCView( BRect bounds);
+                                                       VLCView( BRect bounds, vout_thread_t *p_vout );
        virtual                                 ~VLCView();
 
        virtual void                    AttachedToWindow();
        virtual void                    MouseDown(BPoint where);
+       virtual void                    MouseUp(BPoint where);
        virtual void                    MouseMoved(BPoint where, uint32 transit,
                                                                           const BMessage* dragMessage);
        virtual void                    Pulse();
@@ -71,6 +72,8 @@ class VLCView : public BView
        virtual void                    KeyDown(const char* bytes, int32 numBytes);
 
  private:
+            vout_thread_t   *p_vout;
+            
                        bigtime_t               fLastMouseMovedTime;
                        bool                    fCursorHidden;
                        bool                    fCursorInside;