X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=modules%2Fvideo_output%2Fx11%2Fxcommon.c;h=9cd132c91c71b4c8178b8ea1b02ee602c42928f0;hp=ea973d8663a051e78887f14b0ccea3e899310188;hb=5d854b3643a0673aaaf44fb73c880d537b2edbde;hpb=d0240cc7ddeffc038247df1c13663eae2477cfe1 diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c index ea973d8663..9cd132c91c 100644 --- a/modules/video_output/x11/xcommon.c +++ b/modules/video_output/x11/xcommon.c @@ -1232,6 +1232,8 @@ static int ManageVideo( vout_thread_t *p_vout ) val.i_int |= 1; var_Set( p_vout, "mouse-button-down", val ); + var_SetBool( p_vout->p_libvlc, "intf-popupmenu", false ); + /* detect double-clicks */ if( ( ((XButtonEvent *)&xevent)->time - p_vout->p_sys->i_time_button_last_pressed ) < 300 ) @@ -1252,6 +1254,7 @@ static int ManageVideo( vout_thread_t *p_vout ) var_Get( p_vout, "mouse-button-down", &val ); val.i_int |= 4; var_Set( p_vout, "mouse-button-down", val ); + var_SetBool( p_vout->p_libvlc, "intf-popupmenu", true ); break; case Button4: @@ -1279,7 +1282,6 @@ static int ManageVideo( vout_thread_t *p_vout ) var_Set( p_vout, "mouse-button-down", val ); var_SetBool( p_vout, "mouse-clicked", true ); - var_SetBool( p_vout->p_libvlc, "intf-popupmenu", false ); } break; @@ -1301,7 +1303,6 @@ static int ManageVideo( vout_thread_t *p_vout ) val.i_int &= ~4; var_Set( p_vout, "mouse-button-down", val ); - var_SetBool( p_vout->p_libvlc, "intf-popupmenu", true ); } break;