Use the DPI setting within the i3bar (#2556)

[i3/i3] / src / sighandler.c

diff --git a/src/sighandler.c b/src/sighandler.c
index 4b1307c9de145ce472f964e2760ae72222c3d190..79f90d9a72a0f8aa8953c57710c8f8e0f65ff91e 100644 (file)
--- a/src/sighandler.c
+++ b/src/sighandler.c
@@ -1,5 +1,3 @@
-#undef I3__FILE__
-#define I3__FILE__ "sighandler.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -116,7 +114,7 @@ static int backtrace(void) {
 
     waitpid(pid_gdb, &status, 0);
 
-    /* see if the backtrace was succesful or not */
+    /* see if the backtrace was successful or not */
     if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
         DLOG("GDB did not run properly\n");
         return -1;
@@ -141,7 +139,7 @@ static int sig_draw_window(xcb_window_t win, int width, int height, int font_hei
     xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &inner);
 
     /* restore font color */
-    set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000"));
+    set_font_colors(pixmap_gc, draw_util_hex_to_color("#FFFFFF"), draw_util_hex_to_color("#000000"));
 
     char *bt_colour = "#FFFFFF";
     if (backtrace_done < 0)
@@ -152,14 +150,14 @@ static int sig_draw_window(xcb_window_t win, int width, int height, int font_hei
     for (int i = 0; crash_text_i3strings[i] != NULL; ++i) {
         /* fix the colour for the backtrace line when it finished */
         if (i == backtrace_string_index)
-            set_font_colors(pixmap_gc, get_colorpixel(bt_colour), get_colorpixel("#000000"));
+            set_font_colors(pixmap_gc, draw_util_hex_to_color(bt_colour), draw_util_hex_to_color("#000000"));
 
-        draw_text(crash_text_i3strings[i], pixmap, pixmap_gc,
+        draw_text(crash_text_i3strings[i], pixmap, pixmap_gc, NULL,
                   8, 5 + i * font_height, width - 16);
 
         /* and reset the colour again for other lines */
         if (i == backtrace_string_index)
-            set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000"));
+            set_font_colors(pixmap_gc, draw_util_hex_to_color("#FFFFFF"), draw_util_hex_to_color("#000000"));
     }
 
     /* Copy the contents of the pixmap to the real window */
@@ -176,7 +174,7 @@ static int sig_draw_window(xcb_window_t win, int width, int height, int font_hei
 static int sig_handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_t *event) {
     uint16_t state = event->state;
 
-    /* Apparantly, after activating numlock once, the numlock modifier
+    /* Apparently, after activating numlock once, the numlock modifier
      * stays turned on (use xev(1) to verify). So, to resolve useful
      * keysyms, we remove the numlock flag from the event state */
     state &= ~xcb_numlock_mask;
@@ -327,5 +325,5 @@ void setup_signal_handler(void) {
         sigaction(SIGABRT, &action, NULL) == -1 ||
         sigaction(SIGFPE, &action, NULL) == -1 ||
         sigaction(SIGSEGV, &action, NULL) == -1)
-        ELOG("Could not setup signal handler");
+        ELOG("Could not setup signal handler.\n");
 }