diff -up tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/Input.cc.input tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/Input.cc

--- tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/Input.cc.input	2012-08-29 09:56:37.000000000 +0100

+++ tigervnc-1.2.80-20130314svn5065/unix/xserver/hw/vnc/Input.cc	2014-01-17 16:01:13.140109450 +0000

@@ -1,5 +1,6 @@

 /* Copyright (C) 2009 TightVNC Team

  * Copyright (C) 2009 Red Hat, Inc.

+ * Copyright 2013 Pierre Ossman for Cendio AB

  *

  * This is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

@@ -34,16 +35,6 @@ extern "C" {

 #include "inpututils.h"

 #endif

 #include "mi.h"

-#ifndef XKB_IN_SERVER

-#define XKB_IN_SERVER

-#endif

-#ifdef XKB

-/*

- * This include is needed to use XkbConvertCase instead of XConvertCase even if

- * we don't use XKB extension.

- */

-#include <xkbsrv.h>

-#endif

 #if XORG >= 16

 #include "exevents.h"

 #endif

@@ -58,6 +49,7 @@ CopyKeyClass(DeviceIntPtr device, Device

 extern _X_EXPORT DevPrivateKey CoreDevicePrivateKey;

 #endif

 #include <X11/keysym.h>

+#include <X11/Xlib.h>

 #include <X11/Xutil.h>

 #undef public

 #undef class

@@ -72,12 +64,9 @@ using namespace rfb;

 static LogWriter vlog("Input");

-#define BUTTONS 7

-static int pointerProc(DeviceIntPtr pDevice, int onoff);

+rfb::BoolParameter avoidShiftNumLock("AvoidShiftNumLock", "Avoid fake Shift presses for keys affected by NumLock.", true);

-static int keyboardProc(DeviceIntPtr pDevice, int onoff);

-static KeySym KeyCodetoKeySym(KeySymsPtr keymap, int keycode, int col);

-static KeyCode KeysymToKeycode(KeySymsPtr keymap, KeySym ks, int* col);

+#define BUTTONS 7

 /* Event queue is shared between all devices. */

 #if XORG == 15

@@ -128,26 +117,16 @@ static void enqueueEvents(DeviceIntPtr d

 #endif /* XORG < 111 */

 InputDevice::InputDevice(rfb::VNCServerST *_server)

-	: server(_server), oldButtonMask(0)

+	: server(_server), initialized(false), oldButtonMask(0)

 {

-#if XORG < 17

-	pointerDev = AddInputDevice(

-#if XORG >= 16

-				    serverClient,

-#endif

-				    pointerProc, TRUE);

-	RegisterPointerDevice(pointerDev);

+	int i;

-	keyboardDev = AddInputDevice(

-#if XORG >= 16

-				     serverClient,

-#endif

-				     keyboardProc, TRUE);

-	RegisterKeyboardDevice(keyboardDev);

-#endif

 #if XORG < 111

 	initEventq();

 #endif

+

+	for (i = 0;i < 256;i++)

+		pressedKeys[i] = NoSymbol;

 }

 void InputDevice::PointerButtonAction(int buttonMask)

@@ -160,8 +139,6 @@ void InputDevice::PointerButtonAction(in

 	ValuatorMask mask;

 #endif

-	initInputDevice();

-

 	for (i = 0; i < BUTTONS; i++) {

 		if ((buttonMask ^ oldButtonMask) & (1 << i)) {

 			int action = (buttonMask & (1<

@@ -199,8 +176,6 @@ void InputDevice::PointerMove(const rfb:

 	if (pos.equals(cursorPos))

 		return;

-	initInputDevice();

-

 	valuators[0] = pos.x;

 	valuators[1] = pos.y;

 #if XORG < 110

@@ -287,16 +262,78 @@ static int pointerProc(DeviceIntPtr pDev

 	return Success;

 }

-void InputDevice::initInputDevice(void)

+static void keyboardBell(int percent, DeviceIntPtr device, pointer ctrl,

+			 int class_)

 {

+	if (percent > 0)

+		vncBell();

+}

+

+extern void GetInitKeyboardMap(KeySymsPtr keysyms, CARD8 *modmap);

+

+static int keyboardProc(DeviceIntPtr pDevice, int onoff)

+{

+#if XORG < 17

+	KeySymsRec keySyms;

+	CARD8 modMap[MAP_LENGTH];

+#endif

+	DevicePtr pDev = (DevicePtr)pDevice;

+

+	switch (onoff) {

+	case DEVICE_INIT:

+#if XORG < 17

+		GetInitKeyboardMap(&keySyms, modMap);

+#endif

+		InitKeyboardDeviceStruct(

 #if XORG >= 17

-	int ret;

-	static int initialized = 0;

+					 pDevice, NULL,

+#else

+					 pDev, &keySyms, modMap,

+#endif

+					 keyboardBell, (KbdCtrlProcPtr)NoopDDA);

+		break;

+	case DEVICE_ON:

+		pDev->on = TRUE;

+		break;

+	case DEVICE_OFF:

+		pDev->on = FALSE;

+		break;

+	}

-	if (initialized != 0)

+	return Success;

+}

+

+void InputDevice::InitInputDevice(void)

+{

+	if (initialized)

 		return;

-	initialized = 1;

+	initialized = true;

+

+#if XORG < 17

+	pointerDev = AddInputDevice(

+#if XORG >= 16

+				    serverClient,

+#endif

+				    pointerProc, TRUE);

+	RegisterPointerDevice(pointerDev);

+

+	keyboardDev = AddInputDevice(

+#if XORG >= 16

+				     serverClient,

+#endif

+				     keyboardProc, TRUE);

+	RegisterKeyboardDevice(keyboardDev);

+

+	if (ActivateDevice(pointerDev) != Success ||

+	    ActivateDevice(keyboardDev) != Success)

+		FatalError("Failed to activate TigerVNC devices\n");

+

+	if (!EnableDevice(pointerDev) ||

+	    !EnableDevice(keyboardDev))

+		FatalError("Failed to enable TigerVNC devices\n");

+#else /* < 17 */

+	int ret;

 	ret = AllocDevicePair(serverClient, "TigerVNC", &pointerDev,

 			      &keyboardDev, pointerProc, keyboardProc,

@@ -312,7 +349,9 @@ void InputDevice::initInputDevice(void)

 	if (!EnableDevice(pointerDev, TRUE) ||

 	    !EnableDevice(keyboardDev, TRUE))

 		FatalError("Failed to activate TigerVNC devices\n");

-#endif

+#endif /* 17 */

+

+	PrepareInputDevices();

 }

 static inline void pressKey(DeviceIntPtr dev, int kc, bool down, const char *msg)

@@ -334,143 +373,6 @@ static inline void pressKey(DeviceIntPtr

 #endif

 }

-#define IS_PRESSED(keyc, keycode) \

-	((keyc)->down[(keycode) >> 3] & (1 << ((keycode) & 7)))

-

-/*

- * ModifierState is a class which helps simplify generating a "fake" press or

- * release of shift, ctrl, alt, etc.  An instance of the class is created for

- * every modifier which may need to be pressed or released.  Then either

- * press() or release() may be called to make sure that the corresponding keys

- * are in the right state.  The destructor of the class automatically reverts

- * to the previous state.  Each modifier may have multiple keys associated with

- * it, so in the case of a fake release, this may involve releasing more than

- * one key.

- */

-

-class ModifierState {

-public:

-	ModifierState(DeviceIntPtr _dev, int _modIndex)

-		: modIndex(_modIndex), nKeys(0), keys(0), pressed(false),

-		  dev(_dev) {}

-

-	~ModifierState()

-	{

-		for (int i = 0; i < nKeys; i++)

-			pressKey(dev, keys[i], !pressed, "fake keycode");

-		delete [] keys;

-	}

-

-	void press()

-	{

-		int state, maxKeysPerMod, keycode;

-#if XORG >= 17

-		KeyCode *modmap = NULL;

-#if XORG >= 111

-		state = XkbStateFieldFromRec(&dev->master->key->xkbInfo->state);

-#else /* XORG >= 111 */

-		state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state);

-#endif /* XORG >= 111 */

-#else

-		KeyClassPtr keyc = dev->key;

-		state = keyc->state;

-#endif

-		if ((state & (1 << modIndex)) != 0)

-			return;

-

-#if XORG >= 17

-		if (generate_modkeymap(serverClient, dev, &modmap,

-				       &maxKeysPerMod) != Success) {

-			vlog.error("generate_modkeymap failed");

-			return;

-		}

-

-		if (maxKeysPerMod == 0) {

-			vlog.debug("Keyboard has no modifiers");

-			xfree(modmap);

-			return;

-		}

-

-		keycode = modmap[modIndex * maxKeysPerMod];

-		xfree(modmap);

-#else

-		maxKeysPerMod = keyc->maxKeysPerModifier;

-		keycode = keyc->modifierKeyMap[modIndex * maxKeysPerMod];

-#endif

-		tempKeyEvent(keycode, true, maxKeysPerMod);

-		pressed = true;

-	}

-

-	void release()

-	{

-		int state, maxKeysPerMod;

-		KeyClassPtr keyc;

-#if XORG >= 17

-		KeyCode *modmap = NULL;

-

-#if XORG >= 111

-		keyc = dev->master->key;

-#else /* XORG >= 111 */

-		keyc = dev->u.master->key;

-#endif /* XORG >= 111 */

-		state = XkbStateFieldFromRec(&keyc->xkbInfo->state);

-#else

-		keyc = dev->key;

-		state = keyc->state;

-#endif

-		if ((state & (1 << modIndex)) == 0)

-			return;

-

-#if XORG >= 17

-		if (generate_modkeymap(serverClient, dev, &modmap,

-				       &maxKeysPerMod) != Success) {

-			vlog.error("generate_modkeymap failed");

-			return;

-		}

-

-		if (maxKeysPerMod == 0) {

-			vlog.debug("Keyboard has no modifiers");

-			xfree(modmap);

-			return;

-		}

-#else

-		maxKeysPerMod = keyc->maxKeysPerModifier;

-#endif

-

-		for (int k = 0; k < maxKeysPerMod; k++) {

-			int keycode;

-			int index = modIndex * maxKeysPerMod + k;

-#if XORG >= 17

-			keycode = modmap[index];

-#else

-			keycode = keyc->modifierKeyMap[index];

-#endif

-			if (keycode && IS_PRESSED(keyc, keycode))

-				tempKeyEvent(keycode, false, maxKeysPerMod);

-		}

-#if XORG >= 17

-		xfree(modmap);

-#endif

-	}

-

-private:

-	void tempKeyEvent(int keycode, bool down, int maxKeysPerMod)

-	{

-		if (keycode) {

-			if (!keys) keys = new int[maxKeysPerMod];

-			keys[nKeys++] = keycode;

-			pressKey(dev, keycode, down, "fake keycode");

-		}

-	}

-

-	int modIndex;

-	int nKeys;

-	int *keys;

-	bool pressed;

-	DeviceIntPtr dev;

-};

-

-

 /* altKeysym is a table of alternative keysyms which have the same meaning. */

 static struct altKeysym_t {

@@ -517,102 +419,48 @@ static struct altKeysym_t {

 	{ XK_KP_7,		XK_7 },

 	{ XK_KP_8,		XK_8 },

 	{ XK_KP_9,		XK_9 },

+	{ XK_ISO_Level3_Shift,	XK_Mode_switch },

 };

 /*

  * keyEvent() - work out the best keycode corresponding to the keysym sent by

- * the viewer.  This is non-trivial because we can't assume much about the

- * local keyboard layout.  We must also find out which column of the keyboard

- * mapping the keysym is in, and alter the shift state appropriately.  Column 0

- * means both shift and "mode_switch" (AltGr) must be released, column 1 means

- * shift must be pressed and mode_switch released, column 2 means shift must be

- * released and mode_switch pressed, and column 3 means both shift and

- * mode_switch must be pressed.

- *

- * Magic, which dynamically adds keysym<->keycode mapping depends on X.Org

- * version. Quick explanation of that "magic":

- * 

- * 1.5

- * - has only one core keyboard so we have to keep core keyboard mapping

- *   synchronized with vncKeyboardDevice. Do it via SwitchCoreKeyboard()

- *

- * 1.6 (aka MPX - Multi pointer X)

- * - multiple master devices (= core devices) exists, keep vncKeyboardDevice

- *   synchronized with proper master device

- */

-

-#if XORG >= 17

-#define FREE_MAPS \

-	do { \

-	        xfree(modmap); \

-	        xfree(keymap->map); \

-	        xfree(keymap); \

-	} while (0);

-#else

-#define FREE_MAPS

-#endif

-

-#if XORG >= 17

-/*

- * Modifier keysyms must be handled differently. Instead of finding

- * the right row and collumn in the keymap, directly press/release

- * the keycode which is mapped as modifier with the same keysym.

- *

- * This will avoid issues when there are multiple modifier keysyms

- * in the keymap but only some of them are mapped as modifiers in

- * the modmap.

- *

- * Returns keycode of the modifier key.

+ * the viewer. This is basically impossible in the general case, but we make

+ * a best effort by assuming that all useful keysyms can be reached using

+ * just the Shift and Level 3 (AltGr) modifiers. For core keyboards this is

+ * basically always true, and should be true for most sane, western XKB

+ * layouts.

  */

-

-static inline int isModifier(KeySymsPtr keymap, KeyCode *modmap,

-			      int maxKeysPerMod, rdr::U32 keysym)

+void InputDevice::keyEvent(rdr::U32 keysym, bool down)

 {

-	KeySym *map = keymap->map;

-	KeyCode minKeyCode = keymap->minKeyCode;

-	int mapWidth = keymap->mapWidth;

-	int i, j, k;

-

-	/* Find modifier index in the modmap */

-	for (i = 0; i < 8; i++) {

-		for (k = 0; k < maxKeysPerMod; k++) {

-			int index = i * maxKeysPerMod + k;

-			int keycode = modmap[index];

+	int i;

+	unsigned state, new_state;

+	KeyCode keycode;

-			if (keycode == 0)

-				continue;

+	unsigned level_three_mask;

+	KeyCode shift_press, level_three_press;

+	std::list<KeyCode> shift_release, level_three_release;

-			for (j = 0; j < mapWidth; j++) {

-				if (map[(keycode - minKeyCode) * mapWidth + j]

-				    == keysym) {

-					return keycode;

-				}

+	/*

+	 * Release events must match the press event, so look up what

+	 * keycode we sent for the press.

+	 */

+	if (!down) {

+		for (i = 0;i < 256;i++) {

+			if (pressedKeys[i] == keysym) {

+				pressedKeys[i] = NoSymbol;

+				pressKey(keyboardDev, i, false, "keycode");

+				mieqProcessInputEvents();

+				return;

 			}

 		}

-	}

-

-	return -1; /* Not a modifier */

-}

-#endif

-void InputDevice::keyEvent(rdr::U32 keysym, bool down)

-{

-#if XORG < 17

-	DeviceIntPtr master;

-#endif

-	KeyClassPtr keyc;

-	KeySymsPtr keymap = NULL;

-	KeySym *map = NULL;

-	KeyCode minKeyCode, maxKeyCode;

-	KeyCode *modmap = NULL;

-	int mapWidth;

-	unsigned int i;

-	int j, k, state, maxKeysPerMod;

-#if XORG >= 17

-	KeybdCtrl ctrl;

-#endif

-

-	initInputDevice();

+		/*

+		 * This can happen quite often as we ignore some

+		 * key presses.

+		 */

+		vlog.debug("Unexpected release of keysym 0x%x", keysym);

+		return;

+	}

 	/* 

 	 * Since we are checking the current state to determine if we need

@@ -622,543 +470,214 @@ void InputDevice::keyEvent(rdr::U32 keys

 	 */ 

 	mieqProcessInputEvents();

-	if (keysym == XK_Caps_Lock) {

-		vlog.debug("Ignoring caps lock");

-		return;

-	}

+	state = getKeyboardState();

-#if XORG >= 17

-#if XORG >= 111

-	keyc = keyboardDev->master->key;

-#else /* XORG >= 111 */

-	keyc = keyboardDev->u.master->key;

-#endif /* XORG >= 111 */

-

-	keymap = XkbGetCoreMap(keyboardDev);

-	if (!keymap) {

-		vlog.error("VNC keyboard device has no map");

-		return;

-	}

+	keycode = keysymToKeycode(keysym, state, &new_state);

-	if (generate_modkeymap(serverClient, keyboardDev, &modmap,

-	    		       &maxKeysPerMod) != Success) {

-		vlog.error("generate_modkeymap failed");

-		xfree(keymap->map);

-		xfree(keymap);

-		return;

-	}

-

-	if (maxKeysPerMod == 0)

-		vlog.debug("Keyboard has no modifiers");

-

-	state = XkbStateFieldFromRec(&keyc->xkbInfo->state);

-#else

-	keyc = keyboardDev->key;

-	state = keyc->state;

-	maxKeysPerMod = keyc->maxKeysPerModifier;

-	keymap = &keyc->curKeySyms;

-	modmap = keyc->modifierKeyMap;

-#endif

-	map = keymap->map;

-	minKeyCode = keymap->minKeyCode;

-	maxKeyCode = keymap->maxKeyCode;

-	mapWidth = keymap->mapWidth;

-

-#if XORG >= 17

-	/*

-	 * No server-side key repeating, please. Some clients won't work well,

-	 * check https://bugzilla.redhat.com/show_bug.cgi?id=607866.

-	 */

-	ctrl = keyboardDev->kbdfeed->ctrl;

-	if (ctrl.autoRepeat != FALSE) {

-		ctrl.autoRepeat = FALSE;

-		XkbSetRepeatKeys(keyboardDev, -1, ctrl.autoRepeat);

-	}

-#endif

-

-	/* find which modifier Mode_switch is on. */

-	int modeSwitchMapIndex = 0;

-	for (i = 3; i < 8; i++) {

-		for (k = 0; k < maxKeysPerMod; k++) {

-			int index = i * maxKeysPerMod + k;

-			int keycode = modmap[index];

-

-			if (keycode == 0)

+	/* Try some equivalent keysyms if we couldn't find a perfect match */

+	if (keycode == 0) {

+		for (i = 0;i < sizeof(altKeysym)/sizeof(altKeysym[0]);i++) {

+			KeySym altsym;

+

+			if (altKeysym[i].a == keysym)

+				altsym = altKeysym[i].b;

+			else if (altKeysym[i].b == keysym)

+				altsym = altKeysym[i].a;

+			else

 				continue;

-			for (j = 0; j < mapWidth; j++) {

-				if (map[(keycode - minKeyCode) * mapWidth + j]

-				    == XK_Mode_switch) {

-					modeSwitchMapIndex = i;

-					goto ModeSwitchFound;

-				}

-			}

+			keycode = keysymToKeycode(altsym, state, &new_state);

+			if (keycode != 0)

+				break;

 		}

 	}

-ModeSwitchFound:

-	int kc;

-	int col = 0;

+	/* We don't have lock synchronisation... */

+	if (isLockModifier(keycode, new_state)) {

+		vlog.debug("Ignoring lock key (e.g. caps lock)");

+		return;

+	}

-#if XORG >= 17

-	if ((kc = isModifier(keymap, modmap, maxKeysPerMod, keysym)) != -1) {

-		/*

-		 * It is a modifier key event.

-		 *

-		 * Don't do any auto-repeat because the X server will translate

-		 * each press into a release followed by a press.

-		 */

-		if (IS_PRESSED(keyc, kc) && down) {

-			FREE_MAPS;

+	/* No matches. Will have to add a new entry... */

+	if (keycode == 0) {

+		keycode = addKeysym(keysym, state);

+		if (keycode == 0) {

+			vlog.error("Failure adding new keysym 0x%x", keysym);

 			return;

 		}

-		goto press;

-	}

-#endif

-

-	if (maxKeysPerMod != 0) {

-		if ((state & (1 << ShiftMapIndex)) != 0)

-			col |= 1;

-		if (modeSwitchMapIndex != 0 &&

-		    ((state & (1 << modeSwitchMapIndex))) != 0)

-			col |= 2;

-	}

-

-	kc = KeysymToKeycode(keymap, keysym, &col);

+		vlog.info("Added unknown keysym 0x%x to keycode %d",

+			  keysym, keycode);

-	/*

-	 * Sort out the "shifted Tab" mess.  If we are sent a shifted Tab,

-	 * generate a local shifted Tab regardless of what the "shifted Tab"

-	 * keysym is on the local keyboard (it might be Tab, ISO_Left_Tab or

-	 * HP's private BackTab keysym, and quite possibly some others too).

-	 * We never get ISO_Left_Tab here because it's already been translated

-	 * in VNCSConnectionST.

-	 */

-	if (maxKeysPerMod != 0 && keysym == XK_Tab &&

-	    ((state & (1 << ShiftMapIndex))) != 0)

-		col |= 1;

-

-	if (kc == 0) {

 		/*

-		 * Not a direct match in the local keyboard mapping.  Check for

-		 * alternative keysyms with the same meaning.

+		 * The state given to addKeysym() is just a hint and

+		 * the actual result might still require some state

+		 * changes.

 		 */

-		for (i = 0; i < sizeof(altKeysym) / sizeof(altKeysym_t); i++) {

-			if (keysym == altKeysym[i].a)

-				kc = KeysymToKeycode(keymap, altKeysym[i].b,

-						     &col);

-			else if (keysym == altKeysym[i].b)

-				kc = KeysymToKeycode(keymap, altKeysym[i].a,

-						     &col);

-			if (kc)

-				break;

+		keycode = keysymToKeycode(keysym, state, &new_state);

+		if (keycode == 0) {

+			vlog.error("Newly added keysym 0x%x cannot be generated", keysym);

+			return;

 		}

 	}

-	if (kc == 0) {

-		/* Dynamically add a new key to the keyboard mapping. */

-		for (kc = maxKeyCode; kc >= minKeyCode; kc--) {

-			if (map[(kc - minKeyCode) * mapWidth] != 0)

+	/*

+	 * X11 generally lets shift toggle the keys on the numeric pad

+	 * the same way NumLock does. This is however not the case on

+	 * other systems like Windows. As a result, some applications

+	 * get confused when we do a fake shift to get the same effect

+	 * that having NumLock active would produce.

+	 *

+	 * Until we have proper NumLock synchronisation (so we can

+	 * avoid faking shift), we try to avoid the fake shifts if we

+	 * can use an alternative keysym.

+	 */

+	if (((state & ShiftMask) != (new_state & ShiftMask)) &&

+	    avoidShiftNumLock && isAffectedByNumLock(keycode)) {

+	    	KeyCode keycode2;

+	    	unsigned new_state2;

+

+		vlog.debug("Finding alternative to keysym 0x%x to avoid fake shift for numpad", keysym);

+

+		for (i = 0;i < sizeof(altKeysym)/sizeof(altKeysym[0]);i++) {

+			KeySym altsym;

+

+			if (altKeysym[i].a == keysym)

+				altsym = altKeysym[i].b;

+			else if (altKeysym[i].b == keysym)

+				altsym = altKeysym[i].a;

+			else

 				continue;

-			map[(kc - minKeyCode) * mapWidth] = keysym;

-			col = 0;

+			keycode2 = keysymToKeycode(altsym, state, &new_state2);

+			if (keycode2 == 0)

+				continue;

-			vlog.info("Added unknown keysym 0x%x to keycode %d",

-				  keysym, kc);

+			if (((state & ShiftMask) != (new_state2 & ShiftMask)) &&

+			    isAffectedByNumLock(keycode2))

+				continue;

-#if XORG < 17

-#if XORG == 15

-			master = inputInfo.keyboard;

-#else

-			master = keyboardDev->u.master;

-#endif

-			void *slave = dixLookupPrivate(&master->devPrivates,

-						       CoreDevicePrivateKey);

-			if (keyboardDev == slave) {

-				dixSetPrivate(&master->devPrivates,

-					      CoreDevicePrivateKey, NULL);

-#if XORG == 15

-				SwitchCoreKeyboard(keyboardDev);

-#else

-				CopyKeyClass(keyboardDev, master);

-#endif

-			}

-#else /* XORG < 17 */

-			XkbApplyMappingChange(keyboardDev, keymap, minKeyCode,

-					      maxKeyCode - minKeyCode + 1,

-					      NULL, serverClient);

-#if XORG >= 111

-			XkbCopyDeviceKeymap(keyboardDev->master, keyboardDev);

-#else

-			XkbCopyDeviceKeymap(keyboardDev->u.master, keyboardDev);

-#endif

-#endif /* XORG < 17 */

 			break;

 		}

-	}