all repos — ryudo @ 8fd2f1023936fc28385cfb79e5b26b50c85e7345

the floatiling window manager that flows; fork of rio from plan9port 

fix merge error with zoom feature
Iris Lightshard nilix@nilfm.cc
PGP Signature 
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEkFh6dA+k/6CXFXU4O3+8IhROY5gFAmCvIyUACgkQO3+8IhRO
Y5hRuQ//RjHHgERNlicVzFKOVggZRLtrG/MuvkNHXQXgb+TKu+s5Ye7uqF9VRuHL
VEnFkddnppJU6aLzVIBlH19h2Y+pywZaWhnvs3Nai96c0qW1V0cfuWhk8zPJGNur
Up62ACqc1JwLf268WZZbVGOJJWDft99tCNLNOI+/LnuKgZQzbc/fMoUELZ7Hsu7C
mfWRTMhtQM9GItL2/ogFfNrz755yUq/P1hZOL78NtX1bftJnqCWDIZjZ4lD5cIQ2
CEPWnQ6ndOSJdZOMiIrp7tl5i3QgrXdwUC3b9H2b8M/DcpAOVAeTpts9wan88VlV
HGqo4WEyDy7ZN/nwlh5bpasNvgDN3UiaJVzyU3gjQ24p3BAuYRCazC6KZT79zqyL
SvPa+PZL5taVGBsnUwlhRtRGfKTODRBTdOYtpOcOyzXU+mBHRzVWwK7qW90XTT8c
MPaRZRK8DMCv+vvyWq0JmHUNAK+K+/mX6udY9EP+diffxDamqQW2ZeUm7iYi9Nxx
ZOD3LdnYatN8efVDMFen33ecKNQ5Rwn88aFaoM9qOipVINOOs1FQF06QCU24WElS
jCfAmuOlNvd0tWBZty3OTKVQQFVv7/P5bqS5KV6jCLLD9eiihQS8n1eR1voiEQP9
or08dvvH43l7P3rEXwtDeKZjuilk0hsDH1pJanMXMSVvtk8SMhI=
=/aWn
-----END PGP SIGNATURE-----
commit

8fd2f1023936fc28385cfb79e5b26b50c85e7345

parent

3c8037d3f4cdb1006e3a20e32db07ed870345681

3 files changed, 4 insertions(+), 0 deletions(-)

jump to
M config.h → config.h 
@@ -189,6 +189,8 @@ #define SNAPTOPRIGHT_KEY XK_p
 
 #define SNAPCENTER_KEY XK_c
 
+#define ZOOM_KEY XK_z
+
 #define NEXTVIRT_KEY XK_Right
 #define PREVVIRT_KEY XK_Left
M dat.h → dat.h 
@@ -188,6 +188,7 @@ extern int virt;
 
 /* manage.c */
 extern int isNew;
+extern int zoom;
 
 /* error.c */
 extern int ignore_badwindow;
M main.c → 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;