commit daa7a5e7e27971e25f90a2ab85425418ec8a19a5
author Brian P. Hinz <bphinz@users.sf.net> Sun Nov 12 11:03:25 2017 -0500
committer Brian P. Hinz <bphinz@users.sf.net> Mon Nov 13 18:20:50 2017 -0500
tree 83d7d90aaa6f64eac8a60fe60a4bdfb57a29d9d9
parent ce4722f3cdae6a3446b15dd52ade93ca6f49dca6

Rename CMsgWriter functions to match C++ code

java/com/tigervnc/rfb/CMsgWriter.java

diff --git a/java/com/tigervnc/rfb/CMsgWriter.java b/java/com/tigervnc/rfb/CMsgWriter.java
index ea2b7c9..164fa29 100644
--- a/java/com/tigervnc/rfb/CMsgWriter.java
+++ b/java/com/tigervnc/rfb/CMsgWriter.java
@@ -211,16 +211,16 @@
     endMsg();
   }
 
-  synchronized public void writeKeyEvent(int key, boolean down)
+  synchronized public void keyEvent(int keysym, boolean down)
   {
     startMsg(MsgTypes.msgTypeKeyEvent);
     os.writeU8(down?1:0);
     os.pad(2);
-    os.writeU32(key);
+    os.writeU32(keysym);
     endMsg();
   }
 
-  synchronized public void writePointerEvent(Point pos, int buttonMask)
+  synchronized public void pointerEvent(Point pos, int buttonMask)
   {
     Point p = new Point(pos.x,pos.y);
     if (p.x < 0) p.x = 0;

java/com/tigervnc/vncviewer/CConn.java

diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index 85bdcb6..398ba9d 100644
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -757,7 +757,7 @@
   public void writeKeyEvent(int keysym, boolean down) {
     if (state() != RFBSTATE_NORMAL || shuttingDown)
       return;
-    writer().writeKeyEvent(keysym, down);
+    writer().keyEvent(keysym, down);
   }
 
   public void writeKeyEvent(KeyEvent ev) {
@@ -866,7 +866,7 @@
       break;
     }
 
-    writer().writePointerEvent(new Point(ev.getX(), ev.getY()), buttonMask);
+    writer().pointerEvent(new Point(ev.getX(), ev.getY()), buttonMask);
   }
 
   public void writeWheelEvent(MouseWheelEvent ev) {
@@ -882,9 +882,9 @@
     for (int i = 0; i < Math.abs(clicks); i++) {
       x = ev.getX();
       y = ev.getY();
-      writer().writePointerEvent(new Point(x, y), buttonMask);
+      writer().pointerEvent(new Point(x, y), buttonMask);
       buttonMask = 0;
-      writer().writePointerEvent(new Point(x, y), buttonMask);
+      writer().pointerEvent(new Point(x, y), buttonMask);
     }
 
   }

java/com/tigervnc/vncviewer/Viewport.java

diff --git a/java/com/tigervnc/vncviewer/Viewport.java b/java/com/tigervnc/vncviewer/Viewport.java
index 01d46ca..62b027f 100644
--- a/java/com/tigervnc/vncviewer/Viewport.java
+++ b/java/com/tigervnc/vncviewer/Viewport.java
@@ -87,7 +87,7 @@
     // a server-side cursor. Ideally we'd like to send the actual pointer
     // position, but we can't really tell when the window manager is done
     // placing us so we don't have a good time for that.
-    cc.writer().writePointerEvent(new Point(w/2, h/2), 0);
+    cc.writer().pointerEvent(new Point(w/2, h/2), 0);
   }
 
   // Most efficient format (from Viewport's point of view)