From a43fadeeb0710a17f22744ae50ca6cd0c5b305da Mon Sep 17 00:00:00 2001 From: Eduardo Pedroni Date: Fri, 27 Mar 2015 12:38:35 -0300 Subject: Added custom config.h, fixed some warnings --- README | 51 ------------------------ README.md | 51 ++++++++++++++++++++++++ config.h | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ config.mk | 6 +-- dwm | Bin 0 -> 39024 bytes dwm.c | 1 + dwm.o | Bin 0 -> 57672 bytes 7 files changed, 187 insertions(+), 54 deletions(-) delete mode 100644 README create mode 100644 README.md create mode 100644 config.h create mode 100755 dwm create mode 100644 dwm.o diff --git a/README b/README deleted file mode 100644 index 7abf1cf..0000000 --- a/README +++ /dev/null @@ -1,51 +0,0 @@ -dwm - dynamic window manager -============================ -dwm is an extremely fast, small, and dynamic window manager for X. - - -Requirements ------------- -In order to build dwm you need the Xlib header files. - - -Installation ------------- -Edit config.mk to match your local setup (dwm is installed into -the /usr/local namespace by default). - -Afterwards enter the following command to build and install dwm (if -necessary as root): - - make clean install - -If you are going to use the default bluegray color scheme it is highly -recommended to also install the bluegray files shipped in the dextra package. - - -Running dwm ------------ -Add the following line to your .xinitrc to start dwm using startx: - - exec dwm - -In order to connect dwm to a specific display, make sure that -the DISPLAY environment variable is set correctly, e.g.: - - DISPLAY=foo.bar:1 exec dwm - -(This will start dwm on display :1 of the host foo.bar.) - -In order to display status info in the bar, you can do something -like this in your .xinitrc: - - while xsetroot -name "`date` `uptime | sed 's/.*,//'`" - do - sleep 1 - done & - exec dwm - - -Configuration -------------- -The configuration of dwm is done by creating a custom config.h -and (re)compiling the source code. diff --git a/README.md b/README.md new file mode 100644 index 0000000..7abf1cf --- /dev/null +++ b/README.md @@ -0,0 +1,51 @@ +dwm - dynamic window manager +============================ +dwm is an extremely fast, small, and dynamic window manager for X. + + +Requirements +------------ +In order to build dwm you need the Xlib header files. + + +Installation +------------ +Edit config.mk to match your local setup (dwm is installed into +the /usr/local namespace by default). + +Afterwards enter the following command to build and install dwm (if +necessary as root): + + make clean install + +If you are going to use the default bluegray color scheme it is highly +recommended to also install the bluegray files shipped in the dextra package. + + +Running dwm +----------- +Add the following line to your .xinitrc to start dwm using startx: + + exec dwm + +In order to connect dwm to a specific display, make sure that +the DISPLAY environment variable is set correctly, e.g.: + + DISPLAY=foo.bar:1 exec dwm + +(This will start dwm on display :1 of the host foo.bar.) + +In order to display status info in the bar, you can do something +like this in your .xinitrc: + + while xsetroot -name "`date` `uptime | sed 's/.*,//'`" + do + sleep 1 + done & + exec dwm + + +Configuration +------------- +The configuration of dwm is done by creating a custom config.h +and (re)compiling the source code. diff --git a/config.h b/config.h new file mode 100644 index 0000000..d5b6062 --- /dev/null +++ b/config.h @@ -0,0 +1,132 @@ +/* See LICENSE file for copyright and license details. */ + +/* appearance */ +static const char font[] = "-*-terminus-medium-r-*-*-12-*-*-*-*-*-*-*"; +static const char normbordercolor[] = "#3B3B3B"; +static const char normbgcolor[] = "#111111"; +static const char normfgcolor[] = "#bbbbbb"; +static const char selbordercolor[] = "#000000"; +static const char selbgcolor[] = "#0A0A0A"; +static const char selfgcolor[] = "#eeeeee"; +static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int snap = 32; /* snap pixel */ +static const Bool showbar = True; /* False means no bar */ +static const Bool topbar = False; /* False means bottom bar */ + +/* Display modes of the tab bar: never shown, always shown, shown only in */ +/* monocle mode in presence of several windows. */ +/* 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 */ + +/* tagging */ +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; + +/* default layout per tags */ +/* The first element is for all-tag view, following i-th element corresponds to */ +/* tags[i]. Layout is referred using the layouts array index.*/ +static int def_layouts[1 + LENGTH(tags)] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + +/* rules */ +static const Rule rules[] = { + /* class instance title tags mask isfloating monitor */ + { NULL, NULL, NULL, 0, True, -1 }, +}; + +/* layout(s) */ +static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ +static const int nmaster = 1; /* number of clients in master area */ +static const Bool resizehints = False; /* True means respect size hints in tiled resizals */ + +static const Layout layouts[] = { + /* symbol arrange function */ + { "[]=", tile }, /* first entry is default */ + { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, +}; + +/* key definitions */ +#define MODKEY Mod4Mask +#define TAGKEYS(KEY,TAG) \ + { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, + +/* helper for spawning shell commands in the pre dwm-5.0 fashion */ +#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } + +/* commands */ +static const char *dmenucmd[] = { "dmenu_recent_aliases", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; +static const char *termcmd[] = { "xterm", NULL }; + +static const char *lowervolume[] = { "amixer", "-q", "set", "Master", "2dB-", NULL }; +static const char *raisevolume[] = { "amixer", "-q", "set", "Master", "2dB+", NULL }; +static const char *mutevolume[] = { "amixer", "-q", "set", "Master", "toggle", NULL }; + +static Key keys[] = { + /* modifier key function argument */ + { MODKEY, XK_d, spawn, {.v = dmenucmd } }, + { MODKEY, XK_Return, spawn, {.v = termcmd } }, + + { MODKEY, XK_b, togglebar, {0} }, + + { MODKEY, XK_Left, focusstack, {.i = -1 } }, + { MODKEY, XK_Right, focusstack, {.i = +1 } }, + { MODKEY, XK_Up, incnmaster, {.i = +1 } }, + { MODKEY, XK_Down, incnmaster, {.i = -1 } }, + { MODKEY|ShiftMask, XK_Left, setmfact, {.f = -0.05} }, + { MODKEY|ShiftMask, XK_Right, setmfact, {.f = +0.05} }, + { MODKEY|ShiftMask, XK_Return, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, + + { MODKEY, XK_e, setlayout, {.v = &layouts[0]} }, + { MODKEY, XK_r, setlayout, {.v = &layouts[1]} }, + { MODKEY, XK_w, setlayout, {.v = &layouts[2]} }, + { MODKEY, XK_space, setlayout, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + + { MODKEY, XK_0, view, {.ui = ~0 } }, + { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, + + { MODKEY, XK_comma, focusmon, {.i = -1 } }, + { MODKEY, XK_period, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, + + TAGKEYS( XK_1, 0) + TAGKEYS( XK_2, 1) + TAGKEYS( XK_3, 2) + TAGKEYS( XK_4, 3) + TAGKEYS( XK_5, 4) + TAGKEYS( XK_6, 5) + TAGKEYS( XK_7, 6) + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) + + { 0, XF86XK_AudioRaiseVolume, spawn, {.v = raisevolume } }, + { 0, XF86XK_AudioLowerVolume, spawn, {.v = lowervolume } }, + { 0, XF86XK_AudioMute, spawn, {.v = mutevolume } }, + + { MODKEY|ShiftMask, XK_q, killclient, {0} }, + { MODKEY|ShiftMask, XK_e, quit, {0} }, +}; + +/* button definitions */ +/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ +static Button buttons[] = { + /* click event mask button function argument */ + { ClkLtSymbol, 0, Button1, setlayout, {0} }, + { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, + { ClkWinTitle, 0, Button2, zoom, {0} }, + { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, + { ClkClientWin, MODKEY, Button1, movemouse, {0} }, + { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, + { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, + { ClkTagBar, 0, Button1, view, {0} }, + { ClkTagBar, 0, Button3, toggleview, {0} }, + { ClkTagBar, MODKEY, Button1, tag, {0} }, + { ClkTagBar, MODKEY, Button3, toggletag, {0} }, +}; + diff --git a/config.mk b/config.mk index 484554a..18dea06 100644 --- a/config.mk +++ b/config.mk @@ -4,11 +4,11 @@ VERSION = 6.0 # Customize below to fit your system # paths -PREFIX = /usr/local +PREFIX = /usr MANPREFIX = ${PREFIX}/share/man -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib +X11INC = /usr/include/X11 +X11LIB = /usr/lib/X11 # Xinerama XINERAMALIBS = -L${X11LIB} -lXinerama diff --git a/dwm b/dwm new file mode 100755 index 0000000..9d70def Binary files /dev/null and b/dwm differ diff --git a/dwm.c b/dwm.c index 1d78655..c9be96b 100644 --- a/dwm.c +++ b/dwm.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include diff --git a/dwm.o b/dwm.o new file mode 100644 index 0000000..3fb3947 Binary files /dev/null and b/dwm.o differ -- cgit v1.2.3