diff options
| -rw-r--r-- | config.h | 23 | ||||
| -rw-r--r-- | drw.c | 2 | ||||
| -rw-r--r-- | dwm.c | 2 | ||||
| -rw-r--r-- | util.c | 13 |
4 files changed, 24 insertions, 16 deletions
@@ -8,19 +8,21 @@ static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "Terminus:size=9", "monospace:size=9" }; -static const char dmenufont[] = "Terminus:size=9"; +static const char *fonts[] = { "Terminus:size=11", "monospace:size=11" }; +static const char dmenufont[] = "Terminus:size=11"; static const char col_white[] = "#ffffff"; static const char col_black[] = "#000000"; static const char col_gray[] = "#666666"; +static const char col_lightgray[] = "#cccccc"; static const char col_red[] = "#ff0000"; static const char col_yellow[] = "#ffff00"; static const char *colors[][3] = { /* fg bg border */ [SchemeNorm] = { col_white, col_black, col_gray }, - [SchemeSel] = { col_black, col_white, col_white }, - [SchemeWarn] = { col_black, col_yellow, col_yellow }, - [SchemeUrgent]= { col_white, col_red, col_red }, + [SchemeSel] = { col_black, col_white, col_white }, + [SchemeWarn] = { col_black, col_yellow, col_yellow }, + [SchemeUrgent] = { col_white, col_red, col_red }, + [SchemeNotif] = { col_black, col_lightgray, col_white }, }; /* tagging */ @@ -34,6 +36,7 @@ static const Rule rules[] = { /* class instance title tags mask isfloating monitor */ { "Gimp", NULL, NULL, 0, 1, -1 }, { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, + { "Alacritty-float", NULL, NULL, 0, 1, -1 }, }; /* layout(s) */ @@ -73,10 +76,11 @@ static const char *audio_prev_cmd[] = { ".bin/ag-audio", "prev", NULL }; static const char *audio_play_cmd[] = { ".bin/ag-audio", "play", NULL }; static const char *light_increase_cmd[] = { ".bin/ag-light", "inc", NULL }; static const char *light_decrease_cmd[] = { ".bin/ag-light", "dec", NULL }; -static const char *xorg_config_cmd[] = { ".bin/x11-config", NULL }; -static const char *xorg_screen_cmd[] = { ".bin/x11-screen", NULL }; +static const char *dock_cmd[] = { ".bin/dock", NULL }; static const char *lock_suspend_cmd[] = { ".bin/ag-lock", "-s", NULL }; static const char *lock_cmd[] = { ".bin/ag-lock", NULL }; +static const char *pass_dmenu_show_cmd[] = { ".bin/ag-pass-dmenu", "show", NULL }; +static const char *pass_dmenu_totp_cmd[] = { ".bin/ag-pass-dmenu", "totp", NULL }; static Key keys[] = { /* modifier key function argument */ @@ -118,12 +122,13 @@ static Key keys[] = { { MODKEY|ShiftMask, XK_Left, spawn, {.v = audio_prev_cmd } }, { MODKEY|ShiftMask, XK_Down, spawn, {.v = audio_play_cmd } }, /* commands */ - { MODKEY|ShiftMask, XK_F8, spawn, {.v = xorg_config_cmd } }, - { MODKEY|ShiftMask, XK_F9, spawn, {.v = xorg_screen_cmd } }, + { MODKEY|ShiftMask, XK_F11, spawn, {.v = dock_cmd } }, { MODKEY|ShiftMask, XK_F12, spawn, {.v = lock_suspend_cmd } }, { MODKEY, XK_F12, spawn, {.v = lock_cmd } }, { MODKEY, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_d, spawn, {.v = dmenucmd } }, + { MODKEY, XK_p, spawn, {.v = pass_dmenu_show_cmd } }, + { MODKEY, XK_o, spawn, {.v = pass_dmenu_totp_cmd } }, /* tags */ TAGKEYS( XK_1, 0) TAGKEYS( XK_2, 1) @@ -248,6 +248,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp } else { XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); + if (w < lpad) + return x + w; d = XftDrawCreate(drw->dpy, drw->drawable, DefaultVisual(drw->dpy, drw->screen), DefaultColormap(drw->dpy, drw->screen)); @@ -58,7 +58,7 @@ /* enums */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ -enum { SchemeNorm, SchemeSel, SchemeWarn, SchemeUrgent }; /* color schemes */ +enum { SchemeNorm, SchemeSel, SchemeWarn, SchemeUrgent, SchemeNotif }; /* color schemes */ enum { NetSupported, NetWMName, NetWMState, NetWMCheck, NetWMFullscreen, NetActiveWindow, NetWMWindowType, NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ @@ -1,4 +1,5 @@ /* See LICENSE file for copyright and license details. */ +#include <errno.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -10,17 +11,17 @@ void die(const char *fmt, ...) { va_list ap; + int saved_errno; + + saved_errno = errno; va_start(ap, fmt); vfprintf(stderr, fmt, ap); va_end(ap); - if (fmt[0] && fmt[strlen(fmt)-1] == ':') { - fputc(' ', stderr); - perror(NULL); - } else { - fputc('\n', stderr); - } + if (fmt[0] && fmt[strlen(fmt)-1] == ':') + fprintf(stderr, " %s", strerror(saved_errno)); + fputc('\n', stderr); exit(1); } |