- applied upstream

Changed files:
    tigervnc-options-dialog.patch -> 1.2
    tigervnc-rh611677.patch -> 1.2
    tigervnc-rh633931.patch -> 1.2

diff --git a/tigervnc-options-dialog.patch b/tigervnc-options-dialog.patch
deleted file mode 100644 (file)
index 022fc91..0000000
--- a/tigervnc-options-dialog.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tigervnc/unix/vncviewer/OptionsDialog.h~   2010-10-26 13:40:29.148203596 +0200
-+++ tigervnc/unix/vncviewer/OptionsDialog.h    2010-10-26 13:40:07.863203599 +0200
-@@ -198,6 +198,7 @@
-     y += secVnc.height();
-     secPlain.move(xPad, y);
-     y += secPlain.height();
-+    xPad -= SECOND_COL_XPAD;
- #endif
- 
-     /* Render "OK" and "Cancel" buttons */

diff --git a/tigervnc-rh611677.patch b/tigervnc-rh611677.patch
deleted file mode 100644 (file)
index 029854b..0000000
--- a/tigervnc-rh611677.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -up tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc.rh611677 tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc
---- tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc.rh611677      2010-08-24 17:40:00.511860227 +0200
-+++ tigervnc-1.0.90-20100420svn4030/unix/xserver/hw/vnc/Input.cc       2010-08-24 17:49:23.169007409 +0200
-@@ -322,6 +322,11 @@ public:
-                       return;
-               }
- 
-+              if (maxKeysPerMod == 0) {
-+                      vlog.debug("Keyboard has no modifiers");
-+                      return;
-+              }
-+
-               keycode = modmap[modIndex * maxKeysPerMod];
-               xfree(modmap);
- #else
-@@ -355,6 +360,11 @@ public:
-                       vlog.error("generate_modkeymap failed");
-                       return;
-               }
-+
-+              if (maxKeysPerMod == 0) {
-+                      vlog.debug("Keyboard has no modifiers");
-+                      return;
-+              }
- #else
-               maxKeysPerMod = keyc->maxKeysPerModifier;
- #endif
-@@ -530,6 +540,9 @@ void InputDevice::keyEvent(rdr::U32 keys
-               return;
-       }
- 
-+      if (maxKeysPerMod == 0)
-+              vlog.debug("Keyboard has no modifiers");
-+
-       state = XkbStateFieldFromRec(&keyc->xkbInfo->state);
- #else
-       keyc = keyboardDev->key;
-@@ -565,11 +578,13 @@ void InputDevice::keyEvent(rdr::U32 keys
- ModeSwitchFound:
- 
-       int col = 0;
--      if ((state & (1 << ShiftMapIndex)) != 0)
--              col |= 1;
--      if (modeSwitchMapIndex != 0 &&
--          ((state & (1 << modeSwitchMapIndex))) != 0)
--              col |= 2;
-+      if (maxKeysPerMod != 0) {
-+              if ((state & (1 << ShiftMapIndex)) != 0)
-+                      col |= 1;
-+              if (modeSwitchMapIndex != 0 &&
-+                  ((state & (1 << modeSwitchMapIndex))) != 0)
-+                      col |= 2;
-+      }
- 
-       int kc = KeysymToKeycode(keymap, keysym, &col);
- 
-@@ -581,7 +596,8 @@ ModeSwitchFound:
-        * We never get ISO_Left_Tab here because it's already been translated
-        * in VNCSConnectionST.
-        */
--      if (keysym == XK_Tab && ((state & (1 << ShiftMapIndex))) != 0)
-+      if (maxKeysPerMod != 0 && keysym == XK_Tab &&
-+          ((state & (1 << ShiftMapIndex))) != 0)
-               col |= 1;
- 
-       if (kc == 0) {
-@@ -662,18 +678,20 @@ ModeSwitchFound:
-               }
-       }
- 
--      ModifierState shift(keyboardDev, ShiftMapIndex);
--      ModifierState modeSwitch(keyboardDev, modeSwitchMapIndex);
--      if (down) {
--              if (col & 1)
--                      shift.press();
--              else
--                      shift.release();
--              if (modeSwitchMapIndex) {
--                      if (col & 2)
--                              modeSwitch.press();
-+      if (maxKeysPerMod != 0) {
-+              ModifierState shift(keyboardDev, ShiftMapIndex);
-+              ModifierState modeSwitch(keyboardDev, modeSwitchMapIndex);
-+              if (down) {
-+                      if (col & 1)
-+                              shift.press();
-                       else
--                              modeSwitch.release();
-+                              shift.release();
-+                      if (modeSwitchMapIndex) {
-+                              if (col & 2)
-+                                      modeSwitch.press();
-+                              else
-+                                      modeSwitch.release();
-+                      }
-               }
-       }
- 

diff --git a/tigervnc-rh633931.patch b/tigervnc-rh633931.patch
deleted file mode 100644 (file)
index 71797d5..0000000
--- a/tigervnc-rh633931.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -up tigervnc-1.0.90-20100813svn4123/unix/xserver/hw/vnc/Input.cc.rh633931 tigervnc-1.0.90-20100813svn4123/unix/xserver/hw/vnc/Input.cc
---- tigervnc-1.0.90-20100813svn4123/unix/xserver/hw/vnc/Input.cc.rh633931      2010-09-16 11:29:33.670000097 +0200
-+++ tigervnc-1.0.90-20100813svn4123/unix/xserver/hw/vnc/Input.cc       2010-09-16 12:59:31.530002411 +0200
-@@ -271,6 +271,19 @@ void InputDevice::initInputDevice(void)
- #endif
- }
- 
-+static inline void pressKey(DeviceIntPtr dev, int kc, bool down, const char *msg)
-+{
-+      int action;
-+      unsigned int n;
-+
-+      if (msg != NULL)
-+              vlog.debug("%s %d %s", msg, kc, down ? "down" : "up");
-+
-+      action = down ? KeyPress : KeyRelease;
-+      n = GetKeyboardEvents(eventq, dev, action, kc);
-+      enqueueEvents(dev, n);
-+}
-+
- #define IS_PRESSED(keyc, keycode) \
-       ((keyc)->down[(keycode) >> 3] & (1 << ((keycode) & 7)))
- 
-@@ -294,7 +307,7 @@ public:
-       ~ModifierState()
-       {
-               for (int i = 0; i < nKeys; i++)
--                      generateXKeyEvent(keys[i], !pressed);
-+                      pressKey(dev, keys[i], !pressed, "fake keycode");
-               delete [] keys;
-       }
- 
-@@ -389,22 +402,10 @@ private:
-               if (keycode) {
-                       if (!keys) keys = new int[maxKeysPerMod];
-                       keys[nKeys++] = keycode;
--                      generateXKeyEvent(keycode, down);
-+                      pressKey(dev, keycode, down, "fake keycode");
-               }
-       }
- 
--      void generateXKeyEvent(int keycode, bool down)
--      {
--              int n, action;
--
--              action = down ? KeyPress : KeyRelease;
--              n = GetKeyboardEvents(eventq, dev, action, keycode);
--              enqueueEvents(dev, n);
--
--              vlog.debug("fake keycode %d %s", keycode,
--                         down ? "down" : "up");
--      }
--
-       int modIndex;
-       int nKeys;
-       int *keys;
-@@ -503,8 +504,8 @@ void InputDevice::keyEvent(rdr::U32 keys
-       KeyCode minKeyCode, maxKeyCode;
-       KeyCode *modmap = NULL;
-       int mapWidth;
--      unsigned int i, n;
--      int j, k, action, state, maxKeysPerMod;
-+      unsigned int i;
-+      int j, k, state, maxKeysPerMod;
- 
-       initInputDevice();
- 
-@@ -691,12 +692,14 @@ ModeSwitchFound:
-                                       modeSwitch.release();
-                       }
-               }
--      }
-+              /*
-+               * Ensure ModifierState objects are not destroyed before
-+               * pressKey call, otherwise fake modifier keypress can be lost.
-+               */
-+              pressKey(keyboardDev, kc, down, "keycode");
-+      } else
-+              pressKey(keyboardDev, kc, down, "keycode");
- 
--      vlog.debug("keycode %d %s", kc, down ? "down" : "up");
--      action = down ? KeyPress : KeyRelease;
--      n = GetKeyboardEvents(eventq, keyboardDev, action, kc);
--      enqueueEvents(keyboardDev, n);
- 
-         FREE_MAPS;
-