From 95e0f44c73f2783541b180c9bd555f6b8abb7c0f Mon Sep 17 00:00:00 2001
From: Mikkel Oscar Lyderik <mikkeloscar@gmail.com>
Date: Tue, 5 Jan 2016 18:07:43 +0100
Subject: Move modifier name table to common/util.c
Lookup of modifier names is required in several places, thus it makes
sense to move it to a general place.
---
sway/commands.c | 52 +++++++++++-----------------------------------------
sway/ipc-server.c | 27 ++-------------------------
2 files changed, 13 insertions(+), 66 deletions(-)
(limited to 'sway')
diff --git a/sway/commands.c b/sway/commands.c
index f748a969..963d8f12 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -99,22 +99,6 @@ static sway_cmd bar_colors_cmd_urgent_workspace;
swayc_t *sp_view;
int sp_index = 0;
-static struct modifier_key {
- char *name;
- uint32_t mod;
-} modifiers[] = {
- { XKB_MOD_NAME_SHIFT, WLC_BIT_MOD_SHIFT },
- { XKB_MOD_NAME_CAPS, WLC_BIT_MOD_CAPS },
- { XKB_MOD_NAME_CTRL, WLC_BIT_MOD_CTRL },
- { "Ctrl", WLC_BIT_MOD_CTRL },
- { XKB_MOD_NAME_ALT, WLC_BIT_MOD_ALT },
- { "Alt", WLC_BIT_MOD_ALT },
- { XKB_MOD_NAME_NUM, WLC_BIT_MOD_MOD2 },
- { "Mod3", WLC_BIT_MOD_MOD3 },
- { XKB_MOD_NAME_LOGO, WLC_BIT_MOD_LOGO },
- { "Mod5", WLC_BIT_MOD_MOD5 },
-};
-
static char *bg_options[] = {
"stretch",
"center",
@@ -187,16 +171,11 @@ static struct cmd_results *cmd_bindsym(int argc, char **argv) {
list_t *split = split_string(argv[0], "+");
for (int i = 0; i < split->length; ++i) {
// Check for a modifier key
- int j;
- bool is_mod = false;
- for (j = 0; j < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++j) {
- if (strcasecmp(modifiers[j].name, split->items[i]) == 0) {
- binding->modifiers |= modifiers[j].mod;
- is_mod = true;
- break;
- }
+ uint32_t mod;
+ if ((mod = get_modifier_mask_by_name(split->items[i])) > 0) {
+ binding->modifiers |= mod;
+ continue;
}
- if (is_mod) continue;
// Check for xkb key
xkb_keysym_t sym = xkb_keysym_from_name(split->items[i], XKB_KEYSYM_CASE_INSENSITIVE);
if (!sym) {
@@ -408,17 +387,13 @@ static struct cmd_results *cmd_floating_mod(int argc, char **argv) {
if ((error = checkarg(argc, "floating_modifier", EXPECTED_AT_LEAST, 1))) {
return error;
}
- int i, j;
+ int i;
list_t *split = split_string(argv[0], "+");
config->floating_mod = 0;
// set modifier keys
for (i = 0; i < split->length; ++i) {
- for (j = 0; j < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++j) {
- if (strcasecmp(modifiers[j].name, split->items[i]) == 0) {
- config->floating_mod |= modifiers[j].mod;
- }
- }
+ config->floating_mod |= get_modifier_mask_by_name(split->items[i]);
}
free_flat_list(split);
if (!config->floating_mod) {
@@ -1893,16 +1868,11 @@ static struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
list_t *split = split_string(argv[0], "+");
for (int i = 0; i < split->length; ++i) {
- int j;
- bool is_mod = false;
- for (j = 0; j < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++j) {
- if (strcasecmp(modifiers[j].name, split->items[i]) == 0) {
- mod = modifiers[j].mod;
- is_mod = true;
- break;
- }
- }
- if (!is_mod) {
+ uint32_t tmp_mod;
+ if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) {
+ mod |= tmp_mod;
+ continue;
+ } else {
free_flat_list(split);
return cmd_results_new(CMD_INVALID, "modifier", "Unknown modifier '%s'", split->items[i]);
}
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index da3d52e3..a6598b84 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -19,6 +19,7 @@
#include "commands.h"
#include "list.h"
#include "stringop.h"
+#include "util.h"
static int ipc_socket = -1;
static struct wlc_event_source *ipc_event_source = NULL;
@@ -35,22 +36,6 @@ struct ipc_client {
enum ipc_command_type subscribed_events;
};
-static struct modifier_key {
- char *name;
- uint32_t mod;
-} modifiers[] = {
- { XKB_MOD_NAME_SHIFT, WLC_BIT_MOD_SHIFT },
- { XKB_MOD_NAME_CAPS, WLC_BIT_MOD_CAPS },
- { XKB_MOD_NAME_CTRL, WLC_BIT_MOD_CTRL },
- { "Ctrl", WLC_BIT_MOD_CTRL },
- { XKB_MOD_NAME_ALT, WLC_BIT_MOD_ALT },
- { "Alt", WLC_BIT_MOD_ALT },
- { XKB_MOD_NAME_NUM, WLC_BIT_MOD_MOD2 },
- { "Mod3", WLC_BIT_MOD_MOD3 },
- { XKB_MOD_NAME_LOGO, WLC_BIT_MOD_LOGO },
- { "Mod5", WLC_BIT_MOD_MOD5 },
-};
-
struct sockaddr_un *ipc_user_sockaddr(void);
int ipc_handle_connection(int fd, uint32_t mask, void *data);
int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data);
@@ -640,15 +625,7 @@ void ipc_event_modifier(uint32_t modifier, const char *state) {
json_object *obj = json_object_new_object();
json_object_object_add(obj, "change", json_object_new_string(state));
- const char *modifier_name = NULL;
- int i;
- for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
- if (modifiers[i].mod == modifier) {
- modifier_name = modifiers[i].name;
- break;
- }
- }
-
+ const char *modifier_name = get_modifier_name_by_mask(modifier);
json_object_object_add(obj, "modifier", json_object_new_string(modifier_name));
const char *json_string = json_object_to_json_string(obj);
--
cgit v1.2.3