X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmain.c;h=eb60bc8be853c934e8040e117e5f752b2ec21db8;hb=5ab8c766c4c2d88e05815f7203782b691921ecb1;hp=194ef05c337efc76898d780eee8148f5fc9c9ca0;hpb=17fd50999faeba82cf392d50df51e80749397a85;p=i3%2Fi3 diff --git a/src/main.c b/src/main.c index 194ef05c..eb60bc8b 100644 --- a/src/main.c +++ b/src/main.c @@ -39,8 +39,6 @@ int listen_fds; * temporarily for drag_pointer(). */ static struct ev_prepare *xcb_prepare; -extern Con *focused; - char **start_argv; xcb_connection_t *conn; @@ -643,7 +641,7 @@ int main(int argc, char *argv[]) { /* Setting both, XCB_XKB_PER_CLIENT_FLAG_GRABS_USE_XKB_STATE and * XCB_XKB_PER_CLIENT_FLAG_LOOKUP_STATE_WHEN_GRABBED, will lead to the * X server sending us the full XKB state in KeyPress and KeyRelease: - * https://sources.debian.net/src/xorg-server/2:1.17.2-1.1/xkb/xkbEvents.c/?hl=927#L927 + * https://cgit.freedesktop.org/xorg/xserver/tree/xkb/xkbEvents.c?h=xorg-server-1.20.0#n927 */ xcb_xkb_per_client_flags_reply_t *pcf_reply; /* The last three parameters are unset because they are only relevant @@ -949,8 +947,9 @@ int main(int argc, char *argv[]) { Barconfig *barconfig; TAILQ_FOREACH(barconfig, &barconfigs, configs) { char *command = NULL; - sasprintf(&command, "%s --bar_id=%s --socket=\"%s\"", + sasprintf(&command, "%s %s --bar_id=%s --socket=\"%s\"", barconfig->i3bar_command ? barconfig->i3bar_command : "i3bar", + barconfig->verbose ? "-V" : "", barconfig->id, current_socketpath); LOG("Starting bar process: %s\n", command); start_application(command, true);