From 4f89735fc4d33cb19d97fba253708da8dfe14210 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 29 Nov 2015 17:02:09 -0500 Subject: Add bar config struct and defaults --- include/commands.h | 2 ++ include/config.h | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) (limited to 'include') diff --git a/include/commands.h b/include/commands.h index 9135c670..f291e7cb 100644 --- a/include/commands.h +++ b/include/commands.h @@ -16,6 +16,8 @@ enum cmd_status { // Config Blocks CMD_BLOCK_END, CMD_BLOCK_MODE, + CMD_BLOCK_BAR, + CMD_BLOCK_BAR_COLORS }; /** diff --git a/include/config.h b/include/config.h index b9ef340b..81d4cd20 100644 --- a/include/config.h +++ b/include/config.h @@ -4,6 +4,7 @@ #include #include #include +#include "wayland-desktop-shell-server-protocol.h" #include "list.h" #include "layout.h" #include "container.h" @@ -57,6 +58,44 @@ struct workspace_output { char *workspace; }; +struct bar_config { + /** + * One of "dock", "hide", "invisible" + * + * Always visible in dock mode. Visible only when modifier key is held in hide mode. + * Never visible in invisible mode. + */ + char *mode; + /** + * One of "show" or "hide". + * + * In "show" mode, it will always be shown on top of the active workspace. + */ + char *hidden_state; + uint32_t modifier; + enum desktop_shell_panel_position position; + char *status_command; + char *font; + int bar_height; + bool workspace_buttons; + bool strip_workspace_numbers; + bool binding_mode_indicator; + bool verbose; + struct { + char *background; + char *foreground; + char *focused_workspace_border; + char *focused_workspace_bg; + char *focused_workspace_text; + char *active_workspace_border; + char *active_workspace_bg; + char *active_workspace_text; + char *inactive_workspace_border; + char *inactive_workspace_bg; + char *inactive_workspace_text; + } colors; +}; + /** * The configuration struct. The result of loading a config file. */ @@ -68,6 +107,7 @@ struct sway_config { list_t *output_configs; list_t *criteria; struct sway_mode *current_mode; + struct bar_config bar; uint32_t floating_mod; enum swayc_layouts default_orientation; enum swayc_layouts default_layout; -- cgit v1.2.3