summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortim <tim@capstone09.cs.pdx.edu>2011-02-08 18:44:12 -0800
committertim <tim@capstone09.cs.pdx.edu>2011-02-08 18:44:12 -0800
commit7347714cee7b9259312af993e68cd6d4347532ce (patch)
tree41e05e8fbaafc490d4cc8429fecd64735fa129af
parent9cfa94c609fef8c98d2a823813cb795f2484be16 (diff)
added button and key press and release logging
-rw-r--r--src/xlibclient.c36
1 files changed, 34 insertions, 2 deletions
diff --git a/src/xlibclient.c b/src/xlibclient.c
index da6ea26..ddb57f5 100644
--- a/src/xlibclient.c
+++ b/src/xlibclient.c
@@ -116,7 +116,7 @@ NestedClientCreateScreen(int scrnIndex,
XSelectInput(pPriv->display, pPriv->window, ExposureMask |
PointerMotionMask | EnterWindowMask | LeaveWindowMask | ButtonPressMask |
- KeyPressMask );
+ ButtonReleaseMask | KeyPressMask |KeyReleaseMask);
if (XShmQueryExtension(pPriv->display)) {
if (XShmQueryVersion(pPriv->display, &shmMajor, &shmMinor,
@@ -285,12 +285,44 @@ NestedClientTimerCallback(NestedClientPrivatePtr pPriv) {
}
if (ev.type == ButtonPress) {
- xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Button Pressed!\n");//ev.xkey.keycode);
+ //xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Button Pressed!");//ev.xkey.keycode);
+ switch (ev.xbutton.button)
+ {
+ case Button1: xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Left Mouse Button Pressed\n");
+ break;
+ case Button2: xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Middle Mouse Button Pressed\n");
+ break;
+ case Button3: xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Right Mouse Button Pressed\n");
+ break;
+ case Button4: xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Wheel Up Pressed\n");
+ break;
+ case Button5: xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Wheel Down Pressed\n");
+ }
+ }
+
+ if (ev.type == ButtonRelease) {
+ //xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Button Released!\n");//ev.xkey.keycode);
+ switch (ev.xbutton.button)
+ {
+ case Button1: xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Left Mouse Button Released\n");
+ break;
+ case Button2: xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Middle Mouse Button Released\n");
+ break;
+ case Button3: xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Right Mouse Button Released\n");
+ break;
+ case Button4: xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Wheel Up Released\n");
+ break;
+ case Button5: xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Wheel Down Released\n");
+ }
}
if (ev.type == KeyPress) {
xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Key Pressed!--%d\n",ev.xkey.keycode);
}
+
+ if (ev.type == KeyRelease) {
+ xf86DrvMsg(pPriv->scrnIndex, X_INFO, "Key Released!--%d\n",ev.xkey.keycode);
+ }
}
}