summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Hill <colin.james.hill@gmail.com>2011-02-08 17:34:48 -0800
committerColin Hill <colin.james.hill@gmail.com>2011-02-08 17:34:48 -0800
commit891b0bb7b8e3f63d30032320b40c2ac93f9f492a (patch)
tree6385517cdf41d149a68368eeb6e4846c19df9e5d
parent2983e0ebeaafeb7299547117a854463e675a42ee (diff)
parent9cfa94c609fef8c98d2a823813cb795f2484be16 (diff)
Merge branch 'master' of github.com:colinhect/xf86-video-nested
-rw-r--r--src/xlibclient.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/xlibclient.c b/src/xlibclient.c
index aeb27a4..da6ea26 100644
--- a/src/xlibclient.c
+++ b/src/xlibclient.c
@@ -115,7 +115,8 @@ NestedClientCreateScreen(int scrnIndex,
XMapWindow(pPriv->display, pPriv->window);
XSelectInput(pPriv->display, pPriv->window, ExposureMask |
- PointerMotionMask | EnterWindowMask | LeaveWindowMask );
+ PointerMotionMask | EnterWindowMask | LeaveWindowMask | ButtonPressMask |
+ KeyPressMask );
if (XShmQueryExtension(pPriv->display)) {
if (XShmQueryVersion(pPriv->display, &shmMajor, &shmMinor,
@@ -282,6 +283,14 @@ NestedClientTimerCallback(NestedClientPrivatePtr pPriv) {
if (ev.type == LeaveNotify) {
xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Cursor left window!\n");
}
+
+ if (ev.type == ButtonPress) {
+ xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Button Pressed!\n");//ev.xkey.keycode);
+ }
+
+ if (ev.type == KeyPress) {
+ xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Key Pressed!--%d\n",ev.xkey.keycode);
+ }
}
}