Annotation of /trunk/tigervnc/patches/tigervnc-1.0.90-rh586406.patch
Parent Directory
| 
Revision Log
Revision 1051 -
(hide annotations)
(download)
Mon Jun 14 10:43:20 2010 UTC (14 years ago) by niro
File size: 906 byte(s)
Mon Jun 14 10:43:20 2010 UTC (14 years ago) by niro
File size: 906 byte(s)
added fedora patches
| 1 | niro | 1051 | diff -up tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc.rh586406 tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc |
| 2 | --- tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc.rh586406 2010-04-14 11:24:06.000000000 +0200 | ||
| 3 | +++ tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc 2010-05-13 12:23:14.418190525 +0200 | ||
| 4 | @@ -31,8 +31,10 @@ extern "C" { | ||
| 5 | #define class c_class | ||
| 6 | #include "inputstr.h" | ||
| 7 | #include "mi.h" | ||
| 8 | -#ifndef XKB_IN_SERVER | ||
| 9 | -#define XKB_IN_SERVER | ||
| 10 | +#if XORG < 18 | ||
| 11 | + #ifndef XKB_IN_SERVER | ||
| 12 | + #define XKB_IN_SERVER | ||
| 13 | + #endif | ||
| 14 | #endif | ||
| 15 | #ifdef XKB | ||
| 16 | /* | ||
| 17 | @@ -712,7 +714,12 @@ static KeySym KeyCodetoKeySym(KeySymsPtr | ||
| 18 | } | ||
| 19 | |||
| 20 | if ((per <= (col|1)) || (syms[col|1] == NoSymbol)) { | ||
| 21 | - XConvertCase(syms[col&~1], &lsym, &usym); | ||
| 22 | +#if XORG >= 18 | ||
| 23 | + XkbConvertCase | ||
| 24 | +#else | ||
| 25 | + XConvertCase | ||
| 26 | +#endif | ||
| 27 | + (syms[col&~1], &lsym, &usym); | ||
| 28 | if (!(col & 1)) | ||
| 29 | return lsym; | ||
| 30 | /* |