Changeset 1438

Timestamp:

Oct 31, 2008, 6:20:51 AM (16 years ago)

Author:

broder

Message:

Isolate our patches to the VNC client from the upstream TightVNC
source

Location:

trunk/packages/invirt-vnc-client

Files:

• ButtonPanel.java (modified) (5 diffs)
• InvirtTrustManager.java (deleted)
• Makefile (modified) (3 diffs)
• RfbProto.java (modified) (3 diffs)
• SocketWrapper.java (deleted)
• VNCProxyConnectSocket.java (deleted)
• VNCProxyConnectSocketFactory.java (deleted)
• VNCProxyConnectSocketWrapper.java (deleted)
• VncCanvas.java (modified) (2 diffs)
• config.todo (deleted)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/patches (added)
• debian/patches/add-control-alt-checkboxes.patch (added)
• debian/patches/invirt-ssl-proxy.patch (added)
• debian/patches/makefile-source-version.patch (added)
• debian/patches/series (added)
• debian/rules (modified) (1 diff)

trunk/packages/invirt-vnc-client/ButtonPanel.java

@@ -28 +28 @@
 import java.io.*;
 
-class ButtonPanel extends Panel implements ActionListener, ItemListener {
+class ButtonPanel extends Panel implements ActionListener {
 
   VncViewer viewer;
@@ -37 +37 @@
   Button ctrlAltDelButton;
   Button refreshButton;
-  Checkbox altCheckbox;
-  Checkbox ctrlCheckbox;
 
   ButtonPanel(VncViewer v) {
@@ -68 +66 @@
     add(refreshButton);
     refreshButton.addActionListener(this);
-    
-    altCheckbox = new Checkbox("Alt");
-    altCheckbox.setEnabled(false);
-    add(altCheckbox);
-    altCheckbox.addItemListener(this);
-    ctrlCheckbox = new Checkbox("Control");
-    ctrlCheckbox.setEnabled(false);
-    add(ctrlCheckbox);
-    ctrlCheckbox.addItemListener(this);
   }
 
@@ -115 +104 @@
   public void enableRemoteAccessControls(boolean enable) {
     ctrlAltDelButton.setEnabled(enable);
-    ctrlCheckbox.setEnabled(enable);
-    altCheckbox.setEnabled(enable);
   }
 
@@ -164 +151 @@
     }
   }
-    public void itemStateChanged(ItemEvent evt) {
-        viewer.moveFocusToDesktop();
-        int state = evt.getStateChange();
-        int extraModifiers = 0;
-        if (altCheckbox.getState()) { extraModifiers |= InputEvent.ALT_MASK; }
-        if (ctrlCheckbox.getState()) { extraModifiers |= InputEvent.CTRL_MASK; }
-        viewer.vc.extraModifiers = extraModifiers;
-    }
 }
 

trunk/packages/invirt-vnc-client/Makefile

@@ -5 +5 @@
 CP = cp
 JC = javac
-JCFLAGS = -target 1.1 -source 1.2
+JCFLAGS = -target 1.1
 JAR = jar
 ARCHIVE = VncViewer.jar
@@ -18 +18 @@
           RecordingFrame.class SessionRecorder.class \
           SocketFactory.class HTTPConnectSocketFactory.class \
-          VNCProxyConnectSocketFactory.class VNCProxyConnectSocket.class \
           HTTPConnectSocket.class ReloginPanel.class \
-          InStream.class MemInStream.class ZlibInStream.class \
-          VNCProxyConnectSocketWrapper.class SocketWrapper.class SocketWrapper\$$WrappingSocketImpl.class InvirtTrustManager.class
+          InStream.class MemInStream.class ZlibInStream.class
 
 SOURCES = VncViewer.java RfbProto.java AuthPanel.java VncCanvas.java \
@@ -29 +27 @@
           RecordingFrame.java SessionRecorder.java \
           SocketFactory.java HTTPConnectSocketFactory.java \
-          VNCProxyConnectSocketFactory.java VNCProxyConnectSocket.java \
           HTTPConnectSocket.java ReloginPanel.java \
-          InStream.java MemInStream.java ZlibInStream.java \
-          VNCProxyConnectSocketWrapper.java SocketWrapper.java InvirtTrustManager.java
+          InStream.java MemInStream.java ZlibInStream.java
 
 all: $(CLASSES) $(ARCHIVE)

trunk/packages/invirt-vnc-client/RfbProto.java

@@ -209 +209 @@
 
     if (viewer.socketFactory == null) {
-        System.out.println("Null socketFactory");
       sock = new Socket(host, port);
     } else {
@@ -215 +214 @@
         Class factoryClass = Class.forName(viewer.socketFactory);
         SocketFactory factory = (SocketFactory)factoryClass.newInstance();
-        System.out.println("Using socketFactory " + factory);
         if (viewer.inAnApplet)
           sock = factory.createSocket(host, port, viewer);
@@ -239 +237 @@
       sock.close();
       closed = true;
-      System.out.println("RFB socket closed " + sock);
+      System.out.println("RFB socket closed");
       if (rec != null) {
         rec.close();

trunk/packages/invirt-vnc-client/VncCanvas.java

@@ -80 +80 @@
   // True if we process keyboard and mouse events.
   boolean inputEnabled;
-  int extraModifiers = 0;
 
   //
@@ -1512 +1511 @@
         synchronized(rfb) {
           try {
-            if (extraModifiers != 0) {
-              evt.setModifiers(evt.getModifiers() | extraModifiers);
-            }
             rfb.writeKeyEvent(evt);
           } catch (Exception e) {

trunk/packages/invirt-vnc-client/debian/changelog

@@ +1 @@
+invirt-vnc-client (0.0.6) unstable; urgency=low
+
+  * Isolate our patches from the upstream source
+
+ -- Evan Broder <broder@mit.edu>  Fri, 31 Oct 2008 06:10:38 -0400
+
 invirt-vnc-client (0.0.5) unstable; urgency=low
 

trunk/packages/invirt-vnc-client/debian/control

@@ -3 +3 @@
 Priority: extra
 Maintainer: Invirt project <invirt@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), subversion, sun-java6-jdk | java-compiler
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), quilt, sun-java6-jdk | java-compiler
 Standards-Version: 3.7.2
 

trunk/packages/invirt-vnc-client/debian/rules

@@ -2 +2 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/makefile.mk