2bc431f0a8
- Added cursor pseudo encoding support. - Added Windows support for cursor image capturing in `get_cursor_image` method. Implemented Windows-specific logic using the `win32gui`, `win32ui`, and related libraries to capture the current cursor image, enhancing the cross-platform capability of the application. - Fixed issues in `get_bitmap` method for handling different bpp formats. Specifically addressed the processing logic for 16 bpp (BGR565) format, ensuring that the image conversion and rendering are handled correctly for VNC clients expecting this format. - Added initial Tight encoding support. - Updated the `send_image` method in the Tight encoding class to correctly handle JPEG and ZLIB compression. This includes proper signaling to the client about the type of compression used (JPEG or ZLIB) and ensuring that the data is formatted and sent according to the Tight encoding specifications. - Added checks and conversions in `send_image` to handle different image modes (like RGBX and RGBA) and convert them to the appropriate format (RGB) before compression and transmission. - Implemented a more robust and accurate method for determining when to use JPEG compression in Tight encoding based on the unique color count and image characteristics. These updates significantly improve the functionality, stability, and compatibility of the VNC server, particularly in handling different pixel formats and encoding methods.
55 lines
1.9 KiB
Python
55 lines
1.9 KiB
Python
from . import common
|
|
from lib import log
|
|
from struct import *
|
|
import zlib
|
|
|
|
|
|
class Encoding:
|
|
name = 'zlib'
|
|
id = 6
|
|
description = 'zlib VNC encoding'
|
|
enabled = True
|
|
firstUpdateSent = False
|
|
_compressObj = None
|
|
|
|
def __init__(self):
|
|
log.debug("Initialized", __name__)
|
|
self._compressObj = zlib.compressobj(
|
|
zlib.Z_DEFAULT_COMPRESSION, # level: 0-9
|
|
zlib.DEFLATED, # method: must be DEFLATED
|
|
zlib.MAX_WBITS, # window size in bits:
|
|
# -15..-8: negate, suppress header
|
|
# 8..15: normal
|
|
# 16..30: subtract 16, gzip header
|
|
zlib.DEF_MEM_LEVEL, # mem level: 1..8/9
|
|
zlib.Z_DEFAULT_STRATEGY # strategy:
|
|
# 0 = Z_DEFAULT_STRATEGY
|
|
# 1 = Z_FILTERED
|
|
# 2 = Z_HUFFMAN_ONLY
|
|
# 3 = Z_RLE
|
|
# 4 = Z_FIXED
|
|
)
|
|
|
|
def send_image(self, x, y, w, h, image):
|
|
sendbuff = bytearray()
|
|
|
|
rectangles = 1
|
|
sendbuff.extend(pack("!BxH", 0, rectangles)) # message type 0 == FramebufferUpdate
|
|
sendbuff.extend(pack("!HHHH", x, y, w, h))
|
|
sendbuff.extend(pack(">i", self.id))
|
|
|
|
#log.debug("Compressing...")
|
|
zlibdata = self._compressObj.compress(image.tobytes())
|
|
zlibdata += self._compressObj.flush(zlib.Z_FULL_FLUSH)
|
|
#log.debug("LEN", len(zlibdata))
|
|
|
|
l = pack("!I", len(zlibdata))
|
|
sendbuff.extend(l) # send length
|
|
sendbuff.extend(zlibdata) # send compressed data
|
|
|
|
return sendbuff
|
|
|
|
common.encodings[common.ENCODINGS.zlib] = Encoding
|
|
|
|
log.debug("Loaded encoding: %s (%s)" % (__name__, Encoding.id))
|