Skip to content

fix: preserve X11 cursor scaling when switching cursor shapes #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zorowk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: preserve X11 cursor scaling when switching cursor shapes #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 8 additions & 32 deletions src/dde-session/impl/iowait/xcursor_remap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,26 @@
// SPDX-License-Identifier: GPL-3.0-or-later

#include <stdio.h>
#include <string.h>
#include <math.h>

#include <gio/gio.h>

#include <X11/Xlib.h>
#include <X11/Xcursor/Xcursor.h>
#include <X11/extensions/Xfixes.h>

#include "xcursor_remap.h"

static int xc_remap(char *theme, char *src, char *dst, int size);
static int xc_remap(const char *src, const char *dst);

static XcursorImages*
xc_load_images(const char *theme, const char *name, int size)
{
printf("Will load cursor file: %s - %s\n", theme, name);
printf("Will load cursor file: %s - %s\n", theme ? theme : "(default)", name);
return XcursorLibraryLoadImages(name, theme, size);
}

static void
xc_change_cursor_by_name(Display *dpy, const char *theme,
const char *src, const char* dst, int size)
{
if (size == -1) {
size = XcursorGetDefaultSize(dpy);
}

// load cursor images
XcursorImages *dst_images = xc_load_images(theme, dst, size);
if (!dst_images) {
Expand All @@ -53,14 +45,17 @@ xc_change_cursor_by_name(Display *dpy, const char *theme,
}

static int
xc_remap(char *theme, char *src, char *dst, int size)
xc_remap(const char *src, const char *dst)
{
Display *dpy = XOpenDisplay(NULL);
if (!dpy) {
fprintf(stderr, "Failed to open display\n");
return -1;
}

const char *theme = XcursorGetTheme(dpy);
int size = XcursorGetDefaultSize(dpy);

xc_change_cursor_by_name(dpy, theme, src, dst, size);

XCloseDisplay(dpy);
Expand All @@ -70,28 +65,9 @@ xc_remap(char *theme, char *src, char *dst, int size)
int
xc_left_ptr_to_watch(int enabled)
{
char *theme = "deepin";
int size = 24;
double scale = 1.0;

GSettings *s = g_settings_new("com.deepin.xsettings");
if (s) {
theme = g_settings_get_string(s, "gtk-cursor-theme-name");
size = g_settings_get_int(s, "gtk-cursor-theme-size");
scale = g_settings_get_double(s, "scale-factor");
g_object_unref(s);
}

// if 1.7 < scale < 2, scale = 2
int tmp = (int)(trunc((scale+0.3)*10) / 10);
if (tmp < 1) {
tmp = 1;
}
size *= tmp;

if (enabled) {
return xc_remap(theme, "left_ptr", "left_ptr_watch", size);
return xc_remap("left_ptr", "left_ptr_watch");
} else {
return xc_remap(theme, "left_ptr_watch", "left_ptr", size);
return xc_remap("left_ptr_watch", "left_ptr");
}
}
4 changes: 0 additions & 4 deletions tools/dde-xsettings-checker/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ set(CMAKE_AUTORCC ON)

find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core DBus REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
pkg_check_modules(GIO2 REQUIRED IMPORTED_TARGET gio-2.0)
pkg_check_modules(XCURSOR REQUIRED IMPORTED_TARGET xcursor)
pkg_check_modules(XFIXES REQUIRED IMPORTED_TARGET xfixes)
pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
Expand All @@ -24,8 +22,6 @@ add_executable(${BIN_NAME}
target_link_libraries(${BIN_NAME}
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::DBus
PkgConfig::GLIB2
PkgConfig::GIO2
PkgConfig::XCURSOR
PkgConfig::XFIXES
PkgConfig::X11
Expand Down
Loading