File n_tigervnc_Revert_Attempt_to_handle_Ctrl-key.patch of Package tigervnc.2777

Overview Repositories Revisions Requests Users Attributes Meta

File n_tigervnc_Revert_Attempt_to_handle_Ctrl-key.patch of Package tigervnc.2777

From 5e6450db2c0ecdf458b09a53e9fbcce7f4ab408f Mon Sep 17 00:00:00 2001
From: Michal Srb <michalsrb@gmail.com>
Date: Mon, 2 Feb 2015 09:12:12 +0200
Subject: [PATCH] Revert "Attempt to handle Ctrl+key"

This reverts commit 13a809a6baca9572ab4a9cb992121fbc4e4ffba6.
---
 vncviewer/Viewport.cxx | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

Index: tigervnc-1.4.1/vncviewer/Viewport.cxx
===================================================================
--- tigervnc-1.4.1.orig/vncviewer/Viewport.cxx
+++ tigervnc-1.4.1/vncviewer/Viewport.cxx
@@ -31,7 +31,6 @@
 
 // FLTK can pull in the X11 headers on some systems
 #ifndef XK_VoidSymbol
-#define XK_LATIN1
 #define XK_MISCELLANY
 #define XK_XKB_KEYS
 #include <rfb/keysymdef.h>
@@ -1010,25 +1009,10 @@ rdr::U32 Viewport::translateKeyEvent(voi
   }
 
   // Unknown special key?
-  if (keyTextLen == 0) {
+  if (keyText[0] == '\0') {
     return keyCode;
   }
 
-  // Control character?
-  if ((keyTextLen == 1) && ((keyText[0] < 0x20) | (keyText[0] == 0x7f))) {
-    if (keyText[0] == 0x00)
-      return XK_2;
-    else if (keyText[0] < 0x1b) {
-      if (!!Fl::event_state(FL_SHIFT) != !!Fl::event_state(FL_CAPS_LOCK))
-        return keyText[0] + XK_A - 0x01;
-      else
-        return keyText[0] + XK_a - 0x01;
-    } else if (keyText[0] < 0x20)
-      return keyText[0] + XK_3 - 0x1b;
-    else
-      return XK_8;
-  }
-
   // Look up the symbol the key produces and translate that from Unicode
   // to a X11 keysym.
   if (fl_utf_nb_char((const unsigned char*)keyText, strlen(keyText)) != 1) {

Places

File n_tigervnc_Revert_Attempt_to_handle_Ctrl-key.patch of Package tigervnc.2777

Places