Use lround instead of (long)round

[i3/i3] / libi3 / dpi.c

diff --git a/libi3/dpi.c b/libi3/dpi.c
index 090a65600004dbdd83b80edea8379de4419b5b95..d15e35be78effe198e52e569d85bd2c8025a927e 100644 (file)
--- a/libi3/dpi.c
+++ b/libi3/dpi.c
@@ -1,7 +1,79 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ */
 #include "libi3.h"
+
 #include <math.h>
+#include <stdlib.h>
+#include <xcb/xcb_xrm.h>
+
+static long dpi;
 
-extern xcb_screen_t *root_screen;
+static long init_dpi_fallback(void) {
+    return (double)root_screen->height_in_pixels * 25.4 / (double)root_screen->height_in_millimeters;
+}
+
+/*
+ * Initialize the DPI setting.
+ * This will use the 'Xft.dpi' X resource if available and fall back to
+ * guessing the correct value otherwise.
+ */
+void init_dpi(void) {
+    xcb_xrm_database_t *database = NULL;
+    char *resource = NULL;
+
+    if (conn == NULL) {
+        goto init_dpi_end;
+    }
+
+    database = xcb_xrm_database_from_default(conn);
+    if (database == NULL) {
+        ELOG("Failed to open the resource database.\n");
+        goto init_dpi_end;
+    }
+
+    xcb_xrm_resource_get_string(database, "Xft.dpi", NULL, &resource);
+    if (resource == NULL) {
+        DLOG("Resource Xft.dpi not specified, skipping.\n");
+        goto init_dpi_end;
+    }
+
+    char *endptr;
+    double in_dpi = strtod(resource, &endptr);
+    if (in_dpi == HUGE_VAL || dpi < 0 || *endptr != '\0' || endptr == resource) {
+        ELOG("Xft.dpi = %s is an invalid number and couldn't be parsed.\n", resource);
+        dpi = 0;
+        goto init_dpi_end;
+    }
+    dpi = lround(in_dpi);
+
+    DLOG("Found Xft.dpi = %ld.\n", dpi);
+
+init_dpi_end:
+    free(resource);
+
+    if (database != NULL) {
+        xcb_xrm_database_free(database);
+    }
+
+    if (dpi == 0) {
+        DLOG("Using fallback for calculating DPI.\n");
+        dpi = init_dpi_fallback();
+        DLOG("Using dpi = %ld\n", dpi);
+    }
+}
+
+/*
+ * This function returns the value of the DPI setting.
+ *
+ */
+long get_dpi_value(void) {
+    return dpi;
+}
 
 /*
  * Convert a logical amount of pixels (e.g. 2 pixels on a “standard” 96 DPI
@@ -10,7 +82,19 @@ extern xcb_screen_t *root_screen;
  *
  */
 int logical_px(const int logical) {
-    const int dpi = (double)root_screen->height_in_pixels * 25.4 /
-                    (double)root_screen->height_in_millimeters;
+    if (root_screen == NULL) {
+        /* Dpi info may not be available when parsing a config without an X
+         * server, such as for config file validation. */
+        return logical;
+    }
+
+    /* There are many misconfigurations out there, i.e. systems with screens
+     * whose dpi is in fact higher than 96 dpi, but not significantly higher,
+     * so software was never adapted. We could tell people to reconfigure their
+     * systems to 96 dpi in order to get the behavior they expect/are used to,
+     * but since we can easily detect this case in code, let’s do it for them.
+     */
+    if ((dpi / 96.0) < 1.25)
+        return logical;
     return ceil((dpi / 96.0) * logical);
 }