summaryrefslogtreecommitdiffstats
path: root/x11vnc/keyboard.c
diff options
context:
space:
mode:
authorrunge <runge>2006-09-24 00:08:42 +0000
committerrunge <runge>2006-09-24 00:08:42 +0000
commit6f47809af2e44e28d9f97c11b26726e62ee2654f (patch)
treed2b3913ee11b81f7cf65cbe0b1bf31182e5c0e72 /x11vnc/keyboard.c
parentb9688bb38d00bbc77a54464dabc7aa6313404f0c (diff)
downloadlibtdevnc-6f47809af2e44e28d9f97c11b26726e62ee2654f.tar.gz
libtdevnc-6f47809af2e44e28d9f97c11b26726e62ee2654f.zip
x11vnc: improve SSL Java viewer, cleanup -unixpw code.
Diffstat (limited to 'x11vnc/keyboard.c')
-rw-r--r--x11vnc/keyboard.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/x11vnc/keyboard.c b/x11vnc/keyboard.c
index 240c4bc..bef2cec 100644
--- a/x11vnc/keyboard.c
+++ b/x11vnc/keyboard.c
@@ -2680,20 +2680,19 @@ void keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
if (debug_keyboard) {
char *str;
X_LOCK;
- str = XKeysymToString(keysym);
+ str = XKeysymToString((KeySym) keysym);
X_UNLOCK;
rfbLog("# keyboard(%s, 0x%x \"%s\") uip=%d %.4f\n",
down ? "down":"up", (int) keysym, str ? str : "null",
unixpw_in_progress, tnow - x11vnc_start);
}
-
if (keysym <= 0) {
rfbLog("keyboard: skipping 0x0 keysym\n");
return;
}
- if (unixpw && unixpw_in_progress) {
+ if (unixpw_in_progress) {
if (unixpw_denied) {
rfbLog("keyboard: ignoring keystroke 0x%x in "
"unixpw_denied=1 state\n", (int) keysym);
@@ -2703,7 +2702,9 @@ void keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
rfbLog("keyboard: skipping other client in unixpw\n");
return;
}
+
unixpw_keystroke(down, keysym, 0);
+
return;
}