blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #163 from emersion/wl_shell-fixes 

wl_shell fixes
This commit is contained in:
Drew DeVault 2017-09-28 13:29:49 -04:00 committed by GitHub
parent 3cd4cf4fba 8146d60a87
commit c92199a953
3 changed files with 75 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/wlr/types/wlr_wl_shell.h
View File

@ -21,7 +21,7 @@ struct wlr_wl_shell_surface_transient_state {
struct wlr_wl_shell_surface *parent; struct wlr_wl_shell_surface *parent;
int32_t x; int32_t x;
int32_t y; int32_t y;
uint32_t flags; enum wl_shell_surface_transient flags;
}; };
struct wlr_wl_shell_surface_popup_state { struct wlr_wl_shell_surface_popup_state {
@ -29,11 +29,11 @@ struct wlr_wl_shell_surface_popup_state {
uint32_t serial; uint32_t serial;
}; };
enum wlr_wl_shell_surface_role { enum wlr_wl_shell_surface_state {
WLR_WL_SHELL_SURFACE_ROLE_NONE, WLR_WL_SHELL_SURFACE_STATE_NONE,
WLR_WL_SHELL_SURFACE_ROLE_TOPLEVEL, WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL,
WLR_WL_SHELL_SURFACE_ROLE_TRANSCIENT, WLR_WL_SHELL_SURFACE_STATE_TRANSIENT,
WLR_WL_SHELL_SURFACE_ROLE_POPUP, WLR_WL_SHELL_SURFACE_STATE_POPUP,
}; };
struct wlr_wl_shell_surface { struct wlr_wl_shell_surface {
@ -46,7 +46,7 @@ struct wlr_wl_shell_surface {
uint32_t ping_serial; uint32_t ping_serial;
struct wl_event_source *ping_timer; struct wl_event_source *ping_timer;
enum wlr_wl_shell_surface_role role; enum wlr_wl_shell_surface_state state;
struct wlr_wl_shell_surface_transient_state *transient_state; struct wlr_wl_shell_surface_transient_state *transient_state;
struct wlr_wl_shell_surface_popup_state *popup_state; struct wlr_wl_shell_surface_popup_state *popup_state;
@ -64,7 +64,7 @@ struct wlr_wl_shell_surface {
struct wl_signal request_set_fullscreen; struct wl_signal request_set_fullscreen;
struct wl_signal request_set_maximized; struct wl_signal request_set_maximized;
struct wl_signal set_role; struct wl_signal set_state;
struct wl_signal set_title; struct wl_signal set_title;
struct wl_signal set_class; struct wl_signal set_class;
} events; } events;
@ -84,13 +84,13 @@ struct wlr_wl_shell_surface_resize_event {
struct wlr_wl_shell_surface *surface; struct wlr_wl_shell_surface *surface;
struct wlr_seat_handle *seat_handle; struct wlr_seat_handle *seat_handle;
uint32_t serial; uint32_t serial;
uint32_t edges; enum wl_shell_surface_resize edges;
}; };
struct wlr_wl_shell_surface_set_fullscreen_event { struct wlr_wl_shell_surface_set_fullscreen_event {
struct wl_client *client; struct wl_client *client;
struct wlr_wl_shell_surface *surface; struct wlr_wl_shell_surface *surface;
uint32_t method; enum wl_shell_surface_fullscreen_method method;
uint32_t framerate; uint32_t framerate;
struct wlr_output *output; struct wlr_output *output;
}; };

2
rootston/wl_shell.c
View File

@ -56,7 +56,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
struct wlr_wl_shell_surface *surface = data; struct wlr_wl_shell_surface *surface = data;
wlr_log(L_DEBUG, "new shell surface: title=%s, class=%s", wlr_log(L_DEBUG, "new shell surface: title=%s, class=%s",
surface->title, surface->class); surface->title, surface->class);
wlr_wl_shell_surface_ping(surface); // TODO: segfaults wlr_wl_shell_surface_ping(surface);
struct roots_wl_shell_surface *roots_surface = struct roots_wl_shell_surface *roots_surface =
calloc(1, sizeof(struct roots_wl_shell_surface)); calloc(1, sizeof(struct roots_wl_shell_surface));

133
types/wlr_wl_shell.c
View File

@ -9,6 +9,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <wayland-server-protocol.h> #include <wayland-server-protocol.h>
static const char *wlr_wl_shell_surface_role = "wl_shell_surface";
static void shell_surface_pong(struct wl_client *client, static void shell_surface_pong(struct wl_client *client,
struct wl_resource *resource, uint32_t serial) { struct wl_resource *resource, uint32_t serial) {
wlr_log(L_DEBUG, "got shell surface pong"); wlr_log(L_DEBUG, "got shell surface pong");
@ -35,7 +37,6 @@ static void shell_surface_move(struct wl_client *client,
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
event->client = client; event->client = client;
event->surface = surface; event->surface = surface;
event->seat_handle = seat_handle; event->seat_handle = seat_handle;
@ -48,7 +49,7 @@ static void shell_surface_move(struct wl_client *client,
static void shell_surface_resize(struct wl_client *client, static void shell_surface_resize(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *seat_resource, struct wl_resource *resource, struct wl_resource *seat_resource,
uint32_t serial, uint32_t edges) { uint32_t serial, enum wl_shell_surface_resize edges) {
wlr_log(L_DEBUG, "got shell surface resize"); wlr_log(L_DEBUG, "got shell surface resize");
struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
struct wlr_seat_handle *seat_handle = struct wlr_seat_handle *seat_handle =
@ -60,7 +61,6 @@ static void shell_surface_resize(struct wl_client *client,
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
event->client = client; event->client = client;
event->surface = surface; event->surface = surface;
event->seat_handle = seat_handle; event->seat_handle = seat_handle;
@ -72,55 +72,54 @@ static void shell_surface_resize(struct wl_client *client,
free(event); free(event);
} }
static void shell_surface_set_state(struct wlr_wl_shell_surface *surface,
enum wlr_wl_shell_surface_state state,
struct wlr_wl_shell_surface_transient_state *transient_state,
struct wlr_wl_shell_surface_popup_state *popup_state) {
surface->state = state;
free(surface->transient_state);
surface->transient_state = transient_state;
free(surface->popup_state);
surface->popup_state = popup_state;
wl_signal_emit(&surface->events.set_state, surface);
}
static void shell_surface_set_toplevel(struct wl_client *client, static void shell_surface_set_toplevel(struct wl_client *client,
struct wl_resource *resource) { struct wl_resource *resource) {
wlr_log(L_DEBUG, "got shell surface toplevel"); wlr_log(L_DEBUG, "got shell surface toplevel");
struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL, NULL,
if (surface->role != WLR_WL_SHELL_SURFACE_ROLE_NONE) { NULL);
return;
}
surface->role = WLR_WL_SHELL_SURFACE_ROLE_TOPLEVEL;
wl_signal_emit(&surface->events.set_role, surface);
} }
static void shell_surface_set_transient(struct wl_client *client, static void shell_surface_set_transient(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *parent_resource, struct wl_resource *resource, struct wl_resource *parent_resource,
int32_t x, int32_t y, uint32_t flags) { int32_t x, int32_t y, enum wl_shell_surface_transient flags) {
wlr_log(L_DEBUG, "got shell surface transient"); wlr_log(L_DEBUG, "got shell surface transient");
struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
struct wlr_wl_shell_surface *parent = struct wlr_wl_shell_surface *parent =
wl_resource_get_user_data(parent_resource); wl_resource_get_user_data(parent_resource);
// TODO: check if parent_resource == NULL? // TODO: check if parent_resource == NULL?
if (surface->role != WLR_WL_SHELL_SURFACE_ROLE_NONE) { struct wlr_wl_shell_surface_transient_state *transient_state =
return;
}
struct wlr_wl_shell_surface_transient_state *state =
calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state)); calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state));
if (state == NULL) { if (transient_state == NULL) {
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
transient_state->parent = parent;
transient_state->x = x;
transient_state->y = y;
transient_state->flags = flags;
state->parent = parent; shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_TRANSIENT,
state->x = x; transient_state, NULL);
state->y = y;
state->flags = flags;
free(surface->transient_state);
surface->transient_state = state;
surface->role = WLR_WL_SHELL_SURFACE_ROLE_TRANSCIENT;
wl_signal_emit(&surface->events.set_role, surface);
} }
static void shell_surface_set_fullscreen(struct wl_client *client, static void shell_surface_set_fullscreen(struct wl_client *client,
struct wl_resource *resource, uint32_t method, uint32_t framerate, struct wl_resource *resource,
enum wl_shell_surface_fullscreen_method method, uint32_t framerate,
struct wl_resource *output_resource) { struct wl_resource *output_resource) {
wlr_log(L_DEBUG, "got shell surface fullscreen"); wlr_log(L_DEBUG, "got shell surface fullscreen");
struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
@ -129,7 +128,7 @@ static void shell_surface_set_fullscreen(struct wl_client *client,
output = wl_resource_get_user_data(output_resource); output = wl_resource_get_user_data(output_resource);
} }
if (surface->role == WLR_WL_SHELL_SURFACE_ROLE_TOPLEVEL) { if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL) {
return; return;
} }
@ -139,7 +138,6 @@ static void shell_surface_set_fullscreen(struct wl_client *client,
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
event->client = client; event->client = client;
event->surface = surface; event->surface = surface;
event->method = method; event->method = method;
@ -153,8 +151,9 @@ static void shell_surface_set_fullscreen(struct wl_client *client,
static void shell_surface_set_popup(struct wl_client *client, static void shell_surface_set_popup(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *seat_resource, struct wl_resource *resource, struct wl_resource *seat_resource,
uint32_t serial, struct wl_resource *parent_resource, int32_t x, int32_t y, uint32_t serial, struct wl_resource *parent_resource, int32_t x,
uint32_t flags) { int32_t y, enum wl_shell_surface_transient flags) {
// TODO: do a pointer grab
wlr_log(L_DEBUG, "got shell surface popup"); wlr_log(L_DEBUG, "got shell surface popup");
struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
struct wlr_seat_handle *seat_handle = struct wlr_seat_handle *seat_handle =
@ -163,41 +162,29 @@ static void shell_surface_set_popup(struct wl_client *client,
wl_resource_get_user_data(parent_resource); wl_resource_get_user_data(parent_resource);
// TODO: check if parent_resource == NULL? // TODO: check if parent_resource == NULL?
if (surface->role != WLR_WL_SHELL_SURFACE_ROLE_NONE) { struct wlr_wl_shell_surface_transient_state *transient_state =
return;
}
struct wlr_wl_shell_surface_transient_state *transcient_state =
calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state)); calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state));
if (transcient_state == NULL) { if (transient_state == NULL) {
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
transient_state->parent = parent;
transcient_state->parent = parent; transient_state->x = x;
transcient_state->x = x; transient_state->y = y;
transcient_state->y = y; transient_state->flags = flags;
transcient_state->flags = flags;
struct wlr_wl_shell_surface_popup_state *popup_state = struct wlr_wl_shell_surface_popup_state *popup_state =
calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state)); calloc(1, sizeof(struct wlr_wl_shell_surface_transient_state));
if (popup_state == NULL) { if (popup_state == NULL) {
free(transient_state);
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
popup_state->seat_handle = seat_handle; popup_state->seat_handle = seat_handle;
popup_state->serial = serial; popup_state->serial = serial;
free(surface->transient_state); shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_POPUP,
surface->transient_state = transcient_state; transient_state, popup_state);
free(surface->popup_state);
surface->popup_state = popup_state;
surface->role = WLR_WL_SHELL_SURFACE_ROLE_POPUP;
wl_signal_emit(&surface->events.set_role, surface);
} }
static void shell_surface_set_maximized(struct wl_client *client, static void shell_surface_set_maximized(struct wl_client *client,
@ -209,7 +196,7 @@ static void shell_surface_set_maximized(struct wl_client *client,
output = wl_resource_get_user_data(output_resource); output = wl_resource_get_user_data(output_resource);
} }
if (surface->role == WLR_WL_SHELL_SURFACE_ROLE_TOPLEVEL) { if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL) {
return; return;
} }
@ -219,7 +206,6 @@ static void shell_surface_set_maximized(struct wl_client *client,
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
event->client = client; event->client = client;
event->surface = surface; event->surface = surface;
event->output = output; event->output = output;
@ -279,6 +265,7 @@ static void wl_shell_surface_destroy(struct wlr_wl_shell_surface *surface) {
wl_resource_set_user_data(surface->resource, NULL); wl_resource_set_user_data(surface->resource, NULL);
wl_list_remove(&surface->link); wl_list_remove(&surface->link);
wl_list_remove(&surface->surface_destroy_listener.link); wl_list_remove(&surface->surface_destroy_listener.link);
wl_event_source_remove(surface->ping_timer);
free(surface->transient_state); free(surface->transient_state);
free(surface->popup_state); free(surface->popup_state);
free(surface->title); free(surface->title);
@ -312,6 +299,11 @@ static void wl_shell_get_shell_surface(struct wl_client *client,
struct wl_resource *resource, uint32_t id, struct wl_resource *resource, uint32_t id,
struct wl_resource *surface_resource) { struct wl_resource *surface_resource) {
struct wlr_surface *surface = wl_resource_get_user_data(surface_resource); struct wlr_surface *surface = wl_resource_get_user_data(surface_resource);
if (wlr_surface_set_role(surface, wlr_wl_shell_surface_role,
resource, WL_SHELL_ERROR_ROLE)) {
return;
}
struct wlr_wl_shell *wl_shell = wl_resource_get_user_data(resource); struct wlr_wl_shell *wl_shell = wl_resource_get_user_data(resource);
struct wlr_wl_shell_surface *wl_surface = struct wlr_wl_shell_surface *wl_surface =
calloc(1, sizeof(struct wlr_wl_shell_surface)); calloc(1, sizeof(struct wlr_wl_shell_surface));
@ -324,11 +316,13 @@ static void wl_shell_get_shell_surface(struct wl_client *client,
wl_surface->client = client; wl_surface->client = client;
wl_surface->surface = surface; wl_surface->surface = surface;
wl_surface->resource = wl_resource_create(client, &wl_shell_surface_interface, wl_surface->resource = wl_resource_create(client,
wl_resource_get_version(resource), id); &wl_shell_surface_interface, wl_resource_get_version(resource), id);
wlr_log(L_DEBUG, "new wl_shell %p (res %p)", wl_surface, wl_surface->resource); wlr_log(L_DEBUG, "new wl_shell %p (res %p)", wl_surface,
wl_surface->resource);
wl_resource_set_implementation(wl_surface->resource, wl_resource_set_implementation(wl_surface->resource,
&shell_surface_interface, wl_surface, wl_shell_surface_resource_destroy); &shell_surface_interface, wl_surface,
wl_shell_surface_resource_destroy);
wl_signal_init(&wl_surface->events.destroy); wl_signal_init(&wl_surface->events.destroy);
wl_signal_init(&wl_surface->events.ping_timeout); wl_signal_init(&wl_surface->events.ping_timeout);
@ -336,7 +330,7 @@ static void wl_shell_get_shell_surface(struct wl_client *client,
wl_signal_init(&wl_surface->events.request_resize); wl_signal_init(&wl_surface->events.request_resize);
wl_signal_init(&wl_surface->events.request_set_fullscreen); wl_signal_init(&wl_surface->events.request_set_fullscreen);
wl_signal_init(&wl_surface->events.request_set_maximized); wl_signal_init(&wl_surface->events.request_set_maximized);
wl_signal_init(&wl_surface->events.set_role); wl_signal_init(&wl_surface->events.set_state);
wl_signal_init(&wl_surface->events.set_title); wl_signal_init(&wl_surface->events.set_title);
wl_signal_init(&wl_surface->events.set_class); wl_signal_init(&wl_surface->events.set_class);
@ -369,14 +363,15 @@ static void wl_shell_bind(struct wl_client *wl_client, void *_wl_shell,
struct wlr_wl_shell *wl_shell = _wl_shell; struct wlr_wl_shell *wl_shell = _wl_shell;
assert(wl_client && wl_shell); assert(wl_client && wl_shell);
if (version > 1) { if (version > 1) {
wlr_log(L_ERROR, "Client requested unsupported wl_shell version, disconnecting"); wlr_log(L_ERROR,
"Client requested unsupported wl_shell version, disconnecting");
wl_client_destroy(wl_client); wl_client_destroy(wl_client);
return; return;
} }
struct wl_resource *wl_resource = wl_resource_create( struct wl_resource *wl_resource = wl_resource_create(wl_client,
wl_client, &wl_shell_interface, version, id); &wl_shell_interface, version, id);
wl_resource_set_implementation(wl_resource, &wl_shell_impl, wl_resource_set_implementation(wl_resource, &wl_shell_impl, wl_shell,
wl_shell, wl_shell_destroy); wl_shell_destroy);
wl_list_insert(&wl_shell->wl_resources, wl_resource_get_link(wl_resource)); wl_list_insert(&wl_shell->wl_resources, wl_resource_get_link(wl_resource));
} }
@ -386,8 +381,8 @@ struct wlr_wl_shell *wlr_wl_shell_create(struct wl_display *display) {
return NULL; return NULL;
} }
wl_shell->ping_timeout = 10000; wl_shell->ping_timeout = 10000;
struct wl_global *wl_global = wl_global_create(display, struct wl_global *wl_global = wl_global_create(display, &wl_shell_interface,
&wl_shell_interface, 1, wl_shell, wl_shell_bind); 1, wl_shell, wl_shell_bind);
if (!wl_global) { if (!wl_global) {
free(wl_shell); free(wl_shell);
return NULL; return NULL;