*
*/
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;
- }
-
- if (strcmp(ctype, "workspace") == 0) {
- current_match->workspace = regex_new(cvalue);
- 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
******************************************************************************/
}
CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *border, const char *whole_window, const char *command) {
- configure_binding(bindtype, modifiers, key, release, border, whole_window, command, DEFAULT_BINDING_MODE);
+ configure_binding(bindtype, modifiers, key, release, border, whole_window, command, DEFAULT_BINDING_MODE, false);
}
/*******************************************************************************
******************************************************************************/
static char *current_mode;
+static bool current_mode_pango_markup;
CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *border, const char *whole_window, const char *command) {
- configure_binding(bindtype, modifiers, key, release, border, whole_window, command, current_mode);
+ configure_binding(bindtype, modifiers, key, release, border, whole_window, command, current_mode, current_mode_pango_markup);
}
-CFGFUN(enter_mode, const char *modename) {
+CFGFUN(enter_mode, const char *pango_markup, const char *modename) {
if (strcasecmp(modename, DEFAULT_BINDING_MODE) == 0) {
ELOG("You cannot use the name %s for your mode\n", DEFAULT_BINDING_MODE);
exit(1);
DLOG("\t now in mode %s\n", modename);
FREE(current_mode);
current_mode = sstrdup(modename);
+ current_mode_pango_markup = (pango_markup != NULL);
}
CFGFUN(exec, const char *exectype, const char *no_startup_id, const char *command) {