mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Move repaint debug binding to mod-shift-space

Browse Source 
Alt-space or Super-space are too likely to conflict with application
bindings.
This commit is contained in:
Kristian Høgsberg 2012-06-28 14:13:10 -04:00
parent c7cd626bcf
commit 73694c832b
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compositor.c
View File

@ -1798,6 +1798,8 @@ notify_modifiers(struct wl_seat *wl_seat, uint32_t serial)
seat->modifier_state |= MODIFIER_ALT; seat->modifier_state |= MODIFIER_ALT;
if (mods_lookup & (1 << seat->xkb_info.super_mod)) if (mods_lookup & (1 << seat->xkb_info.super_mod))
seat->modifier_state |= MODIFIER_SUPER; seat->modifier_state |= MODIFIER_SUPER;
if (mods_lookup & (1 << seat->xkb_info.shift_mod))
seat->modifier_state |= MODIFIER_SHIFT;
/* Finally, notify the compositor that LEDs have changed. */ /* Finally, notify the compositor that LEDs have changed. */
if (xkb_state_led_index_is_active(seat->xkb_state.state, if (xkb_state_led_index_is_active(seat->xkb_state.state,

1
src/compositor.h
View File

@ -52,6 +52,7 @@ enum weston_keyboard_modifier {
MODIFIER_CTRL = (1 << 0), MODIFIER_CTRL = (1 << 0),
MODIFIER_ALT = (1 << 1), MODIFIER_ALT = (1 << 1),
MODIFIER_SUPER = (1 << 2), MODIFIER_SUPER = (1 << 2),
MODIFIER_SHIFT = (1 << 3),
}; };
enum weston_led { enum weston_led {

2
src/shell.c
View File

@ -3248,7 +3248,7 @@ shell_add_bindings(struct weston_compositor *ec, struct desktop_shell *shell)
ec); ec);
weston_compositor_add_key_binding(ec, KEY_BRIGHTNESSUP, 0, weston_compositor_add_key_binding(ec, KEY_BRIGHTNESSUP, 0,
backlight_binding, ec); backlight_binding, ec);
weston_compositor_add_key_binding(ec, KEY_SPACE, mod, weston_compositor_add_key_binding(ec, KEY_SPACE, mod | MODIFIER_SHIFT,
debug_repaint_binding, shell); debug_repaint_binding, shell);
weston_compositor_add_key_binding(ec, KEY_K, mod, weston_compositor_add_key_binding(ec, KEY_K, mod,
force_kill_binding, shell); force_kill_binding, shell);