nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-21 22:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

xwm: expose individual axis for _set_maximized()

Browse Source 
This allows compositors to support both axis individually.
To keep existing behavior, compositors can supply the same
maximized state for both axis.
This commit is contained in:
Consolatis 2024-04-13 14:48:59 +02:00 committed by Kirill Primak
parent f9199bb6d4
commit ceb4fcedca
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/xwayland/xwayland.h
View File

@ -261,7 +261,7 @@ void wlr_xwayland_surface_set_minimized(struct wlr_xwayland_surface *surface,
bool minimized); bool minimized);
void wlr_xwayland_surface_set_maximized(struct wlr_xwayland_surface *surface, void wlr_xwayland_surface_set_maximized(struct wlr_xwayland_surface *surface,
bool maximized); bool maximized_horz, bool maximized_vert);
void wlr_xwayland_surface_set_fullscreen(struct wlr_xwayland_surface *surface, void wlr_xwayland_surface_set_fullscreen(struct wlr_xwayland_surface *surface,
bool fullscreen); bool fullscreen);

18
xwayland/xwm.c
View File

@ -1392,11 +1392,6 @@ static bool update_state(int action, bool *state) {
return changed; return changed;
} }
static bool xsurface_is_maximized(
struct wlr_xwayland_surface *xsurface) {
return xsurface->maximized_horz && xsurface->maximized_vert;
}
static void xwm_handle_net_wm_state_message(struct wlr_xwm *xwm, static void xwm_handle_net_wm_state_message(struct wlr_xwm *xwm,
xcb_client_message_event_t *client_message) { xcb_client_message_event_t *client_message) {
struct wlr_xwayland_surface *xsurface = struct wlr_xwayland_surface *xsurface =
@ -1409,7 +1404,8 @@ static void xwm_handle_net_wm_state_message(struct wlr_xwm *xwm,
} }
bool fullscreen = xsurface->fullscreen; bool fullscreen = xsurface->fullscreen;
bool maximized = xsurface_is_maximized(xsurface); bool maximized_vert = xsurface->maximized_vert;
bool maximized_horz = xsurface->maximized_horz;
bool minimized = xsurface->minimized; bool minimized = xsurface->minimized;
uint32_t action = client_message->data.data32[0]; uint32_t action = client_message->data.data32[0];
@ -1445,7 +1441,9 @@ static void xwm_handle_net_wm_state_message(struct wlr_xwm *xwm,
wl_signal_emit_mutable(&xsurface->events.request_fullscreen, NULL); wl_signal_emit_mutable(&xsurface->events.request_fullscreen, NULL);
} }
if (maximized != xsurface_is_maximized(xsurface)) { if (maximized_vert != xsurface->maximized_vert
|| maximized_horz != xsurface->maximized_horz) {
wl_signal_emit_mutable(&xsurface->events.request_maximize, NULL); wl_signal_emit_mutable(&xsurface->events.request_maximize, NULL);
} }
@ -2342,9 +2340,9 @@ void wlr_xwayland_surface_set_minimized(struct wlr_xwayland_surface *surface,
} }
void wlr_xwayland_surface_set_maximized(struct wlr_xwayland_surface *surface, void wlr_xwayland_surface_set_maximized(struct wlr_xwayland_surface *surface,
bool maximized) { bool maximized_horz, bool maximized_vert) {
surface->maximized_horz = maximized; surface->maximized_horz = maximized_horz;
surface->maximized_vert = maximized; surface->maximized_vert = maximized_vert;
xsurface_set_net_wm_state(surface); xsurface_set_net_wm_state(surface);
xcb_flush(surface->xwm->xcb_conn); xcb_flush(surface->xwm->xcb_conn);
} }