diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/commands.h | 3 | ||||
-rw-r--r-- | include/sway/config.h | 5 | ||||
-rw-r--r-- | include/sway/debug.h | 2 | ||||
-rw-r--r-- | include/sway/ipc-json.h | 2 | ||||
-rw-r--r-- | include/swaybar/bar.h | 2 | ||||
-rw-r--r-- | include/swaybar/config.h | 2 | ||||
-rw-r--r-- | include/swaybar/render.h | 4 | ||||
-rw-r--r-- | include/swaybar/tray/dbus.h | 18 | ||||
-rw-r--r-- | include/swaybar/tray/sni_watcher.h | 10 | ||||
-rw-r--r-- | include/swaybar/tray/tray.h | 32 |
10 files changed, 10 insertions, 70 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 1654eb48..afa65340 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -95,7 +95,7 @@ struct cmd_results *add_color(const char *name, | |||
95 | /** | 95 | /** |
96 | * TODO: Move this function and its dependent functions to container.c. | 96 | * TODO: Move this function and its dependent functions to container.c. |
97 | */ | 97 | */ |
98 | void container_resize_tiled(struct sway_container *parent, enum wlr_edges edge, | 98 | bool container_resize_tiled(struct sway_container *parent, enum wlr_edges edge, |
99 | int amount); | 99 | int amount); |
100 | 100 | ||
101 | sway_cmd cmd_assign; | 101 | sway_cmd cmd_assign; |
@@ -217,6 +217,7 @@ sway_cmd bar_colors_cmd_urgent_workspace; | |||
217 | sway_cmd input_cmd_seat; | 217 | sway_cmd input_cmd_seat; |
218 | sway_cmd input_cmd_accel_profile; | 218 | sway_cmd input_cmd_accel_profile; |
219 | sway_cmd input_cmd_click_method; | 219 | sway_cmd input_cmd_click_method; |
220 | sway_cmd input_cmd_drag; | ||
220 | sway_cmd input_cmd_drag_lock; | 221 | sway_cmd input_cmd_drag_lock; |
221 | sway_cmd input_cmd_dwt; | 222 | sway_cmd input_cmd_dwt; |
222 | sway_cmd input_cmd_events; | 223 | sway_cmd input_cmd_events; |
diff --git a/include/sway/config.h b/include/sway/config.h index af5c7a18..2395bc51 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -93,6 +93,7 @@ struct input_config { | |||
93 | 93 | ||
94 | int accel_profile; | 94 | int accel_profile; |
95 | int click_method; | 95 | int click_method; |
96 | int drag; | ||
96 | int drag_lock; | 97 | int drag_lock; |
97 | int dwt; | 98 | int dwt; |
98 | int left_handed; | 99 | int left_handed; |
@@ -449,8 +450,6 @@ void free_sway_variable(struct sway_variable *var); | |||
449 | */ | 450 | */ |
450 | char *do_var_replacement(char *str); | 451 | char *do_var_replacement(char *str); |
451 | 452 | ||
452 | struct cmd_results *check_security_config(); | ||
453 | |||
454 | int input_identifier_cmp(const void *item, const void *data); | 453 | int input_identifier_cmp(const void *item, const void *data); |
455 | 454 | ||
456 | struct input_config *new_input_config(const char* identifier); | 455 | struct input_config *new_input_config(const char* identifier); |
@@ -471,7 +470,7 @@ struct seat_config *copy_seat_config(struct seat_config *seat); | |||
471 | 470 | ||
472 | void free_seat_config(struct seat_config *ic); | 471 | void free_seat_config(struct seat_config *ic); |
473 | 472 | ||
474 | struct seat_attachment_config *seat_attachment_config_new(); | 473 | struct seat_attachment_config *seat_attachment_config_new(void); |
475 | 474 | ||
476 | struct seat_attachment_config *seat_config_get_attachment( | 475 | struct seat_attachment_config *seat_config_get_attachment( |
477 | struct seat_config *seat_config, char *identifier); | 476 | struct seat_config *seat_config, char *identifier); |
diff --git a/include/sway/debug.h b/include/sway/debug.h index bf3a5f6d..0e9bb056 100644 --- a/include/sway/debug.h +++ b/include/sway/debug.h | |||
@@ -17,6 +17,6 @@ struct sway_debug { | |||
17 | 17 | ||
18 | extern struct sway_debug debug; | 18 | extern struct sway_debug debug; |
19 | 19 | ||
20 | void update_debug_tree(); | 20 | void update_debug_tree(void); |
21 | 21 | ||
22 | #endif | 22 | #endif |
diff --git a/include/sway/ipc-json.h b/include/sway/ipc-json.h index fef243e3..1cbfd15d 100644 --- a/include/sway/ipc-json.h +++ b/include/sway/ipc-json.h | |||
@@ -4,7 +4,7 @@ | |||
4 | #include "sway/tree/container.h" | 4 | #include "sway/tree/container.h" |
5 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
6 | 6 | ||
7 | json_object *ipc_json_get_version(); | 7 | json_object *ipc_json_get_version(void); |
8 | 8 | ||
9 | json_object *ipc_json_describe_disabled_output(struct sway_output *o); | 9 | json_object *ipc_json_describe_disabled_output(struct sway_output *o); |
10 | json_object *ipc_json_describe_node(struct sway_node *node); | 10 | json_object *ipc_json_describe_node(struct sway_node *node); |
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h index 20992014..de234111 100644 --- a/include/swaybar/bar.h +++ b/include/swaybar/bar.h | |||
@@ -83,6 +83,8 @@ struct swaybar_output { | |||
83 | enum wl_output_subpixel subpixel; | 83 | enum wl_output_subpixel subpixel; |
84 | struct pool_buffer buffers[2]; | 84 | struct pool_buffer buffers[2]; |
85 | struct pool_buffer *current_buffer; | 85 | struct pool_buffer *current_buffer; |
86 | bool dirty; | ||
87 | bool frame_scheduled; | ||
86 | }; | 88 | }; |
87 | 89 | ||
88 | struct swaybar_workspace { | 90 | struct swaybar_workspace { |
diff --git a/include/swaybar/config.h b/include/swaybar/config.h index 6739c28a..5f5688cf 100644 --- a/include/swaybar/config.h +++ b/include/swaybar/config.h | |||
@@ -50,7 +50,7 @@ struct swaybar_config { | |||
50 | } colors; | 50 | } colors; |
51 | }; | 51 | }; |
52 | 52 | ||
53 | struct swaybar_config *init_config(); | 53 | struct swaybar_config *init_config(void); |
54 | void free_config(struct swaybar_config *config); | 54 | void free_config(struct swaybar_config *config); |
55 | uint32_t parse_position(const char *position); | 55 | uint32_t parse_position(const char *position); |
56 | 56 | ||
diff --git a/include/swaybar/render.h b/include/swaybar/render.h index 071e2298..ebdc69e4 100644 --- a/include/swaybar/render.h +++ b/include/swaybar/render.h | |||
@@ -1,10 +1,8 @@ | |||
1 | #ifndef _SWAYBAR_RENDER_H | 1 | #ifndef _SWAYBAR_RENDER_H |
2 | #define _SWAYBAR_RENDER_H | 2 | #define _SWAYBAR_RENDER_H |
3 | 3 | ||
4 | struct swaybar; | ||
5 | struct swaybar_output; | 4 | struct swaybar_output; |
6 | struct swaybar_config; | ||
7 | 5 | ||
8 | void render_frame(struct swaybar *bar, struct swaybar_output *output); | 6 | void render_frame(struct swaybar_output *output); |
9 | 7 | ||
10 | #endif | 8 | #endif |
diff --git a/include/swaybar/tray/dbus.h b/include/swaybar/tray/dbus.h deleted file mode 100644 index eb9cfea7..00000000 --- a/include/swaybar/tray/dbus.h +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | #ifndef _SWAYBAR_DBUS_H | ||
2 | #define _SWAYBAR_DBUS_H | ||
3 | |||
4 | #include <stdbool.h> | ||
5 | #include <dbus/dbus.h> | ||
6 | extern DBusConnection *conn; | ||
7 | |||
8 | /** | ||
9 | * Should be called in main loop to dispatch events | ||
10 | */ | ||
11 | void dispatch_dbus(); | ||
12 | |||
13 | /** | ||
14 | * Initializes async dbus communication | ||
15 | */ | ||
16 | int dbus_init(); | ||
17 | |||
18 | #endif /* _SWAYBAR_DBUS_H */ | ||
diff --git a/include/swaybar/tray/sni_watcher.h b/include/swaybar/tray/sni_watcher.h deleted file mode 100644 index 25ddfcd2..00000000 --- a/include/swaybar/tray/sni_watcher.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #ifndef _SWAYBAR_SNI_WATCHER_H | ||
2 | #define _SWAYBAR_SNI_WATCHER_H | ||
3 | |||
4 | /** | ||
5 | * Starts the sni_watcher, the watcher is practically a black box and should | ||
6 | * only be accessed though functions described in its spec | ||
7 | */ | ||
8 | int init_sni_watcher(); | ||
9 | |||
10 | #endif /* _SWAYBAR_SNI_WATCHER_H */ | ||
diff --git a/include/swaybar/tray/tray.h b/include/swaybar/tray/tray.h deleted file mode 100644 index 2d0662be..00000000 --- a/include/swaybar/tray/tray.h +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | #ifndef _SWAYBAR_TRAY_H | ||
2 | #define _SWAYBAR_TRAY_H | ||
3 | |||
4 | #include <stdint.h> | ||
5 | #include <stdbool.h> | ||
6 | #include "swaybar/tray/dbus.h" | ||
7 | #include "swaybar/tray/sni.h" | ||
8 | #include "swaybar/bar.h" | ||
9 | #include "list.h" | ||
10 | |||
11 | extern struct tray *tray; | ||
12 | |||
13 | struct tray { | ||
14 | list_t *items; | ||
15 | }; | ||
16 | |||
17 | /** | ||
18 | * Processes a mouse event on the bar | ||
19 | */ | ||
20 | void tray_mouse_event(struct output *output, int x, int y, | ||
21 | uint32_t button, uint32_t state); | ||
22 | |||
23 | uint32_t tray_render(struct output *output, struct config *config); | ||
24 | |||
25 | void tray_upkeep(struct bar *bar); | ||
26 | |||
27 | /** | ||
28 | * Initializes the tray with D-Bus | ||
29 | */ | ||
30 | void init_tray(struct bar *bar); | ||
31 | |||
32 | #endif /* _SWAYBAR_TRAY_H */ | ||