aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Stevens <nilix@nilfm.cc>2021-05-26 21:42:13 -0700
committerDerek Stevens <nilix@nilfm.cc>2021-05-26 21:42:13 -0700
commit8fd2f1023936fc28385cfb79e5b26b50c85e7345 (patch)
treece9eb76e71146da4c4511470ae4cf53f7adbf115
parent3c8037d3f4cdb1006e3a20e32db07ed870345681 (diff)
fix merge error with zoom feature
-rw-r--r--config.h2
-rw-r--r--dat.h1
-rw-r--r--main.c1
3 files changed, 4 insertions, 0 deletions
diff --git a/config.h b/config.h
index da3f6da..f207159 100644
--- a/config.h
+++ b/config.h
@@ -189,6 +189,8 @@
#define SNAPCENTER_KEY XK_c
+#define ZOOM_KEY XK_z
+
#define NEXTVIRT_KEY XK_Right
#define PREVVIRT_KEY XK_Left
diff --git a/dat.h b/dat.h
index f97bf8c..d22be33 100644
--- a/dat.h
+++ b/dat.h
@@ -188,6 +188,7 @@ extern int virt;
/* manage.c */
extern int isNew;
+extern int zoom;
/* error.c */
extern int ignore_badwindow;
diff --git a/main.c b/main.c
index dee15d5..5a77e06 100644
--- a/main.c
+++ b/main.c
@@ -43,6 +43,7 @@ int solidsweep = 0;
int numvirtuals = 0;
int ffm = 0;
int kbLaunch = 0;
+int zoom = 0;
Atom exit_rio;
Atom restart_rio;