Changeset 3dcb1349a93e8dc6f62d59ba457161483e955c7e

Timestamp:

10/02/03 00:42:06 (6 years ago)

Author:

Sigmund Augdal Helberg <sigmunau@videolan.org>

git-committer:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1044834126 +0000

git-parent:

[6a741bd30475513f2b783130077c32837ca56a12]

git-author:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1044834126 +0000

Message:

*: a new mouse gestures interface, currently supporting back, forward, quit

fullscreen and a nice debug message when you draw a clockwise square. Video
output modules needs to be modified for this to work, but it should be minor
in modules supporting dvd navigation.

btw: it should be easy to add new gestures, ideas appreciated

Files:

• modules/Makefile.am (modified) (1 diff)
• modules/control/Modules.am (added)
• modules/control/gestures.c (added)
• modules/video_output/x11/xcommon.c (modified) (5 diffs)
• src/video_output/video_output.c (modified) (2 diffs)

modules/Makefile.am

@@ -29 +29 @@
-    control/lirc/Modules.am \
-    control/rc/Modules.am \
+    control/Modules.am \
-    demux/Modules.am \
-    demux/aac/Modules.am \

modules/video_output/x11/xcommon.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-3 2003/02/01 18:54:10 sam
+4 2003/02/09 23:42:06 sigmunau
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -614 +614 @@
-            {
-                case Button1:
-
+
+
+
+
-                    /* detect double-clicks */
-                    if( ( ((XButtonEvent *)&xevent)->time -
@@ -625 +628 @@
-                        ((XButtonEvent *)&xevent)->time;
-                    break;
-
+
+
+
+
+
+
+
+
+
+
+
+
-                case Button4:
+                    var_Get( p_vout, "mouse-button-down", &val );
+                    val.i_int |= 8;
+                    var_Set( p_vout, "mouse-button-down", val );
-                    input_Seek( p_vout, 15, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
-                    break;
-
-                case Button5:
+                    var_Get( p_vout, "mouse-button-down", &val );
+                    val.i_int |= 16;
+                    var_Set( p_vout, "mouse-button-down", val );
-                    input_Seek( p_vout, -15, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
-                    break;
@@ -641 +661 @@
-            {
-                case Button1:
+                    var_Get( p_vout, "mouse-button-down", &val );
+                    val.i_int &= ~1;
+                    var_Set( p_vout, "mouse-button-down", val );
+
-                    val.b_bool = VLC_TRUE;
-                    var_Set( p_vout, "mouse-clicked", val );
-                    break;
-
+
+
+
+
+
+
+
-                case Button3:
-                    {
-                        intf_thread_t *p_intf;
+                        var_Get( p_vout, "mouse-button-down", &val );
+                        val.i_int &= ~4;
+                        var_Set( p_vout, "mouse-button-down", val );
-                        p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF,
-                                                          FIND_ANYWHERE );
@@ -657 +690 @@
-                    }
-                    break;
+
+                case Button4:
+                    var_Get( p_vout, "mouse-button-down", &val );
+                    val.i_int &= ~8;
+                    var_Set( p_vout, "mouse-button-down", val );
+                    break;
+
+                case Button5:
+                    var_Get( p_vout, "mouse-button-down", &val );
+                    val.i_int &= ~16;
+                    var_Set( p_vout, "mouse-button-down", val );
+                    break;
+                    
-            }
-        }

src/video_output/video_output.c

@@ -6 +6 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-1 2003/01/30 19:14:17 gbazin
+2 2003/02/09 23:42:06 sigmunau
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -328 +328 @@
-    var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
-    var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
+    var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
-    var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
-    var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );