git.videolan.org
/
vlc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x11: Show popup menu on click, not on release, as KDE and GNOME seem to do it.
[vlc.git]
/
modules
/
video_output
/
x11
/
xcommon.c
diff --git
a/modules/video_output/x11/xcommon.c
b/modules/video_output/x11/xcommon.c
index
ea973d8
..
9cd132c
100644
(file)
--- 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 );
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 )
/* 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_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:
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_Set( p_vout, "mouse-button-down", val );
var_SetBool( p_vout, "mouse-clicked", true );
- var_SetBool( p_vout->p_libvlc, "intf-popupmenu", false );
}
break;
}
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 );
val.i_int &= ~4;
var_Set( p_vout, "mouse-button-down", val );
- var_SetBool( p_vout->p_libvlc, "intf-popupmenu", true );
}
break;
}
break;