mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

window: Toggle maximized with super-f5

This commit is contained in:
Kristian Høgsberg 2012-02-16 15:53:46 -05:00
parent 96879dfe52
commit d6bcd7daa7
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clients/window.c
View File

@ -50,6 +50,7 @@
#endif
#include <X11/extensions/XKBcommon.h>
#include <X11/X.h>
#include <linux/input.h>
#include <wayland-client.h>
@ -99,6 +100,7 @@ struct display {
enum {
TYPE_TOPLEVEL,
TYPE_FULLSCREEN,
TYPE_MAXIMIZED,
TYPE_TRANSIENT,
TYPE_MENU,
TYPE_CUSTOM
@ -790,6 +792,9 @@ window_set_type(struct window *window)
case TYPE_FULLSCREEN:
wl_shell_surface_set_fullscreen(window->shell_surface);
break;
case TYPE_MAXIMIZED:
wl_shell_surface_set_maximized(window->shell_surface, NULL);
break;
case TYPE_TOPLEVEL:
wl_shell_surface_set_toplevel(window->shell_surface);
break;
@ -1566,9 +1571,14 @@ input_handle_key(void *data, struct wl_input_device *input_device,
else
input->modifiers &= ~d->xkb->map->modmap[code];
if (window->key_handler)
(*window->key_handler)(window, input, time, key, sym, state,
window->user_data);
if (key == KEY_F5 && input->modifiers == Mod4Mask) {
if (state)
window_set_maximized(window,
window->type != TYPE_MAXIMIZED);
} else if (window->key_handler) {
(*window->key_handler)(window, input, time, key,
sym, state, window->user_data);
}
}
static void
@ -2172,6 +2182,28 @@ window_set_fullscreen(struct window *window, int fullscreen)
window_schedule_resize(window, width, height);
}
void
window_set_maximized(struct window *window, int maximized)
{
if (!window->display->shell)
return;
if ((window->type == TYPE_MAXIMIZED) == maximized)
return;
if (window->type == TYPE_TOPLEVEL) {
window->saved_allocation = window->allocation;
wl_shell_surface_set_maximized(window->shell_surface, NULL);
window->type = TYPE_MAXIMIZED;
} else {
wl_shell_surface_set_toplevel(window->shell_surface);
window->type = TYPE_TOPLEVEL;
window_schedule_resize(window,
window->saved_allocation.width,
window->saved_allocation.height);
}
}
void
window_set_user_data(struct window *window, void *data)
{

3
clients/window.h
View File

@ -270,6 +270,9 @@ window_set_buffer_type(struct window *window, enum window_buffer_type type);
void
window_set_fullscreen(struct window *window, int fullscreen);
void
window_set_maximized(struct window *window, int maximized);
void
window_set_custom(struct window *window);