x11vnc: touchscreen uinput support and Java viewer mousewheel support. See x11vnc/ChangeLog for rest.

8 files changed, 340 insertions, 26 deletions

diff --git a/classes/ssl/SignedUltraViewerSSL.jar b/classes/ssl/SignedUltraViewerSSL.jar
index eccb9b9..6c18737 100644
--- a/classes/ssl/SignedUltraViewerSSL.jar
+++ b/classes/ssl/SignedUltraViewerSSL.jar
diff --git a/classes/ssl/SignedVncViewer.jar b/classes/ssl/SignedVncViewer.jar
index f0d8bfa..95c0b0b 100644
--- a/classes/ssl/SignedVncViewer.jar
+++ b/classes/ssl/SignedVncViewer.jar
diff --git a/classes/ssl/UltraViewerSSL.jar b/classes/ssl/UltraViewerSSL.jar
index 1791a09..45259fd 100644
--- a/classes/ssl/UltraViewerSSL.jar
+++ b/classes/ssl/UltraViewerSSL.jar
diff --git a/classes/ssl/VncViewer.jar b/classes/ssl/VncViewer.jar
index 46d59d0..9453c6f 100644
--- a/classes/ssl/VncViewer.jar
+++ b/classes/ssl/VncViewer.jar
diff --git a/classes/ssl/ss_vncviewer b/classes/ssl/ss_vncviewer
index 4f42bd5..7e793ff 100755
--- a/classes/ssl/ss_vncviewer
+++ b/classes/ssl/ss_vncviewer
@@ -2964,6 +2964,10 @@ if [ "X$use_ssh" = "X1" ]; then
 	fi
 	echo "ssh_pid='$pssh'"; echo
 	if [ "X$use_sshssl" = "X" -a "X$getport" = "X" ]; then
+		if [ "X$SSVNC_EXTRA_COMMAND" != "X" ]; then
+			(sh -c "$SSVNC_EXTRA_COMMAND") &
+			echo "($SSVNC_EXTRA_COMMAND) &"; echo
+		fi
 		echo "Running viewer:"
 
 		trap "final" 0 2 15
@@ -3334,6 +3338,10 @@ if [ "X$direct_connect" != "X" ]; then
 		echo "T sleep $SSVNC_EXTRA_SLEEP"
 		sleep $SSVNC_EXTRA_SLEEP
 	fi
+	if [ "X$SSVNC_EXTRA_COMMAND" != "X" ]; then
+		(sh -c "$SSVNC_EXTRA_COMMAND") &
+		echo "($SSVNC_EXTRA_COMMAND) &"; echo
+	fi
 	if [ "X$reverse" = "X" ]; then
 		hostdisp="$host:$disp"
 		if [ "X$SSVNC_ULTRA_DSM" != "X" ]; then
@@ -3568,6 +3576,10 @@ if [ "X$SSVNC_EXTRA_SLEEP" != "X" ]; then
 	echo "sleep $SSVNC_EXTRA_SLEEP"
 	sleep $SSVNC_EXTRA_SLEEP
 fi
+if [ "X$SSVNC_EXTRA_COMMAND" != "X" ]; then
+	(sh -c "$SSVNC_EXTRA_COMMAND") &
+	echo "($SSVNC_EXTRA_COMMAND) &"; echo
+fi
 
 if [ "X$reverse" = "X" ]; then
 	if [ "X$NEED_VENCRYPT_VIEWER_BRIDGE" = "X1" -a "X$ptmp" != "X" ] ; then
diff --git a/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch b/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
index db611af..bc10f3c 100644
--- a/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
+++ b/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch
@@ -1,6 +1,6 @@
 --- vnc_javasrc.orig/VncCanvas.java	2004-10-10 02:15:54.000000000 -0400
-+++ vnc_javasrc/VncCanvas.java	2006-03-27 22:34:02.000000000 -0500
-@@ -28,6 +28,7 @@
++++ vnc_javasrc/VncCanvas.java	2010-11-30 21:01:15.000000000 -0500
+@@ -28,13 +28,14 @@
  import java.lang.*;
  import java.util.zip.*;
  
@@ -8,6 +8,14 @@
  
  //
  // VncCanvas is a subclass of Canvas which draws a VNC desktop on it.
+ //
+ 
+ class VncCanvas extends Canvas
+-  implements KeyListener, MouseListener, MouseMotionListener {
++  implements KeyListener, MouseListener, MouseMotionListener, MouseWheelListener {
+ 
+   VncViewer viewer;
+   RfbProto rfb;
 @@ -81,6 +82,20 @@
      cm8 = new DirectColorModel(8, 7, (7 << 3), (3 << 6));
      cm24 = new DirectColorModel(24, 0xFF0000, 0x00FF00, 0x0000FF);
@@ -29,7 +37,53 @@
      colors = new Color[256];
      for (int i = 0; i < 256; i++)
        colors[i] = new Color(cm8.getRGB(i));
-@@ -1387,9 +1402,9 @@
+@@ -169,6 +184,7 @@
+       inputEnabled = true;
+       addMouseListener(this);
+       addMouseMotionListener(this);
++      addMouseWheelListener(this);
+       if (viewer.showControls) {
+ 	viewer.buttonPanel.enableRemoteAccessControls(true);
+       }
+@@ -177,6 +193,7 @@
+       inputEnabled = false;
+       removeMouseListener(this);
+       removeMouseMotionListener(this);
++      removeMouseWheelListener(this);
+       if (viewer.showControls) {
+ 	viewer.buttonPanel.enableRemoteAccessControls(false);
+       }
+@@ -1190,6 +1207,9 @@
+   public void mouseDragged(MouseEvent evt) {
+     processLocalMouseEvent(evt, true);
+   }
++  public void mouseWheelMoved(MouseWheelEvent evt) {
++    processLocalMouseWheelEvent(evt);
++  }
+ 
+   public void processLocalKeyEvent(KeyEvent evt) {
+     if (viewer.rfb != null && rfb.inNormalProtocol) {
+@@ -1221,6 +1241,19 @@
+     evt.consume();
+   }
+ 
++  public void processLocalMouseWheelEvent(MouseWheelEvent evt) {
++    if (viewer.rfb != null && rfb.inNormalProtocol) {
++      synchronized(rfb) {
++	try {
++	  rfb.writeWheelEvent(evt);
++	} catch (Exception e) {
++	  e.printStackTrace();
++	}
++	rfb.notify();
++      }
++    }
++  }
++
+   public void processLocalMouseEvent(MouseEvent evt, boolean moved) {
+     if (viewer.rfb != null && rfb.inNormalProtocol) {
+       if (moved) {
+@@ -1387,9 +1420,9 @@
  		result = cm8.getRGB(pixBuf[i]);
  	      } else {
  		result = 0xFF000000 |
@@ -42,7 +96,7 @@
  	      }
  	    } else {
  	      result = 0;	// Transparent pixel
-@@ -1403,9 +1418,9 @@
+@@ -1403,9 +1436,9 @@
  	      result = cm8.getRGB(pixBuf[i]);
  	    } else {
  	      result = 0xFF000000 |
diff --git a/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch b/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
index fb77d33..801234a 100644
--- a/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
+++ b/classes/ssl/tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch
@@ -1,4 +1,4 @@
-diff -x VncCanvas.java -Naur vnc_javasrc.orig/Makefile vnc_javasrc/Makefile
+diff -Naur vnc_javasrc.orig/Makefile vnc_javasrc/Makefile
 --- vnc_javasrc.orig/Makefile	2004-03-04 08:34:25.000000000 -0500
 +++ vnc_javasrc/Makefile	2010-05-18 20:56:26.000000000 -0400
 @@ -4,6 +4,7 @@
@@ -44,9 +44,9 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/Makefile vnc_javasrc/Makefile
  
  export:: $(CLASSES) $(ARCHIVE) $(PAGES)
  	@$(ExportJavaClasses)
-diff -x VncCanvas.java -Naur vnc_javasrc.orig/RfbProto.java vnc_javasrc/RfbProto.java
+diff -Naur vnc_javasrc.orig/RfbProto.java vnc_javasrc/RfbProto.java
 --- vnc_javasrc.orig/RfbProto.java	2004-03-04 08:34:25.000000000 -0500
-+++ vnc_javasrc/RfbProto.java	2010-03-27 17:58:37.000000000 -0400
++++ vnc_javasrc/RfbProto.java	2010-11-30 22:05:12.000000000 -0500
 @@ -199,7 +199,21 @@
      host = h;
      port = p;
@@ -79,7 +79,46 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/RfbProto.java vnc_javasrc/RfbProto
      }
  
      serverMajor = (b[4] - '0') * 100 + (b[5] - '0') * 10 + (b[6] - '0');
-@@ -992,6 +1006,19 @@
+@@ -892,6 +906,38 @@
+   final static int ALT_MASK   = InputEvent.ALT_MASK;
+ 
+ 
++  void writeWheelEvent(MouseWheelEvent evt) throws IOException {
++
++    eventBufLen = 0;
++
++    int x = evt.getX();
++    int y = evt.getY();
++
++    if (x < 0) x = 0;
++    if (y < 0) y = 0;
++
++    int ptrmask;
++
++    int clicks = evt.getWheelRotation();
++    System.out.println("writeWheelEvent: clicks: " + clicks);
++    if (clicks > 0) {
++    	ptrmask = 16;
++    } else if (clicks < 0) {
++    	ptrmask = 8;
++    } else {
++    	return;
++    }
++
++    eventBuf[eventBufLen++] = (byte) PointerEvent;
++    eventBuf[eventBufLen++] = (byte) ptrmask;
++    eventBuf[eventBufLen++] = (byte) ((x >> 8) & 0xff);
++    eventBuf[eventBufLen++] = (byte) (x & 0xff);
++    eventBuf[eventBufLen++] = (byte) ((y >> 8) & 0xff);
++    eventBuf[eventBufLen++] = (byte) (y & 0xff);
++
++    os.write(eventBuf, 0, eventBufLen);
++  }
++
+   //
+   // Write a pointer event message.  We may need to send modifier key events
+   // around it to set the correct modifier state.
+@@ -992,6 +1038,19 @@
      boolean down = (evt.getID() == KeyEvent.KEY_PRESSED);
  
      int key;
@@ -99,7 +138,7 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/RfbProto.java vnc_javasrc/RfbProto
      if (evt.isActionKey()) {
  
        //
-@@ -1025,6 +1052,13 @@
+@@ -1025,6 +1084,13 @@
          return;
        }
  
@@ -113,7 +152,7 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/RfbProto.java vnc_javasrc/RfbProto
      } else {
  
        //
-@@ -1036,6 +1070,7 @@
+@@ -1036,6 +1102,7 @@
  
        key = keyChar;
  
@@ -121,7 +160,7 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/RfbProto.java vnc_javasrc/RfbProto
        if (key < 0x20) {
          if (evt.isControlDown()) {
            key += 0x60;
-@@ -1121,6 +1156,16 @@
+@@ -1121,6 +1188,16 @@
    int oldModifiers = 0;
  
    void writeModifierKeyEvents(int newModifiers) {
@@ -138,7 +177,7 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/RfbProto.java vnc_javasrc/RfbProto
      if ((newModifiers & CTRL_MASK) != (oldModifiers & CTRL_MASK))
        writeKeyEvent(0xffe3, (newModifiers & CTRL_MASK) != 0);
  
-diff -x VncCanvas.java -Naur vnc_javasrc.orig/SSLSocketToMe.java vnc_javasrc/SSLSocketToMe.java
+diff -Naur vnc_javasrc.orig/SSLSocketToMe.java vnc_javasrc/SSLSocketToMe.java
 --- vnc_javasrc.orig/SSLSocketToMe.java	1969-12-31 19:00:00.000000000 -0500
 +++ vnc_javasrc/SSLSocketToMe.java	2010-07-10 19:18:06.000000000 -0400
 @@ -0,0 +1,2067 @@
@@ -2209,7 +2248,119 @@ diff -x VncCanvas.java -Naur vnc_javasrc.orig/SSLSocketToMe.java vnc_javasrc/SSL
 +	private Base64Coder() {}
 +
 +}
-diff -x VncCanvas.java -Naur vnc_javasrc.orig/VncViewer.java vnc_javasrc/VncViewer.java
+diff -Naur vnc_javasrc.orig/VncCanvas.java vnc_javasrc/VncCanvas.java
+--- vnc_javasrc.orig/VncCanvas.java	2004-10-10 02:15:54.000000000 -0400
++++ vnc_javasrc/VncCanvas.java	2010-11-30 21:01:15.000000000 -0500
+@@ -28,13 +28,14 @@
+ import java.lang.*;
+ import java.util.zip.*;
+ 
++import java.util.Collections;
+ 
+ //
+ // VncCanvas is a subclass of Canvas which draws a VNC desktop on it.
+ //
+ 
+ class VncCanvas extends Canvas
+-  implements KeyListener, MouseListener, MouseMotionListener {
++  implements KeyListener, MouseListener, MouseMotionListener, MouseWheelListener {
+ 
+   VncViewer viewer;
+   RfbProto rfb;
+@@ -81,6 +82,20 @@
+     cm8 = new DirectColorModel(8, 7, (7 << 3), (3 << 6));
+     cm24 = new DirectColorModel(24, 0xFF0000, 0x00FF00, 0x0000FF);
+ 
++    // kludge to not show any Java cursor in the canvas since we are
++    // showing the soft cursor (should be a user setting...)
++    Cursor dot = Toolkit.getDefaultToolkit().createCustomCursor(
++        Toolkit.getDefaultToolkit().createImage(new byte[4]), new Point(0,0),
++        "dot");
++    this.setCursor(dot);
++
++    // while we are at it... get rid of the keyboard traversals that
++    // make it so we can't type a Tab character:
++    this.setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS,
++        Collections.EMPTY_SET);
++    this.setFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS,
++        Collections.EMPTY_SET);
++
+     colors = new Color[256];
+     for (int i = 0; i < 256; i++)
+       colors[i] = new Color(cm8.getRGB(i));
+@@ -169,6 +184,7 @@
+       inputEnabled = true;
+       addMouseListener(this);
+       addMouseMotionListener(this);
++      addMouseWheelListener(this);
+       if (viewer.showControls) {
+ 	viewer.buttonPanel.enableRemoteAccessControls(true);
+       }
+@@ -177,6 +193,7 @@
+       inputEnabled = false;
+       removeMouseListener(this);
+       removeMouseMotionListener(this);
++      removeMouseWheelListener(this);
+       if (viewer.showControls) {
+ 	viewer.buttonPanel.enableRemoteAccessControls(false);
+       }
+@@ -1190,6 +1207,9 @@
+   public void mouseDragged(MouseEvent evt) {
+     processLocalMouseEvent(evt, true);
+   }
++  public void mouseWheelMoved(MouseWheelEvent evt) {
++    processLocalMouseWheelEvent(evt);
++  }
+ 
+   public void processLocalKeyEvent(KeyEvent evt) {
+     if (viewer.rfb != null && rfb.inNormalProtocol) {
+@@ -1221,6 +1241,19 @@
+     evt.consume();
+   }
+ 
++  public void processLocalMouseWheelEvent(MouseWheelEvent evt) {
++    if (viewer.rfb != null && rfb.inNormalProtocol) {
++      synchronized(rfb) {
++	try {
++	  rfb.writeWheelEvent(evt);
++	} catch (Exception e) {
++	  e.printStackTrace();
++	}
++	rfb.notify();
++      }
++    }
++  }
++
+   public void processLocalMouseEvent(MouseEvent evt, boolean moved) {
+     if (viewer.rfb != null && rfb.inNormalProtocol) {
+       if (moved) {
+@@ -1387,9 +1420,9 @@
+ 		result = cm8.getRGB(pixBuf[i]);
+ 	      } else {
+ 		result = 0xFF000000 |
+-		  (pixBuf[i * 4 + 1] & 0xFF) << 16 |
+-		  (pixBuf[i * 4 + 2] & 0xFF) << 8 |
+-		  (pixBuf[i * 4 + 3] & 0xFF);
++		  (pixBuf[i * 4 + 2] & 0xFF) << 16 |
++		  (pixBuf[i * 4 + 1] & 0xFF) << 8 |
++		  (pixBuf[i * 4 + 0] & 0xFF);
+ 	      }
+ 	    } else {
+ 	      result = 0;	// Transparent pixel
+@@ -1403,9 +1436,9 @@
+ 	      result = cm8.getRGB(pixBuf[i]);
+ 	    } else {
+ 	      result = 0xFF000000 |
+-		(pixBuf[i * 4 + 1] & 0xFF) << 16 |
+-		(pixBuf[i * 4 + 2] & 0xFF) << 8 |
+-		(pixBuf[i * 4 + 3] & 0xFF);
++		(pixBuf[i * 4 + 2] & 0xFF) << 16 |
++		(pixBuf[i * 4 + 1] & 0xFF) << 8 |
++		(pixBuf[i * 4 + 0] & 0xFF);
+ 	    }
+ 	  } else {
+ 	    result = 0;		// Transparent pixel
+diff -Naur vnc_javasrc.orig/VncViewer.java vnc_javasrc/VncViewer.java
 --- vnc_javasrc.orig/VncViewer.java	2004-03-04 08:34:25.000000000 -0500
 +++ vnc_javasrc/VncViewer.java	2010-03-27 17:57:04.000000000 -0400
 @@ -29,6 +29,7 @@
diff --git a/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch b/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
index 224d825..3309860 100644
--- a/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
+++ b/classes/ssl/ultravnc-102-JavaViewer-ssl-etc.patch
@@ -1685,7 +1685,7 @@ diff -Naur JavaViewer.orig/OptionsFrame.java JavaViewer/OptionsFrame.java
      choices[shareDesktopIndex].select("Yes");
 diff -Naur JavaViewer.orig/RfbProto.java JavaViewer/RfbProto.java
 --- JavaViewer.orig/RfbProto.java	2006-05-24 15:14:40.000000000 -0400
-+++ JavaViewer/RfbProto.java	2010-03-27 17:59:56.000000000 -0400
++++ JavaViewer/RfbProto.java	2010-11-30 22:13:58.000000000 -0500
 @@ -31,6 +31,7 @@
  import java.net.Socket;
  import java.util.*;
@@ -2662,7 +2662,45 @@ diff -Naur JavaViewer.orig/RfbProto.java JavaViewer/RfbProto.java
  
  		os.write(b);
  	//	}
-@@ -1610,6 +1971,21 @@
+@@ -1506,6 +1867,37 @@
+ 	final static int META_MASK = InputEvent.META_MASK;
+ 	final static int ALT_MASK = InputEvent.ALT_MASK;
+ 
++	void writeWheelEvent(MouseWheelEvent evt) throws IOException {
++		eventBufLen = 0;
++
++		int x = evt.getX();
++		int y = evt.getY();
++
++		if (x < 0) x = 0;
++		if (y < 0) y = 0;
++
++		int ptrmask;
++
++		int clicks = evt.getWheelRotation();
++		System.out.println("writeWheelEvent: clicks: " + clicks);
++		if (clicks > 0) {
++			ptrmask = 16;
++		} else if (clicks < 0) {
++			ptrmask = 8;
++		} else {
++			return;
++		}
++
++		eventBuf[eventBufLen++] = (byte) PointerEvent;
++		eventBuf[eventBufLen++] = (byte) ptrmask;
++		eventBuf[eventBufLen++] = (byte) ((x >> 8) & 0xff);
++		eventBuf[eventBufLen++] = (byte) (x & 0xff);
++		eventBuf[eventBufLen++] = (byte) ((y >> 8) & 0xff);
++		eventBuf[eventBufLen++] = (byte) (y & 0xff);
++
++		os.write(eventBuf, 0, eventBufLen);
++	}
++
+ 	//
+ 	// Write a pointer event message.  We may need to send modifier key events
+ 	// around it to set the correct modifier state.
+@@ -1610,6 +2002,21 @@
  
  		boolean down = (evt.getID() == KeyEvent.KEY_PRESSED);
  
@@ -2684,7 +2722,7 @@ diff -Naur JavaViewer.orig/RfbProto.java JavaViewer/RfbProto.java
  		int key;
  		if (evt.isActionKey()) {
  
-@@ -1685,6 +2061,9 @@
+@@ -1685,6 +2092,9 @@
  				default :
  					return;
  			}
@@ -2694,7 +2732,7 @@ diff -Naur JavaViewer.orig/RfbProto.java JavaViewer/RfbProto.java
  
  		} else {
  
-@@ -1794,6 +2173,16 @@
+@@ -1794,6 +2204,16 @@
  	int oldModifiers = 0;
  
  	void writeModifierKeyEvents(int newModifiers) {
@@ -4784,18 +4822,31 @@ diff -Naur JavaViewer.orig/SSLSocketToMe.java JavaViewer/SSLSocketToMe.java
 +}
 diff -Naur JavaViewer.orig/VncCanvas.java JavaViewer/VncCanvas.java
 --- JavaViewer.orig/VncCanvas.java	2005-11-21 18:50:18.000000000 -0500
-+++ JavaViewer/VncCanvas.java	2007-05-31 15:33:20.000000000 -0400
-@@ -27,6 +27,9 @@
++++ JavaViewer/VncCanvas.java	2010-11-30 22:57:50.000000000 -0500
+@@ -27,6 +27,13 @@
  import java.lang.*;
  import java.util.zip.*;
  
 +// begin runge/x11vnc
 +import java.util.Collections;
 +// end runge/x11vnc
++
++// begin runge/x11vnc
++// all the MouseWheel stuff below.
++// end runge/x11vnc
  
  //
  // VncCanvas is a subclass of Canvas which draws a VNC desktop on it.
-@@ -85,6 +88,22 @@
+@@ -34,7 +41,7 @@
+ 
+ class VncCanvas
+ 	extends Canvas
+-	implements KeyListener, MouseListener, MouseMotionListener {
++	implements KeyListener, MouseListener, MouseMotionListener, MouseWheelListener {
+ 
+ 	VncViewer viewer;
+ 	RfbProto rfb;
+@@ -85,6 +92,22 @@
  		
  		cm24 = new DirectColorModel(24, 0xFF0000, 0x00FF00, 0x0000FF);
  
@@ -4818,7 +4869,23 @@ diff -Naur JavaViewer.orig/VncCanvas.java JavaViewer/VncCanvas.java
  		colors = new Color[256];
  		// sf@2005 - Now Default
  		for (int i = 0; i < 256; i++)
-@@ -202,6 +221,9 @@
+@@ -186,6 +209,7 @@
+ 			inputEnabled = true;
+ 			addMouseListener(this);
+ 			addMouseMotionListener(this);
++			addMouseWheelListener(this);
+ 			if (viewer.showControls) {
+ 				viewer.buttonPanel.enableRemoteAccessControls(true);
+ 			}
+@@ -193,6 +217,7 @@
+ 			inputEnabled = false;
+ 			removeMouseListener(this);
+ 			removeMouseMotionListener(this);
++			removeMouseWheelListener(this);
+ 			if (viewer.showControls) {
+ 				viewer.buttonPanel.enableRemoteAccessControls(false);
+ 			}
+@@ -202,6 +227,9 @@
  	
  	public void setPixelFormat() throws IOException {
  		// sf@2005 - Adding more color modes
@@ -4828,7 +4895,7 @@ diff -Naur JavaViewer.orig/VncCanvas.java JavaViewer/VncCanvas.java
  		if (viewer.options.eightBitColors > 0)
  		{
  			viewer.options.oldEightBitColors = viewer.options.eightBitColors;
-@@ -237,6 +259,9 @@
+@@ -237,6 +265,9 @@
  		}
  		else 
  		{
@@ -4838,7 +4905,7 @@ diff -Naur JavaViewer.orig/VncCanvas.java JavaViewer/VncCanvas.java
  			rfb.writeSetPixelFormat(
  				32,
  				24,
-@@ -376,12 +401,14 @@
+@@ -376,12 +407,14 @@
  		// Start/stop session recording if necessary.
  		viewer.checkRecordingStatus();
  
@@ -4859,7 +4926,7 @@ diff -Naur JavaViewer.orig/VncCanvas.java JavaViewer/VncCanvas.java
  
  		//
  		// main dispatch loop
-@@ -390,6 +417,9 @@
+@@ -390,6 +423,9 @@
  		while (true) {
  			// Read message type from the server.
  			int msgType = rfb.readServerMessageType();
@@ -4869,7 +4936,37 @@ diff -Naur JavaViewer.orig/VncCanvas.java JavaViewer/VncCanvas.java
  
  			// Process the message depending on its type.
  			switch (msgType) {
-@@ -1532,9 +1562,14 @@
+@@ -1332,6 +1368,9 @@
+ 	public void mouseDragged(MouseEvent evt) {
+ 		processLocalMouseEvent(evt, true);
+ 	}
++	public void mouseWheelMoved(MouseWheelEvent evt) {
++		processLocalMouseWheelEvent(evt);
++	}
+ 
+ 	public void processLocalKeyEvent(KeyEvent evt) {
+ 		if (viewer.rfb != null && rfb.inNormalProtocol) {
+@@ -1367,6 +1406,19 @@
+ 		evt.consume();
+ 	}
+ 
++	public void processLocalMouseWheelEvent(MouseWheelEvent evt) {
++		if (viewer.rfb != null && rfb.inNormalProtocol) {
++			synchronized(rfb) {
++			try {
++				rfb.writeWheelEvent(evt);
++			} catch (Exception e) {
++				e.printStackTrace();
++			}
++				rfb.notify();
++			}
++		}
++	}
++
+ 	public void processLocalMouseEvent(MouseEvent evt, boolean moved) {
+ 		if (viewer.rfb != null && rfb.inNormalProtocol) {
+ 			if (moved) {
+@@ -1532,9 +1584,14 @@
  							else
  							{
  								result =
@@ -4887,7 +4984,7 @@ diff -Naur JavaViewer.orig/VncCanvas.java JavaViewer/VncCanvas.java
  							}
  						} else {
  							result = 0; // Transparent pixel
-@@ -1565,9 +1600,14 @@
+@@ -1565,9 +1622,14 @@
  						else
  						{
  							result =