[mutter/wayland] wayland-keyboard: Remove unused modifier indexes
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] wayland-keyboard: Remove unused modifier indexes
- Date: Fri, 7 Mar 2014 17:01:51 +0000 (UTC)
commit dfc7f7222b27e29e8ad2f7fcd4bb6a6c901d9bcd
Author: Rui Matos <tiagomatos gmail com>
Date: Wed Mar 5 15:05:23 2014 +0100
wayland-keyboard: Remove unused modifier indexes
This was copied from weston where they're used for compositor
keybindings. Mutter has its own keybindings code which doesn't need
this.
https://bugzilla.gnome.org/show_bug.cgi?id=722847
src/wayland/meta-wayland-keyboard.c | 14 --------------
src/wayland/meta-wayland-keyboard.h | 8 --------
2 files changed, 0 insertions(+), 22 deletions(-)
---
diff --git a/src/wayland/meta-wayland-keyboard.c b/src/wayland/meta-wayland-keyboard.c
index 477d563..19faa8c 100644
--- a/src/wayland/meta-wayland-keyboard.c
+++ b/src/wayland/meta-wayland-keyboard.c
@@ -142,20 +142,6 @@ meta_wayland_keyboard_take_keymap (MetaWaylandKeyboard *keyboard,
xkb_keymap_unref (xkb_info->keymap);
xkb_info->keymap = keymap;
- xkb_info->shift_mod =
- xkb_map_mod_get_index (xkb_info->keymap, XKB_MOD_NAME_SHIFT);
- xkb_info->caps_mod =
- xkb_map_mod_get_index (xkb_info->keymap, XKB_MOD_NAME_CAPS);
- xkb_info->ctrl_mod =
- xkb_map_mod_get_index (xkb_info->keymap, XKB_MOD_NAME_CTRL);
- xkb_info->alt_mod =
- xkb_map_mod_get_index (xkb_info->keymap, XKB_MOD_NAME_ALT);
- xkb_info->mod2_mod = xkb_map_mod_get_index (xkb_info->keymap, "Mod2");
- xkb_info->mod3_mod = xkb_map_mod_get_index (xkb_info->keymap, "Mod3");
- xkb_info->super_mod =
- xkb_map_mod_get_index (xkb_info->keymap, XKB_MOD_NAME_LOGO);
- xkb_info->mod5_mod = xkb_map_mod_get_index (xkb_info->keymap, "Mod5");
-
keymap_str = xkb_map_get_as_string (xkb_info->keymap);
if (keymap_str == NULL)
{
diff --git a/src/wayland/meta-wayland-keyboard.h b/src/wayland/meta-wayland-keyboard.h
index 8d2cb06..969e4b2 100644
--- a/src/wayland/meta-wayland-keyboard.h
+++ b/src/wayland/meta-wayland-keyboard.h
@@ -72,14 +72,6 @@ typedef struct
int keymap_fd;
size_t keymap_size;
char *keymap_area;
- xkb_mod_index_t shift_mod;
- xkb_mod_index_t caps_mod;
- xkb_mod_index_t ctrl_mod;
- xkb_mod_index_t alt_mod;
- xkb_mod_index_t mod2_mod;
- xkb_mod_index_t mod3_mod;
- xkb_mod_index_t super_mod;
- xkb_mod_index_t mod5_mod;
} MetaWaylandXkbInfo;
typedef struct
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]