1 files changed, 22 insertions, 22 deletions

diff --git a/java/com/tigervnc/vncviewer/Viewport.java b/java/com/tigervnc/vncviewer/Viewport.java
index 1ce411c5..1f21beef 100644
--- a/java/com/tigervnc/vncviewer/Viewport.java
+++ b/java/com/tigervnc/vncviewer/Viewport.java
@@ -135,8 +135,8 @@ class Viewport extends JPanel implements ActionListener {
   public void updateWindow() {
     Rect r = frameBuffer.getDamage();
     if (!r.is_empty()) {
-      if (cc.cp.width != scaledWidth ||
-          cc.cp.height != scaledHeight) {
+      if (cc.server.width() != scaledWidth ||
+          cc.server.height() != scaledHeight) {
         AffineTransform t = new AffineTransform(); 
         t.scale((double)scaleRatioX, (double)scaleRatioY);
         Rectangle s = new Rectangle(r.tl.x, r.tl.y, r.width(), r.height());
@@ -309,8 +309,8 @@ class Viewport extends JPanel implements ActionListener {
   public void paintComponent(Graphics g) {
     Graphics2D g2 = (Graphics2D)g;
     synchronized(frameBuffer.getImage()) {
-      if (cc.cp.width != scaledWidth ||
-          cc.cp.height != scaledHeight) {
+      if (cc.server.width() != scaledWidth ||
+          cc.server.height() != scaledHeight) {
         g2.setRenderingHint(RenderingHints.KEY_RENDERING,
                             RenderingHints.VALUE_RENDER_QUALITY);
         g2.drawImage(frameBuffer.getImage(), 0, 0,
@@ -342,14 +342,14 @@ class Viewport extends JPanel implements ActionListener {
         scaledWidth = width;
         scaledHeight = height;
       } else {
-        float widthRatio = (float)width / (float)cc.cp.width;
-        float heightRatio = (float)height / (float)cc.cp.height;
+        float widthRatio = (float)width / (float)cc.server.width();
+        float heightRatio = (float)height / (float)cc.server.height();
         float ratio = Math.min(widthRatio, heightRatio);
-        scaledWidth = (int)Math.floor(cc.cp.width * ratio);
-        scaledHeight = (int)Math.floor(cc.cp.height * ratio);
+        scaledWidth = (int)Math.floor(cc.server.width() * ratio);
+        scaledHeight = (int)Math.floor(cc.server.height() * ratio);
       }
-      scaleRatioX = (float)scaledWidth / (float)cc.cp.width;
-      scaleRatioY = (float)scaledHeight / (float)cc.cp.height;
+      scaleRatioX = (float)scaledWidth / (float)cc.server.width();
+      scaleRatioY = (float)scaledHeight / (float)cc.server.height();
     }
     if (scaledWidth != getWidth() || scaledHeight != getHeight())
       setSize(new Dimension(scaledWidth, scaledHeight));
@@ -360,15 +360,15 @@ class Viewport extends JPanel implements ActionListener {
     if (!viewOnly.getValue()) {
       if (buttonMask != lastButtonMask || !pos.equals(lastPointerPos)) {
         try {
-          if (cc.cp.width != scaledWidth ||
-              cc.cp.height != scaledHeight) {
+          if (cc.server.width() != scaledWidth ||
+              cc.server.height() != scaledHeight) {
             int sx = (scaleRatioX == 1.00) ?
               pos.x : (int)Math.floor(pos.x / scaleRatioX);
             int sy = (scaleRatioY == 1.00) ?
               pos.y : (int)Math.floor(pos.y / scaleRatioY);
             pos = pos.translate(new Point(sx - pos.x, sy - pos.y));
           }
-          cc.writer().pointerEvent(pos, buttonMask);
+          cc.writer().writePointerEvent(pos, buttonMask);
         } catch (Exception e) {
           vlog.error("%s", e.getMessage());
           cc.close();
@@ -430,8 +430,8 @@ class Viewport extends JPanel implements ActionListener {
           downKeySym.containsValue(XK_Alt_R)) {
         vlog.debug("Faking release of AltGr (Ctrl_L+Alt_R)");
         try {
-          cc.writer().keyEvent(XK_Control_L, false);
-          cc.writer().keyEvent(XK_Alt_R, false);
+          cc.writer().writeKeyEvent(XK_Control_L, false);
+          cc.writer().writeKeyEvent(XK_Alt_R, false);
         } catch (Exception e) {
           vlog.error("%s", e.getMessage());
           cc.close();
@@ -450,9 +450,9 @@ class Viewport extends JPanel implements ActionListener {
     try {
       // Fake keycode?
       if (keyCode > 0xffff)
-        cc.writer().keyEvent(keySym, true);
+        cc.writer().writeKeyEvent(keySym, true);
       else
-        cc.writer().keyEvent(keySym, true);
+        cc.writer().writeKeyEvent(keySym, true);
     } catch (Exception e) {
       vlog.error("%s", e.getMessage());
       cc.close();
@@ -464,8 +464,8 @@ class Viewport extends JPanel implements ActionListener {
           downKeySym.containsValue(XK_Alt_R)) {
         vlog.debug("Restoring AltGr state");
         try {
-          cc.writer().keyEvent(XK_Control_L, true);
-          cc.writer().keyEvent(XK_Alt_R, true);
+          cc.writer().writeKeyEvent(XK_Control_L, true);
+          cc.writer().writeKeyEvent(XK_Alt_R, true);
         } catch (Exception e) {
           vlog.error("%s", e.getMessage());
           cc.close();
@@ -493,9 +493,9 @@ class Viewport extends JPanel implements ActionListener {
 
     try {
       if (keyCode > 0xffff)
-        cc.writer().keyEvent(iter, false);
+        cc.writer().writeKeyEvent(iter, false);
       else
-        cc.writer().keyEvent(iter, false);
+        cc.writer().writeKeyEvent(iter, false);
     } catch (Exception e) {
       vlog.error("%s", e.getMessage());
       cc.close();
@@ -773,7 +773,7 @@ class Viewport extends JPanel implements ActionListener {
   {
     setMenuKey();
     /*
-    setScaledSize(cc.cp.width, cc.cp.height);
+    setScaledSize(cc.server.width(), cc.server.height());
     if (!oldSize.equals(new Dimension(scaledWidth, scaledHeight))) {
     // Re-layout the DesktopWindow when the scaled size changes.
     // Ideally we'd do this with a ComponentListener, but unfortunately