]> Pileus Git - ~andy/sunrise/commitdiff
x11-wm/dwm: New Ebuild for bug 141530
authorCédric Krier <cedk@gentoo.org>
Sun, 23 Jul 2006 21:18:13 +0000 (21:18 +0000)
committerCédric Krier <cedk@gentoo.org>
Sun, 23 Jul 2006 21:18:13 +0000 (21:18 +0000)
svn path=/sunrise/; revision=675

x11-wm/dwm/ChangeLog [new file with mode: 0644]
x11-wm/dwm/Manifest [new file with mode: 0644]
x11-wm/dwm/dwm-0.5.ebuild [new file with mode: 0644]
x11-wm/dwm/files/digest-dwm-0.5 [new file with mode: 0644]
x11-wm/dwm/files/dwm-0.5-config_mk.patch [new file with mode: 0644]
x11-wm/dwm/files/dwm-0.5-fixfocus.patch [new file with mode: 0644]
x11-wm/dwm/files/dwm-0.5-numlock.patch [new file with mode: 0644]
x11-wm/dwm/files/dwm-0.5-tags.patch [new file with mode: 0644]
x11-wm/dwm/metadata.xml [new file with mode: 0644]

diff --git a/x11-wm/dwm/ChangeLog b/x11-wm/dwm/ChangeLog
new file mode 100644 (file)
index 0000000..ed06256
--- /dev/null
@@ -0,0 +1,9 @@
+# ChangeLog for x11-wm/dwm
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  23 Jul 2006; Cedric Krier <ced@ced.homedns.org> +dwm-0.5.ebuild,
+  +files/dwm-0.5-config_mk.patch, +files/dwm-0.5-fixfocus.patch,
+  +files/dwm-0.5-numlock.patch, +files/dwm-0.5-tags.patch, +metadata.xml:
+  New Ebuild for bug 141530
+
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
new file mode 100644 (file)
index 0000000..21c1fa5
--- /dev/null
@@ -0,0 +1,32 @@
+AUX dwm-0.5-config_mk.patch 779 RMD160 70f1bf8aa9e012f7407d8429c608eef09e0f0648 SHA1 788d3aa57923b1f95c9a07a455f3ffd50cff955f SHA256 c1ccccbde8d97d4a32acf2ddbd365d9b8a02540a36ddc209c3d3316cca7214c6
+MD5 500023f37b38321546085787bf7431fe files/dwm-0.5-config_mk.patch 779
+RMD160 70f1bf8aa9e012f7407d8429c608eef09e0f0648 files/dwm-0.5-config_mk.patch 779
+SHA256 c1ccccbde8d97d4a32acf2ddbd365d9b8a02540a36ddc209c3d3316cca7214c6 files/dwm-0.5-config_mk.patch 779
+AUX dwm-0.5-fixfocus.patch 2360 RMD160 65f3b891860dba35f75281cb70daf83997a44af7 SHA1 443b63dd9fbb7f8546410218f59b7d2a98200dfa SHA256 63eb4640d44659929e9b4ed1eedee21caf11c00c1a70d3c34c3040529ac97151
+MD5 23ad876c745c7724bd77eacf242f9db9 files/dwm-0.5-fixfocus.patch 2360
+RMD160 65f3b891860dba35f75281cb70daf83997a44af7 files/dwm-0.5-fixfocus.patch 2360
+SHA256 63eb4640d44659929e9b4ed1eedee21caf11c00c1a70d3c34c3040529ac97151 files/dwm-0.5-fixfocus.patch 2360
+AUX dwm-0.5-numlock.patch 1314 RMD160 cd9568afeadf544872a79379ddd56f21b11d72c7 SHA1 f3d74d137012ceaa24d26388333a5df86c341bef SHA256 232d5ef75c607d783cc08f20deabe1ec5ace87a1461bdedf64e330cc7ba169fe
+MD5 6c65cfddc1d4abe9852592849e80dc33 files/dwm-0.5-numlock.patch 1314
+RMD160 cd9568afeadf544872a79379ddd56f21b11d72c7 files/dwm-0.5-numlock.patch 1314
+SHA256 232d5ef75c607d783cc08f20deabe1ec5ace87a1461bdedf64e330cc7ba169fe files/dwm-0.5-numlock.patch 1314
+AUX dwm-0.5-tags.patch 3970 RMD160 2775755322ff8ab3449840e0159650324545874f SHA1 1ddf92518928f7e3b36cb6797786a658474fa122 SHA256 65bc42afa8b66cbe6fc7b0c1c967d6c997b638b8c4fc3034e2803194fee8bab0
+MD5 88c79ad0cbdd0ceaf92cbc72e1d9c3c4 files/dwm-0.5-tags.patch 3970
+RMD160 2775755322ff8ab3449840e0159650324545874f files/dwm-0.5-tags.patch 3970
+SHA256 65bc42afa8b66cbe6fc7b0c1c967d6c997b638b8c4fc3034e2803194fee8bab0 files/dwm-0.5-tags.patch 3970
+DIST dwm-0.5.tar.gz 13795 RMD160 99d283b65076a5ba76ca20ad4faca726e47448a7 SHA1 4b85249d91e12c5df6206008843f1b31a9e8c41f SHA256 d025d5a43dc09fa81985ea41363cd2dbc967a8923d6b62a930a7238a56ca1473
+EBUILD dwm-0.5.ebuild 4003 RMD160 73da76283e736d60872ee5641d9847187a33e454 SHA1 83a04b90151187336c35682a00ec6bff6127117f SHA256 81acd6b18a43e62f39408e19ed2090fa67f81cc4e97b12552a2269380f069156
+MD5 d4099c3ed023a8a0236abbeef1574ea2 dwm-0.5.ebuild 4003
+RMD160 73da76283e736d60872ee5641d9847187a33e454 dwm-0.5.ebuild 4003
+SHA256 81acd6b18a43e62f39408e19ed2090fa67f81cc4e97b12552a2269380f069156 dwm-0.5.ebuild 4003
+MISC ChangeLog 346 RMD160 ac7efd41b59e4cf02111a7b67634b9bd1643a96c SHA1 4f87e0060c4df61e868d7ca585fe724d990aa835 SHA256 ab84e28bd5a0f289408d523aa807a02074c91bc34125eeb56603805f026f41b5
+MD5 523ee18f9f385a85a763fa28005ad906 ChangeLog 346
+RMD160 ac7efd41b59e4cf02111a7b67634b9bd1643a96c ChangeLog 346
+SHA256 ab84e28bd5a0f289408d523aa807a02074c91bc34125eeb56603805f026f41b5 ChangeLog 346
+MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
+RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
+SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
+MD5 9fd32f93c227efae15972870d78ab976 files/digest-dwm-0.5 220
+RMD160 d496b1e4b7896d9843741027ac4e51c97d125319 files/digest-dwm-0.5 220
+SHA256 3660b9dab072f459ad19fed239197e763880eb576c8a061da364a52b49e530bc files/digest-dwm-0.5 220
diff --git a/x11-wm/dwm/dwm-0.5.ebuild b/x11-wm/dwm/dwm-0.5.ebuild
new file mode 100644 (file)
index 0000000..9fcecb9
--- /dev/null
@@ -0,0 +1,144 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a dynamic window manager for X11"
+HOMEPAGE="http://www.10kloc.org/dwm/"
+SRC_URI="http://10kloc.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="|| ( x11-libs/libX11 virtual/x11 )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}/${P}-config_mk.patch"
+       epatch "${FILESDIR}/${P}-numlock.patch"
+       epatch "${FILESDIR}/${P}-fixfocus.patch"
+}
+
+src_compile() {
+       for def in FONT BGCOLOR FGCOLOR BORDERCOLOR; do
+               dwm_def="DWM_${def}"
+               if [ "X${!dwm_def}" != "X" ]; then
+                       einfo "Using \"${!dwm_def}\" as ${def}"
+                       sed -i -e "s/^#define ${def}.*$/#define ${def} \"${!dwm_def}\"/" dwm.h
+               else
+                       einfo "Using default ${def}"
+               fi
+       done
+
+       for def in MODKEY MASTERW NumLockMask; do
+               dwm_def="DWM_${def}"
+               if [ "X${!dwm_def}" != "X" ]; then
+                       einfo "Using ${!dwm_def} as ${def}"
+                       sed -i -e "s/^#define ${def}.*$/#define ${def} ${!dwm_def}/" dwm.h
+               else
+                       einfo "Using default ${def}"
+               fi
+       done
+
+       if [ "X${DWM_TERM}" != "X" ]; then
+               einfo "Using \"${DWM_TERM}\" as term"
+               ARG=""
+               for i in ${DWM_TERM}; do
+                       if [ "X${ARG}" != "X" ]; then
+                               ARG="${ARG}, \"${i}\""
+                       else
+                               ARG="\"${i}\""
+                       fi
+               done
+               sed -i -e "s/^const char \*term\[\] =.*$/const char \*term\[\] = \{ ${ARG} , NULL \};/" event.c
+       else
+               einfo "Using default term"
+       fi
+
+       if [ "X${DWM_TAGS}" != "X" ]; then
+               einfo "Using \"${DWM_TAGS}\" as tags"
+               epatch "${FILESDIR}/${P}-tags.patch"
+               i=0;
+               for tag in ${DWM_TAGS}; do
+                       sed -i -e "s/GT${i}/T${tag}/" event.c
+                       TAGS="${TAGS} [T${tag}] = \"${tag}\","
+                       TAGS_ENUM="${TAGS_ENUM} T${tag},"
+                       if [ "${tag}" == "${DWM_DEFAULT_TAG}" ]; then
+                               default_tag=${tag}
+                       elif [ "X$default_tag" == "X" ]; then
+                               default_tag=${tag}
+                       fi
+                       i=$(($i+1))
+               done
+               while [ $i -le 9 ]; do
+                       sed -i -e "s/.*GT${i}.*//" event.c
+                       i=$(($i+1))
+               done
+               sed -i -e "s/^enum { };/enum \{ ${TAGS_ENUM} TLast \};/" dwm.h
+               sed -i -e "s/^char \*tags\[TLast\] = { };/char \*tags\[TLast\] = \{ ${TAGS} \};/" tag.c
+               sed -i -e "s/^int tsel =.*;/int tsel = T${default_tag};/" main.c
+
+               if [ "X${DWM_RULES}" != "X" ]; then
+                       einfo "Using \"${DWM_RULES}\" as rules"
+                       sed -i -e "s/^static Rule rule\[\] = { };/static Rule rule\[\] = \{ ${DWM_RULES} \};/" tag.c
+               fi
+       else
+               einfo "Using default tags"
+       fi
+
+       if [ "X${DWM_KEYBOARD}" == "Xbe" ]; then
+               einfo "Using ${DWM_KEYBOARD} keyboard"
+               sed -i -e "s/XK_0/XK_agrave/" \
+                       -e "s/XK_1/XK_ampersand/" \
+                       -e "s/XK_2/XK_eacute/" \
+                       -e "s/XK_3/XK_quotedbl/" \
+                       -e "s/XK_4/XK_apostrophe/" \
+                       -e "s/XK_5/XK_parenleft/" \
+                       -e "s/XK_6/XK_section/" \
+                       -e "s/XK_7/XK_egrave/" \
+                       -e "s/XK_8/XK_exclam/" \
+                       -e "s/XK_9/XK_ccedilla/" event.c
+       elif [ "X${DWM_KEYBOARD}" == "Xfr" ]; then
+               einfo "Using ${DWM_KEYBOARD} keyboard"
+               sed -i -e "s/XK_0/XK_agrave/" \
+                       -e "s/XK_1/XK_ampersand/" \
+                       -e "s/XK_2/XK_eacute/" \
+                       -e "s/XK_3/XK_quotedbl/" \
+                       -e "s/XK_4/XK_apostrophe/" \
+                       -e "s/XK_5/XK_parenleft/" \
+                       -e "s/XK_6/XK_less/" \
+                       -e "s/XK_7/XK_egrave/" \
+                       -e "s/XK_8/XK_underscore/" \
+                       -e "s/XK_9/XK_ccedilla/" event.c
+       else
+               einfo "Using default keyboard"
+       fi
+
+       emake CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"
+}
+
+pkg_postinst() {
+       einfo "To customize dwm set this variables by examples:"
+       einfo "DWM_FONT=\"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*\""
+       einfo "DWM_BGCOLOR=\"#0a2c2d\""
+       einfo "DWM_FGCOLOR=\"#ddeeee\""
+       einfo "DWM_BORDERCOLOR=\"#176164\""
+       einfo "DWM_MODKEY=\"Mod1Mask\""
+       einfo "DWM_MASTERW=\"52\""
+       einfo "DWM_NumLockMask=\"Mod2Mask\""
+       einfo "DWM_TERM=\"xterm\""
+       einfo "DWM_TAGS=\"fnord dev net work misc\""
+       einfo "DWM_RULES='{ \\\"Firefox.*\\\", { [Tnet] = \\\"net\\\" }, False }, { \\\"Gimp.*\\\", { 0 }, True},'"
+       einfo "DWM_DEFAULT_TAG=\"dev\""
+       einfo "DWM_KEYBOARD=\"en\""
+}
diff --git a/x11-wm/dwm/files/digest-dwm-0.5 b/x11-wm/dwm/files/digest-dwm-0.5
new file mode 100644 (file)
index 0000000..5f4d203
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 e8dfa2d3502d6bc9aeb9f0f21ab2dec5 dwm-0.5.tar.gz 13795
+RMD160 99d283b65076a5ba76ca20ad4faca726e47448a7 dwm-0.5.tar.gz 13795
+SHA256 d025d5a43dc09fa81985ea41363cd2dbc967a8923d6b62a930a7238a56ca1473 dwm-0.5.tar.gz 13795
diff --git a/x11-wm/dwm/files/dwm-0.5-config_mk.patch b/x11-wm/dwm/files/dwm-0.5-config_mk.patch
new file mode 100644 (file)
index 0000000..1598d32
--- /dev/null
@@ -0,0 +1,29 @@
+--- dwm-0.5~/config.mk 2006-07-20 16:29:57.000000000 +0200
++++ dwm-0.5/config.mk  2006-07-20 16:35:38.000000000 +0200
+@@ -1,8 +1,8 @@
+ # Customize to fit your system
+ # paths
+-PREFIX = /usr/local
+-MANPREFIX = ${PREFIX}/share/man
++PREFIX ?= /usr/local
++MANPREFIX ?= ${PREFIX}/share/man
+ X11INC = /usr/X11R6/include
+ X11LIB = /usr/X11R6/lib
+@@ -13,7 +13,7 @@
+ LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
+ # Linux/BSD
+-CFLAGS = -O3 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
++CFLAGS += -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
+       -DVERSION=\"${VERSION}\"
+ LDFLAGS = ${LIBS}
+ #CFLAGS = -g -Wall -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
+@@ -26,5 +26,5 @@
+ #LIBS += -lnsl -lsocket
+ AR = ar cr
+-CC = cc
++CC ?= cc
+ RANLIB = ranlib
diff --git a/x11-wm/dwm/files/dwm-0.5-fixfocus.patch b/x11-wm/dwm/files/dwm-0.5-fixfocus.patch
new file mode 100644 (file)
index 0000000..dc50ad9
--- /dev/null
@@ -0,0 +1,75 @@
+diff -ru dwm-0.5~/client.c dwm-0.5-fixfocus/client.c
+--- dwm-0.5~/client.c  2006-07-22 15:38:12.000000000 +0200
++++ dwm-0.5-fixfocus/client.c  2006-07-23 20:22:23.000000000 +0200
+@@ -244,11 +244,11 @@
+       c->next = clients;
+       clients = c;
+-      XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask,
++      XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonMask,
+                       GrabModeAsync, GrabModeSync, None, None);
+-      XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask,
++      XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonMask,
+                       GrabModeAsync, GrabModeSync, None, None);
+-      XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask,
++      XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonMask,
+                       GrabModeAsync, GrabModeSync, None, None);
+       if(!c->isfloat)
+diff -ru dwm-0.5~/dwm.h dwm-0.5-fixfocus/dwm.h
+--- dwm-0.5~/dwm.h     2006-07-22 15:38:12.000000000 +0200
++++ dwm-0.5-fixfocus/dwm.h     2006-07-23 20:22:48.000000000 +0200
+@@ -24,6 +24,10 @@
+ enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
+ /* END CUSTOMIZE */
++/* mask shorthands, used in event.c and client.c */
++#define ButtonMask     (ButtonPressMask | ButtonReleaseMask)
++#define MouseMask      (ButtonMask | PointerMotionMask)
++
+ typedef union Arg Arg;
+ typedef struct Client Client;
+diff -ru dwm-0.5~/event.c dwm-0.5-fixfocus/event.c
+--- dwm-0.5~/event.c   2006-07-22 15:38:12.000000000 +0200
++++ dwm-0.5-fixfocus/event.c   2006-07-23 20:23:47.000000000 +0200
+@@ -8,9 +8,6 @@
+ #include <X11/keysym.h>
+ #include <X11/Xatom.h>
+-#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
+-#define MouseMask       (ButtonMask | PointerMotionMask)
+-
+ /* CUSTOMIZE */
+ typedef struct {
+@@ -247,7 +244,7 @@
+       Client *c;
+       XCrossingEvent *ev = &e->xcrossing;
+-      if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
++      if(ev->detail == NotifyInferior)
+               return;
+       if((c = getclient(ev->window)))
+diff -ru dwm-0.5~/tag.c dwm-0.5-fixfocus/tag.c
+--- dwm-0.5~/tag.c     2006-07-22 15:38:12.000000000 +0200
++++ dwm-0.5-fixfocus/tag.c     2006-07-23 20:28:06.000000000 +0200
+@@ -67,6 +67,8 @@
+                       higher(sel);
+                       focus(sel);
+               }
++              else
++                      XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       }
+       drawall();
+ }
+@@ -130,6 +132,8 @@
+                       higher(sel);
+                       focus(sel);
+               }
++              else
++                      XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       }
+       drawall();
+ }
diff --git a/x11-wm/dwm/files/dwm-0.5-numlock.patch b/x11-wm/dwm/files/dwm-0.5-numlock.patch
new file mode 100644 (file)
index 0000000..84e3c71
--- /dev/null
@@ -0,0 +1,45 @@
+--- dwm-0.5~/event.c   2006-07-22 15:38:12.000000000 +0200
++++ dwm-0.5-new/event.c        2006-07-23 12:25:29.000000000 +0200
+@@ -64,6 +64,9 @@
+       */
+ };
++#define NumLockMask Mod2Mask
++unsigned int valid_mask =  255 &  ~( NumLockMask | LockMask);
++
+ /* END CUSTOMIZE */
+ /* static */
+@@ -277,10 +280,11 @@
+       unsigned int i;
+       KeySym keysym;
+       XKeyEvent *ev = &e->xkey;
++      ev->state &= valid_mask;
+       keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
+       for(i = 0; i < len; i++)
+-              if((keysym == key[i].keysym) && (key[i].mod == ev->state)) {
++              if((keysym == key[i].keysym) && ((key[i].mod & valid_mask) == ev->state)) {
+                       if(key[i].func)
+                               key[i].func(&key[i].arg);
+                       return;
+@@ -383,7 +387,19 @@
+       for(i = 0; i < len; i++) {
+               code = XKeysymToKeycode(dpy, key[i].keysym);
+               XUngrabKey(dpy, code, key[i].mod, root);
++              if (NumLockMask)
++              {
++                      XUngrabKey(dpy, code, key[i].mod | NumLockMask, root);
++                      XUngrabKey(dpy, code, key[i].mod | NumLockMask | LockMask, root);
++              }
+               XGrabKey(dpy, code, key[i].mod, root, True,
+                               GrabModeAsync, GrabModeAsync);
++              if (NumLockMask)
++              {
++                      XGrabKey(dpy, code, key[i].mod | NumLockMask, root, True,
++                                      GrabModeAsync, GrabModeAsync);
++                      XGrabKey(dpy, code, key[i].mod | NumLockMask | LockMask, root, True,
++                                      GrabModeAsync, GrabModeAsync);
++              }
+       }
+ }
diff --git a/x11-wm/dwm/files/dwm-0.5-tags.patch b/x11-wm/dwm/files/dwm-0.5-tags.patch
new file mode 100644 (file)
index 0000000..48c8693
--- /dev/null
@@ -0,0 +1,102 @@
+diff -ru dwm-0.5~/dwm.h dwm-0.5/dwm.h
+--- dwm-0.5~/dwm.h     2006-07-22 15:38:12.000000000 +0200
++++ dwm-0.5/dwm.h      2006-07-22 17:28:41.000000000 +0200
+@@ -21,7 +21,7 @@
+ #define WM_PROTOCOL_DELWIN    1
+ /* tags */
+-enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
++enum { };
+ /* END CUSTOMIZE */
+diff -ru dwm-0.5~/event.c dwm-0.5/event.c
+--- dwm-0.5~/event.c   2006-07-22 15:38:12.000000000 +0200
++++ dwm-0.5/event.c    2006-07-22 19:16:58.000000000 +0200
+@@ -34,26 +34,41 @@
+ static Key key[] = {
+       /* modifier             key             function        arguments */
+-      { MODKEY,               XK_0,           view,           { .i = Tfnord } }, 
+-      { MODKEY,               XK_1,           view,           { .i = Tdev } }, 
+-      { MODKEY,               XK_2,           view,           { .i = Tnet } }, 
+-      { MODKEY,               XK_3,           view,           { .i = Twork } }, 
+-      { MODKEY,               XK_4,           view,           { .i = Tmisc} }, 
++      { MODKEY,               XK_0,           view,           { .i =  GT9 } }, 
++      { MODKEY,               XK_1,           view,           { .i =  GT0 } }, 
++      { MODKEY,               XK_2,           view,           { .i =  GT1 } }, 
++      { MODKEY,               XK_3,           view,           { .i =  GT2 } }, 
++      { MODKEY,               XK_4,           view,           { .i =  GT3 } }, 
++      { MODKEY,               XK_5,           view,           { .i =  GT4 } }, 
++      { MODKEY,               XK_6,           view,           { .i =  GT5 } }, 
++      { MODKEY,               XK_7,           view,           { .i =  GT6 } }, 
++      { MODKEY,               XK_8,           view,           { .i =  GT7 } }, 
++      { MODKEY,               XK_9,           view,           { .i =  GT8 } }, 
+       { MODKEY,               XK_j,           focusnext,      { 0 } }, 
+       { MODKEY,               XK_k,           focusprev,      { 0 } },
+       { MODKEY,               XK_m,           togglemax,      { 0 } }, 
+       { MODKEY,               XK_space,       togglemode,     { 0 } }, 
+       { MODKEY,               XK_Return,      zoom,           { 0 } },
+-      { MODKEY|ControlMask,   XK_0,           appendtag,      { .i = Tfnord } }, 
+-      { MODKEY|ControlMask,   XK_1,           appendtag,      { .i = Tdev } }, 
+-      { MODKEY|ControlMask,   XK_2,           appendtag,      { .i = Tnet } }, 
+-      { MODKEY|ControlMask,   XK_3,           appendtag,      { .i = Twork } }, 
+-      { MODKEY|ControlMask,   XK_4,           appendtag,      { .i = Tmisc } }, 
+-      { MODKEY|ShiftMask,     XK_0,           replacetag,     { .i = Tfnord } }, 
+-      { MODKEY|ShiftMask,     XK_1,           replacetag,     { .i = Tdev } }, 
+-      { MODKEY|ShiftMask,     XK_2,           replacetag,     { .i = Tnet } }, 
+-      { MODKEY|ShiftMask,     XK_3,           replacetag,     { .i = Twork } }, 
+-      { MODKEY|ShiftMask,     XK_4,           replacetag,     { .i = Tmisc } }, 
++      { MODKEY|ControlMask,   XK_0,           appendtag,      { .i = GT9 } }, 
++      { MODKEY|ControlMask,   XK_1,           appendtag,      { .i = GT0 } }, 
++      { MODKEY|ControlMask,   XK_2,           appendtag,      { .i = GT1 } }, 
++      { MODKEY|ControlMask,   XK_3,           appendtag,      { .i = GT2 } }, 
++      { MODKEY|ControlMask,   XK_4,           appendtag,      { .i = GT3 } }, 
++      { MODKEY|ControlMask,   XK_5,           appendtag,      { .i = GT4 } }, 
++      { MODKEY|ControlMask,   XK_6,           appendtag,      { .i = GT5 } }, 
++      { MODKEY|ControlMask,   XK_7,           appendtag,      { .i = GT6 } }, 
++      { MODKEY|ControlMask,   XK_8,           appendtag,      { .i = GT7 } }, 
++      { MODKEY|ControlMask,   XK_9,           appendtag,      { .i = GT8 } }, 
++      { MODKEY|ShiftMask,     XK_0,           replacetag,     { .i = GT9 } }, 
++      { MODKEY|ShiftMask,     XK_1,           replacetag,     { .i = GT0 } }, 
++      { MODKEY|ShiftMask,     XK_2,           replacetag,     { .i = GT1 } }, 
++      { MODKEY|ShiftMask,     XK_3,           replacetag,     { .i = GT2 } }, 
++      { MODKEY|ShiftMask,     XK_4,           replacetag,     { .i = GT3 } }, 
++      { MODKEY|ShiftMask,     XK_5,           replacetag,     { .i = GT4 } }, 
++      { MODKEY|ShiftMask,     XK_6,           replacetag,     { .i = GT5 } }, 
++      { MODKEY|ShiftMask,     XK_7,           replacetag,     { .i = GT6 } }, 
++      { MODKEY|ShiftMask,     XK_8,           replacetag,     { .i = GT7 } }, 
++      { MODKEY|ShiftMask,     XK_9,           replacetag,     { .i = GT8 } }, 
+       { MODKEY|ShiftMask,     XK_c,           killclient,     { 0 } }, 
+       { MODKEY|ShiftMask,     XK_q,           quit,           { 0 } },
+       { MODKEY|ShiftMask,     XK_Return,      spawn,          { .argv = term } },
+diff -ru dwm-0.5~/tag.c dwm-0.5/tag.c
+--- dwm-0.5~/tag.c     2006-07-22 15:38:12.000000000 +0200
++++ dwm-0.5/tag.c      2006-07-22 15:41:40.000000000 +0200
+@@ -19,12 +19,17 @@
+ } Rule;
+ /* CUSTOMIZE */ 
++static Rule rule[] = { };
++/*
+ static Rule rule[] = {
+-      /* class:instance       tags                            isfloat */
++      / * class:instance      tags                            isfloat * /
+       { "Firefox.*",          { [Tnet] = "net" },             False },
+       { "Gimp.*",             { 0 },                          True},
+ };
++*/
++char *tags[TLast] = { };
++/*
+ char *tags[TLast] = {
+       [Tfnord] = "fnord",
+       [Tdev] = "dev",
+@@ -32,6 +37,7 @@
+       [Twork] = "work",
+       [Tmisc] = "misc",
+ };
++*/
+ void (*arrange)(Arg *) = dotile;
diff --git a/x11-wm/dwm/metadata.xml b/x11-wm/dwm/metadata.xml
new file mode 100644 (file)
index 0000000..7e32869
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+</pkgmetadata>