(end && *end != '\0')) {
ELOG("Could not parse con id \"%s\"\n", cvalue);
} else {
- current_match->con_id = (Con*)parsed;
- printf("id as int = %p\n", current_match->con_id);
+ current_match->con_id = (Con *)parsed;
+ DLOG("id as int = %p\n", current_match->con_id);
}
return;
}
ELOG("Could not parse window id \"%s\"\n", cvalue);
} else {
current_match->id = parsed;
- printf("window id as int = %d\n", current_match->id);
+ DLOG("window id as int = %d\n", current_match->id);
}
return;
}
static char *font_pattern;
CFGFUN(font, const char *font) {
- config.font = load_font(font, true);
- set_font(&config.font);
+ config.font = load_font(font, true);
+ set_font(&config.font);
- /* Save the font pattern for using it as bar font later on */
- FREE(font_pattern);
- font_pattern = sstrdup(font);
+ /* Save the font pattern for using it as bar font later on */
+ FREE(font_pattern);
+ font_pattern = sstrdup(font);
}
-CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *command) {
- configure_binding(bindtype, modifiers, key, release, command, DEFAULT_BINDING_MODE);
+CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *whole_window, const char *command) {
+ configure_binding(bindtype, modifiers, key, release, whole_window, command, DEFAULT_BINDING_MODE);
}
-
/*******************************************************************************
* Mode handling
******************************************************************************/
static char *current_mode;
-CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *command) {
- configure_binding(bindtype, modifiers, key, release, command, current_mode);
+CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *whole_window, const char *command) {
+ configure_binding(bindtype, modifiers, key, release, whole_window, command, current_mode);
}
CFGFUN(enter_mode, const char *modename) {
}
CFGFUN(exec, const char *exectype, const char *no_startup_id, const char *command) {
- struct Autostart *new = smalloc(sizeof(struct Autostart));
- new->command = sstrdup(command);
- new->no_startup_id = (no_startup_id != NULL);
- if (strcmp(exectype, "exec") == 0) {
- TAILQ_INSERT_TAIL(&autostarts, new, autostarts);
- } else {
- TAILQ_INSERT_TAIL(&autostarts_always, new, autostarts_always);
- }
+ struct Autostart *new = smalloc(sizeof(struct Autostart));
+ new->command = sstrdup(command);
+ new->no_startup_id = (no_startup_id != NULL);
+ if (strcmp(exectype, "exec") == 0) {
+ TAILQ_INSERT_TAIL(&autostarts, new, autostarts);
+ } else {
+ TAILQ_INSERT_TAIL(&autostarts_always, new, autostarts_always);
+ }
}
CFGFUN(for_window, const char *command) {
config.default_orientation = HORIZ;
else if (strcmp(orientation, "vertical") == 0)
config.default_orientation = VERT;
- else config.default_orientation = NO_ORIENTATION;
+ else
+ config.default_orientation = NO_ORIENTATION;
}
CFGFUN(workspace_layout, const char *layout) {
else if (strcmp(layout, "stacking") == 0 ||
strcmp(layout, "stacked") == 0)
config.default_layout = L_STACKED;
- else config.default_layout = L_TABBED;
+ else
+ config.default_layout = L_TABBED;
}
CFGFUN(new_window, const char *windowtype, const char *border, const long width) {
}
if (strcmp(windowtype, "new_window") == 0) {
- DLOG("default tiled border style = %d and border width = %d\n", border_style, border_width);
+ DLOG("default tiled border style = %d and border width = %d (%d physical px)\n",
+ border_style, border_width, logical_px(border_width));
config.default_border = border_style;
- config.default_border_width = border_width;
+ config.default_border_width = logical_px(border_width);
} else {
- DLOG("default floating border style = %d and border width = %d\n", border_style, border_width);
+ DLOG("default floating border style = %d and border width = %d (%d physical px)\n",
+ border_style, border_width, logical_px(border_width));
config.default_floating_border = border_style;
- config.default_floating_border_width = border_width;
+ config.default_floating_border_width = logical_px(border_width);
}
}
config.hide_edge_borders = ADJ_NONE;
else if (eval_boolstr(borders))
config.hide_edge_borders = ADJ_LEFT_SCREEN_EDGE | ADJ_RIGHT_SCREEN_EDGE;
- else config.hide_edge_borders = ADJ_NONE;
+ else
+ config.hide_edge_borders = ADJ_NONE;
}
CFGFUN(focus_follows_mouse, const char *value) {
config.disable_focus_follows_mouse = !eval_boolstr(value);
}
+CFGFUN(mouse_warping, const char *value) {
+ if (strcmp(value, "none") == 0)
+ config.mouse_warping = POINTER_WARPING_NONE;
+ else if (strcmp(value, "output") == 0)
+ config.mouse_warping = POINTER_WARPING_OUTPUT;
+}
+
CFGFUN(force_xinerama, const char *value) {
config.force_xinerama = eval_boolstr(value);
}
}
CFGFUN(color, const char *colorclass, const char *border, const char *background, const char *text, const char *indicator) {
-#define APPLY_COLORS(classname) \
- do { \
- if (strcmp(colorclass, "client." #classname) == 0) { \
- config.client.classname.border = get_colorpixel(border); \
- config.client.classname.background = get_colorpixel(background); \
- config.client.classname.text = get_colorpixel(text); \
- if (indicator != NULL) { \
- config.client. classname .indicator = get_colorpixel(indicator); \
- } \
- } \
+#define APPLY_COLORS(classname) \
+ do { \
+ if (strcmp(colorclass, "client." #classname) == 0) { \
+ config.client.classname.border = get_colorpixel(border); \
+ config.client.classname.background = get_colorpixel(background); \
+ config.client.classname.text = get_colorpixel(text); \
+ if (indicator != NULL) { \
+ config.client.classname.indicator = get_colorpixel(indicator); \
+ } \
+ } \
} while (0)
APPLY_COLORS(focused_inactive);
APPLY_COLORS(focused);
APPLY_COLORS(unfocused);
APPLY_COLORS(urgent);
+ APPLY_COLORS(placeholder);
#undef APPLY_COLORS
}
CFGFUN(bar_output, const char *output) {
int new_outputs = current_bar.num_outputs + 1;
- current_bar.outputs = srealloc(current_bar.outputs, sizeof(char*) * new_outputs);
+ current_bar.outputs = srealloc(current_bar.outputs, sizeof(char *) * new_outputs);
current_bar.outputs[current_bar.num_outputs] = sstrdup(output);
current_bar.num_outputs = new_outputs;
}
current_bar.modifier = M_SHIFT;
}
+CFGFUN(bar_wheel_up_cmd, const char *command) {
+ FREE(current_bar.wheel_up_cmd);
+ current_bar.wheel_up_cmd = sstrdup(command);
+}
+
+CFGFUN(bar_wheel_down_cmd, const char *command) {
+ FREE(current_bar.wheel_down_cmd);
+ current_bar.wheel_down_cmd = sstrdup(command);
+}
+
CFGFUN(bar_position, const char *position) {
current_bar.position = (strcmp(position, "top") == 0 ? P_TOP : P_BOTTOM);
}
}
CFGFUN(bar_color, const char *colorclass, const char *border, const char *background, const char *text) {
-#define APPLY_COLORS(classname) \
- do { \
- if (strcmp(colorclass, #classname) == 0) { \
- if (text != NULL) { \
- /* New syntax: border, background, text */ \
- current_bar.colors. classname ## _border = sstrdup(border); \
- current_bar.colors. classname ## _bg = sstrdup(background); \
- current_bar.colors. classname ## _text = sstrdup(text); \
- } else { \
- /* Old syntax: text, background */ \
- current_bar.colors. classname ## _bg = sstrdup(background); \
- current_bar.colors. classname ## _text = sstrdup(border); \
- } \
- } \
+#define APPLY_COLORS(classname) \
+ do { \
+ if (strcmp(colorclass, #classname) == 0) { \
+ if (text != NULL) { \
+ /* New syntax: border, background, text */ \
+ current_bar.colors.classname##_border = sstrdup(border); \
+ current_bar.colors.classname##_bg = sstrdup(background); \
+ current_bar.colors.classname##_text = sstrdup(text); \
+ } else { \
+ /* Old syntax: text, background */ \
+ current_bar.colors.classname##_bg = sstrdup(background); \
+ current_bar.colors.classname##_text = sstrdup(border); \
+ } \
+ } \
} while (0)
APPLY_COLORS(focused_workspace);
projects / i3 / i3 / blobdiff