Changeset 128

Timestamp:

Oct 7, 2007, 9:44:45 PM (17 years ago)

Author:

quentin

Message:

Added control and alt checkboxes, for ease of typing modifier sequences

Location:

trunk/vnc/vnc_javasrc

Files:

• ButtonPanel.java (modified) (5 diffs)
• VncCanvas.java (modified) (2 diffs)

trunk/vnc/vnc_javasrc/ButtonPanel.java

@@ -28 +28 @@
 import java.io.*;
 
-class ButtonPanel extends Panel implements ActionListener {
+class ButtonPanel extends Panel implements ActionListener, ItemListener {
 
   VncViewer viewer;
@@ -37 +37 @@
   Button ctrlAltDelButton;
   Button refreshButton;
+  Checkbox altCheckbox;
+  Checkbox ctrlCheckbox;
 
   ButtonPanel(VncViewer v) {
@@ -66 +68 @@
     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);
   }
 
@@ -104 +115 @@
   public void enableRemoteAccessControls(boolean enable) {
     ctrlAltDelButton.setEnabled(enable);
+    ctrlCheckbox.setEnabled(enable);
+    altCheckbox.setEnabled(enable);
   }
 
@@ -151 +164 @@
     }
   }
+    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/vnc/vnc_javasrc/VncCanvas.java

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