diff options
| author | runge <runge> | 2006-11-13 15:33:00 +0000 |
|---|---|---|
| committer | runge <runge> | 2006-11-13 15:33:00 +0000 |
| commit | 4a83f87609b9d53b2983806be58ccd02498a5cd3 (patch) | |
| tree | a79c96930a97fb162edd1765adece43425f8db8a /x11vnc/keyboard.c | |
| parent | 5f9693d4a2c511f8f2ea069373807c5f36ac1459 (diff) | |
| download | libtdevnc-4a83f87609b9d53b2983806be58ccd02498a5cd3.tar.gz libtdevnc-4a83f87609b9d53b2983806be58ccd02498a5cd3.zip | |
x11vnc: Native Mac OS X support.
Diffstat (limited to 'x11vnc/keyboard.c')
| -rw-r--r-- | x11vnc/keyboard.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/x11vnc/keyboard.c b/x11vnc/keyboard.c index bef2cec..ae056ab 100644 --- a/x11vnc/keyboard.c +++ b/x11vnc/keyboard.c @@ -129,7 +129,7 @@ void clear_modifiers(int init) { kcount++; } } - XFree((void *) keymap); + XFree_wr((void *) keymap); first = 0; } if (init) { @@ -458,7 +458,7 @@ int add_keysym(KeySym keysym) { ret = kc; break; } - XFree(keymap); + XFree_wr(keymap); return ret; #endif /* NO_X11 */ } @@ -491,7 +491,7 @@ static void delete_keycode(KeyCode kc, int bequiet) { kc, ksym, str ? str : "null"); } - XFree(keymap); + XFree_wr(keymap); XFlush_wr(dpy); #endif /* NO_X11 */ } @@ -994,7 +994,7 @@ void switch_to_xkb_if_better(void) { } n = k; - XFree(keymap); + XFree_wr(keymap); if (missing_noxkb == 0 && syms_gt_4 >= 8) { if (! raw_fb_str) { rfbLog("XKEYBOARD: number of keysyms per keycode %d " @@ -2300,7 +2300,7 @@ void initialize_modtweak(void) { iso_level3_code = XKeysymToKeycode(dpy, XK_ISO_Level3_Shift); #endif - XFree ((void *) keymap); + XFree_wr ((void *) keymap); X_UNLOCK; #endif /* NO_X11 */ @@ -2531,6 +2531,8 @@ static void pipe_keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) { console_key_command(down, keysym, client); } else if (pipeinput_int == PIPEINPUT_UINPUT) { uinput_key_command(down, keysym, client); + } else if (pipeinput_int == PIPEINPUT_MACOSX) { + macosx_key_command(down, keysym, client); } if (pipeinput_fh == NULL) { return; |