X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3-nagbar%2Fmain.c;h=b9f27a87fabc928f9d8e323a46f41427c9aa6f92;hb=f25c3d5e77f410305efeed97da5ac9adb25491f3;hp=d86cd69a3f984f15f80012117b868d168f06ef3b;hpb=fdfe4081593268257cd65932bd5353eade45e190;p=i3%2Fi3 diff --git a/i3-nagbar/main.c b/i3-nagbar/main.c index d86cd69a..b9f27a87 100644 --- a/i3-nagbar/main.c +++ b/i3-nagbar/main.c @@ -8,6 +8,8 @@ * when the user has an error in their configuration file. * */ +#include "libi3.h" + #include #include #include @@ -28,10 +30,14 @@ #include #include #include +#include -#include "libi3.h" #include "i3-nagbar.h" +/** This is the equivalent of XC_left_ptr. I’m not sure why xcb doesn’t have a + * constant for that. */ +#define XCB_CURSOR_LEFT_PTR 68 + static char *argv0 = NULL; typedef struct { @@ -51,11 +57,11 @@ static button_t *buttons; static int buttoncnt; /* Result of get_colorpixel() for the various colors. */ -static uint32_t color_background; /* background of the bar */ -static uint32_t color_button_background; /* background for buttons */ -static uint32_t color_border; /* color of the button border */ -static uint32_t color_border_bottom; /* color of the bottom border */ -static uint32_t color_text; /* color of the text */ +static color_t color_background; /* background of the bar */ +static color_t color_button_background; /* background for buttons */ +static color_t color_border; /* color of the button border */ +static color_t color_border_bottom; /* color of the bottom border */ +static color_t color_text; /* color of the text */ xcb_window_t root; xcb_connection_t *conn; @@ -191,12 +197,12 @@ static void handle_button_release(xcb_connection_t *conn, xcb_button_release_eve */ static int handle_expose(xcb_connection_t *conn, xcb_expose_event_t *event) { /* re-draw the background */ - xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_background}); + xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_background.colorpixel}); xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &rect); /* restore font color */ set_font_colors(pixmap_gc, color_text, color_background); - draw_text(prompt, pixmap, pixmap_gc, + draw_text(prompt, pixmap, pixmap_gc, NULL, logical_px(4) + logical_px(4), logical_px(4) + logical_px(4), rect.width - logical_px(4) - logical_px(4)); @@ -210,14 +216,14 @@ static int handle_expose(xcb_connection_t *conn, xcb_expose_event_t *event) { w += logical_px(8); int y = rect.width; uint32_t values[3]; - values[0] = color_button_background; + values[0] = color_button_background.colorpixel; values[1] = line_width; xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND | XCB_GC_LINE_WIDTH, values); xcb_rectangle_t close = {y - w - (2 * line_width), 0, w + (2 * line_width), rect.height}; xcb_poly_fill_rectangle(conn, pixmap, pixmap_gc, 1, &close); - xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_border}); + xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_border.colorpixel}); xcb_point_t points[] = { {y - w - (2 * line_width), line_width / 2}, {y - (line_width / 2), line_width / 2}, @@ -245,11 +251,11 @@ static int handle_expose(xcb_connection_t *conn, xcb_expose_event_t *event) { /* account for left/right padding, which seems to be set to 12px (total) below */ w += logical_px(12); y -= logical_px(30); - xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_button_background}); + xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_button_background.colorpixel}); 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}); + xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND, (uint32_t[]){color_border.colorpixel}); buttons[c].x = y - w - (2 * line_width); buttons[c].width = w; xcb_point_t points2[] = { @@ -260,11 +266,11 @@ static int handle_expose(xcb_connection_t *conn, xcb_expose_event_t *event) { {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; - values[1] = color_button_background; + values[0] = color_text.colorpixel; + values[1] = color_button_background.colorpixel; 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, + draw_text(buttons[c].label, pixmap, pixmap_gc, NULL, y - w - line_width + logical_px(6), logical_px(4) + logical_px(3), rect.width - y + w + line_width - logical_px(6)); @@ -274,7 +280,7 @@ static int handle_expose(xcb_connection_t *conn, xcb_expose_event_t *event) { /* border line at the bottom */ line_width = logical_px(2); - values[0] = color_border_bottom; + values[0] = color_border_bottom.colorpixel; values[1] = line_width; xcb_change_gc(conn, pixmap_gc, XCB_GC_FOREGROUND | XCB_GC_LINE_WIDTH, values); xcb_point_t bottom[] = { @@ -448,25 +454,50 @@ int main(int argc, char *argv[]) { if (bar_type == TYPE_ERROR) { /* Red theme for error messages */ - color_button_background = get_colorpixel("#680a0a"); - color_background = get_colorpixel("#900000"); - color_text = get_colorpixel("#ffffff"); - color_border = get_colorpixel("#d92424"); - color_border_bottom = get_colorpixel("#470909"); + color_button_background = draw_util_hex_to_color("#680a0a"); + color_background = draw_util_hex_to_color("#900000"); + color_text = draw_util_hex_to_color("#ffffff"); + color_border = draw_util_hex_to_color("#d92424"); + color_border_bottom = draw_util_hex_to_color("#470909"); } else { /* Yellowish theme for warnings */ - color_button_background = get_colorpixel("#ffc100"); - color_background = get_colorpixel("#ffa8000"); - color_text = get_colorpixel("#000000"); - color_border = get_colorpixel("#ab7100"); - color_border_bottom = get_colorpixel("#ab7100"); + color_button_background = draw_util_hex_to_color("#ffc100"); + color_background = draw_util_hex_to_color("#ffa8000"); + color_text = draw_util_hex_to_color("#000000"); + color_border = draw_util_hex_to_color("#ab7100"); + color_border_bottom = draw_util_hex_to_color("#ab7100"); } + init_dpi(); font = load_font(pattern, true); set_font(&font); +#if defined(__OpenBSD__) + if (pledge("stdio rpath wpath cpath getpw proc exec", NULL) == -1) + err(EXIT_FAILURE, "pledge"); +#endif + xcb_rectangle_t win_pos = get_window_position(); + xcb_cursor_t cursor; + xcb_cursor_context_t *cursor_ctx; + if (xcb_cursor_context_new(conn, root_screen, &cursor_ctx) == 0) { + cursor = xcb_cursor_load_cursor(cursor_ctx, "left_ptr"); + xcb_cursor_context_free(cursor_ctx); + } else { + cursor = xcb_generate_id(conn); + i3Font cursor_font = load_font("cursor", false); + xcb_create_glyph_cursor( + conn, + cursor, + cursor_font.specific.xcb.id, + cursor_font.specific.xcb.id, + XCB_CURSOR_LEFT_PTR, + XCB_CURSOR_LEFT_PTR + 1, + 0, 0, 0, + 65535, 65535, 65535); + } + /* Open an input window */ win = xcb_generate_id(conn); @@ -479,13 +510,14 @@ int main(int argc, char *argv[]) { 0, /* x11 border = 0, we draw our own */ XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_WINDOW_CLASS_COPY_FROM_PARENT, /* copy visual from parent */ - XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK, + XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK | XCB_CW_CURSOR, (uint32_t[]){ 0, /* back pixel: black */ XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_BUTTON_PRESS | - XCB_EVENT_MASK_BUTTON_RELEASE}); + XCB_EVENT_MASK_BUTTON_RELEASE, + cursor}); /* Map the window (make it visible) */ xcb_map_window(conn, win);