publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase from master

Browse Source
This commit is contained in:
matt
2021-10-12 18:43:20 +00:00
parent a996e9fa87 bcad19542e
commit 3236216af9
13 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/rfb/InputHandler.h
View File

@@ -38,7 +38,11 @@ namespace rfb {
virtual void pointerEvent(const Point& __unused_attr pos,
int __unused_attr buttonMask,
const bool __unused_attr skipClick,
const bool __unused_attr skipRelease) { }
const bool __unused_attr skipRelease,
int scrollX,
int scrollY) { }
virtual void clientCutText(const char* __unused_attr str,
int __unused_attr len) { }
};
}

4
common/rfb/SMsgReader.cxx
View File

@@ -224,7 +224,9 @@ void SMsgReader::readPointerEvent()
int mask = is->readU8();
int x = is->readU16();
int y = is->readU16();
handler->pointerEvent(Point(x, y), mask, false, false);
int scrollX = is->readS16();
int scrollY = is->readS16();
handler->pointerEvent(Point(x, y), mask, false, false, scrollX, scrollY);
}

18
common/rfb/TightWEBPEncoder.cxx
View File

@@ -71,12 +71,12 @@ static const struct TightWEBPConfiguration conf[10] = {
{ 24, 0 }, // 1
{ 30, 0 }, // 2
{ 37, 0 }, // 3
{ 42, 1 }, // 4
{ 65, 1 }, // 5
{ 78, 1 }, // 6
{ 85, 2 }, // 7
{ 88, 3 }, // 8
{ 100, 4 } // 9
{ 42, 0 }, // 4
{ 65, 0 }, // 5
{ 78, 0 }, // 6
{ 85, 0 }, // 7
{ 88, 0 }, // 8
{ 100, 0 } // 9
};
@@ -143,7 +143,7 @@ void TightWEBPEncoder::compressOnly(const PixelBuffer* pb, const uint8_t quality
method = conf[qualityIn].method;
} else {
quality = 8;
method = 4;
method = 0;
}
WebPConfigInit(&cfg);
@@ -214,7 +214,7 @@ void TightWEBPEncoder::writeRect(const PixelBuffer* pb, const Palette& palette)
method = conf[qualityLevel].method;
} else {
quality = 8;
method = 4;
method = 0;
}
WebPConfigInit(&cfg);
@@ -265,7 +265,7 @@ rdr::U32 TightWEBPEncoder::benchmark() const
rdr::U8* buffer;
struct timeval start;
int stride, i;
const uint8_t quality = 8, method = 4;
const uint8_t quality = 8, method = 2;
WebPConfig cfg;
WebPPicture pic;
WebPMemoryWriter wrt;

4
common/rfb/VNCSConnectionST.cxx
View File

@@ -703,7 +703,7 @@ void VNCSConnectionST::setPixelFormat(const PixelFormat& pf)
setCursor();
}
void VNCSConnectionST::pointerEvent(const Point& pos, int buttonMask, const bool skipClick, const bool skipRelease)
void VNCSConnectionST::pointerEvent(const Point& pos, int buttonMask, const bool skipClick, const bool skipRelease, int scrollX, int scrollY)
{
pointerEventTime = lastEventTime = time(0);
server->lastUserInputTime = lastEventTime;
@@ -731,7 +731,7 @@ void VNCSConnectionST::pointerEvent(const Point& pos, int buttonMask, const bool
}
}
server->desktop->pointerEvent(pointerEventPos, buttonMask, skipclick, skiprelease);
server->desktop->pointerEvent(pointerEventPos, buttonMask, skipclick, skiprelease, scrollX, scrollY);
}
}

2
common/rfb/VNCSConnectionST.h
View File

@@ -207,7 +207,7 @@ namespace rfb {
virtual void queryConnection(const char* userName);
virtual void clientInit(bool shared);
virtual void setPixelFormat(const PixelFormat& pf);
virtual void pointerEvent(const Point& pos, int buttonMask, const bool skipClick, const bool skipRelease);
virtual void pointerEvent(const Point& pos, int buttonMask, const bool skipClick, const bool skipRelease, int scrollX, int scrollY);
virtual void keyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down);
virtual void framebufferUpdateRequest(const Rect& r, bool incremental);
virtual void setDesktopSize(int fb_width, int fb_height,