# HG changeset patch # User riono # Date 1580890219 -32400 # Node ID 6f95d475906bd1371ecc6da51af1cfc79981287f # Parent 44920845d4e11664451388c35a3aa3efa4ac66c1 fix nullRenderer diff -r 44920845d4e1 -r 6f95d475906b src/main/java/com/glavsoft/rfb/protocol/NullRenderer.java --- a/src/main/java/com/glavsoft/rfb/protocol/NullRenderer.java Wed Feb 05 16:37:02 2020 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/NullRenderer.java Wed Feb 05 17:10:19 2020 +0900 @@ -3,6 +3,7 @@ import com.glavsoft.drawing.ColorDecoder; import com.glavsoft.drawing.Renderer; import com.glavsoft.exceptions.TransportException; +import com.glavsoft.rfb.encoding.PixelFormat; import com.glavsoft.rfb.encoding.decoder.FramebufferUpdateRectangle; import com.glavsoft.transport.Reader; @@ -10,138 +11,13 @@ private int bytePerPixcel; - NullRenderer(int bytePerPixcel) { - this.bytePerPixcel = bytePerPixcel; - } - - @Override - public void drawJpegImage(byte[] bytes, int offset, int jpegBufferLength, - FramebufferUpdateRectangle rect) { - // TODO Auto-generated method stub - - } - - @Override - public void copyRect(int srcX, int srcY, FramebufferUpdateRectangle rect) { - // TODO Auto-generated method stub - - } - - @Override - public int readPixelColor(Reader reader) throws TransportException { - // TODO Auto-generated method stub - return 0; - } - - @Override - public void fillRect(int i, int tileX, int tileY, int tileWidth, - int tileHeight) { - // TODO Auto-generated method stub - - } - - @Override - public int getBytesPerPixel() { - return bytePerPixcel; - } - - @Override - public int getBytesPerCPixel() { - return bytePerPixcel; - } - - @Override - public void drawBytes(byte[] bytes, int x, int y, int width, int height) { - // TODO Auto-generated method stub - - } - - @Override - public int getPixelColor(byte[] buffer, int i) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public void createCursor(int[] cursorPixels, FramebufferUpdateRectangle rect) { - // TODO Auto-generated method stub - - } - - @Override - public void fillRect(int color, FramebufferUpdateRectangle rect) { - // TODO Auto-generated method stub - + public NullRenderer(int i, int width, int height, PixelFormat pixelFormat) { + super(); + init(null, width, height, pixelFormat); } @Override - public int getBytesPerPixelSignificant() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int readTightPixelColor(Reader reader) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int drawTightBytes(byte[] buffer, int i, int x, int y, int width, - int height) { - return 0; - } + public void drawJpegImage(byte[] bytes, int offset, int jpegBufferLength, FramebufferUpdateRectangle rect) { - @Override - public void drawBytesWithPalette(byte[] buffer, - FramebufferUpdateRectangle rect, int[] palette) { - // TODO Auto-generated method stub - - } - - @Override - public ColorDecoder getColorDecoder() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void drawUncaliberedRGBLine(byte[] thisRow, int x, int i, int width) { - // TODO Auto-generated method stub - } - - @Override - public int getCompactPixelColor(byte[] bytes, int index) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public void fillColorBitmapWithColor(int[] decodedBitmap, - int decodedOffset, int rlength, int color) { - // TODO Auto-generated method stub - - } - - @Override - public void drawColoredBitmap(int[] decodedBitmap, int tileX, int tileY, - int tileWidth, int tileHeight) { - // TODO Auto-generated method stub - - } - - @Override - public int drawCompactBytes(byte[] bytes, int offset, int tileX, int tileY, - int tileWidth, int tileHeight) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public void decodeCursorPosition(FramebufferUpdateRectangle rect) { - // TODO Auto-generated method stub - - } - } diff -r 44920845d4e1 -r 6f95d475906b src/main/java/com/glavsoft/rfb/protocol/NullRepaintController.java --- a/src/main/java/com/glavsoft/rfb/protocol/NullRepaintController.java Wed Feb 05 16:37:02 2020 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/NullRepaintController.java Wed Feb 05 17:10:19 2020 +0900 @@ -37,7 +37,7 @@ @Override public Renderer createRenderer(Reader reader, int width, int height, PixelFormat pixelFormat) { - return new NullRenderer(pixelFormat.bitsPerPixel/8); + return new NullRenderer(pixelFormat.bitsPerPixel/8, width, height, pixelFormat); } @Override diff -r 44920845d4e1 -r 6f95d475906b src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java --- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Wed Feb 05 16:37:02 2020 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java Wed Feb 05 17:10:19 2020 +0900 @@ -99,7 +99,7 @@ } renderer = repaintController.createRenderer(reader, context.getFbWidth(), context.getFbHeight(), context.getPixelFormat()); } else { - renderer = new NullRenderer(context.getPixelFormat().bitsPerPixel/8); + renderer = new NullRenderer(context.getPixelFormat().bitsPerPixel/8, context.getFbWidth(), context.getFbHeight(), context.getPixelFormat()); } if(rfb.isTreeManager()) { fullscreenFbUpdateIncrementalRequest = new FramebufferUpdateRequestMessage(cp.getX(), cp.getY(), cp.getSingleWidth(), cp.getSingleHeight(), false); @@ -385,7 +385,7 @@ while (numberOfRectangeles-- > 0) { rect.fill(in); Decoder decoder = decoders.getDecoderByType(rect.getEncodingType()); - decoder.decode(in,new NullRenderer(context.getPixelFormat().bitsPerPixel/8),rect); + decoder.decode(in,new NullRenderer(context.getPixelFormat().bitsPerPixel/8, context.getFbWidth(), context.getFbHeight(), context.getPixelFormat()),rect); } } catch (Exception e) { e.printStackTrace();