diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/commands.h | 1 | ||||
-rw-r--r-- | include/sway/config.h | 10 | ||||
-rw-r--r-- | include/sway/input/cursor.h | 2 | ||||
-rw-r--r-- | include/swaybar/config.h | 10 | ||||
-rw-r--r-- | include/swaybar/input.h | 15 |
5 files changed, 23 insertions, 15 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 68487879..7672a3fd 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -207,6 +207,7 @@ sway_cmd bar_cmd_pango_markup; | |||
207 | sway_cmd bar_cmd_strip_workspace_numbers; | 207 | sway_cmd bar_cmd_strip_workspace_numbers; |
208 | sway_cmd bar_cmd_strip_workspace_name; | 208 | sway_cmd bar_cmd_strip_workspace_name; |
209 | sway_cmd bar_cmd_swaybar_command; | 209 | sway_cmd bar_cmd_swaybar_command; |
210 | sway_cmd bar_cmd_tray_bindcode; | ||
210 | sway_cmd bar_cmd_tray_bindsym; | 211 | sway_cmd bar_cmd_tray_bindsym; |
211 | sway_cmd bar_cmd_tray_output; | 212 | sway_cmd bar_cmd_tray_output; |
212 | sway_cmd bar_cmd_tray_padding; | 213 | sway_cmd bar_cmd_tray_padding; |
diff --git a/include/sway/config.h b/include/sway/config.h index 96fe899b..978606a6 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -260,7 +260,7 @@ struct bar_config { | |||
260 | 260 | ||
261 | #if HAVE_TRAY | 261 | #if HAVE_TRAY |
262 | char *icon_theme; | 262 | char *icon_theme; |
263 | const char *tray_bindings[10]; // mouse buttons 0-9 | 263 | struct wl_list tray_bindings; // struct tray_binding::link |
264 | list_t *tray_outputs; // char * | 264 | list_t *tray_outputs; // char * |
265 | int tray_padding; | 265 | int tray_padding; |
266 | #endif | 266 | #endif |
@@ -272,6 +272,14 @@ struct bar_binding { | |||
272 | char *command; | 272 | char *command; |
273 | }; | 273 | }; |
274 | 274 | ||
275 | #if HAVE_TRAY | ||
276 | struct tray_binding { | ||
277 | uint32_t button; | ||
278 | const char *command; | ||
279 | struct wl_list link; // struct tray_binding::link | ||
280 | }; | ||
281 | #endif | ||
282 | |||
275 | struct border_colors { | 283 | struct border_colors { |
276 | float border[4]; | 284 | float border[4]; |
277 | float background[4]; | 285 | float background[4]; |
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 77aa0ea1..abd72783 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h | |||
@@ -103,4 +103,6 @@ uint32_t get_mouse_bindcode(const char *name, char **error); | |||
103 | // Considers both bindsym and bindcode | 103 | // Considers both bindsym and bindcode |
104 | uint32_t get_mouse_button(const char *name, char **error); | 104 | uint32_t get_mouse_button(const char *name, char **error); |
105 | 105 | ||
106 | const char *get_mouse_button_name(uint32_t button); | ||
107 | |||
106 | #endif | 108 | #endif |
diff --git a/include/swaybar/config.h b/include/swaybar/config.h index add0a1cf..ec042e51 100644 --- a/include/swaybar/config.h +++ b/include/swaybar/config.h | |||
@@ -70,13 +70,21 @@ struct swaybar_config { | |||
70 | 70 | ||
71 | #if HAVE_TRAY | 71 | #if HAVE_TRAY |
72 | char *icon_theme; | 72 | char *icon_theme; |
73 | char *tray_bindings[10]; // mouse buttons 0-9 | 73 | struct wl_list tray_bindings; // struct tray_binding::link |
74 | bool tray_hidden; | 74 | bool tray_hidden; |
75 | list_t *tray_outputs; // char * | 75 | list_t *tray_outputs; // char * |
76 | int tray_padding; | 76 | int tray_padding; |
77 | #endif | 77 | #endif |
78 | }; | 78 | }; |
79 | 79 | ||
80 | #if HAVE_TRAY | ||
81 | struct tray_binding { | ||
82 | uint32_t button; | ||
83 | char *command; | ||
84 | struct wl_list link; // struct tray_binding::link | ||
85 | }; | ||
86 | #endif | ||
87 | |||
80 | struct swaybar_config *init_config(void); | 88 | struct swaybar_config *init_config(void); |
81 | void free_config(struct swaybar_config *config); | 89 | void free_config(struct swaybar_config *config); |
82 | uint32_t parse_position(const char *position); | 90 | uint32_t parse_position(const char *position); |
diff --git a/include/swaybar/input.h b/include/swaybar/input.h index 4b46b0de..d76cd551 100644 --- a/include/swaybar/input.h +++ b/include/swaybar/input.h | |||
@@ -22,19 +22,6 @@ struct swaybar_pointer { | |||
22 | uint32_t serial; | 22 | uint32_t serial; |
23 | }; | 23 | }; |
24 | 24 | ||
25 | enum x11_button { | ||
26 | NONE, | ||
27 | LEFT, | ||
28 | MIDDLE, | ||
29 | RIGHT, | ||
30 | SCROLL_UP, | ||
31 | SCROLL_DOWN, | ||
32 | SCROLL_LEFT, | ||
33 | SCROLL_RIGHT, | ||
34 | BACK, | ||
35 | FORWARD, | ||
36 | }; | ||
37 | |||
38 | enum hotspot_event_handling { | 25 | enum hotspot_event_handling { |
39 | HOTSPOT_IGNORE, | 26 | HOTSPOT_IGNORE, |
40 | HOTSPOT_PROCESS, | 27 | HOTSPOT_PROCESS, |
@@ -54,6 +41,8 @@ extern const struct wl_seat_listener seat_listener; | |||
54 | 41 | ||
55 | void update_cursor(struct swaybar *bar); | 42 | void update_cursor(struct swaybar *bar); |
56 | 43 | ||
44 | uint32_t event_to_x11_button(uint32_t event); | ||
45 | |||
57 | void free_hotspots(struct wl_list *list); | 46 | void free_hotspots(struct wl_list *list); |
58 | 47 | ||
59 | #endif | 48 | #endif |