From e18c4836aec2ce491b63b464ea10782c581f5110 Mon Sep 17 00:00:00 2001 From: Eduardo Pedroni Date: Sun, 5 Apr 2015 13:05:20 +0200 Subject: Merging fonts does not work, trying multi font support --- config.h | 17 +++++++++-------- dwm | Bin 41328 -> 36480 bytes dwm.o | Bin 62056 -> 40948 bytes transient.c | 42 ------------------------------------------ 4 files changed, 9 insertions(+), 50 deletions(-) delete mode 100644 transient.c diff --git a/config.h b/config.h index e2b19f3..edaf504 100644 --- a/config.h +++ b/config.h @@ -1,26 +1,27 @@ /* See LICENSE file for copyright and license details. */ /* XF86 keys */ -#define VOLUP 0x1008FF11 /* Volume control down */ -#define VOLDOWN 0x1008FF12 /* Mute sound from the system */ -#define VOLMUTE 0x1008FF13 /* Volume control up */ +#define VOLDOWN 0x1008FF11 /* Volume control down */ +#define VOLMUTE 0x1008FF12 /* Mute sound from the system */ +#define VOLUP 0x1008FF13 /* Volume control up */ /* appearance */ -static const char font[] = "DejaVu Sans:size=8:weight=140"; -static const char symfont[] = "-*-xbmicons-medium-r-*-*-12-*-*-*-*-*-*-*"; +static const char font[] = "DejaVu Sans:size=8"; +static const char symfont[] = "DejaVu Sans Mono:size=8:weight=140"; -#define NUMCOLORS 4 // need at least 3 +#define NUMCOLORS 5 // need at least 3 static const char colors[NUMCOLORS][ColLast][8] = { // border foreground background { "#3b3b3b", "#454545", "#000000" }, // 0 = normal { "#000000", "#386dff", "#000000" }, // 1 = selected { "#ffffff", "#ffca38", "#000000" }, // 2 = urgent/warning { "#ffffff", "#ff3838", "#000000" }, // 3 = error + { "#ffffff", "#BBBBBB", "#000000" }, // 4 = statusbar }; static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 16; /* snap pixel */ static const Bool showbar = True; /* False means no bar */ -static const Bool topbar = True; /* False means bottom bar */ +static const Bool topbar = False; /* False means bottom bar */ static const Bool showtitle = False; /* True means titles are shown on bar */ /* Display modes of the tab bar: never shown, always shown, shown only in */ @@ -28,7 +29,7 @@ static const Bool showtitle = False; /* True means titles are shown o /* A mode can be disabled by moving it after the showtab_nmodes end marker */ enum showtab_modes { showtab_never, showtab_auto, showtab_nmodes, showtab_always}; static const int showtab = showtab_auto; /* Default tab bar show mode */ -static const Bool toptab = False; /* False means bottom tab bar */ +static const Bool toptab = True; /* False means bottom tab bar */ /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; diff --git a/dwm b/dwm index cd44377..6751bfb 100755 Binary files a/dwm and b/dwm differ diff --git a/dwm.o b/dwm.o index 5cee5fe..8ab5cd0 100644 Binary files a/dwm.o and b/dwm.o differ diff --git a/transient.c b/transient.c deleted file mode 100644 index 040adb5..0000000 --- a/transient.c +++ /dev/null @@ -1,42 +0,0 @@ -/* cc transient.c -o transient -lX11 */ - -#include -#include -#include -#include - -int main(void) { - Display *d; - Window r, f, t = None; - XSizeHints h; - XEvent e; - - d = XOpenDisplay(NULL); - if (!d) - exit(1); - r = DefaultRootWindow(d); - - f = XCreateSimpleWindow(d, r, 100, 100, 400, 400, 0, 0, 0); - h.min_width = h.max_width = h.min_height = h.max_height = 400; - h.flags = PMinSize | PMaxSize; - XSetWMNormalHints(d, f, &h); - XStoreName(d, f, "floating"); - XMapWindow(d, f); - - XSelectInput(d, f, ExposureMask); - while (1) { - XNextEvent(d, &e); - - if (t == None) { - sleep(5); - t = XCreateSimpleWindow(d, r, 50, 50, 100, 100, 0, 0, 0); - XSetTransientForHint(d, t, f); - XStoreName(d, t, "transient"); - XMapWindow(d, t); - XSelectInput(d, t, ExposureMask); - } - } - - XCloseDisplay(d); - exit(0); -} -- cgit v1.2.3