gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check the Xft/DPI XSETTINGS

Browse Source 
Similar to Xrm's "Xft.dpi" key, but stores in 1024th increments.
This commit is contained in:
Emmanuele Bassi
2024-06-13 15:41:43 +01:00
committed by Sam Lantinga
parent e049098733
commit a98774e62c
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/x11/SDL_x11modes.c
View File

@@ -231,9 +231,18 @@ static float GetGlobalContentScale(SDL_VideoDevice *_this)
} }
} }
/* If that failed, try the XSETTINGS key... */ /* If that failed, try the XSETTINGS keys... */
if (scale_factor <= 0.0) { if (scale_factor <= 0.0) {
scale_factor = X11_GetXsettingsIntKey(_this, "Gdk/WindowScalingFactor", -1); scale_factor = X11_GetXsettingsIntKey(_this, "Gdk/WindowScalingFactor", -1);
/* The Xft/DPI key is stored in increments of 1024th */
if (scale_factor <= 0.0) {
int dpi = X11_GetXsettingsIntKey(_this, "Xft/DPI", -1);
if (dpi > 0) {
scale_factor = (double) dpi / 1024.0;
scale_factor /= 96.0;
}
}
} }
/* If that failed, try the GDK_SCALE envvar... */ /* If that failed, try the GDK_SCALE envvar... */

7
src/video/x11/SDL_x11settings.c
View File

@@ -27,6 +27,7 @@
#include "SDL_x11settings.h" #include "SDL_x11settings.h"
#define SDL_XSETTINGS_GDK_WINDOW_SCALING_FACTOR "Gdk/WindowScalingFactor" #define SDL_XSETTINGS_GDK_WINDOW_SCALING_FACTOR "Gdk/WindowScalingFactor"
#define SDL_XSETTINGS_XFT_DPI "Xft/DPI"
static void X11_XsettingsNotify(const char *name, XSettingsAction action, XSettingsSetting *setting, void *data) static void X11_XsettingsNotify(const char *name, XSettingsAction action, XSettingsSetting *setting, void *data)
{ {
@@ -34,7 +35,8 @@ static void X11_XsettingsNotify(const char *name, XSettingsAction action, XSetti
float scale_factor = 1.0; float scale_factor = 1.0;
int i; int i;
if (SDL_strcmp(name, SDL_XSETTINGS_GDK_WINDOW_SCALING_FACTOR) != 0) { if (SDL_strcmp(name, SDL_XSETTINGS_GDK_WINDOW_SCALING_FACTOR) != 0 ||
SDL_strcmp(name, SDL_XSETTINGS_XFT_DPI) != 0) {
return; return;
} }
@@ -47,6 +49,9 @@ static void X11_XsettingsNotify(const char *name, XSettingsAction action, XSetti
SDL_FALLTHROUGH; SDL_FALLTHROUGH;
case XSETTINGS_ACTION_CHANGED: case XSETTINGS_ACTION_CHANGED:
scale_factor = setting->data.v_int; scale_factor = setting->data.v_int;
if (SDL_strcmp(name, SDL_XSETTINGS_XFT_DPI) == 0) {
scale_factor = scale_factor / 1024.0f / 96.0f;
}
break; break;
case XSETTINGS_ACTION_DELETED: case XSETTINGS_ACTION_DELETED:
scale_factor = 1.0; scale_factor = 1.0;