*
*/
CFGFUN(criteria_add, const char *ctype, const char *cvalue) {
- DLOG("ctype=*%s*, cvalue=*%s*\n", ctype, cvalue);
-
- if (strcmp(ctype, "class") == 0) {
- current_match->class = regex_new(cvalue);
- return;
- }
-
- if (strcmp(ctype, "instance") == 0) {
- current_match->instance = regex_new(cvalue);
- return;
- }
-
- if (strcmp(ctype, "window_role") == 0) {
- current_match->window_role = regex_new(cvalue);
- return;
- }
-
- if (strcmp(ctype, "con_id") == 0) {
- char *end;
- long parsed = strtol(cvalue, &end, 10);
- if (parsed == LONG_MIN ||
- parsed == LONG_MAX ||
- parsed < 0 ||
- (end && *end != '\0')) {
- ELOG("Could not parse con id \"%s\"\n", cvalue);
- } else {
- current_match->con_id = (Con *)parsed;
- DLOG("id as int = %p\n", current_match->con_id);
- }
- return;
- }
-
- if (strcmp(ctype, "id") == 0) {
- char *end;
- long parsed = strtol(cvalue, &end, 10);
- if (parsed == LONG_MIN ||
- parsed == LONG_MAX ||
- parsed < 0 ||
- (end && *end != '\0')) {
- ELOG("Could not parse window id \"%s\"\n", cvalue);
- } else {
- current_match->id = parsed;
- DLOG("window id as int = %d\n", current_match->id);
- }
- return;
- }
-
- if (strcmp(ctype, "window_type") == 0) {
- if (strcasecmp(cvalue, "normal") == 0)
- current_match->window_type = A__NET_WM_WINDOW_TYPE_NORMAL;
- else if (strcasecmp(cvalue, "dialog") == 0)
- current_match->window_type = A__NET_WM_WINDOW_TYPE_DIALOG;
- else if (strcasecmp(cvalue, "utility") == 0)
- current_match->window_type = A__NET_WM_WINDOW_TYPE_UTILITY;
- else if (strcasecmp(cvalue, "toolbar") == 0)
- current_match->window_type = A__NET_WM_WINDOW_TYPE_TOOLBAR;
- else if (strcasecmp(cvalue, "splash") == 0)
- current_match->window_type = A__NET_WM_WINDOW_TYPE_SPLASH;
- else if (strcasecmp(cvalue, "menu") == 0)
- current_match->window_type = A__NET_WM_WINDOW_TYPE_MENU;
- else if (strcasecmp(cvalue, "dropdown_menu") == 0)
- current_match->window_type = A__NET_WM_WINDOW_TYPE_DROPDOWN_MENU;
- else if (strcasecmp(cvalue, "popup_menu") == 0)
- current_match->window_type = A__NET_WM_WINDOW_TYPE_POPUP_MENU;
- else if (strcasecmp(cvalue, "tooltip") == 0)
- current_match->window_type = A__NET_WM_WINDOW_TYPE_TOOLTIP;
- else
- ELOG("unknown window_type value \"%s\"\n", cvalue);
-
- return;
- }
-
- if (strcmp(ctype, "con_mark") == 0) {
- current_match->mark = regex_new(cvalue);
- return;
- }
-
- if (strcmp(ctype, "title") == 0) {
- current_match->title = regex_new(cvalue);
- return;
- }
-
- if (strcmp(ctype, "urgent") == 0) {
- if (strcasecmp(cvalue, "latest") == 0 ||
- strcasecmp(cvalue, "newest") == 0 ||
- strcasecmp(cvalue, "recent") == 0 ||
- strcasecmp(cvalue, "last") == 0) {
- current_match->urgent = U_LATEST;
- } else if (strcasecmp(cvalue, "oldest") == 0 ||
- strcasecmp(cvalue, "first") == 0) {
- current_match->urgent = U_OLDEST;
- }
- return;
- }
-
- ELOG("Unknown criterion: %s\n", ctype);
+ match_parse_property(current_match, ctype, cvalue);
}
-/* TODO: refactor the above criteria code into a single file (with src/commands.c). */
-
/*******************************************************************************
* Utility functions
******************************************************************************/
}
/*
- * A utility function to convert a string of modifiers to the corresponding bit
- * mask.
+ * A utility function to convert a string containing the group and modifiers to
+ * the corresponding bit mask.
*/
-uint32_t modifiers_from_str(const char *str) {
+i3_event_state_mask_t event_state_from_str(const char *str) {
/* It might be better to use strtok() here, but the simpler strstr() should
* do for now. */
- uint32_t result = 0;
+ i3_event_state_mask_t result = 0;
if (str == NULL)
return result;
if (strstr(str, "Mod1") != NULL)
- result |= BIND_MOD1;
+ result |= XCB_KEY_BUT_MASK_MOD_1;
if (strstr(str, "Mod2") != NULL)
- result |= BIND_MOD2;
+ result |= XCB_KEY_BUT_MASK_MOD_2;
if (strstr(str, "Mod3") != NULL)
- result |= BIND_MOD3;
+ result |= XCB_KEY_BUT_MASK_MOD_3;
if (strstr(str, "Mod4") != NULL)
- result |= BIND_MOD4;
+ result |= XCB_KEY_BUT_MASK_MOD_4;
if (strstr(str, "Mod5") != NULL)
- result |= BIND_MOD5;
+ result |= XCB_KEY_BUT_MASK_MOD_5;
if (strstr(str, "Control") != NULL ||
strstr(str, "Ctrl") != NULL)
- result |= BIND_CONTROL;
+ result |= XCB_KEY_BUT_MASK_CONTROL;
if (strstr(str, "Shift") != NULL)
- result |= BIND_SHIFT;
- if (strstr(str, "Mode_switch") != NULL)
- result |= BIND_MODE_SWITCH;
+ result |= XCB_KEY_BUT_MASK_SHIFT;
+
+ if (strstr(str, "Group1") != NULL)
+ result |= (I3_XKB_GROUP_MASK_1 << 16);
+ if (strstr(str, "Group2") != NULL ||
+ strstr(str, "Mode_switch") != NULL)
+ result |= (I3_XKB_GROUP_MASK_2 << 16);
+ if (strstr(str, "Group3") != NULL)
+ result |= (I3_XKB_GROUP_MASK_3 << 16);
+ if (strstr(str, "Group4") != NULL)
+ result |= (I3_XKB_GROUP_MASK_4 << 16);
return result;
}
return;
}
DLOG("\t should execute command %s for the criteria mentioned above\n", command);
- Assignment *assignment = scalloc(sizeof(Assignment));
+ Assignment *assignment = scalloc(1, sizeof(Assignment));
assignment->type = A_COMMAND;
match_copy(&(assignment->match), current_match);
assignment->dest.command = sstrdup(command);
}
CFGFUN(floating_modifier, const char *modifiers) {
- config.floating_modifier = modifiers_from_str(modifiers);
+ config.floating_modifier = event_state_from_str(modifiers);
}
CFGFUN(default_orientation, const char *orientation) {
config.workspace_urgency_timer = duration_ms / 1000.0;
}
-CFGFUN(delay_exit_on_zero_displays, const long duration_ms) {
- config.zero_disp_exit_timer_ms = duration_ms;
-}
-
CFGFUN(focus_on_window_activation, const char *mode) {
if (strcmp(mode, "smart") == 0)
config.focus_on_window_activation = FOWA_SMART;
return;
}
- DLOG("Set new focus_on_window_activation mode = %i", config.focus_on_window_activation);
+ DLOG("Set new focus_on_window_activation mode = %i.\n", config.focus_on_window_activation);
}
CFGFUN(show_marks, const char *value) {
}
}
if (!duplicate) {
- assignment = scalloc(sizeof(struct Workspace_Assignment));
+ assignment = scalloc(1, sizeof(struct Workspace_Assignment));
assignment->name = sstrdup(workspace);
assignment->output = sstrdup(output);
TAILQ_INSERT_TAIL(&ws_assignments, assignment, ws_assignments);
ELOG("Match is empty, ignoring this assignment\n");
return;
}
- DLOG("new assignment, using above criteria, to workspace %s\n", workspace);
- Assignment *assignment = scalloc(sizeof(Assignment));
+ DLOG("New assignment, using above criteria, to workspace \"%s\".\n", workspace);
+ Assignment *assignment = scalloc(1, sizeof(Assignment));
match_copy(&(assignment->match), current_match);
assignment->type = A_TO_WORKSPACE;
assignment->dest.workspace = sstrdup(workspace);
return;
}
- DLOG("new assignment, using above criteria, to ignore focus on manage");
- Assignment *assignment = scalloc(sizeof(Assignment));
+ DLOG("New assignment, using above criteria, to ignore focus on manage.\n");
+ Assignment *assignment = scalloc(1, sizeof(Assignment));
match_copy(&(assignment->match), current_match);
assignment->type = A_NO_FOCUS;
TAILQ_INSERT_TAIL(&assignments, assignment, assignments);
}
}
- struct Barbinding *new_binding = scalloc(sizeof(struct Barbinding));
+ struct Barbinding *new_binding = scalloc(1, sizeof(struct Barbinding));
new_binding->input_code = input_code;
new_binding->command = sstrdup(command);
TAILQ_INSERT_TAIL(&(current_bar.bar_bindings), new_binding, bindings);
/* Copy the current (static) structure into a dynamically allocated
* one, then cleanup our static one. */
- Barconfig *bar_config = scalloc(sizeof(Barconfig));
+ Barconfig *bar_config = scalloc(1, sizeof(Barconfig));
memcpy(bar_config, ¤t_bar, sizeof(Barconfig));
TAILQ_INSERT_TAIL(&barconfigs, bar_config, configs);
projects / i3 / i3 / blobdiff