summaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar David Eklov <david.eklov@gmail.com>2016-07-10 11:03:39 -0500
committerLibravatar David Eklov <david.eklov@gmail.com>2016-07-14 17:15:31 -0500
commit4bb45abc46def3f05f83561745349c121e6a8a2a (patch)
tree099fbce796f757759872c7aa1b039de75932aac7 /sway
parentRevert "swaybg: Make swaybg a shell surface" (diff)
downloadsway-4bb45abc46def3f05f83561745349c121e6a8a2a.tar.gz
sway-4bb45abc46def3f05f83561745349c121e6a8a2a.tar.zst
sway-4bb45abc46def3f05f83561745349c121e6a8a2a.zip
Don't treat backgrounds as shell surfaces
This code had some issues. Remove it now so that we can start clean and fix it later.
Diffstat (limited to 'sway')
-rw-r--r--sway/extensions.c1
-rw-r--r--sway/handlers.c13
2 files changed, 1 insertions, 13 deletions
diff --git a/sway/extensions.c b/sway/extensions.c
index 1fe15ac5..ab425fa7 100644
--- a/sway/extensions.c
+++ b/sway/extensions.c
@@ -73,7 +73,6 @@ static void set_background(struct wl_client *client, struct wl_resource *resourc
73 } 73 }
74 sway_log(L_DEBUG, "Setting surface %p as background for output %d", surface, (int)output); 74 sway_log(L_DEBUG, "Setting surface %p as background for output %d", surface, (int)output);
75 struct background_config *config = malloc(sizeof(struct background_config)); 75 struct background_config *config = malloc(sizeof(struct background_config));
76 config->client = client;
77 config->output = output; 76 config->output = output;
78 config->surface = wlc_resource_from_wl_surface_resource(surface); 77 config->surface = wlc_resource_from_wl_surface_resource(surface);
79 config->wl_surface_res = surface; 78 config->wl_surface_res = surface;
diff --git a/sway/handlers.c b/sway/handlers.c
index 4336b6c7..c339fa5e 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -176,17 +176,6 @@ static void handle_output_focused(wlc_handle output, bool focus) {
176 } 176 }
177} 177}
178 178
179static bool client_is_background(struct wl_client *client) {
180 int i;
181 for (i = 0; i < desktop_shell.backgrounds->length; i++) {
182 struct background_config *config = desktop_shell.backgrounds->items[i];
183 if (config->client == client) {
184 return true;
185 }
186 }
187 return false;
188}
189
190static bool client_is_panel(struct wl_client *client) { 179static bool client_is_panel(struct wl_client *client) {
191 int i; 180 int i;
192 for (i = 0; i < desktop_shell.panels->length; i++) { 181 for (i = 0; i < desktop_shell.panels->length; i++) {
@@ -229,7 +218,7 @@ static bool handle_view_created(wlc_handle handle) {
229 struct wl_client *client = wlc_view_get_wl_client(handle); 218 struct wl_client *client = wlc_view_get_wl_client(handle);
230 pid_t pid; 219 pid_t pid;
231 220
232 if (client_is_background(client) || client_is_panel(client)) { 221 if (client_is_panel(client)) {
233 return true; 222 return true;
234 } 223 }
235 224