diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/commands.h | 2 | ||||
-rw-r--r-- | include/sway/config.h | 5 | ||||
-rw-r--r-- | include/sway/input/cursor.h | 8 | ||||
-rw-r--r-- | include/swaybar/bar.h | 1 | ||||
-rw-r--r-- | include/swaybar/config.h | 2 | ||||
-rw-r--r-- | include/swaylock/swaylock.h | 5 |
6 files changed, 22 insertions, 1 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 7d0ff838..04f93ba9 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -198,6 +198,8 @@ sway_cmd bar_cmd_id; | |||
198 | sway_cmd bar_cmd_position; | 198 | sway_cmd bar_cmd_position; |
199 | sway_cmd bar_cmd_separator_symbol; | 199 | sway_cmd bar_cmd_separator_symbol; |
200 | sway_cmd bar_cmd_status_command; | 200 | sway_cmd bar_cmd_status_command; |
201 | sway_cmd bar_cmd_status_edge_padding; | ||
202 | sway_cmd bar_cmd_status_padding; | ||
201 | sway_cmd bar_cmd_pango_markup; | 203 | sway_cmd bar_cmd_pango_markup; |
202 | sway_cmd bar_cmd_strip_workspace_numbers; | 204 | sway_cmd bar_cmd_strip_workspace_numbers; |
203 | sway_cmd bar_cmd_strip_workspace_name; | 205 | sway_cmd bar_cmd_strip_workspace_name; |
diff --git a/include/sway/config.h b/include/sway/config.h index ebf16e6a..a667984d 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -27,7 +27,8 @@ struct sway_variable { | |||
27 | enum binding_input_type { | 27 | enum binding_input_type { |
28 | BINDING_KEYCODE, | 28 | BINDING_KEYCODE, |
29 | BINDING_KEYSYM, | 29 | BINDING_KEYSYM, |
30 | BINDING_MOUSE, | 30 | BINDING_MOUSECODE, |
31 | BINDING_MOUSESYM, | ||
31 | }; | 32 | }; |
32 | 33 | ||
33 | enum binding_flags { | 34 | enum binding_flags { |
@@ -231,6 +232,8 @@ struct bar_config { | |||
231 | bool verbose; | 232 | bool verbose; |
232 | struct side_gaps gaps; | 233 | struct side_gaps gaps; |
233 | pid_t pid; | 234 | pid_t pid; |
235 | int status_padding; | ||
236 | int status_edge_padding; | ||
234 | struct { | 237 | struct { |
235 | char *background; | 238 | char *background; |
236 | char *statusline; | 239 | char *statusline; |
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 22e278b0..4636bf6b 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h | |||
@@ -86,4 +86,12 @@ void cursor_warp_to_container(struct sway_cursor *cursor, | |||
86 | 86 | ||
87 | void cursor_warp_to_workspace(struct sway_cursor *cursor, | 87 | void cursor_warp_to_workspace(struct sway_cursor *cursor, |
88 | struct sway_workspace *workspace); | 88 | struct sway_workspace *workspace); |
89 | |||
90 | uint32_t get_mouse_bindsym(const char *name, char **error); | ||
91 | |||
92 | uint32_t get_mouse_bindcode(const char *name, char **error); | ||
93 | |||
94 | // Considers both bindsym and bindcode | ||
95 | uint32_t get_mouse_button(const char *name, char **error); | ||
96 | |||
89 | #endif | 97 | #endif |
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h index e377b8de..2d9ba0d9 100644 --- a/include/swaybar/bar.h +++ b/include/swaybar/bar.h | |||
@@ -61,6 +61,7 @@ struct swaybar_output { | |||
61 | struct wl_list hotspots; // swaybar_hotspot::link | 61 | struct wl_list hotspots; // swaybar_hotspot::link |
62 | 62 | ||
63 | char *name; | 63 | char *name; |
64 | char *identifier; | ||
64 | bool focused; | 65 | bool focused; |
65 | 66 | ||
66 | uint32_t width, height; | 67 | uint32_t width, height; |
diff --git a/include/swaybar/config.h b/include/swaybar/config.h index 1f6577bd..add0a1cf 100644 --- a/include/swaybar/config.h +++ b/include/swaybar/config.h | |||
@@ -43,6 +43,8 @@ struct swaybar_config { | |||
43 | struct wl_list outputs; // config_output::link | 43 | struct wl_list outputs; // config_output::link |
44 | bool all_outputs; | 44 | bool all_outputs; |
45 | int height; | 45 | int height; |
46 | int status_padding; | ||
47 | int status_edge_padding; | ||
46 | struct { | 48 | struct { |
47 | int top; | 49 | int top; |
48 | int right; | 50 | int right; |
diff --git a/include/swaylock/swaylock.h b/include/swaylock/swaylock.h index 18af7ab4..516a56f4 100644 --- a/include/swaylock/swaylock.h +++ b/include/swaylock/swaylock.h | |||
@@ -22,6 +22,7 @@ enum auth_state { | |||
22 | struct swaylock_colorset { | 22 | struct swaylock_colorset { |
23 | uint32_t input; | 23 | uint32_t input; |
24 | uint32_t cleared; | 24 | uint32_t cleared; |
25 | uint32_t caps_lock; | ||
25 | uint32_t verifying; | 26 | uint32_t verifying; |
26 | uint32_t wrong; | 27 | uint32_t wrong; |
27 | }; | 28 | }; |
@@ -30,6 +31,8 @@ struct swaylock_colors { | |||
30 | uint32_t background; | 31 | uint32_t background; |
31 | uint32_t bs_highlight; | 32 | uint32_t bs_highlight; |
32 | uint32_t key_highlight; | 33 | uint32_t key_highlight; |
34 | uint32_t caps_lock_bs_highlight; | ||
35 | uint32_t caps_lock_key_highlight; | ||
33 | uint32_t separator; | 36 | uint32_t separator; |
34 | struct swaylock_colorset inside; | 37 | struct swaylock_colorset inside; |
35 | struct swaylock_colorset line; | 38 | struct swaylock_colorset line; |
@@ -45,6 +48,8 @@ struct swaylock_args { | |||
45 | uint32_t thickness; | 48 | uint32_t thickness; |
46 | bool ignore_empty; | 49 | bool ignore_empty; |
47 | bool show_indicator; | 50 | bool show_indicator; |
51 | bool show_caps_lock_text; | ||
52 | bool show_caps_lock_indicator; | ||
48 | bool daemonize; | 53 | bool daemonize; |
49 | }; | 54 | }; |
50 | 55 | ||