diff options
author | 2018-09-17 13:38:56 -0400 | |
---|---|---|
committer | 2018-09-17 13:38:56 -0400 | |
commit | 15dadaaa4496085e064f290708267e703b3cd029 (patch) | |
tree | 2478038b93b9af323a9fdba0edf2abd6c1798954 /include/swaybar | |
parent | Merge pull request #2649 from wmww/fix-move-crash (diff) | |
parent | swaybar: use output names instead of output indexes (diff) | |
download | sway-15dadaaa4496085e064f290708267e703b3cd029.tar.gz sway-15dadaaa4496085e064f290708267e703b3cd029.tar.zst sway-15dadaaa4496085e064f290708267e703b3cd029.zip |
Merge pull request #2652 from emersion/swaybar-output-names
swaybar: use output names instead of output indexes
Diffstat (limited to 'include/swaybar')
-rw-r--r-- | include/swaybar/bar.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h index 1cecea71..4065fb8b 100644 --- a/include/swaybar/bar.h +++ b/include/swaybar/bar.h | |||
@@ -2,6 +2,8 @@ | |||
2 | #define _SWAYBAR_BAR_H | 2 | #define _SWAYBAR_BAR_H |
3 | #include <wayland-client.h> | 3 | #include <wayland-client.h> |
4 | #include "pool-buffer.h" | 4 | #include "pool-buffer.h" |
5 | #include "wlr-layer-shell-unstable-v1-client-protocol.h" | ||
6 | #include "xdg-output-unstable-v1-client-protocol.h" | ||
5 | 7 | ||
6 | struct swaybar_config; | 8 | struct swaybar_config; |
7 | struct swaybar_output; | 9 | struct swaybar_output; |
@@ -47,6 +49,7 @@ struct swaybar { | |||
47 | struct wl_display *display; | 49 | struct wl_display *display; |
48 | struct wl_compositor *compositor; | 50 | struct wl_compositor *compositor; |
49 | struct zwlr_layer_shell_v1 *layer_shell; | 51 | struct zwlr_layer_shell_v1 *layer_shell; |
52 | struct zxdg_output_manager_v1 *xdg_output_manager; | ||
50 | struct wl_shm *shm; | 53 | struct wl_shm *shm; |
51 | struct wl_seat *seat; | 54 | struct wl_seat *seat; |
52 | 55 | ||
@@ -65,6 +68,7 @@ struct swaybar_output { | |||
65 | struct wl_list link; | 68 | struct wl_list link; |
66 | struct swaybar *bar; | 69 | struct swaybar *bar; |
67 | struct wl_output *output; | 70 | struct wl_output *output; |
71 | struct zxdg_output_v1 *xdg_output; | ||
68 | struct wl_surface *surface; | 72 | struct wl_surface *surface; |
69 | struct zwlr_layer_surface_v1 *layer_surface; | 73 | struct zwlr_layer_surface_v1 *layer_surface; |
70 | uint32_t wl_name; | 74 | uint32_t wl_name; |
@@ -73,7 +77,6 @@ struct swaybar_output { | |||
73 | struct wl_list hotspots; | 77 | struct wl_list hotspots; |
74 | 78 | ||
75 | char *name; | 79 | char *name; |
76 | size_t index; | ||
77 | bool focused; | 80 | bool focused; |
78 | 81 | ||
79 | uint32_t width, height; | 82 | uint32_t width, height; |