aboutsummaryrefslogtreecommitdiffstats
path: root/conf.c
diff options
context:
space:
mode:
authorokan2013-05-22 16:54:09 +0000
committerokan2013-05-22 16:54:09 +0000
commit92c867e77e4da3c07ed400b7d66ec200b4e15bc2 (patch)
tree53ae373166d7b480ab844e233090b21c0199de96 /conf.c
parent1ea4db26e9ce71da6e81886df5de1c593f85d0f7 (diff)
downloadcwm-92c867e77e4da3c07ed400b7d66ec200b4e15bc2.tar.gz
get rid of long standing XXX: now that we configure screens based on
config options, add the keybinding GrabKey calls here
Diffstat (limited to 'conf.c')
-rw-r--r--conf.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/conf.c b/conf.c
index b49b489..72c72d4 100644
--- a/conf.c
+++ b/conf.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: conf.c,v 1.130 2013/05/22 16:32:15 okan Exp $
+ * $OpenBSD: conf.c,v 1.131 2013/05/22 16:54:09 okan Exp $
*/
#include <sys/param.h>
@@ -98,8 +98,9 @@ static char *color_binds[CWM_COLOR_MAX] = {
void
conf_screen(struct screen_ctx *sc)
{
- int i;
- XftColor xc;
+ struct keybinding *kb;
+ int i;
+ XftColor xc;
sc->gap = Conf.gap;
@@ -139,6 +140,9 @@ conf_screen(struct screen_ctx *sc)
sc->visual, sc->colormap);
if (sc->xftdraw == NULL)
errx(1, "XftDrawCreate");
+
+ TAILQ_FOREACH(kb, &Conf.keybindingq, entry)
+ xu_key_grab(sc->rootwin, kb->modmask, kb->keysym);
}
static struct {