summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2015-11-29 17:02:09 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2015-11-29 17:05:04 -0500
commit4f89735fc4d33cb19d97fba253708da8dfe14210 (patch)
tree799754ced938aec650f0a1bc488be58d0c890918 /include
parentMerge pull request #278 from christophgysin/merge (diff)
downloadsway-4f89735fc4d33cb19d97fba253708da8dfe14210.tar.gz
sway-4f89735fc4d33cb19d97fba253708da8dfe14210.tar.zst
sway-4f89735fc4d33cb19d97fba253708da8dfe14210.zip
Add bar config struct and defaults
Diffstat (limited to 'include')
-rw-r--r--include/commands.h2
-rw-r--r--include/config.h40
2 files changed, 42 insertions, 0 deletions
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 {
16 // Config Blocks 16 // Config Blocks
17 CMD_BLOCK_END, 17 CMD_BLOCK_END,
18 CMD_BLOCK_MODE, 18 CMD_BLOCK_MODE,
19 CMD_BLOCK_BAR,
20 CMD_BLOCK_BAR_COLORS
19}; 21};
20 22
21/** 23/**
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 @@
4#include <stdint.h> 4#include <stdint.h>
5#include <wlc/wlc.h> 5#include <wlc/wlc.h>
6#include <xkbcommon/xkbcommon.h> 6#include <xkbcommon/xkbcommon.h>
7#include "wayland-desktop-shell-server-protocol.h"
7#include "list.h" 8#include "list.h"
8#include "layout.h" 9#include "layout.h"
9#include "container.h" 10#include "container.h"
@@ -57,6 +58,44 @@ struct workspace_output {
57 char *workspace; 58 char *workspace;
58}; 59};
59 60
61struct bar_config {
62 /**
63 * One of "dock", "hide", "invisible"
64 *
65 * Always visible in dock mode. Visible only when modifier key is held in hide mode.
66 * Never visible in invisible mode.
67 */
68 char *mode;
69 /**
70 * One of "show" or "hide".
71 *
72 * In "show" mode, it will always be shown on top of the active workspace.
73 */
74 char *hidden_state;
75 uint32_t modifier;
76 enum desktop_shell_panel_position position;
77 char *status_command;
78 char *font;
79 int bar_height;
80 bool workspace_buttons;
81 bool strip_workspace_numbers;
82 bool binding_mode_indicator;
83 bool verbose;
84 struct {
85 char *background;
86 char *foreground;
87 char *focused_workspace_border;
88 char *focused_workspace_bg;
89 char *focused_workspace_text;
90 char *active_workspace_border;
91 char *active_workspace_bg;
92 char *active_workspace_text;
93 char *inactive_workspace_border;
94 char *inactive_workspace_bg;
95 char *inactive_workspace_text;
96 } colors;
97};
98
60/** 99/**
61 * The configuration struct. The result of loading a config file. 100 * The configuration struct. The result of loading a config file.
62 */ 101 */
@@ -68,6 +107,7 @@ struct sway_config {
68 list_t *output_configs; 107 list_t *output_configs;
69 list_t *criteria; 108 list_t *criteria;
70 struct sway_mode *current_mode; 109 struct sway_mode *current_mode;
110 struct bar_config bar;
71 uint32_t floating_mod; 111 uint32_t floating_mod;
72 enum swayc_layouts default_orientation; 112 enum swayc_layouts default_orientation;
73 enum swayc_layouts default_layout; 113 enum swayc_layouts default_layout;