Merge branch 'menu' into merged

1 files changed, 6 insertions, 0 deletions

diff --git a/config.def.h b/config.def.h
index d1967ca..8a891e2 100644
--- a/config.def.h
+++ b/config.def.h
@@ -21,6 +21,11 @@ static const float fullscreen_bg[]         = {0.0f, 0.0f, 0.0f, 1.0f}; /* You ca
 /* logging */
 static int log_level = WLR_ERROR;
 
+static const Menu menus[] = {
+	/* command                            feed function        action function */
+	{ "wmenu -i -l 10 -p Windows",        menuwinfeed,         menuwinaction    },
+};
+
 static const Rule rules[] = {
 	/* app_id             title       tags mask     isfloating neverdim   monitor */
 	{ "Gimp_EXAMPLE",     NULL,       0,            1,	0,           -1 }, /* Start on currently visible tags floating, not tiled */
@@ -139,6 +144,7 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_f,           setlayout,        {.v = &layouts[1]} },
 	{ MODKEY,                    XKB_KEY_m,           setlayout,        {.v = &layouts[2]} },
 	{ MODKEY,                    XKB_KEY_space,       setlayout,        {0} },
+	{ MODKEY,                    XKB_KEY_o,           menu,             {.v = &menus[0]} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,       togglefloating,   {0} },
 	{ MODKEY,                    XKB_KEY_e,           togglefullscreen, {0} },
 	{ MODKEY,                    XKB_KEY_0,           view,             {.ui = ~0} },