diff options
| author | Eduardo Pedroni <e.pedroni91@gmail.com> | 2015-03-28 15:48:27 -0300 |
|---|---|---|
| committer | Eduardo Pedroni <e.pedroni91@gmail.com> | 2015-03-28 15:48:27 -0300 |
| commit | 4de1b0d13237c92e5fcc02e2fc5e7ecab3d5a6b1 (patch) | |
| tree | a021ede2c55481b4b6d9fae6d6c5255f2c14a0af | |
| parent | 254990b4b9f5aa9693aa66d1c140907b2d0a12e4 (diff) | |
Colour scheme looking a little better, added symbols file, now looking into multifont support with xft
| -rw-r--r-- | config.h | 25 | ||||
| -rwxr-xr-x | dwm | bin | 41328 -> 41328 bytes | |||
| -rw-r--r-- | dwm.c | 2 | ||||
| -rw-r--r-- | dwm.o | bin | 62056 -> 62056 bytes | |||
| -rw-r--r-- | xbmicons.bdf | 693 |
5 files changed, 708 insertions, 12 deletions
@@ -1,21 +1,26 @@ /* 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 */ + /* appearance */ -//static const char font[] = "-*-terminus-medium-r-*-*-10-*-*-*-*-*-*-*"; -static const char font[] = "DejaVu Sans:size=8"; +static const char font[] = "DejaVu Sans:size=8:weight=140"; +static const char symfont[] = "-*-xbmicons-medium-r-*-*-12-*-*-*-*-*-*-*"; #define NUMCOLORS 4 // need at least 3 static const char colors[NUMCOLORS][ColLast][8] = { // border foreground background - { "#3b3b3b", "#303030", "#000000" }, // 0 = normal + { "#3b3b3b", "#454545", "#000000" }, // 0 = normal { "#000000", "#386dff", "#000000" }, // 1 = selected - { "#ffffff", "#808080", "#ffffaa" }, // 2 = urgent/warning - { "#ffffff", "#808080", "#ffaaaa" }, // 3 = error + { "#ffffff", "#ffca38", "#000000" }, // 2 = urgent/warning + { "#ffffff", "#ff3838", "#000000" }, // 3 = error }; 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 = False; /* False means bottom bar */ +static const Bool topbar = True; /* 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 */ @@ -23,7 +28,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 = True; /* False means bottom tab bar */ +static const Bool toptab = False; /* False means bottom tab bar */ /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; @@ -118,9 +123,9 @@ static Key keys[] = { TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = raisevolumecmd } }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = lowervolumecmd } }, - { 0, XF86XK_AudioMute, spawn, {.v = mutevolumecmd } }, + { 0, VOLUP, spawn, {.v = raisevolumecmd } }, + { 0, VOLDOWN, spawn, {.v = lowervolumecmd } }, + { 0, VOLMUTE, spawn, {.v = mutevolumecmd } }, { MODKEY|ShiftMask, XK_q, killclient, {0} }, { MODKEY|ShiftMask, XK_e, quit, {0} }, Binary files differ@@ -32,7 +32,6 @@ #include <sys/wait.h> #include <X11/cursorfont.h> #include <X11/keysym.h> -#include <X11/XF86keysym.h> #include <X11/Xatom.h> #include <X11/Xlib.h> #include <X11/Xproto.h> @@ -201,7 +200,6 @@ static void drawtabs(void); static void drawcoloredtext(char *text); static void drawsquare(Bool filled, Bool empty, int col); static void drawtext(Drawable drawable, const char *text, int col, Bool pad); -//static void drawtabtext(const char *text, unsigned long col[ColLast], Bool invert); static void enternotify(XEvent *e); static void expose(XEvent *e); static void focus(Client *c); Binary files differdiff --git a/xbmicons.bdf b/xbmicons.bdf new file mode 100644 index 0000000..2c974c7 --- /dev/null +++ b/xbmicons.bdf @@ -0,0 +1,693 @@ +STARTFONT 2.1 +FONT -Misc-xbmicons-Medium-R-Normal--12-120-72-72-C-60-ISO10646-1 +SIZE 12 72 72 +FONTBOUNDINGBOX 9 12 0 -2 + +STARTPROPERTIES 22 +POINT_SIZE 120 +PIXEL_SIZE 12 +RESOLUTION_X 72 +RESOLUTION_Y 72 +AVERAGE_WIDTH 60 +SPACING "C" +_GBDFED_INFO "Edited with gbdfed 1.6." +FAMILY_NAME "xbmicons" +CHARSET_REGISTRY "ISO10646" +CHARSET_ENCODING "1" +FOUNDRY "Misc" +COPYRIGHT "GPLv2" +MIN_SPACE 6 +QUAD_WIDTH 6 +SETWIDTH_NAME "Normal" +SLANT "R" +WEIGHT 10 +WEIGHT_NAME "Medium" +X_HEIGHT 10 +DEFAULT_CHAR 0 +FONT_DESCENT 2 +FONT_ASCENT 10 +ENDPROPERTIES + +CHARS 33 + +STARTCHAR U+E000 +ENCODING 57344 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +3C00 +6600 +F700 +F500 +A500 +A700 +4E00 +3C00 +0000 +0000 +ENDCHAR + +STARTCHAR U+E001 +ENCODING 57345 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +6000 +EC00 +DE00 +5E00 +EC00 +DE00 +3F00 +3F00 +0000 +0000 +ENDCHAR + +STARTCHAR char57346 +ENCODING 57346 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +7E00 +FF00 +8100 +A100 +9100 +A100 +8100 +7E00 +0000 +0000 +ENDCHAR + +STARTCHAR char57347 +ENCODING 57347 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +7E00 +FF00 +8100 +BD00 +8100 +BD00 +8100 +7E00 +0000 +0000 +ENDCHAR + +STARTCHAR char57347 +ENCODING 57348 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +7E00 +FF00 +8100 +A500 +8100 +BD00 +8100 +7E00 +0000 +0000 +ENDCHAR + +STARTCHAR char57348 +ENCODING 57349 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +FE00 +B500 +B500 +BD00 +8100 +8100 +8100 +FF00 +0000 +0000 +ENDCHAR + +STARTCHAR char57349 +ENCODING 57350 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +3C00 +7600 +E700 +FF00 +E000 +F800 +7E00 +3C00 +0000 +0000 +ENDCHAR + +STARTCHAR char57350 +ENCODING 57351 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0800 +0800 +1C00 +1C00 +3E00 +3E00 +7700 +6300 +E380 +8080 +0000 +ENDCHAR + +STARTCHAR char57351 +ENCODING 57352 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +FF00 +8100 +8100 +8100 +8100 +FF00 +1800 +FF00 +0000 +0000 +ENDCHAR + +STARTCHAR char57352 +ENCODING 57353 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +F700 +F700 +F000 +0700 +F700 +F000 +F700 +F700 +0000 +0000 +ENDCHAR + +STARTCHAR char57353 +ENCODING 57354 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +F800 +F800 +F800 +FB00 +FB00 +0300 +1F00 +1F00 +0000 +0000 +ENDCHAR + +STARTCHAR char57354 +ENCODING 57355 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +FF00 +FF00 +FF00 +FF00 +FF00 +FF00 +FF00 +FF00 +0000 +0000 +ENDCHAR + +STARTCHAR char57355 +ENCODING 57356 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +EF00 +EF00 +EF00 +EF00 +0000 +DB00 +DB00 +DB00 +0000 +0000 +ENDCHAR + +STARTCHAR char57356 +ENCODING 57357 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +DB00 +DB00 +0000 +DB00 +DB00 +0000 +DB00 +DB00 +0000 +0000 +ENDCHAR + +STARTCHAR char57357 +ENCODING 57358 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +3F00 +3F00 +2100 +2100 +2100 +2100 +E700 +E700 +0000 +0000 +ENDCHAR + +STARTCHAR char57358 +ENCODING 57359 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +DB00 +8100 +3C00 +BD00 +BD00 +3C00 +8100 +DB00 +0000 +0000 +ENDCHAR + +STARTCHAR char57359 +ENCODING 57360 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +AA00 +0000 +FE00 +FE00 +FE00 +FE00 +0000 +AA00 +0000 +0000 +ENDCHAR + +STARTCHAR char57360 +ENCODING 57361 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +3800 +3800 +3800 +3800 +FE00 +7C00 +3800 +1000 +0000 +0000 +ENDCHAR + +STARTCHAR char57361 +ENCODING 57362 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +1000 +3800 +7C00 +FE00 +3800 +3800 +3800 +3800 +0000 +0000 +ENDCHAR + +STARTCHAR char57362 +ENCODING 57363 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +7E00 +FF00 +FF00 +FF00 +FF00 +7E00 +0C00 +1800 +0000 +0000 +ENDCHAR + +STARTCHAR char57363 +ENCODING 57364 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +0000 +FF80 +BE80 +DD80 +EB80 +D580 +BE80 +FF80 +0000 +0000 +ENDCHAR + +STARTCHAR char57364 +ENCODING 57365 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +1000 +3200 +F100 +F500 +F500 +F100 +3200 +1000 +0000 +0000 +ENDCHAR + +STARTCHAR char57365 +ENCODING 57366 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +3C00 +6E00 +EF00 +EF00 +E100 +FF00 +7E00 +3C00 +0000 +0000 +ENDCHAR + +STARTCHAR char57366 +ENCODING 57367 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +FF00 +FF00 +1800 +1800 +FF00 +DB00 +C300 +FF00 +0000 +0000 +ENDCHAR + +STARTCHAR char57367 +ENCODING 57368 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +8000 +C000 +E000 +F000 +F800 +FC00 +FC00 +F800 +F000 +E000 +C000 +8000 +ENDCHAR + +STARTCHAR char57368 +ENCODING 57369 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +8000 +4000 +2000 +1000 +0800 +0400 +0400 +0800 +1000 +2000 +4000 +8000 +ENDCHAR + +STARTCHAR char57369 +ENCODING 57370 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0400 +0C00 +1C00 +3C00 +7C00 +FC00 +FC00 +7C00 +3C00 +1C00 +0C00 +0400 +ENDCHAR + +STARTCHAR char57370 +ENCODING 57371 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0400 +0800 +1000 +2000 +4000 +8000 +8000 +4000 +2000 +1000 +0800 +0400 +ENDCHAR + +STARTCHAR char57372 +ENCODING 57372 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +8000 +C000 +E000 +F000 +F800 +F800 +F800 +F800 +F800 +F800 +F800 +F800 +ENDCHAR + +STARTCHAR char57373 +ENCODING 57373 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +7C00 +7C00 +7C00 +7C00 +7C00 +7C00 +7C00 +7C00 +3C00 +1C00 +0C00 +0400 +ENDCHAR + +STARTCHAR char57374 +ENCODING 57374 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +0000 +7F00 +8080 +3E00 +4100 +1C00 +0000 +0800 +0000 +0000 +ENDCHAR + +STARTCHAR char57375 +ENCODING 57375 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0000 +0000 +7800 +FC00 +8400 +B400 +B400 +B400 +8400 +FC00 +0000 +0000 +ENDCHAR + +STARTCHAR char57376 +ENCODING 57376 +SWIDTH 500 0 +DWIDTH 6 0 +BBX 9 12 0 -2 +BITMAP +0800 +0800 +0800 +0800 +0800 +0800 +0800 +0800 +0800 +0800 +0800 +0800 +ENDCHAR + +ENDFONT |