diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/bar/bar.h | 3 | ||||
-rw-r--r-- | include/bar/ipc.h | 6 | ||||
-rw-r--r-- | include/bar/render.h | 5 | ||||
-rw-r--r-- | include/client/window.h | 6 | ||||
-rw-r--r-- | include/extensions.h | 4 |
5 files changed, 19 insertions, 5 deletions
diff --git a/include/bar/bar.h b/include/bar/bar.h index c20efc55..a3c511d9 100644 --- a/include/bar/bar.h +++ b/include/bar/bar.h | |||
@@ -32,6 +32,9 @@ struct workspace { | |||
32 | bool urgent; | 32 | bool urgent; |
33 | }; | 33 | }; |
34 | 34 | ||
35 | /** Global bar state */ | ||
36 | extern struct bar swaybar; | ||
37 | |||
35 | /** | 38 | /** |
36 | * Setup bar. | 39 | * Setup bar. |
37 | */ | 40 | */ |
diff --git a/include/bar/ipc.h b/include/bar/ipc.h index 741c067b..c11931d0 100644 --- a/include/bar/ipc.h +++ b/include/bar/ipc.h | |||
@@ -13,5 +13,11 @@ void ipc_bar_init(struct bar *bar, const char *bar_id); | |||
13 | */ | 13 | */ |
14 | bool handle_ipc_event(struct bar *bar); | 14 | bool handle_ipc_event(struct bar *bar); |
15 | 15 | ||
16 | |||
17 | /** | ||
18 | * Send workspace command to sway | ||
19 | */ | ||
20 | void ipc_send_workspace_command(const char *workspace_name); | ||
21 | |||
16 | #endif /* _SWAYBAR_IPC_H */ | 22 | #endif /* _SWAYBAR_IPC_H */ |
17 | 23 | ||
diff --git a/include/bar/render.h b/include/bar/render.h index 931a1cdd..114f43f4 100644 --- a/include/bar/render.h +++ b/include/bar/render.h | |||
@@ -14,4 +14,9 @@ void render(struct output *output, struct config *config, struct status_line *li | |||
14 | */ | 14 | */ |
15 | void set_window_height(struct window *window, int height); | 15 | void set_window_height(struct window *window, int height); |
16 | 16 | ||
17 | /** | ||
18 | * Compute the size of a workspace name | ||
19 | */ | ||
20 | void workspace_button_size(struct window *window, const char *workspace_name, int *width, int *height); | ||
21 | |||
17 | #endif /* _SWAYBAR_RENDER_H */ | 22 | #endif /* _SWAYBAR_RENDER_H */ |
diff --git a/include/client/window.h b/include/client/window.h index 7be4fff3..55a12225 100644 --- a/include/client/window.h +++ b/include/client/window.h | |||
@@ -28,10 +28,10 @@ struct cursor { | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | struct pointer_input { | 30 | struct pointer_input { |
31 | wl_fixed_t last_x; | 31 | int last_x; |
32 | wl_fixed_t last_y; | 32 | int last_y; |
33 | 33 | ||
34 | void (*notify)(struct window *window, wl_fixed_t x, wl_fixed_t y, uint32_t button); | 34 | void (*notify)(struct window *window, int x, int y, uint32_t button); |
35 | }; | 35 | }; |
36 | 36 | ||
37 | struct window { | 37 | struct window { |
diff --git a/include/extensions.h b/include/extensions.h index 7c508b5e..d26e95c1 100644 --- a/include/extensions.h +++ b/include/extensions.h | |||
@@ -11,8 +11,6 @@ struct background_config { | |||
11 | wlc_resource surface; | 11 | wlc_resource surface; |
12 | // we need the wl_resource of the surface in the destructor | 12 | // we need the wl_resource of the surface in the destructor |
13 | struct wl_resource *wl_surface_res; | 13 | struct wl_resource *wl_surface_res; |
14 | // used to determine if client is a background | ||
15 | struct wl_client *client; | ||
16 | }; | 14 | }; |
17 | 15 | ||
18 | struct panel_config { | 16 | struct panel_config { |
@@ -25,6 +23,8 @@ struct panel_config { | |||
25 | enum desktop_shell_panel_position panel_position; | 23 | enum desktop_shell_panel_position panel_position; |
26 | // used to determine if client is a panel | 24 | // used to determine if client is a panel |
27 | struct wl_client *client; | 25 | struct wl_client *client; |
26 | // wlc handle for this panel's surface, not set until panel is created | ||
27 | wlc_handle handle; | ||
28 | }; | 28 | }; |
29 | 29 | ||
30 | struct desktop_shell_state { | 30 | struct desktop_shell_state { |