[packages/tigervnc.git] / tigervnc-getmaster.patch

diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/c.getmaster tigervnc-1.4.2/unix/xserver/hw/vnc/InputXKB.c
--- tigervnc-1.4.2/unix/xserver/hw/vnc/InputXKB.c.getmaster	2015-01-23 23:37:23.000000000 +0000
+++ tigervnc-1.4.2/unix/xserver/hw/vnc/InputXKB.c	2015-02-13 12:32:54.398502082 +0000
@@ -210,10 +210,7 @@ void vncPrepareInputDevices(void)

 unsigned vncGetKeyboardState(void)
 {
-	DeviceIntPtr master;
-
-	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
-	return XkbStateFieldFromRec(&master->key->xkbInfo->state);
+	return XkbStateFieldFromRec(&vncKeyboardDev->master->key->xkbInfo->state);
 }

 unsigned vncGetLevelThreeMask(void)
@@ -232,7 +229,7 @@ unsigned InputDevice::vncGetLevelThreeMask(
 			return 0;
 	}

-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
+	xkb = vncKeyboardDev->master->key->xkbInfo->desc;

 	act = XkbKeyActionPtr(xkb, keycode, state);
 	if (act == NULL)
@@ -257,7 +254,7 @@ KeyCode InputDevice::vncPressShift(void)
 	if (state & ShiftMask)
 		return 0;

-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
+	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
 	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
 		XkbAction *act;
 		unsigned char mask;
@@ -299,7 +296,7 @@ size_t vncReleaseShift(KeyCode *keys, size_t maxKeys)

 	count = 0;

-	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
+	master = vncKeyboardDev->master;
 	xkb = master->key->xkbInfo->desc;
 	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
 		XkbAction *act;
@@ -347,7 +344,7 @@ KeyCode InputDevice::vncPressLevelThree(voi
 			return 0;
 	}

-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
+	xkb = vncKeyboardDev->master->key->xkbInfo->desc;

 	act = XkbKeyActionPtr(xkb, keycode, state);
 	if (act == NULL)
@@ -386,7 +383,7 @@ size_t vncReleaseLevelThree(KeyCode *keys, size_t maxKeys)

 	count = 0;

-	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
+	master = vncKeyboardDev->master;
 	xkb = master->key->xkbInfo->desc;
 	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
 		XkbAction *act;
@@ -416,7 +413,7 @@ KeyCode InputDevice::vncKeysymToKeycode(Key
 	if (new_state != NULL)
 		*new_state = state;

-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
+	xkb = vncKeyboardDev->master->key->xkbInfo->desc;
 	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
 		unsigned int state_out;
 		KeySym dummy;
@@ -473,7 +470,7 @@ bool InputDevice::vncIsLockModifier(KeyCode
 	XkbDescPtr xkb;
 	XkbAction *act;

-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
+	xkb = vncKeyboardDev->master->key->xkbInfo->desc;

 	act = XkbKeyActionPtr(xkb, keycode, state);
 	if (act == NULL)
@@ -524,7 +521,7 @@ int vncIsAffectedByNumLock(KeyCode keycode)
 	if (numlock_keycode == 0)
 		return 0;

-	xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
+	xkb = vncKeyboardDev->master->key->xkbInfo->desc;

 	act = XkbKeyActionPtr(xkb, numlock_keycode, state);
 	if (act == NULL)
@@ -545,7 +542,7 @@ KeyCode InputDevice::vncAddKeysym(KeySym ke
 	KeySym *syms;
 	KeySym upper, lower;

-	master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
+	master = vncKeyboardDev->master;
 	xkb = master->key->xkbInfo->desc;
 	for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
 		if (XkbKeyNumGroups(xkb, key) == 0)
Commit	Line	Data
33eaa71a JR	1	diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/c.getmaster tigervnc-1.4.2/unix/xserver/hw/vnc/InputXKB.c
	2	--- tigervnc-1.4.2/unix/xserver/hw/vnc/InputXKB.c.getmaster 2015-01-23 23:37:23.000000000 +0000
	3	+++ tigervnc-1.4.2/unix/xserver/hw/vnc/InputXKB.c 2015-02-13 12:32:54.398502082 +0000
	4	@@ -210,10 +210,7 @@ void vncPrepareInputDevices(void)
	5
	6	unsigned vncGetKeyboardState(void)
2e5d6664 JR	7	{
	8	- DeviceIntPtr master;
	9	-
33eaa71a	10	- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
2e5d6664	11	- return XkbStateFieldFromRec(&master->key->xkbInfo->state);
33eaa71a	12	+ return XkbStateFieldFromRec(&vncKeyboardDev->master->key->xkbInfo->state);
2e5d6664	13	}
33eaa71a JR	14
	15	unsigned vncGetLevelThreeMask(void)
	16	@@ -232,7 +229,7 @@ unsigned InputDevice::vncGetLevelThreeMask(
2e5d6664 JR	17	return 0;
2e5d6664 JR	18	}
33eaa71a JR	19
	20	- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
	21	+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
	22
2e5d6664 JR	23	act = XkbKeyActionPtr(xkb, keycode, state);
2e5d6664 JR	24	if (act == NULL)
33eaa71a	25	@@ -257,7 +254,7 @@ KeyCode InputDevice::vncPressShift(void)
2e5d6664 JR	26	if (state & ShiftMask)
2e5d6664 JR	27	return 0;
33eaa71a JR	28
	29	- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
	30	+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
2e5d6664 JR	31	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
	32	XkbAction *act;
	33	unsigned char mask;
33eaa71a JR	34	@@ -299,7 +296,7 @@ size_t vncReleaseShift(KeyCode *keys, size_t maxKeys)
	35
	36	count = 0;
	37
	38	- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
	39	+ master = vncKeyboardDev->master;
2e5d6664 JR	40	xkb = master->key->xkbInfo->desc;
	41	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
	42	XkbAction *act;
33eaa71a	43	@@ -347,7 +344,7 @@ KeyCode InputDevice::vncPressLevelThree(voi
2e5d6664 JR	44	return 0;
2e5d6664 JR	45	}
33eaa71a JR	46
	47	- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
	48	+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
	49
2e5d6664 JR	50	act = XkbKeyActionPtr(xkb, keycode, state);
2e5d6664 JR	51	if (act == NULL)
33eaa71a JR	52	@@ -386,7 +383,7 @@ size_t vncReleaseLevelThree(KeyCode *keys, size_t maxKeys)
	53
	54	count = 0;
	55
	56	- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
	57	+ master = vncKeyboardDev->master;
2e5d6664 JR	58	xkb = master->key->xkbInfo->desc;
	59	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
	60	XkbAction *act;
33eaa71a	61	@@ -416,7 +413,7 @@ KeyCode InputDevice::vncKeysymToKeycode(Key
2e5d6664 JR	62	if (new_state != NULL)
2e5d6664 JR	63	*new_state = state;
33eaa71a JR	64
	65	- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
	66	+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
2e5d6664 JR	67	for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
	68	unsigned int state_out;
	69	KeySym dummy;
33eaa71a	70	@@ -473,7 +470,7 @@ bool InputDevice::vncIsLockModifier(KeyCode
2e5d6664 JR	71	XkbDescPtr xkb;
2e5d6664 JR	72	XkbAction *act;
33eaa71a JR	73
	74	- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
	75	+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
	76
2e5d6664 JR	77	act = XkbKeyActionPtr(xkb, keycode, state);
2e5d6664 JR	78	if (act == NULL)
33eaa71a	79	@@ -524,7 +521,7 @@ int vncIsAffectedByNumLock(KeyCode keycode)
2e5d6664	80	if (numlock_keycode == 0)
33eaa71a JR	81	return 0;
	82
	83	- xkb = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
	84	+ xkb = vncKeyboardDev->master->key->xkbInfo->desc;
	85
2e5d6664 JR	86	act = XkbKeyActionPtr(xkb, numlock_keycode, state);
2e5d6664 JR	87	if (act == NULL)
33eaa71a	88	@@ -545,7 +542,7 @@ KeyCode InputDevice::vncAddKeysym(KeySym ke
2e5d6664 JR	89	KeySym *syms;
2e5d6664 JR	90	KeySym upper, lower;
33eaa71a JR	91
	92	- master = GetMaster(vncKeyboardDev, KEYBOARD_OR_FLOAT);
	93	+ master = vncKeyboardDev->master;
2e5d6664 JR	94	xkb = master->key->xkbInfo->desc;
	95	for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
	96	if (XkbKeyNumGroups(xkb, key) == 0)