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: support high DPI cursors when needed

Browse Source
This commit is contained in:
Quantum 2021-08-14 19:32:33 -04:00 committed by Geoffrey McRae
parent 2dd1ad53f8
commit 7cd0c55847
3 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
client/displayservers/Wayland/cursor.c
View File

@ -90,6 +90,7 @@ static bool loadThemedCursor(const char * name, struct wl_surface ** surface,
return NULL; return NULL;
wl_surface_attach(*surface, buffer, 0, 0); wl_surface_attach(*surface, buffer, 0, 0);
wl_surface_set_buffer_scale(*surface, wlWm.cursorScale);
wl_surface_commit(*surface); wl_surface_commit(*surface);
*hotspot = (struct Point) { *hotspot = (struct Point) {
@ -126,6 +127,15 @@ static const char ** nameLists[LG_POINTER_COUNT] = {
[LG_POINTER_NOT_ALLOWED] = (const char *[]) { "crossed_circle", "not-allowed", NULL }, [LG_POINTER_NOT_ALLOWED] = (const char *[]) { "crossed_circle", "not-allowed", NULL },
}; };
static void reloadCursors(void)
{
if (wlWm.cursorTheme)
for (LG_DSPointer pointer = LG_POINTER_ARROW; pointer < LG_POINTER_COUNT; ++pointer)
for (const char ** names = nameLists[pointer]; *names; ++names)
if (loadThemedCursor(*names, wlWm.cursors + pointer, wlWm.cursorHot + pointer))
break;
}
bool waylandCursorInit(void) bool waylandCursorInit(void)
{ {
if (!wlWm.compositor) if (!wlWm.compositor)
@ -142,23 +152,20 @@ bool waylandCursorInit(void)
wl_surface_commit(wlWm.cursors[LG_POINTER_SQUARE]); wl_surface_commit(wlWm.cursors[LG_POINTER_SQUARE]);
} }
const char * cursorTheme = getenv("XCURSOR_THEME"); wlWm.cursorThemeName = getenv("XCURSOR_THEME");
const char * cursorSizeEnv = getenv("XCURSOR_SIZE"); wlWm.cursorSize = 24;
int cursorSize = 24;
const char * cursorSizeEnv = getenv("XCURSOR_SIZE");
if (cursorSizeEnv) if (cursorSizeEnv)
{ {
int size = atoi(cursorSizeEnv); int size = atoi(cursorSizeEnv);
if (size) if (size)
cursorSize = size; wlWm.cursorSize = size;
} }
wlWm.cursorTheme = wl_cursor_theme_load(cursorTheme, cursorSize, wlWm.shm); wlWm.cursorTheme = wl_cursor_theme_load(wlWm.cursorThemeName, wlWm.cursorSize, wlWm.shm);
if (wlWm.cursorTheme) wlWm.cursorScale = 1;
for (LG_DSPointer pointer = LG_POINTER_ARROW; pointer < LG_POINTER_COUNT; ++pointer) reloadCursors();
for (const char ** names = nameLists[pointer]; *names; ++names)
if (loadThemedCursor(*names, wlWm.cursors + pointer, wlWm.cursorHot + pointer))
break;
return true; return true;
} }
@ -174,8 +181,39 @@ void waylandCursorFree(void)
wl_buffer_destroy(wlWm.cursorSquareBuffer); wl_buffer_destroy(wlWm.cursorSquareBuffer);
} }
void waylandCursorScaleChange(void)
{
int newScale = ceil(wl_fixed_to_double(wlWm.scale));
if (newScale == wlWm.cursorScale)
return;
struct wl_cursor_theme * new = wl_cursor_theme_load(wlWm.cursorThemeName,
wlWm.cursorSize * newScale, wlWm.shm);
if (!new)
return;
struct wl_surface * old[LG_POINTER_COUNT];
memcpy(old, wlWm.cursors, sizeof(old));
memset(wlWm.cursors, 0, sizeof(wlWm.cursors));
if (wlWm.cursorTheme)
wl_cursor_theme_destroy(wlWm.cursorTheme);
wlWm.cursorTheme = new;
wlWm.cursorScale = newScale;
reloadCursors();
waylandSetPointer(wlWm.cursorId);
for (int i = 0; i < LG_POINTER_COUNT; ++i)
if (old[i])
wl_surface_destroy(old[i]);
}
void waylandSetPointer(LG_DSPointer pointer) void waylandSetPointer(LG_DSPointer pointer)
{ {
wlWm.cursorId = pointer;
wlWm.cursor = wlWm.cursors[pointer]; wlWm.cursor = wlWm.cursors[pointer];
wlWm.cursorHotX = wlWm.cursorHot[pointer].x; wlWm.cursorHotX = wlWm.cursorHot[pointer].x;
wlWm.cursorHotY = wlWm.cursorHot[pointer].y; wlWm.cursorHotY = wlWm.cursorHot[pointer].y;

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

@ -143,10 +143,14 @@ struct WaylandDSState
struct zxdg_toplevel_decoration_v1 * xdgToplevelDecoration; struct zxdg_toplevel_decoration_v1 * xdgToplevelDecoration;
#endif #endif
const char * cursorThemeName;
int cursorSize;
int cursorScale;
struct wl_cursor_theme * cursorTheme; struct wl_cursor_theme * cursorTheme;
struct wl_buffer * cursorSquareBuffer; struct wl_buffer * cursorSquareBuffer;
struct wl_surface * cursors[LG_POINTER_COUNT]; struct wl_surface * cursors[LG_POINTER_COUNT];
struct Point cursorHot[LG_POINTER_COUNT]; struct Point cursorHot[LG_POINTER_COUNT];
LG_DSPointer cursorId;
struct wl_surface * cursor; struct wl_surface * cursor;
int cursorHotX; int cursorHotX;
int cursorHotY; int cursorHotY;
@ -238,6 +242,7 @@ void waylandCBInvalidate(void);
bool waylandCursorInit(void); bool waylandCursorInit(void);
void waylandCursorFree(void); void waylandCursorFree(void);
void waylandSetPointer(LG_DSPointer pointer); void waylandSetPointer(LG_DSPointer pointer);
void waylandCursorScaleChange(void);
// gl module // gl module
#if defined(ENABLE_EGL) || defined(ENABLE_OPENGL) #if defined(ENABLE_EGL) || defined(ENABLE_OPENGL)

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

@ -48,6 +48,7 @@ void waylandWindowUpdateScale(void)
wlWm.scale = maxScale; wlWm.scale = maxScale;
wlWm.fractionalScale = wl_fixed_from_int(wl_fixed_to_int(maxScale)) != maxScale; wlWm.fractionalScale = wl_fixed_from_int(wl_fixed_to_int(maxScale)) != maxScale;
wlWm.needsResize = true; wlWm.needsResize = true;
waylandCursorScaleChange();
app_invalidateWindow(true); app_invalidateWindow(true);
waylandStopWaitFrame(); waylandStopWaitFrame();
} }