#include <getopt.h>
#include <limits.h>
#include <fcntl.h>
+#include <paths.h>
#include <xcb/xcb.h>
#include <xcb/xcb_aux.h>
xcb_screen_t *root_screen;
/*
- * Having verboselog() and errorlog() is necessary when using libi3.
+ * Having verboselog(), errorlog() and debuglog() is necessary when using libi3.
*
*/
void verboselog(char *fmt, ...) {
va_end(args);
}
+void debuglog(char *fmt, ...) {
+}
+
/*
* Starts the given application by passing it through a shell. We use double fork
* to avoid zombie processes. As the started application’s parent exits (immediately),
/* Child process */
setsid();
if (fork() == 0) {
- /* Stores the path of the shell */
- static const char *shell = NULL;
-
- if (shell == NULL)
- if ((shell = getenv("SHELL")) == NULL)
- shell = "/bin/sh";
-
/* This is the child */
- execl(shell, shell, "-c", command, (void*)NULL);
+ execl(_PATH_BSHELL, _PATH_BSHELL, "-c", command, (void*)NULL);
/* not reached */
}
exit(0);
fclose(script);
char *link_path;
+ char *exe_path = get_exe_path(argv0);
sasprintf(&link_path, "%s.nagbar_cmd", script_path);
- symlink(get_exe_path(argv0), link_path);
+ symlink(exe_path, link_path);
char *terminal_cmd;
sasprintf(&terminal_cmd, "i3-sensible-terminal -e %s", link_path);
free(link_path);
free(terminal_cmd);
free(script_path);
+ free(exe_path);
/* TODO: unset flag, re-render */
}
4 + 4, 4 + 4, rect.width - 4 - 4);
/* render close button */
+ const char *close_button_label = "X";
int line_width = 4;
- int w = 20;
+ /* 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;
int y = rect.width;
uint32_t values[3];
values[0] = color_button_background;
values[0] = 1;
set_font_colors(pixmap_gc, color_text, color_button_background);
- draw_text_ascii("X", pixmap, pixmap_gc, y - w - line_width + w / 2 - 4,
+ /* 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);
y -= w;
/* render custom buttons */
line_width = 1;
for (int c = 0; c < buttoncnt; c++) {
- /* TODO: make w = text extents of the label */
- w = 100;
+ /* 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;
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 };
values[0] = color_text;
values[1] = color_button_background;
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);
while ((o = getopt_long(argc, argv, options_string, long_options, &option_index)) != -1) {
switch (o) {
case 'v':
- printf("i3-nagbar " I3_VERSION);
+ printf("i3-nagbar " I3_VERSION "\n");
return 0;
case 'f':
FREE(pattern);
uint32_t top_end_x;
uint32_t bottom_start_x;
uint32_t bottom_end_x;
- } __attribute__((__packed__)) strut_partial = {0,};
+ } __attribute__((__packed__)) strut_partial;
+ memset(&strut_partial, 0, sizeof(strut_partial));
strut_partial.top = font.height + 6;
strut_partial.top_start_x = 0;