directvnc-latin2.patch

   1 --- directvnc-0.7.5/src/dfb.c.old       2006-12-18 18:47:53.000000000 +0100
   2 +++ directvnc-0.7.5/src/dfb.c   2006-12-18 20:08:32.000000000 +0100
   3 @@ -386,11 +386,10 @@
   4  ===========================================================================
   5  */
   6
   7 -
   8  /* This table assumes an iso8859_1 encoding for the characters
   9   * > 80, as returned by pccons */
  10 -static KeySym latin1_to_x[256] = {
  11 -       XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  12 +static KeySym latin_to_x[2][256] = {
  13 +{      XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  14         XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  15         XK_BackSpace,   XK_Tab,         XK_Linefeed,    XK_VoidSymbol,
  16         XK_VoidSymbol,  XK_Return,      XK_VoidSymbol,  XK_VoidSymbol,
  17 @@ -454,7 +453,74 @@
  18         XK_ocircumflex, XK_otilde,      XK_odiaeresis,  XK_division,
  19         XK_oslash,      XK_ugrave,      XK_uacute,      XK_ucircumflex,
  20         XK_udiaeresis,  XK_yacute,      XK_thorn,       XK_ydiaeresis
  21 -      };
  22 +      },
  23 +{
  24 +/*00*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  25 +/*04*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  26 +/*08*/ XK_BackSpace,   XK_Tab,         XK_Linefeed,    XK_VoidSymbol,
  27 +/*0C*/ XK_VoidSymbol,  XK_Return,      XK_VoidSymbol,  XK_VoidSymbol,
  28 +/*10*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  29 +/*14*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  30 +/*18*/ XK_Cancel,      XK_VoidSymbol,  XK_VoidSymbol,  XK_Escape,
  31 +/*1C*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  32 +/*20*/ XK_space,       XK_exclam,      XK_quotedbl,    XK_numbersign,
  33 +/*24*/ XK_dollar,      XK_percent,     XK_ampersand,   XK_apostrophe,
  34 +/*28*/ XK_parenleft,   XK_parenright,  XK_asterisk,    XK_plus,
  35 +/*2C*/ XK_comma,       XK_minus,       XK_period,      XK_slash,
  36 +/*30*/ XK_0,           XK_1,           XK_2,           XK_3,
  37 +/*34*/ XK_4,           XK_5,           XK_6,           XK_7,
  38 +/*38*/ XK_8,           XK_9,           XK_colon,       XK_semicolon,
  39 +/*3C*/ XK_less,        XK_equal,       XK_greater,     XK_question,
  40 +/*40*/ XK_at,          XK_A,           XK_B,           XK_C,
  41 +/*44*/ XK_D,           XK_E,           XK_F,           XK_G,
  42 +/*48*/ XK_H,           XK_I,           XK_J,           XK_K,
  43 +/*4C*/ XK_L,           XK_M,           XK_N,           XK_O,
  44 +/*50*/ XK_P,           XK_Q,           XK_R,           XK_S,
  45 +/*54*/ XK_T,           XK_U,           XK_V,           XK_W,
  46 +/*58*/ XK_X,           XK_Y,           XK_Z,           XK_bracketleft,
  47 +/*5C*/ XK_backslash,   XK_bracketright,XK_asciicircum, XK_underscore,
  48 +/*60*/ XK_grave,       XK_a,           XK_b,           XK_c,
  49 +/*64*/ XK_d,           XK_e,           XK_f,           XK_g,
  50 +/*68*/ XK_h,           XK_i,           XK_j,           XK_k,
  51 +/*6C*/ XK_l,           XK_m,           XK_n,           XK_o,
  52 +/*70*/ XK_p,           XK_q,           XK_r,           XK_s,
  53 +/*74*/ XK_t,           XK_u,           XK_v,           XK_w,
  54 +/*78*/ XK_x,           XK_y,           XK_z,           XK_braceleft,
  55 +/*7C*/ XK_bar,         XK_braceright,  XK_asciitilde,  XK_Delete,
  56 +/*80*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  57 +/*84*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  58 +/*88*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  59 +/*8C*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  60 +/*90*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  61 +/*94*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  62 +/*98*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  63 +/*9C*/ XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,  XK_VoidSymbol,
  64 +/*A0*/ XK_nobreakspace,XK_Aogonek,     XK_breve,       XK_Lstroke,
  65 +/*A4*/ XK_currency,    XK_Lcaron,      XK_Sacute,      XK_section,
  66 +/*A8*/ XK_diaeresis,   XK_Scaron,      XK_Scedilla,    XK_Tcaron,
  67 +/*AC*/ XK_Zacute,      XK_hyphen,      XK_Zcaron,      XK_Zabovedot,
  68 +/*B0*/ XK_degree,      XK_aogonek,     XK_ogonek,      XK_lstroke,
  69 +/*B4*/ XK_acute,       XK_lcaron,      XK_sacute,      XK_caron,
  70 +/*B8*/ XK_cedilla,     XK_scaron,      XK_scedilla,    XK_tcaron,
  71 +/*BC*/ XK_zacute,      XK_doubleacute, XK_zcaron,      XK_zabovedot,
  72 +/*C0*/ XK_Racute,      XK_Aacute,      XK_Acircumflex, XK_Abreve,
  73 +/*C4*/ XK_Adiaeresis,  XK_Lacute,      XK_Cacute,      XK_Ccedilla,
  74 +/*C8*/ XK_Ccaron,      XK_Eacute,      XK_Eogonek,     XK_Ediaeresis,
  75 +/*CC*/ XK_Ecaron,      XK_Iacute,      XK_Icircumflex, XK_Dcaron,
  76 +/*D0*/ XK_Dstroke,     XK_Nacute,      XK_Ncaron,      XK_Oacute,
  77 +/*D4*/ XK_Ocircumflex, XK_Odoubleacute,XK_Odiaeresis,  XK_multiply,
  78 +/*D8*/ XK_Rcaron,      XK_Uring,       XK_Uacute,      XK_Udoubleacute,
  79 +/*DC*/ XK_Udiaeresis,  XK_Yacute,      XK_Tcedilla,    XK_ssharp,
  80 +/*E0*/ XK_racute,      XK_aacute,      XK_acircumflex, XK_abreve,
  81 +/*E4*/ XK_adiaeresis,  XK_lacute,      XK_cacute,      XK_ccedilla,
  82 +/*E8*/ XK_ccaron,      XK_eacute,      XK_eogonek,     XK_ediaeresis,
  83 +/*EC*/ XK_ecaron,      XK_iacute,      XK_icircumflex, XK_dcaron,
  84 +/*F0*/ XK_dstroke,     XK_nacute,      XK_ncaron,      XK_oacute,
  85 +/*F4*/ XK_ocircumflex, XK_odoubleacute,XK_odiaeresis,  XK_division,
  86 +/*F8*/ XK_rcaron,      XK_uring,       XK_uacute,      XK_udoubleacute,
  87 +/*FC*/ XK_udiaeresis,  XK_yacute,      XK_tcedilla,    XK_abovedot
  88 +}
  89 +};
  90
  91  static DFBInputDeviceKeymapSymbolIndex diksi[4] = {
  92    DIKSI_BASE,
  93 @@ -566,7 +632,7 @@
  94      return XK_ISO_Left_Tab;
  95
  96    if (symbol > 0 && symbol < 256)
  97 -    return latin1_to_x[symbol];
  98 +    return latin_to_x[opt.codepage][symbol];
  99
 100    if (DFB_KEY_TYPE (symbol) == DIKT_FUNCTION && symbol < DFB_FUNCTION_KEY(36))
 101      return XK_F1 + symbol - DIKS_F1;
 102 --- directvnc-0.7.5/src/args.c.old      2006-12-18 19:38:51.000000000 +0100
 103 +++ directvnc-0.7.5/src/args.c  2006-12-18 20:09:09.000000000 +0100
 104 @@ -35,7 +35,6 @@
 105     if (argc <= 1)
 106        show_usage_and_exit();
 107
 108 -
 109     /* servername and display like so: 192.168.0.1:1 or so: localhost:2 */
 110     buf = argv[1];
 111
 112 @@ -71,6 +70,7 @@
 113     opt.v_ratio = 1;
 114     opt.h_offset = 0;
 115     opt.v_offset = 0;
 116 +   opt.codepage = 0;
 117
 118  #ifdef DEBUG
 119     printf("server: %s\n", opt.servername);
 120 @@ -86,7 +86,7 @@
 121  static void
 122  _parse_options_array(int argc, char **argv)
 123  {
 124 -   static char stropts[] = "hvob:p:e:c:q:snlf:";
 125 +   static char stropts[] = "hvob:p:e:c:q:snlf:i";
 126     static struct option lopts[] = {
 127        /* actions */
 128        {"help", 0, 0, 'h'},
 129 @@ -101,6 +101,7 @@
 130        {"noshared", 0, 0, 'n'},
 131        {"nolocalcursor", 0, 0, 'l'},
 132        {"pollfrequency", 1, 0, 'f'},
 133 +      {"latin2", 0, 0, 'i'},
 134        {0, 0, 0, 0}
 135     };
 136     int optch = 0, cmdx = 0;
 137 @@ -164,8 +165,9 @@
 138             if (quality >=0 && quality <= 9)
 139                opt.client.quality = quality;
 140             break;
 141 -
 142 -
 143 +       case 'i':
 144 +           opt.codepage = 1;
 145 +           break;
 146        }
 147     }
 148  }
 149 @@ -192,6 +194,7 @@
 150   "  -l, --nolocalcursor        Disable local cursor handling.\n"
 151   "  -c, --compresslevel        0..9 compression level to be used by zlib\n"
 152   "  -q, --quality              0..9 quality level to be used by jpeg compression in tight encoding\n"
 153 + "  -i, --latin2               Use latin2 keysyms\n"
 154   , VERSION);
 155     exit(1);
 156  }
 157 --- directvnc-0.7.5/src/directvnc.h.old 2006-12-18 20:03:04.000000000 +0100
 158 +++ directvnc-0.7.5/src/directvnc.h     2006-12-18 20:04:53.000000000 +0100
 159 @@ -130,6 +130,7 @@
 160     double v_ratio;
 161     int h_offset;
 162     int v_offset;
 163 +   int codepage;
 164  };
 165
 166
 167 --- directvnc-0.7.5/directvnc.1.old     2006-12-18 19:48:34.000000000 +0100
 168 +++ directvnc-0.7.5/directvnc.1 2006-12-18 19:49:49.000000000 +0100
 169 @@ -91,6 +91,10 @@
 170  that look suitable for lossy compression, so quality level 0 does not always
 171  mean unacceptable image quality.
 172
 173 +.TP 5
 174 +.B -i --latin2
 175 +Use the latin2 table of keysyms.
 176 +
 177  .SH LIMITATIONS
 178  Currently only 16 bpp color depth is supported.
 179  .SH BUGS