Changeset 1438 for trunk/packages


Ignore:
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:
5 added
6 deleted
7 edited

Legend:

Unmodified
Added
Removed

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

    r1334 r1438  
    2828import java.io.*;
    2929
    30 class ButtonPanel extends Panel implements ActionListener, ItemListener {
     30class ButtonPanel extends Panel implements ActionListener {
    3131
    3232  VncViewer viewer;
    … …  
    3737  Button ctrlAltDelButton;
    3838  Button refreshButton;
    39   Checkbox altCheckbox;
    40   Checkbox ctrlCheckbox;
    4139
    4240  ButtonPanel(VncViewer v) {
    … …  
    6866    add(refreshButton);
    6967    refreshButton.addActionListener(this);
    70    
    71     altCheckbox = new Checkbox("Alt");
    72     altCheckbox.setEnabled(false);
    73     add(altCheckbox);
    74     altCheckbox.addItemListener(this);
    75     ctrlCheckbox = new Checkbox("Control");
    76     ctrlCheckbox.setEnabled(false);
    77     add(ctrlCheckbox);
    78     ctrlCheckbox.addItemListener(this);
    7968  }
    8069
    … …  
    115104  public void enableRemoteAccessControls(boolean enable) {
    116105    ctrlAltDelButton.setEnabled(enable);
    117     ctrlCheckbox.setEnabled(enable);
    118     altCheckbox.setEnabled(enable);
    119106  }
    120107
    … …  
    164151    }
    165152  }
    166     public void itemStateChanged(ItemEvent evt) {
    167         viewer.moveFocusToDesktop();
    168         int state = evt.getStateChange();
    169         int extraModifiers = 0;
    170         if (altCheckbox.getState()) { extraModifiers |= InputEvent.ALT_MASK; }
    171         if (ctrlCheckbox.getState()) { extraModifiers |= InputEvent.CTRL_MASK; }
    172         viewer.vc.extraModifiers = extraModifiers;
    173     }
    174153}
    175154

  • trunk/packages/invirt-vnc-client/Makefile

    r1336 r1438  
    55CP = cp
    66JC = javac
    7 JCFLAGS = -target 1.1 -source 1.2
     7JCFLAGS = -target 1.1
    88JAR = jar
    99ARCHIVE = VncViewer.jar
    … …  
    1818          RecordingFrame.class SessionRecorder.class \
    1919          SocketFactory.class HTTPConnectSocketFactory.class \
    20           VNCProxyConnectSocketFactory.class VNCProxyConnectSocket.class \
    2120          HTTPConnectSocket.class ReloginPanel.class \
    22           InStream.class MemInStream.class ZlibInStream.class \
    23           VNCProxyConnectSocketWrapper.class SocketWrapper.class SocketWrapper\$$WrappingSocketImpl.class InvirtTrustManager.class
     21          InStream.class MemInStream.class ZlibInStream.class
    2422
    2523SOURCES = VncViewer.java RfbProto.java AuthPanel.java VncCanvas.java \
    … …  
    2927          RecordingFrame.java SessionRecorder.java \
    3028          SocketFactory.java HTTPConnectSocketFactory.java \
    31           VNCProxyConnectSocketFactory.java VNCProxyConnectSocket.java \
    3229          HTTPConnectSocket.java ReloginPanel.java \
    33           InStream.java MemInStream.java ZlibInStream.java \
    34           VNCProxyConnectSocketWrapper.java SocketWrapper.java InvirtTrustManager.java
     30          InStream.java MemInStream.java ZlibInStream.java
    3531
    3632all: $(CLASSES) $(ARCHIVE)

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

    r1334 r1438  
    209209
    210210    if (viewer.socketFactory == null) {
    211         System.out.println("Null socketFactory");
    212211      sock = new Socket(host, port);
    213212    } else {
    … …  
    215214        Class factoryClass = Class.forName(viewer.socketFactory);
    216215        SocketFactory factory = (SocketFactory)factoryClass.newInstance();
    217         System.out.println("Using socketFactory " + factory);
    218216        if (viewer.inAnApplet)
    219217          sock = factory.createSocket(host, port, viewer);
    … …  
    239237      sock.close();
    240238      closed = true;
    241       System.out.println("RFB socket closed " + sock);
     239      System.out.println("RFB socket closed");
    242240      if (rec != null) {
    243241        rec.close();

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

    r1334 r1438  
    8080  // True if we process keyboard and mouse events.
    8181  boolean inputEnabled;
    82   int extraModifiers = 0;
    8382
    8483  //
    … …  
    15121511        synchronized(rfb) {
    15131512          try {
    1514             if (extraModifiers != 0) {
    1515               evt.setModifiers(evt.getModifiers() | extraModifiers);
    1516             }
    15171513            rfb.writeKeyEvent(evt);
    15181514          } catch (Exception e) {

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

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

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

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

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

    r1334 r1438  
    22
    33include /usr/share/cdbs/1/rules/debhelper.mk
     4include /usr/share/cdbs/1/rules/patchsys-quilt.mk
    45include /usr/share/cdbs/1/class/makefile.mk
    56
Note: See TracChangeset for help on using the changeset viewer.