xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &inner);
/* restore font color */
- xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){ get_colorpixel("#FFFFFF") });
+ set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000"));
for (int i = 0; i < sizeof(crash_text) / sizeof(char*); i++) {
- draw_text(crash_text[i], strlen(crash_text[i]), false,
- pixmap, pixmap_gc, 8, 3 + (i - 1) * font_height);
+ draw_text(crash_text[i], strlen(crash_text[i]), false, pixmap, pixmap_gc,
+ 8, 5 + i * font_height, width - 16);
}
/* Copy the contents of the pixmap to the real window */
int height = 13 + (crash_text_num * config.font.height);
/* calculate width for longest text */
- int text_len = strlen(crash_text[crash_text_longest]);
+ size_t text_len = strlen(crash_text[crash_text_longest]);
xcb_char2b_t *longest_text = convert_utf8_to_ucs2(crash_text[crash_text_longest], &text_len);
int font_width = predict_text_width((char *)longest_text, text_len, true);
int width = font_width + 20;
xcb_create_pixmap(conn, root_depth, pixmap, win, width, height);
xcb_create_gc(conn, pixmap_gc, pixmap, 0, 0);
- /* Create graphics context */
- xcb_change_gc(conn, pixmap_gc, XCB_GC_FONT, (uint32_t[]){ config.font.id });
-
/* Grab the keyboard to get all input */
xcb_grab_keyboard(conn, false, win, XCB_CURRENT_TIME, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
* Setup signal handlers to safely handle SIGSEGV and SIGFPE
*
*/
-void setup_signal_handler() {
+void setup_signal_handler(void) {
struct sigaction action;
action.sa_sigaction = handle_signal;
action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
sigemptyset(&action.sa_mask);
- if (sigaction(SIGSEGV, &action, NULL) == -1 ||
+ /* Catch all signals with default action "Core", see signal(7) */
+ if (sigaction(SIGQUIT, &action, NULL) == -1 ||
+ sigaction(SIGILL, &action, NULL) == -1 ||
sigaction(SIGABRT, &action, NULL) == -1 ||
- sigaction(SIGFPE, &action, NULL) == -1)
+ sigaction(SIGFPE, &action, NULL) == -1 ||
+ sigaction(SIGSEGV, &action, NULL) == -1)
ELOG("Could not setup signal handler");
}