diff options
author | Bert <ber.t@gmx.com> | 2011-01-18 16:32:40 +0100 |
---|---|---|
committer | Bert <ber.t@gmx.com> | 2011-01-18 16:32:40 +0100 |
commit | fb6411ab5c887fcd39f01d406eda21ce02f708ec (patch) | |
tree | 113dac95fdfa86dadd59540a4fd020a080f1c8c6 /events.c | |
parent | ab480ecc47c00632c3cf182dec4fd45fa00575bf (diff) | |
download | nsxiv-fb6411ab5c887fcd39f01d406eda21ce02f708ec.tar.zst |
Encapsulate window environment in win_env_t
Diffstat (limited to 'events.c')
-rw-r--r-- | events.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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: |