From daa7a5e7e27971e25f90a2ab85425418ec8a19a5 Mon Sep 17 00:00:00 2001 From: "Brian P. Hinz" Date: Sun, 12 Nov 2017 11:03:25 -0500 Subject: [PATCH] Rename CMsgWriter functions to match C++ code --- java/com/tigervnc/rfb/CMsgWriter.java | 6 +++--- java/com/tigervnc/vncviewer/CConn.java | 8 ++++---- java/com/tigervnc/vncviewer/Viewport.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/com/tigervnc/rfb/CMsgWriter.java b/java/com/tigervnc/rfb/CMsgWriter.java index ea2b7c91..164fa293 100644 --- a/java/com/tigervnc/rfb/CMsgWriter.java +++ b/java/com/tigervnc/rfb/CMsgWriter.java @@ -211,16 +211,16 @@ public class CMsgWriter { 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; diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java index 85bdcb69..398ba9d0 100644 --- a/java/com/tigervnc/vncviewer/CConn.java +++ b/java/com/tigervnc/vncviewer/CConn.java @@ -757,7 +757,7 @@ public class CConn extends CConnection implements 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 @@ public class CConn extends CConnection implements 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 @@ public class CConn extends CConnection implements 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); } } diff --git a/java/com/tigervnc/vncviewer/Viewport.java b/java/com/tigervnc/vncviewer/Viewport.java index 01d46caf..62b027f7 100644 --- a/java/com/tigervnc/vncviewer/Viewport.java +++ b/java/com/tigervnc/vncviewer/Viewport.java @@ -87,7 +87,7 @@ class Viewport extends JPanel implements MouseListener, // 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) -- 2.39.5