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

wl_shell: gluten-free cosmetic variable renaming

This commit is contained in:
emersion 2017-09-28 01:02:30 +02:00
parent dd9c15c69e
commit d41a4a0bae
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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); // TODO: segfaults
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));

21
types/wlr_wl_shell.c
View File

@ -362,23 +362,22 @@ static void wl_shell_bind(struct wl_client *wl_client, void *_wl_shell,
} }
struct wlr_wl_shell *wlr_wl_shell_create(struct wl_display *display) { struct wlr_wl_shell *wlr_wl_shell_create(struct wl_display *display) {
struct wlr_wl_shell *wlr_wl_shell = struct wlr_wl_shell *wl_shell = calloc(1, sizeof(struct wlr_wl_shell));
calloc(1, sizeof(struct wlr_wl_shell)); if (!wl_shell) {
if (!wlr_wl_shell) {
return NULL; return NULL;
} }
wlr_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, 1, wlr_wl_shell, wl_shell_bind); &wl_shell_interface, 1, wl_shell, wl_shell_bind);
if (!wl_global) { if (!wl_global) {
free(wlr_wl_shell); free(wl_shell);
return NULL; return NULL;
} }
wlr_wl_shell->wl_global = wl_global; wl_shell->wl_global = wl_global;
wl_list_init(&wlr_wl_shell->wl_resources); wl_list_init(&wl_shell->wl_resources);
wl_list_init(&wlr_wl_shell->surfaces); wl_list_init(&wl_shell->surfaces);
wl_signal_init(&wlr_wl_shell->events.new_surface); wl_signal_init(&wl_shell->events.new_surface);
return wlr_wl_shell; return wl_shell;
} }
void wlr_wl_shell_destroy(struct wlr_wl_shell *wlr_wl_shell) { void wlr_wl_shell_destroy(struct wlr_wl_shell *wlr_wl_shell) {