summaryrefslogtreecommitdiff
path: root/config.def.h
diff options
context:
space:
mode:
Diffstat (limited to 'config.def.h')
-rw-r--r--config.def.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/config.def.h b/config.def.h
index 2c53956..1381341 100644
--- a/config.def.h
+++ b/config.def.h
@@ -59,9 +59,10 @@ static const Rule rules[] = {
{ "St", NULL, NULL, 0, 0, 0, 1, 0, -1, 1 },
{ "dropdown",NULL, NULL, 0, 1, 1, 0, 0, -1, 1 },
{ NULL, NULL, "Color Picker", 0, 1, 1, 0, 0, -1, 1 },
+ { "Tk", NULL, NULL, 0, 0, 0, 0, 1, -1, 1 },
{ "youtube", NULL, NULL, 0, 1, 1, 1, 0, -1, 1 },
{ "Nvim-R", NULL, NULL, 0, 0, 0, 1, 1, -1, 1 },
- /* { NULL, NULL, "Event Tester", 0, 0, 1, 0, 1, -1, 1 }, /1* xev *1/ */
+ { NULL, NULL, "Event Tester", 0, 0, 1, 0, 1, -1, 1 }, /* xev */
/* { "R_x11", NULL, NULL, 0, 0, 1, 0, 1, -1, 0 }, /1* R popup *1/ */
/* { "Matplotlib",NULL, NULL, 0, 1, 1, 0, 1, -1, 0 }, /1* Python popups *1/ */
/* { NULL,NULL,"Subplot Configuration Tool",0, 1, 1, 0, 1, -1, 0 }, /1* Python popups *1/ */
@@ -80,12 +81,8 @@ static const Rule rules[] = {
/* layout(s) */
static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */
static const int nmaster = 1; /* number of clients in master area */
-<<<<<<< HEAD
-static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */
-=======
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
->>>>>>> origin/master
static const Layout layouts[] = {
/* symbol arrange function */