X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3-nagbar%2Fmain.c;h=d86cd69a3f984f15f80012117b868d168f06ef3b;hb=c85d16faa4fa3fc34b35782d2281b5852e5a429b;hp=bdf6582bd04f917fe642892702c90349249d7e6c;hpb=61418f4dfb2a8b3aa1b9568a54e960c8aad09332;p=i3%2Fi3 diff --git a/i3-nagbar/main.c b/i3-nagbar/main.c index bdf6582b..d86cd69a 100644 --- a/i3-nagbar/main.c +++ b/i3-nagbar/main.c @@ -2,10 +2,10 @@ * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE) + * © 2009 Michael Stapelberg and contributors (see also: LICENSE) * * i3-nagbar is a utility which displays a nag message, for example in the case - * when the user has an error in his configuration file. + * when the user has an error in their configuration file. * */ #include @@ -27,6 +27,7 @@ #include #include #include +#include #include "libi3.h" #include "i3-nagbar.h" @@ -131,7 +132,7 @@ static void handle_button_release(xcb_connection_t *conn, xcb_button_release_eve printf("button released on x = %d, y = %d\n", event->event_x, event->event_y); /* If the user hits the close button, we exit(0) */ - if (event->event_x >= (rect.width - 32)) + if (event->event_x >= (rect.width - logical_px(32))) exit(0); button_t *button = get_button_at(event->event_x, event->event_y); if (!button) @@ -164,7 +165,9 @@ static void handle_button_release(xcb_connection_t *conn, xcb_button_release_eve char *link_path; char *exe_path = get_exe_path(argv0); sasprintf(&link_path, "%s.nagbar_cmd", script_path); - symlink(exe_path, link_path); + if (symlink(exe_path, link_path) == -1) { + err(EXIT_FAILURE, "Failed to symlink %s to %s", link_path, exe_path); + } char *terminal_cmd; sasprintf(&terminal_cmd, "i3-sensible-terminal -e %s", link_path); @@ -194,15 +197,17 @@ static int handle_expose(xcb_connection_t *conn, xcb_expose_event_t *event) { /* restore font color */ set_font_colors(pixmap_gc, color_text, color_background); draw_text(prompt, pixmap, pixmap_gc, - 4 + 4, 4 + 4, rect.width - 4 - 4); + logical_px(4) + logical_px(4), + logical_px(4) + logical_px(4), + rect.width - logical_px(4) - logical_px(4)); /* render close button */ const char *close_button_label = "X"; - int line_width = 4; + int line_width = logical_px(4); /* set width to the width of the label */ int w = predict_text_width(i3string_from_utf8(close_button_label)); /* account for left/right padding, which seems to be set to 8px (total) below */ - w += 8; + w += logical_px(8); int y = rect.width; uint32_t values[3]; values[0] = color_button_background; @@ -216,19 +221,21 @@ static int handle_expose(xcb_connection_t *conn, xcb_expose_event_t *event) { xcb_point_t points[] = { {y - w - (2 * line_width), line_width / 2}, {y - (line_width / 2), line_width / 2}, - {y - (line_width / 2), (rect.height - (line_width / 2)) - 2}, - {y - w - (2 * line_width), (rect.height - (line_width / 2)) - 2}, + {y - (line_width / 2), (rect.height - (line_width / 2)) - logical_px(2)}, + {y - w - (2 * line_width), (rect.height - (line_width / 2)) - logical_px(2)}, {y - w - (2 * line_width), line_width / 2}}; xcb_poly_line(conn, XCB_COORD_MODE_ORIGIN, pixmap, pixmap_gc, 5, points); values[0] = 1; set_font_colors(pixmap_gc, color_text, color_button_background); /* the x term here seems to set left/right padding */ - draw_text_ascii(close_button_label, pixmap, pixmap_gc, y - w - line_width + w / 2 - 4, - 4 + 4 - 1, rect.width - y + w + line_width - w / 2 + 4); + draw_text_ascii(close_button_label, pixmap, pixmap_gc, + y - w - line_width + w / 2 - logical_px(4), + logical_px(4) + logical_px(3), + rect.width - y + w + line_width - w / 2 + logical_px(4)); y -= w; - y -= 20; + y -= logical_px(20); /* render custom buttons */ line_width = 1; @@ -236,21 +243,21 @@ static int handle_expose(xcb_connection_t *conn, xcb_expose_event_t *event) { /* set w to the width of the label */ w = predict_text_width(buttons[c].label); /* account for left/right padding, which seems to be set to 12px (total) below */ - w += 12; - y -= 30; + w += logical_px(12); + y -= logical_px(30); xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_button_background}); - close = (xcb_rectangle_t){y - w - (2 * line_width), 2, w + (2 * line_width), rect.height - 6}; + close = (xcb_rectangle_t){y - w - (2 * line_width), logical_px(2), w + (2 * line_width), rect.height - logical_px(6)}; xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &close); xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_border}); buttons[c].x = y - w - (2 * line_width); buttons[c].width = w; xcb_point_t points2[] = { - {y - w - (2 * line_width), (line_width / 2) + 2}, - {y - (line_width / 2), (line_width / 2) + 2}, - {y - (line_width / 2), (rect.height - 4 - (line_width / 2))}, - {y - w - (2 * line_width), (rect.height - 4 - (line_width / 2))}, - {y - w - (2 * line_width), (line_width / 2) + 2}}; + {y - w - (2 * line_width), (line_width / 2) + logical_px(2)}, + {y - (line_width / 2), (line_width / 2) + logical_px(2)}, + {y - (line_width / 2), (rect.height - logical_px(4) - (line_width / 2))}, + {y - w - (2 * line_width), (rect.height - logical_px(4) - (line_width / 2))}, + {y - w - (2 * line_width), (line_width / 2) + logical_px(2)}}; xcb_poly_line(conn, XCB_COORD_MODE_ORIGIN, pixmap, pixmap_gc, 5, points2); values[0] = color_text; @@ -258,13 +265,15 @@ static int handle_expose(xcb_connection_t *conn, xcb_expose_event_t *event) { set_font_colors(pixmap_gc, color_text, color_button_background); /* the x term seems to set left/right padding */ draw_text(buttons[c].label, pixmap, pixmap_gc, - y - w - line_width + 6, 4 + 3, rect.width - y + w + line_width - 6); + y - w - line_width + logical_px(6), + logical_px(4) + logical_px(3), + rect.width - y + w + line_width - logical_px(6)); y -= w; } /* border line at the bottom */ - line_width = 2; + line_width = logical_px(2); values[0] = color_border_bottom; values[1] = line_width; xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND | XCB_GC_LINE_WIDTH, values); @@ -280,6 +289,60 @@ static int handle_expose(xcb_connection_t *conn, xcb_expose_event_t *event) { return 1; } +/** + * Return the position and size the i3-nagbar window should use. + * This will be the primary output or a fallback if it cannot be determined. + */ +static xcb_rectangle_t get_window_position(void) { + /* Default values if we cannot determine the primary output or its CRTC info. */ + xcb_rectangle_t result = (xcb_rectangle_t){50, 50, 500, font.height + logical_px(8) + logical_px(8)}; + + xcb_randr_get_screen_resources_current_cookie_t rcookie = xcb_randr_get_screen_resources_current(conn, root); + xcb_randr_get_output_primary_cookie_t pcookie = xcb_randr_get_output_primary(conn, root); + + xcb_randr_get_output_primary_reply_t *primary = NULL; + xcb_randr_get_screen_resources_current_reply_t *res = NULL; + + if ((primary = xcb_randr_get_output_primary_reply(conn, pcookie, NULL)) == NULL) { + DLOG("Could not determine the primary output.\n"); + goto free_resources; + } + + if ((res = xcb_randr_get_screen_resources_current_reply(conn, rcookie, NULL)) == NULL) { + goto free_resources; + } + + xcb_randr_get_output_info_reply_t *output = + xcb_randr_get_output_info_reply(conn, + xcb_randr_get_output_info(conn, primary->output, res->config_timestamp), + NULL); + if (output == NULL || output->crtc == XCB_NONE) + goto free_resources; + + xcb_randr_get_crtc_info_reply_t *crtc = + xcb_randr_get_crtc_info_reply(conn, + xcb_randr_get_crtc_info(conn, output->crtc, res->config_timestamp), + NULL); + if (crtc == NULL) + goto free_resources; + + DLOG("Found primary output on position x = %i / y = %i / w = %i / h = %i.\n", + crtc->x, crtc->y, crtc->width, crtc->height); + if (crtc->width == 0 || crtc->height == 0) { + DLOG("Primary output is not active, ignoring it.\n"); + goto free_resources; + } + + result.x = crtc->x; + result.y = crtc->y; + goto free_resources; + +free_resources: + FREE(res); + FREE(primary); + return result; +} + int main(int argc, char *argv[]) { /* The following lines are a terribly horrible kludge. Because terminal * emulators have different ways of interpreting the -e command line @@ -308,7 +371,7 @@ int main(int argc, char *argv[]) { if (argv0_len > strlen(".nagbar_cmd") && strcmp(argv[0] + argv0_len - strlen(".nagbar_cmd"), ".nagbar_cmd") == 0) { unlink(argv[0]); - cmd = strdup(argv[0]); + cmd = sstrdup(argv[0]); *(cmd + argv0_len - strlen(".nagbar_cmd")) = '\0'; execl("/bin/sh", "/bin/sh", cmd, NULL); err(EXIT_FAILURE, "execv(/bin/sh, /bin/sh, %s)", cmd); @@ -316,7 +379,7 @@ int main(int argc, char *argv[]) { argv0 = argv[0]; - char *pattern = sstrdup("-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1"); + char *pattern = sstrdup("pango:monospace 8"); int o, option_index = 0; enum { TYPE_ERROR = 0, TYPE_WARNING = 1 } bar_type = TYPE_ERROR; @@ -355,7 +418,7 @@ int main(int argc, char *argv[]) { printf("i3-nagbar [-m ] [-b