#define _POSIX_C_SOURCE 200809L
-#include "config/mousebind.h"
-#include "config/rcxml.h"
+#include <assert.h>
#include <linux/input-event-codes.h>
#include <strings.h>
#include <unistd.h>
#include <wlr/util/log.h>
+#include "config/mousebind.h"
+#include "config/rcxml.h"
-static enum ssd_part_type
-context_from_str(const char *str)
-{
- if (str == NULL) {
- return LAB_SSD_NONE;
- } else if (strcasecmp(str, "Titlebar") == 0) {
- return LAB_SSD_PART_TITLEBAR;
- } else {
- return LAB_SSD_NONE;
- }
-}
-
-static uint32_t
-mouse_button_from_str(const char *str)
+uint32_t
+mousebind_button_from_str(const char *str)
{
- if (str == NULL) {
- return UINT32_MAX;
- } else if (strcasecmp(str, "Left") == 0) {
+ assert(str);
+ if (!strcasecmp(str, "Left")) {
return BTN_LEFT;
- } else if (strcasecmp(str, "Right") == 0) {
+ } else if (!strcasecmp(str, "Right")) {
return BTN_RIGHT;
- } else if (strcasecmp(str, "Middle") == 0) {
+ } else if (!strcasecmp(str, "Middle")) {
return BTN_MIDDLE;
} else {
+ wlr_log(WLR_ERROR, "unknown button (%s)", str);
return UINT32_MAX;
}
}
-static enum action_mouse_did
-action_mouse_did_from_str(const char *str)
+enum mouse_event
+mousebind_event_from_str(const char *str)
{
- if (str == NULL) {
- return MOUSE_ACTION_NONE;
- } else if (strcasecmp(str, "doubleclick") == 0) {
+ assert(str);
+ if (strcasecmp(str, "doubleclick") == 0) {
return MOUSE_ACTION_DOUBLECLICK;
} else {
+ wlr_log(WLR_ERROR, "unknown mouse action (%s)", str);
return MOUSE_ACTION_NONE;
}
}
-struct mousebind *
-mousebind_create(const char *context_str, const char *mouse_button_str,
- const char *action_mouse_did_str, const char *action, const char *command)
+static enum ssd_part_type
+context_from_str(const char *str)
{
- struct mousebind *m = calloc(1, sizeof(struct mousebind));
-
- enum ssd_part_type context = context_from_str(context_str);
- uint32_t button = mouse_button_from_str(mouse_button_str);
- enum action_mouse_did action_mouse_did =
- action_mouse_did_from_str(action_mouse_did_str);
-
- if (context == LAB_SSD_NONE) {
- wlr_log(WLR_ERROR, "unknown mouse context (%s)", context_str);
- goto CREATE_ERROR;
- }
- if (button == UINT32_MAX) {
- wlr_log(WLR_ERROR, "unknown button (%s)", mouse_button_str);
- goto CREATE_ERROR;
- }
- if (action_mouse_did == MOUSE_ACTION_NONE) {
- wlr_log(WLR_ERROR, "unknown mouse action (%s)",
- action_mouse_did_str);
- goto CREATE_ERROR;
- }
- if (action == NULL) {
- wlr_log(WLR_ERROR, "action is NULL\n");
- goto CREATE_ERROR;
+ if (!strcasecmp(str, "Titlebar")) {
+ return LAB_SSD_PART_TITLEBAR;
+ } else {
+ wlr_log(WLR_ERROR, "unknown mouse context (%s)", str);
+ return LAB_SSD_NONE;
}
+}
- m->context = context;
- m->button = button;
- m->mouse_action = action_mouse_did;
- m->action = strdup(action); /* TODO: replace with strndup? */
- if (command && !strcasecmp(action, "Execute")) {
- m->command = strdup(command);
+struct mousebind *
+mousebind_create(const char *context)
+{
+ if (!context) {
+ wlr_log(WLR_ERROR, "mousebind context not specified");
+ return NULL;
}
-
+ struct mousebind *m = calloc(1, sizeof(struct mousebind));
+ m->context = context_from_str(context);
+ wl_list_insert(&rc.mousebinds, &m->link);
return m;
-
-CREATE_ERROR:
- free(m);
- return NULL;
}
#define _POSIX_C_SOURCE 200809L
-#include "config/rcxml.h"
-#include "common/dir.h"
-#include "common/nodename.h"
-#include "common/string-helpers.h"
-#include "common/zfree.h"
-#include "config/keybind.h"
-#include "config/mousebind.h"
#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <unistd.h>
#include <wayland-server-core.h>
#include <wlr/util/log.h>
+#include "common/dir.h"
+#include "common/nodename.h"
+#include "common/string-helpers.h"
+#include "common/zfree.h"
+#include "config/keybind.h"
+#include "config/mousebind.h"
+#include "config/rcxml.h"
static bool in_keybind = false;
static bool in_mousebind = false;
static bool is_attribute = false;
static struct keybind *current_keybind;
-static const char *current_mouse_context = "";
+static struct mousebind *current_mousebind;
+static const char *current_mouse_context;
enum font_place
{
/* TODO: Add all places based on Openbox's rc.xml */
};
-/*
- * unchecked mousebind params. we fill these out one at a time, then pass them
- * all to mousebind_create() once we are ready
- */
-static const char *current_mouse_button = "";
-static const char *current_action_mouse_did = "";
-struct mouse_action {
- const char *action;
- const char *command;
-};
-/*
- * A given mousebind can have multiple actions associated with it.
- * This array is a list of the actions for the currently-being-parsed mousebind
- *
- * TODO: make it a linked list?
- */
-#define MAX_MOUSE_ACTIONS 32
-static struct mouse_action mouse_actions[MAX_MOUSE_ACTIONS] = {{0}};
-static int num_mouse_actions = 0;
-
-static void
-load_default_key_bindings(void);
+static void load_default_key_bindings(void);
static void
fill_keybind(char *nodename, char *content)
}
}
-static void
-add_new_mousebinds(void)
-{
- for (int i = 0; i < num_mouse_actions; i++) {
- struct mousebind *m = mousebind_create(current_mouse_context,
- current_mouse_button, current_action_mouse_did,
- mouse_actions[i].action, mouse_actions[i].command);
- if (m != NULL) {
- wl_list_insert(&rc.mousebinds, &m->link);
- } else {
- wlr_log(WLR_ERROR,
- "failed to create mousebind\n"
- " context: (%s)\n"
- " button: (%s)\n"
- " mouse action (%s)\n"
- " action (%s)\n"
- " command: (%s)\n",
- current_mouse_context, current_mouse_button,
- current_action_mouse_did, mouse_actions[i].action,
- mouse_actions[i].command);
- }
- }
-
- num_mouse_actions = 0;
- memset(
- mouse_actions, 0, sizeof(struct mouse_action) * MAX_MOUSE_ACTIONS);
-}
-
static void
fill_mousebind(char *nodename, char *content)
{
/*
- * Example of what we're parsing:
- *
+ * Example of what we are parsing:
* <mousebind button="Left" action="DoubleClick">
* <action name="ToggleMaximize"/>
* </mousebind>
*/
+
+ if (!strcmp(nodename, "mousebind.context.mouse")) {
+ wlr_log(WLR_INFO, "create mousebind for %s",
+ current_mouse_context);
+ current_mousebind = mousebind_create(current_mouse_context);
+ }
if (!content) {
return;
}
-
string_truncate_at_pattern(nodename, ".mousebind.context.mouse");
- if (is_attribute && !strcmp(nodename, "button")) {
- current_mouse_button = content;
+ if (!strcmp(nodename, "button")) {
+ current_mousebind->button = mousebind_button_from_str(content);
} else if (!strcmp(nodename, "action")) {
- /*
- * checking for is_attribute fails even though we are looking
- * for the attribute of mousebind named action. initial thoughts
- * were to check for is_attribute to distinguish the attribute
- * of mousebind named action from the child of mousebind named
- * action. since the child of mousebind named action doesn't
- * have any content, I don't think we need to make this
- * distinction since we already filtered out nodes that don't
- * have content
- */
- current_action_mouse_did = content;
- } else if (is_attribute && !strcmp(nodename, "name.action")) {
- if (num_mouse_actions < MAX_MOUSE_ACTIONS) {
- num_mouse_actions++;
- mouse_actions[num_mouse_actions - 1].action = content;
- }
+ /* <mousebind button="" action="EVENT"> */
+ current_mousebind->mouse_event =
+ mousebind_event_from_str(content);
+ } else if (!strcmp(nodename, "name.action")) {
+ current_mousebind->action = strdup(content);
} else if (!strcmp(nodename, "command.action")) {
- mouse_actions[num_mouse_actions - 1].command = content;
+ current_mousebind->command = strdup(content);
}
}
printf("%s: %s\n", nodename, content);
}
+ if (in_keybind) {
+ fill_keybind(nodename, content);
+ }
+ if (in_mousebind) {
+ fill_mousebind(nodename, content);
+ }
+
/* handle nodes without content, e.g. <keyboard><default /> */
if (!strcmp(nodename, "default.keyboard")) {
load_default_key_bindings();
if (!content) {
return;
}
- if (in_keybind) {
- fill_keybind(nodename, content);
- }
-
- if (in_mousebind) {
- fill_mousebind(nodename, content);
- }
-
if (is_attribute && !strcmp(nodename, "place.font.theme")) {
font_place = enum_font_place(content);
}
entry(node, name, content);
}
-static void
-xml_tree_walk(xmlNode *node);
+static void xml_tree_walk(xmlNode *node);
static void
traverse(xmlNode *n)
in_mousebind = true;
traverse(n);
in_mousebind = false;
- add_new_mousebinds();
continue;
}
traverse(n);
zfree(rc.theme_name);
struct keybind *k, *k_tmp;
- wl_list_for_each_safe(k, k_tmp, &rc.keybinds, link)
- {
+ wl_list_for_each_safe(k, k_tmp, &rc.keybinds, link) {
wl_list_remove(&k->link);
zfree(k->command);
zfree(k->action);
}
struct mousebind *m, *m_tmp;
- wl_list_for_each_safe(m, m_tmp, &rc.mousebinds, link)
- {
+ wl_list_for_each_safe(m, m_tmp, &rc.mousebinds, link) {
wl_list_remove(&m->link);
zfree(m->command);
zfree(m->action);
projects / proto / labwc.git / commitdiff