aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortakase1121 <20792268+takase1121@users.noreply.github.com>2021-08-15 08:09:06 +0800
committerFrancesco <francesco.bbt@gmail.com>2021-08-17 07:53:44 -0700
commit35fd29fc399ae124d8947cba67c1f73e6cfd7d31 (patch)
treed78cd4949e7d241a4d2530ed90d68192a6ed887e
parent02d59c8ec2666a715c9965b908a369e135a8b194 (diff)
downloadlite-xl-35fd29fc399ae124d8947cba67c1f73e6cfd7d31.tar.gz
lite-xl-35fd29fc399ae124d8947cba67c1f73e6cfd7d31.zip
remove extraneous DPI code
since 5 months ago (ttps://github.com/libsdl-org/SDL/commit/c289bad9007cb672c994f726d967f6e5682f200d) SDL2 now reads Xft.dpi. There is no need to link to X11 anymore.
-rw-r--r--src/main.c32
1 files changed, 1 insertions, 31 deletions
diff --git a/src/main.c b/src/main.c
index 53e8e364..576b7fcf 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,10 +9,6 @@
#include <windows.h>
#elif __linux__
#include <unistd.h>
- #include <SDL_syswm.h>
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
- #include <X11/Xresource.h>
#include <signal.h>
#elif __APPLE__
#include <mach-o/dyld.h>
@@ -22,35 +18,9 @@
SDL_Window *window;
static double get_scale(void) {
-#ifdef _WIN32
- float dpi;
+ float dpi = 96.0;
SDL_GetDisplayDPI(0, NULL, &dpi, NULL);
return dpi / 96.0;
-#elif __linux__
- SDL_SysWMinfo info;
- XrmDatabase db;
- XrmValue value;
- char *type = NULL;
-
- SDL_VERSION(&info.version);
- if (!SDL_GetWindowWMInfo(window, &info)
- || info.subsystem != SDL_SYSWM_X11)
- return 1.0;
-
- char *resource = XResourceManagerString(info.info.x11.display);
- if (resource == NULL)
- return 1.0;
-
- XrmInitialize();
- db = XrmGetStringDatabase(resource);
- if (XrmGetResource(db, "Xft.dpi", "String", &type, &value) == False
- || value.addr == NULL)
- return 1.0;
-
- return atof(value.addr) / 96.0;
-#else
- return 1.0;
-#endif
}