alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't treat backgrounds as shell surfaces

Browse source 
This code had some issues. Remove it now so that we can start clean and fix
it later.
This commit is contained in:
David Eklov 2016-07-10 11:03:39 -05:00
parent 6d94f77457
commit 4bb45abc46
3 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/extensions.h
View file

@ -11,8 +11,6 @@ struct background_config {
wlc_resource surface; wlc_resource surface;
// we need the wl_resource of the surface in the destructor // we need the wl_resource of the surface in the destructor
struct wl_resource *wl_surface_res; struct wl_resource *wl_surface_res;
// used to determine if client is a background
struct wl_client *client;
}; };
struct panel_config { struct panel_config {

1
sway/extensions.c
View file

@ -73,7 +73,6 @@ static void set_background(struct wl_client *client, struct wl_resource *resourc
} }
sway_log(L_DEBUG, "Setting surface %p as background for output %d", surface, (int)output); sway_log(L_DEBUG, "Setting surface %p as background for output %d", surface, (int)output);
struct background_config *config = malloc(sizeof(struct background_config)); struct background_config *config = malloc(sizeof(struct background_config));
config->client = client;
config->output = output; config->output = output;
config->surface = wlc_resource_from_wl_surface_resource(surface); config->surface = wlc_resource_from_wl_surface_resource(surface);
config->wl_surface_res = surface; config->wl_surface_res = surface;

13
sway/handlers.c
View file

@ -176,17 +176,6 @@ static void handle_output_focused(wlc_handle output, bool focus) {
} }
} }
static bool client_is_background(struct wl_client *client) {
int i;
for (i = 0; i < desktop_shell.backgrounds->length; i++) {
struct background_config *config = desktop_shell.backgrounds->items[i];
if (config->client == client) {
return true;
}
}
return false;
}
static bool client_is_panel(struct wl_client *client) { static bool client_is_panel(struct wl_client *client) {
int i; int i;
for (i = 0; i < desktop_shell.panels->length; i++) { for (i = 0; i < desktop_shell.panels->length; i++) {
@ -229,7 +218,7 @@ static bool handle_view_created(wlc_handle handle) {
struct wl_client *client = wlc_view_get_wl_client(handle); struct wl_client *client = wlc_view_get_wl_client(handle);
pid_t pid; pid_t pid;
if (client_is_background(client) || client_is_panel(client)) { if (client_is_panel(client)) {
return true; return true;
} }