Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-10 08:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] wayland: handle output scale changes

Browse Source 
If the scale factor of an wl_output changes while the client is running,
the maximum scale factor is not updated. This may result in incorrect
scaling.

Therefore, when the scale factor is changed, we should generate a
resize event.
This commit is contained in:
Quantum 2021-02-22 02:19:03 -05:00 committed by Geoffrey McRae
parent 0089c1252f
commit 389d8824e2
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/displayservers/Wayland/output.c
View File

@ -49,6 +49,7 @@ static void outputScaleHandler(void * opaque, struct wl_output * output, int32_t
{ {
struct WaylandOutput * node = opaque; struct WaylandOutput * node = opaque;
node->scale = scale; node->scale = scale;
waylandWindowUpdateScale();
} }
static const struct wl_output_listener outputListener = { static const struct wl_output_listener outputListener = {

1
client/displayservers/Wayland/wayland.c
View File

@ -89,6 +89,7 @@ static bool waylandProbe(void)
static bool waylandInit(const LG_DSInitParams params) static bool waylandInit(const LG_DSInitParams params)
{ {
memset(&wlWm, 0, sizeof(wlWm)); memset(&wlWm, 0, sizeof(wlWm));
wl_list_init(&wlWm.surfaceOutputs);
wlWm.warpSupport = option_get_bool("wayland", "warpSupport"); wlWm.warpSupport = option_get_bool("wayland", "warpSupport");

1
client/displayservers/Wayland/wayland.h
View File

@ -238,6 +238,7 @@ void waylandRegistryFree(void);
// window module // window module
bool waylandWindowInit(const char * title, bool fullscreen, bool maximize, bool borderless); bool waylandWindowInit(const char * title, bool fullscreen, bool maximize, bool borderless);
void waylandWindowFree(void); void waylandWindowFree(void);
void waylandWindowUpdateScale(void);
void waylandSetWindowSize(int x, int y); void waylandSetWindowSize(int x, int y);
void waylandSetFullscreen(bool fs); void waylandSetFullscreen(bool fs);
bool waylandGetFullscreen(void); bool waylandGetFullscreen(void);

7
client/displayservers/Wayland/window.c
View File

@ -41,7 +41,7 @@ static const struct xdg_wm_base_listener xdgWmBaseListener = {
// Surface-handling listeners. // Surface-handling listeners.
static void surfaceUpdateScale(void) void waylandWindowUpdateScale(void)
{ {
int32_t maxScale = 0; int32_t maxScale = 0;
struct SurfaceOutput * node; struct SurfaceOutput * node;
@ -65,7 +65,7 @@ static void wlSurfaceEnterHandler(void * data, struct wl_surface * surface, stru
struct SurfaceOutput * node = malloc(sizeof(struct SurfaceOutput)); struct SurfaceOutput * node = malloc(sizeof(struct SurfaceOutput));
node->output = output; node->output = output;
wl_list_insert(&wlWm.surfaceOutputs, &node->link); wl_list_insert(&wlWm.surfaceOutputs, &node->link);
surfaceUpdateScale(); waylandWindowUpdateScale();
} }
static void wlSurfaceLeaveHandler(void * data, struct wl_surface * surface, struct wl_output * output) static void wlSurfaceLeaveHandler(void * data, struct wl_surface * surface, struct wl_output * output)
@ -77,7 +77,7 @@ static void wlSurfaceLeaveHandler(void * data, struct wl_surface * surface, stru
wl_list_remove(&node->link); wl_list_remove(&node->link);
break; break;
} }
surfaceUpdateScale(); waylandWindowUpdateScale();
} }
static const struct wl_surface_listener wlSurfaceListener = { static const struct wl_surface_listener wlSurfaceListener = {
@ -158,7 +158,6 @@ bool waylandWindowInit(const char * title, bool fullscreen, bool maximize, bool
return false; return false;
} }
wl_list_init(&wlWm.surfaceOutputs);
wl_surface_add_listener(wlWm.surface, &wlSurfaceListener, NULL); wl_surface_add_listener(wlWm.surface, &wlSurfaceListener, NULL);
wlWm.xdgSurface = xdg_wm_base_get_xdg_surface(wlWm.xdgWmBase, wlWm.surface); wlWm.xdgSurface = xdg_wm_base_get_xdg_surface(wlWm.xdgWmBase, wlWm.surface);