summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-06-07 12:26:56 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-06-07 12:26:56 +0000
commiteb3bbc4a02745db84873a753eee781fb0da7deb6 (patch)
tree5734ae4e5f1c18bbc51f317af86bd51fac4b5c65 /x11-wm/echinus/files/echinus-0.3.1-modkey.patch
parentStable on amd64 wrt bug #313821 (diff)
downloadgentoo-2-eb3bbc4a02745db84873a753eee781fb0da7deb6.tar.gz
gentoo-2-eb3bbc4a02745db84873a753eee781fb0da7deb6.tar.bz2
gentoo-2-eb3bbc4a02745db84873a753eee781fb0da7deb6.zip
Remove old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/echinus/files/echinus-0.3.1-modkey.patch')
-rw-r--r--x11-wm/echinus/files/echinus-0.3.1-modkey.patch73
1 files changed, 0 insertions, 73 deletions
diff --git a/x11-wm/echinus/files/echinus-0.3.1-modkey.patch b/x11-wm/echinus/files/echinus-0.3.1-modkey.patch
deleted file mode 100644
index 2b1c9781ac8b..000000000000
--- a/x11-wm/echinus/files/echinus-0.3.1-modkey.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -r ffa4f6eba0b2 echinus.c
---- a/echinus.c Tue Aug 19 22:53:23 2008 +0400
-+++ b/echinus.c Wed Aug 20 03:20:40 2008 +0200
-@@ -276,6 +276,7 @@
- int nrules = 0;
- Bool dectiled = 0;
- Bool hidebastards = 0;
-+unsigned int modkey = 0;
- /* configuration, allows nested code to access above variables */
- #include "config.h"
- #include "ewmh.c"
-@@ -488,7 +489,7 @@
- focus(c);
- restack();
- XAllowEvents(dpy, ReplayPointer, CurrentTime);
-- if(CLEANMASK(ev->state) != MODKEY)
-+ if(CLEANMASK(ev->state) != modkey)
- return;
- if(ev->button == Button1) {
- if((layouts[ltidxs[curtag]].arrange == floating) || c->isfloating)
-@@ -959,8 +960,8 @@
- void
- grabbuttons(Client *c, Bool focused) {
- unsigned int Buttons[] = {Button1, Button2, Button3};
-- unsigned int Modifiers[] = {MODKEY, MODKEY|LockMask,
-- MODKEY|numlockmask, MODKEY|numlockmask|LockMask};
-+ unsigned int Modifiers[] = {modkey, modkey|LockMask,
-+ modkey|numlockmask, modkey|numlockmask|LockMask};
- int i, j;
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-
-@@ -1779,6 +1780,30 @@
- xrdb = XrmGetFileDatabase("echinusrc");
- if(!xrdb)
- eprint("echinus: cannot open configuration file\n");
-+
-+ /* init modkey */
-+ char* key;
-+ if(!(key = getresource("modkey", NULL)))
-+ modkey = MODKEY;
-+ else {
-+ switch(atoi(key)) {
-+ case 1:
-+ modkey = Mod1Mask;
-+ break;
-+ case 2:
-+ modkey = Mod2Mask;
-+ break;
-+ case 3:
-+ modkey = Mod3Mask;
-+ break;
-+ case 4:
-+ modkey = Mod4Mask;
-+ break;
-+ default:
-+ modkey = MODKEY;
-+ break;
-+ }
-+ }
-
- /* init tags */
- inittags();
-diff -r ffa4f6eba0b2 echinusrc
---- a/echinusrc Tue Aug 19 22:53:23 2008 +0400
-+++ b/echinusrc Wed Aug 20 03:20:40 2008 +0200
-@@ -41,6 +41,7 @@
- Echinus*tags.layout1: m
- Echinus*tags.layout3: b
-
-+Echinus*modkey: 1
- Echinus*togglestruts: A + b
- Echinus*focusnext: A + j
- Echinus*focusprev: A + k