# HG changeset patch # User mir3636 # Date 1467018449 -32400 # Node ID c6058c4e2a794c503432e62ffbfc257f489399b9 # Parent 9f5cd8ca0ebc089e5ce8d858b90a5047b23e5ae2 remove debug message diff -r 9f5cd8ca0ebc -r c6058c4e2a79 src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java --- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Thu Jun 23 19:36:31 2016 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Mon Jun 27 18:07:29 2016 +0900 @@ -308,6 +308,7 @@ renderer = repaintController.createRenderer(reader, rect.width, rect.height, context.getPixelFormat()); } repaintController.setVisible(id != rfb.getId()); + // System.out.println("got INIT_DATA: myID = " + rfb.getId() + " sharingID = " + id); if (rfb.hasViewer()){ setScreenParameter(rect,singleWidth,singleHeight); } diff -r 9f5cd8ca0ebc -r c6058c4e2a79 src/viewer_swing/java/com/glavsoft/viewer/Viewer.java --- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Thu Jun 23 19:36:31 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Mon Jun 27 18:07:29 2016 +0900 @@ -363,6 +363,7 @@ connectionPresenter.setSingleWidth(width); connectionPresenter.setSingleHeight(height); connectionPresenter.setRetinaScale(scale); + // System.out.println("Sarver change accepted from id :" + newVNCServerId); return connectionPresenter; } diff -r 9f5cd8ca0ebc -r c6058c4e2a79 src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java --- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Thu Jun 23 19:36:31 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Mon Jun 27 18:07:29 2016 +0900 @@ -920,7 +920,7 @@ int x = rectangle1.getXfb(); int y = rectangle1.getYfb(); int scale = rectangle1.getRetinaScale(); - showScreenInfo("request screen change", 0, x, y, singleWidth, singleHeight, scale); + // showScreenInfo("request screen change id = " + viewer.getRfb().getId(), 0, x, y, singleWidth, singleHeight, scale); if (viewer.getRfb().isTreeManager()) { changeVncServer(viewer, x, y, singleWidth * scale, singleHeight * scale, scale, viewer.getRfb().getId()); } @@ -966,17 +966,17 @@ int thatRetinaScale = presenter.getRetinaScale(); final int thatScreenWidth = presenter.getSingleWidth(); final int thatScreenHeight = presenter.getSingleHeight(); - showScreenInfo("that", 0, thatScreenX, thatScreenY, thatScreenWidth, thatScreenHeight, thatRetinaScale); - System.out.println("that FB x:" + viewer.getRfb().getContext().getFbWidth() + " y:" + viewer.getRfb().getContext().getFbHeight()); + // showScreenInfo("that", 0, thatScreenX, thatScreenY, thatScreenWidth, thatScreenHeight, thatRetinaScale); + // System.out.println("that FB x:" + viewer.getRfb().getContext().getFbWidth() + " y:" + viewer.getRfb().getContext().getFbHeight()); frame.setSize(thisScreenWidth, thisScreenHeight); double scale = uiSettings.fitScreen(thisScreenWidth, thisScreenHeight, thatScreenWidth, thatScreenHeight); // final Rectangle visible = new Rectangle((int)(thatScreenX*scale),(int)(thatScreenY*scale),(int)(thatScreenWidth*scale)-1,(int)(thatScreenHeight*scale)-1); - showScreenInfo("this", thisScreenNumber, 0, 0,thisScreenWidth, thisScreenHeight, thisRetinaScale); + // showScreenInfo("this", thisScreenNumber, 0, 0,thisScreenWidth, thisScreenHeight, thisRetinaScale); final int scrollx = (int)(thatScreenX * scale); final int scrolly = (int)(thatScreenY * scale); - System.out.println("thisScrollScale: " + scale + " xmax:"+scroller.getHorizontalScrollBar().getMaximum() + " scrollx:"+scrollx); - System.out.println("thisScrollScale: " + scale + " ymax:"+scroller.getVerticalScrollBar().getMaximum() + " scrolly:"+scrolly); + // System.out.println("thisScrollScale: " + scale + " xmax:"+scroller.getHorizontalScrollBar().getMaximum() + " scrollx:"+scrollx); + // System.out.println("thisScrollScale: " + scale + " ymax:"+scroller.getVerticalScrollBar().getMaximum() + " scrolly:"+scrolly); SwingUtilities.invokeLater(new Runnable() { public void run() { scroller.getHorizontalScrollBar().setValue(scrollx);