fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-01-06 13:10:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg-shell: Add a "delete" event

Browse source 
This is equivalent to WM_DELETE_WINDOW request under X11, or equivalent
to pressing the "close" button under CSD. Weston currently doesn't have
a compositor-side way to close the window, so no new code is needed on
its side.
This commit is contained in:
Jasper St. Pierre 2014-02-01 18:17:34 -05:00 • committed by Kristian Høgsberg
parent e5b4dce642
commit 2097fe12d4
2 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
clients/window.c
View file

@ -1363,6 +1363,15 @@ window_has_focus(struct window *window)
return window->focused;
}
static void
window_close(struct window *window)
{
if (window->close_handler)
window->close_handler(window->user_data);
else
display_exit(window->display);
}
struct display *
window_get_display(struct window *window)
{
@ -2261,10 +2270,7 @@ frame_menu_func(struct window *window,
switch (index) {
case 0: /* close */
if (window->close_handler)
window->close_handler(window->user_data);
else
display_exit(window->display);
window_close(window);
break;
case 1: /* move to workspace above */
display = window->display;
@ -2378,10 +2384,7 @@ frame_handle_status(struct window_frame *frame, struct input *input,
}
if (status & FRAME_STATUS_CLOSE) {
if (window->close_handler)
window->close_handler(window->user_data);
else
display_exit(window->display);
window_close(window);
return;
}
@ -2909,10 +2912,7 @@ keyboard_handle_key(void *data, struct wl_keyboard *keyboard,
} else if (sym == XKB_KEY_F4 &&
input->modifiers == MOD_ALT_MASK &&
state == WL_KEYBOARD_KEY_STATE_PRESSED) {
if (window->close_handler)
window->close_handler(window->user_data);
else
display_exit(window->display);
window_close(window);
} else if (window->key_handler) {
(*window->key_handler)(window, input, time, key,
sym, state, window->user_data);
@ -3902,6 +3902,13 @@ handle_surface_request_unset_fullscreen(void *data, struct xdg_surface *xdg_surf
window_set_fullscreen(window, 0);
}
static void
handle_surface_delete(void *data, struct xdg_surface *xdg_surface)
{
struct window *window = data;
window_close(window);
}
static const struct xdg_surface_listener xdg_surface_listener = {
handle_surface_ping,
handle_surface_configure,
@ -3911,6 +3918,7 @@ static const struct xdg_surface_listener xdg_surface_listener = {
handle_surface_request_unset_fullscreen,
handle_surface_focused_set,
handle_surface_focused_unset,
handle_surface_delete,
};
static void

13
protocol/xdg-shell.xml
View file

@ -373,6 +373,19 @@
decorations should be updated accordingly.
</description>
</event>
<event name="delete">
<description summary="surface wants to be closed">
The delete event is sent by the compositor when the user
wants the surface to be closed. This should be equivalent to
the user clicking the close button in client-side decorations,
if your application has any...
This is only a request that the user intends to close your
window. The client may choose to ignore this request, or show
a dialog to ask the user to save their data...
</description>
</event>
</interface>
<interface name="xdg_popup" version="1">