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

simple-touch: Add maximized/fullscreen states 

Helpful to have other states like maximized or fullscreen for
the simple-touch client.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad 2022-12-22 18:27:14 +02:00
parent c7a29b5196
commit 76f689e370
1 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
clients/simple-touch.c
View File

@ -64,9 +64,13 @@ struct touch {
struct xdg_toplevel *xdg_toplevel;
struct buffer *buffer;
int width, height;
int init_width, init_height;
bool running;
bool wait_for_configure;
bool needs_buffer_update;
bool has_argb;
bool maximized;
bool fullscreen;
};
static struct buffer *
@ -111,7 +115,7 @@ create_shm_buffer(struct touch *touch)
}
static void
initial_redraw(void *data)
redraw(void *data)
{
struct touch *touch = data;
struct buffer *buffer = NULL;
@ -119,6 +123,9 @@ initial_redraw(void *data)
buffer = create_shm_buffer(touch);
assert(buffer);
if (touch->buffer)
free(touch->buffer);
touch->buffer = buffer;
/* paint the "work-area" */
@ -283,9 +290,10 @@ handle_xdg_surface_configure(void *data, struct xdg_surface *surface,
xdg_surface_ack_configure(surface, serial);
if (touch->wait_for_configure) {
initial_redraw(touch);
if (touch->wait_for_configure || touch->needs_buffer_update) {
redraw(touch);
touch->wait_for_configure = false;
touch->needs_buffer_update = false;
}
}
@ -340,9 +348,40 @@ static const struct wl_registry_listener registry_listener = {
static void
handle_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
int32_t width, int32_t height,
struct wl_array *state)
int32_t width, int32_t height, struct wl_array *states)
{
struct touch *touch = data;
uint32_t *p;
touch->fullscreen = false;
touch->maximized = false;
wl_array_for_each(p, states) {
uint32_t state = *p;
switch (state) {
case XDG_TOPLEVEL_STATE_FULLSCREEN:
touch->fullscreen = true;
break;
case XDG_TOPLEVEL_STATE_MAXIMIZED:
touch->maximized = true;
break;
}
}
if (width > 0 && height > 0) {
if (!touch->fullscreen && !touch->maximized) {
touch->init_width = width;
touch->init_width = height;
}
touch->width = width;
touch->height = height;
} else if (!touch->fullscreen && !touch->maximized) {
touch->width = touch->init_width;
touch->height = touch->init_height;
}
touch->needs_buffer_update = true;
}
static void
@ -371,6 +410,7 @@ touch_create(int width, int height)
assert(touch->display);
touch->has_argb = false;
touch->buffer = NULL;
touch->registry = wl_display_get_registry(touch->display);
wl_registry_add_listener(touch->registry, &registry_listener, touch);
wl_display_dispatch(touch->display);
@ -386,8 +426,8 @@ touch_create(int width, int height)
exit(1);
}
touch->width = width;
touch->height = height;
touch->init_width = width;
touch->init_height = height;
touch->surface = wl_compositor_create_surface(touch->compositor);
touch->xdg_surface =
@ -403,6 +443,7 @@ touch_create(int width, int height)
xdg_toplevel_set_title(touch->xdg_toplevel, "simple-touch");
xdg_toplevel_set_app_id(touch->xdg_toplevel, "simple-touch");
touch->wait_for_configure = true;
touch->needs_buffer_update = false;
wl_surface_commit(touch->surface);
touch->running = true;