fix merge error with zoom feature
This commit is contained in:
parent
3c8037d3f4
commit
8fd2f10239
3 changed files with 4 additions and 0 deletions
2
config.h
2
config.h
|
@ -189,6 +189,8 @@
|
||||||
|
|
||||||
#define SNAPCENTER_KEY XK_c
|
#define SNAPCENTER_KEY XK_c
|
||||||
|
|
||||||
|
#define ZOOM_KEY XK_z
|
||||||
|
|
||||||
#define NEXTVIRT_KEY XK_Right
|
#define NEXTVIRT_KEY XK_Right
|
||||||
#define PREVVIRT_KEY XK_Left
|
#define PREVVIRT_KEY XK_Left
|
||||||
|
|
||||||
|
|
1
dat.h
1
dat.h
|
@ -188,6 +188,7 @@ extern int virt;
|
||||||
|
|
||||||
/* manage.c */
|
/* manage.c */
|
||||||
extern int isNew;
|
extern int isNew;
|
||||||
|
extern int zoom;
|
||||||
|
|
||||||
/* error.c */
|
/* error.c */
|
||||||
extern int ignore_badwindow;
|
extern int ignore_badwindow;
|
||||||
|
|
1
main.c
1
main.c
|
@ -43,6 +43,7 @@ int solidsweep = 0;
|
||||||
int numvirtuals = 0;
|
int numvirtuals = 0;
|
||||||
int ffm = 0;
|
int ffm = 0;
|
||||||
int kbLaunch = 0;
|
int kbLaunch = 0;
|
||||||
|
int zoom = 0;
|
||||||
|
|
||||||
Atom exit_rio;
|
Atom exit_rio;
|
||||||
Atom restart_rio;
|
Atom restart_rio;
|
||||||
|
|
Loading…
Reference in a new issue