KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wayland: Inform compositor of new window geometry when setting window size

Browse Source
This commit is contained in:
Kovid Goyal 2021-07-25 12:26:09 +05:30
parent 174abb352c
commit 2e01c1f37e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
glfw/wl_window.c vendored
View File

@ -396,7 +396,16 @@ _glfwPlatformToggleFullscreen(_GLFWwindow *window, unsigned int flags UNUSED) {
return !already_fullscreen; return !already_fullscreen;
} }
static void xdgToplevelHandleConfigure(void* data, static void
inform_compositor_of_window_geometry(_GLFWwindow *window, const char *event) {
#define geometry window->wl.decorations.geometry
debug("Setting window geometry in %s event: x=%d y=%d %dx%d\n", event, geometry.x, geometry.y, geometry.width, geometry.height);
xdg_surface_set_window_geometry(window->wl.xdg.surface, geometry.x, geometry.y, geometry.width, geometry.height);
#undef geometry
}
static void
xdgToplevelHandleConfigure(void* data,
struct xdg_toplevel* toplevel UNUSED, struct xdg_toplevel* toplevel UNUSED,
int32_t width, int32_t width,
int32_t height, int32_t height,
@ -452,10 +461,7 @@ static void xdgToplevelHandleConfigure(void* data,
_glfwInputWindowFocus(window, window->wl.toplevel_states & TOPLEVEL_STATE_ACTIVATED); _glfwInputWindowFocus(window, window->wl.toplevel_states & TOPLEVEL_STATE_ACTIVATED);
ensure_csd_resources(window); ensure_csd_resources(window);
wl_surface_commit(window->wl.surface); wl_surface_commit(window->wl.surface);
#define geometry window->wl.decorations.geometry inform_compositor_of_window_geometry(window, "configure");
debug("Setting window geometry: x=%d y=%d %dx%d\n", geometry.x, geometry.y, geometry.width, geometry.height);
xdg_surface_set_window_geometry(window->wl.xdg.surface, geometry.x, geometry.y, geometry.width, geometry.height);
#undef geometry
if (live_resize_done) _glfwInputLiveResize(window, false); if (live_resize_done) _glfwInputLiveResize(window, false);
} }
@ -872,6 +878,7 @@ void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
resizeFramebuffer(window); resizeFramebuffer(window);
ensure_csd_resources(window); ensure_csd_resources(window);
wl_surface_commit(window->wl.surface); wl_surface_commit(window->wl.surface);
inform_compositor_of_window_geometry(window, "SetWindowSize");
} }
} }

8
kitty/glfw.c
View File

@ -502,7 +502,7 @@ get_window_content_scale(GLFWwindow *w, float *xscale, float *yscale, double *xd
*ydpi = *yscale * factor; *ydpi = *yscale * factor;
} }
static inline void static void
get_window_dpi(GLFWwindow *w, double *x, double *y) { get_window_dpi(GLFWwindow *w, double *x, double *y) {
float xscale, yscale; float xscale, yscale;
get_window_content_scale(w, &xscale, &yscale, x, y); get_window_content_scale(w, &xscale, &yscale, x, y);
@ -513,7 +513,7 @@ set_os_window_dpi(OSWindow *w) {
get_window_dpi(w->handle, &w->logical_dpi_x, &w->logical_dpi_y); get_window_dpi(w->handle, &w->logical_dpi_x, &w->logical_dpi_y);
} }
static inline bool static bool
do_toggle_fullscreen(OSWindow *w) { do_toggle_fullscreen(OSWindow *w) {
int width, height, x, y; int width, height, x, y;
glfwGetWindowSize(w->handle, &width, &height); glfwGetWindowSize(w->handle, &width, &height);
@ -534,9 +534,9 @@ static bool
toggle_fullscreen_for_os_window(OSWindow *w) { toggle_fullscreen_for_os_window(OSWindow *w) {
if (w && w->handle) { if (w && w->handle) {
#ifdef __APPLE__ #ifdef __APPLE__
if (!OPT(macos_traditional_fullscreen)) return glfwToggleFullscreen(w->handle, 1); if (!OPT(macos_traditional_fullscreen)) return glfwToggleFullscreen(w->handle, 1);
#endif #endif
return do_toggle_fullscreen(w); return do_toggle_fullscreen(w);
} }
return false; return false;
} }