1 From d11e60203e74d8b5e5a35764804ed8b9b7775c89 Mon Sep 17 00:00:00 2001

     2 From: atkac <atkac@3789f03b-4d11-0410-bbf8-ca57d06f2519>

     3 Date: Tue, 18 May 2010 13:35:37 +0000

     4 Subject: [PATCH] [Bugfix] Use always XkbConvertCase instead of XConvertCase when compiling

     5  against X.Org 1.8.X and newer. Othewrise keysyms are not mapped correctly

     6  to keycodes.

     7 

     8 Reference: https://bugzilla.redhat.com/show_bug.cgi?id=586406

     9 

    10 

    11 git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk@4057 3789f03b-4d11-0410-bbf8-ca57d06f2519

    12 ---

    13  unix/xserver/hw/vnc/Input.cc |    7 ++++++-

    14  1 files changed, 6 insertions(+), 1 deletions(-)

    15 

    16 diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc

    17 index d108763..f1e4801 100644

    18 --- a/unix/xserver/hw/vnc/Input.cc

    19 +++ b/unix/xserver/hw/vnc/Input.cc

    20 @@ -712,7 +712,12 @@ static KeySym KeyCodetoKeySym(KeySymsPtr keymap, int keycode, int col)

    21  	}

    22  

    23  	if ((per <= (col|1)) || (syms[col|1] == NoSymbol)) {

    24 -		XConvertCase(syms[col&~1], &lsym, &usym);

    25 +#if XORG >= 18

    26 +		XkbConvertCase

    27 +#else

    28 +		XConvertCase

    29 +#endif

    30 +			    (syms[col&~1], &lsym, &usym);

    31  		if (!(col & 1))

    32  			return lsym;

    33  		/*

    34 -- 

    35 1.5.6.5

    36