X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fgestures.c;h=627e1bb1a56907be2783e2c69909304599f50a05;hb=53cf4a01e51723479b2a845716b715ac7882dbd9;hp=11471b0c4afe90ac0b81b46cffb27c99b0bbeaad;hpb=3dcb1349a93e8dc6f62d59ba457161483e955c7e;p=vlc diff --git a/modules/control/gestures.c b/modules/control/gestures.c index 11471b0c4a..627e1bb1a5 100644 --- a/modules/control/gestures.c +++ b/modules/control/gestures.c @@ -1,16 +1,16 @@ /***************************************************************************** - * geatures.c: control vlc with mouse gestures + * gestures.c: control vlc with mouse gestures ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: gestures.c,v 1.1 2003/02/09 23:42:06 sigmunau Exp $ + * Copyright (C) 2004 the VideoLAN team + * $Id$ * - * Authors: Sigmund Augdal + * Authors: Sigmund Augdal Helberg * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -26,14 +26,14 @@ *****************************************************************************/ #include /* malloc(), free() */ #include -#include #include #include #include -#include "stream_control.h" -#include "input_ext-intf.h" +#ifdef HAVE_UNISTD_H +# include +#endif /***************************************************************************** * intf_sys_t: description and status of interface @@ -74,23 +74,27 @@ static void RunIntf ( intf_thread_t *p_intf ); /***************************************************************************** * Module descriptor *****************************************************************************/ -#define THRESHOLD_TEXT N_( "Motion threshold" ) +#define THRESHOLD_TEXT N_( "Motion threshold (10-100)" ) #define THRESHOLD_LONGTEXT N_( \ - "the amount of movement required for a mouse" \ - " gesture to be recorded" ) + "Amount of movement required for a mouse gesture to be recorded." ) -#define BUTTON_TEXT N_( "Mouse button" ) +#define BUTTON_TEXT N_( "Trigger button" ) #define BUTTON_LONGTEXT N_( \ - "the mouse button to be held down during mouse gestures" ) + "Trigger button for mouse gestures." ) -static char *button_list[] = { "left", "middle", "right", NULL }; +static char *button_list[] = { "left", "middle", "right" }; +static char *button_list_text[] = { N_("Left"), N_("Middle"), N_("Right") }; vlc_module_begin(); - add_category_hint( N_( "Gestures" ), NULL ); - add_integer( "gestures-threshold", 30, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT ); - add_string_from_list( "gestures-button", "right", button_list, NULL, - BUTTON_TEXT, BUTTON_LONGTEXT ); - set_description( _("mouse gestures control module") ); + set_shortname( _("Gestures")); + set_category( CAT_INTERFACE ); + set_subcategory( SUBCAT_INTERFACE_CONTROL ); + add_integer( "gestures-threshold", 30, NULL, + THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE ); + add_string( "gestures-button", "right", NULL, + BUTTON_TEXT, BUTTON_LONGTEXT, VLC_FALSE ); + change_string_list( button_list, button_list_text, 0 ); + set_description( _("Mouse gestures control interface") ); set_capability( "interface", 0 ); set_callbacks( E_(Open), E_(Close) ); @@ -122,7 +126,7 @@ static int gesture( int i_pattern, int i_num ) { return ( i_pattern >> ( i_num * 4 ) ) & 0xF; } - + /***************************************************************************** * CloseIntf: destroy dummy interface *****************************************************************************/ @@ -145,17 +149,17 @@ static void RunIntf( intf_thread_t *p_intf ) if( InitThread( p_intf ) < 0 ) { - msg_Err( p_intf, "can't initialize intf" ); + msg_Err( p_intf, "can't initialize interface thread" ); return; } - msg_Dbg( p_intf, "intf initialized" ); + msg_Dbg( p_intf, "interface thread initialized" ); /* Main loop */ - while( !p_intf->b_die ) + while( !intf_ShouldDie( p_intf ) ) { vlc_mutex_lock( &p_intf->change_lock ); - /* + /* * mouse cursor */ if( p_intf->p_sys->b_got_gesture ) @@ -170,7 +174,7 @@ static void RunIntf( intf_thread_t *p_intf ) { break; } - + playlist_Prev( p_playlist ); vlc_object_release( p_playlist ); break; @@ -181,20 +185,23 @@ static void RunIntf( intf_thread_t *p_intf ) { break; } - + playlist_Next( p_playlist ); vlc_object_release( p_playlist ); break; - - case DOWN: - if (p_intf->p_sys->p_vout - && ((vout_thread_t *)p_intf->p_sys->p_vout)->b_fullscreen ) + case GESTURE(UP,RIGHT,NONE,NONE): + if (p_intf->p_sys->p_vout ) { - ((vout_thread_t *)p_intf->p_sys->p_vout)->i_changes |= VOUT_FULLSCREEN_CHANGE; + ((vout_thread_t *)p_intf->p_sys->p_vout)->i_changes |= + VOUT_FULLSCREEN_CHANGE; } break; + case GESTURE(DOWN,RIGHT,NONE,NONE): + /* FIXME: Should close the vout!"*/ + p_intf->p_libvlc->b_die = VLC_TRUE; + break; case GESTURE(DOWN,LEFT,UP,RIGHT): - msg_Dbg(p_intf, "A square!" ); + msg_Dbg(p_intf, "a square was drawn!" ); break; default: break; @@ -203,11 +210,11 @@ static void RunIntf( intf_thread_t *p_intf ) p_intf->p_sys->i_pattern = 0; p_intf->p_sys->b_got_gesture = VLC_FALSE; } - + vlc_mutex_unlock( &p_intf->change_lock ); - /* + /* * video output */ if( p_intf->p_sys->p_vout && p_intf->p_sys->p_vout->b_die ) @@ -254,7 +261,7 @@ static int InitThread( intf_thread_t * p_intf ) { char *psz_button; /* we might need some locking here */ - if( !p_intf->b_die ) + if( !intf_ShouldDie( p_intf ) ) { input_thread_t * p_input; @@ -265,7 +272,8 @@ static int InitThread( intf_thread_t * p_intf ) p_intf->p_sys->p_input = p_input; p_intf->p_sys->b_got_gesture = VLC_FALSE; p_intf->p_sys->b_button_pressed = VLC_FALSE; - p_intf->p_sys->i_threshold = config_GetInt( p_intf, "gestures-threshold" ); + p_intf->p_sys->i_threshold = + config_GetInt( p_intf, "gestures-threshold" ); psz_button = config_GetPsz( p_intf, "gestures-button" ); if ( !strcmp( psz_button, "left" ) ) { @@ -300,17 +308,19 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var, { vlc_value_t val; int pattern = 0; - + signed int i_horizontal, i_vertical; intf_thread_t *p_intf = (intf_thread_t *)p_data; /* don't process new gestures before the last events are processed */ - if( p_intf->p_sys->b_got_gesture ) { + if( p_intf->p_sys->b_got_gesture ) + { return VLC_SUCCESS; } vlc_mutex_lock( &p_intf->change_lock ); - if( !strcmp(psz_var, "mouse-moved" ) && p_intf->p_sys->b_button_pressed ) { + if( !strcmp(psz_var, "mouse-moved" ) && p_intf->p_sys->b_button_pressed ) + { var_Get( p_intf->p_sys->p_vout, "mouse-x", &val ); p_intf->p_sys->i_mouse_x = val.i_int; var_Get( p_intf->p_sys->p_vout, "mouse-y", &val ); @@ -321,40 +331,43 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var, i_vertical = p_intf->p_sys->i_mouse_y - p_intf->p_sys->i_last_y; i_vertical = i_vertical / p_intf->p_sys->i_threshold; - - if ( i_horizontal < 0 ) + + if( i_horizontal < 0 ) { - msg_Dbg( p_intf, "left gesture(%d)", i_horizontal ); + msg_Dbg( p_intf, "left gesture (%d)", i_horizontal ); pattern = LEFT; } - else if ( i_horizontal > 0 ) + else if( i_horizontal > 0 ) { - msg_Dbg( p_intf, "right gesture(%d)", i_horizontal ); + msg_Dbg( p_intf, "right gesture (%d)", i_horizontal ); pattern = RIGHT; } - if ( i_vertical < 0 ) + if( i_vertical < 0 ) { - msg_Dbg( p_intf, "up gesture(%d)", i_vertical ); + msg_Dbg( p_intf, "up gesture (%d)", i_vertical ); pattern = UP; } - else if ( i_vertical > 0 ) + else if( i_vertical > 0 ) { - msg_Dbg( p_intf, "down gesture(%d)", i_vertical ); + msg_Dbg( p_intf, "down gesture (%d)", i_vertical ); pattern = DOWN; } - if (pattern ) + if( pattern ) { p_intf->p_sys->i_last_y = p_intf->p_sys->i_mouse_y; p_intf->p_sys->i_last_x = p_intf->p_sys->i_mouse_x; - if( gesture(p_intf->p_sys->i_pattern, p_intf->p_sys->i_num_gestures - 1 ) != pattern ) + if( gesture( p_intf->p_sys->i_pattern, + p_intf->p_sys->i_num_gestures - 1 ) != pattern ) { - p_intf->p_sys->i_pattern |= pattern << ( p_intf->p_sys->i_num_gestures * 4 ); + p_intf->p_sys->i_pattern |= + pattern << ( p_intf->p_sys->i_num_gestures * 4 ); p_intf->p_sys->i_num_gestures++; } } } - if( !strcmp( psz_var, "mouse-button-down" ) && newval.i_int & p_intf->p_sys->i_button_mask + if( !strcmp( psz_var, "mouse-button-down" ) + && newval.i_int & p_intf->p_sys->i_button_mask && !p_intf->p_sys->b_button_pressed ) { p_intf->p_sys->b_button_pressed = VLC_TRUE; @@ -363,7 +376,8 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var, var_Get( p_intf->p_sys->p_vout, "mouse-y", &val ); p_intf->p_sys->i_last_y = val.i_int; } - if( !strcmp( psz_var, "mouse-button-down" ) && !( newval.i_int & p_intf->p_sys->i_button_mask ) + if( !strcmp( psz_var, "mouse-button-down" ) + && !( newval.i_int & p_intf->p_sys->i_button_mask ) && p_intf->p_sys->b_button_pressed ) { p_intf->p_sys->b_button_pressed = VLC_FALSE;