From fb6411ab5c887fcd39f01d406eda21ce02f708ec Mon Sep 17 00:00:00 2001 From: Bert Date: Tue, 18 Jan 2011 16:32:40 +0100 Subject: Encapsulate window environment in win_env_t --- events.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'events.c') diff --git a/events.c b/events.c index 8e7b9e2..fbd6706 100644 --- a/events.c +++ b/events.c @@ -28,8 +28,6 @@ void on_keypress(app_t*, XEvent*); void on_configurenotify(app_t*, XEvent*); void on_expose(app_t*, XEvent*); -extern Display *dpy; - static void (*handler[LASTEvent])(app_t*, XEvent*) = { [Expose] = on_expose, [ConfigureNotify] = on_configurenotify, @@ -39,7 +37,7 @@ static void (*handler[LASTEvent])(app_t*, XEvent*) = { void event_loop(app_t *app) { XEvent ev; - while (!XNextEvent(dpy, &ev)) { + while (!XNextEvent(app->win.env.dpy, &ev)) { if (handler[ev.type]) handler[ev.type](app, &ev); } @@ -53,7 +51,7 @@ void on_keypress(app_t *app, XEvent *ev) { return; kev = &ev->xkey; - keysym = XKeycodeToKeysym(dpy, (KeyCode) kev->keycode, 0); + keysym = XKeycodeToKeysym(app->win.env.dpy, (KeyCode) kev->keycode, 0); switch (keysym) { case XK_Escape: -- cgit v1.2.3-54-g00ecf