Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use generic hot key combo for client control #1375

Draft
wants to merge 21 commits into
base: master
Choose a base branch
from
Draft

Use generic hot key combo for client control #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ec75b80
TEMP: Use event taps for keyboard grab on macOS
CendioOssman Dec 23, 2021
ea57867
TEMP: remove level workaround?
CendioOssman Dec 27, 2021
73e9ebf
Ask user for keyboard access when needed
CendioOssman Jan 21, 2022
ec157df
TEMP: release grab in desktopwindow destructor
CendioOssman Jan 24, 2022
16da7c1
TEMP: experiment giving focus to auth dialog
CendioOssman Jan 4, 2022
5f68df5
Log invalid screen layout
CendioOssman Dec 27, 2021
e9ba685
Better fix for fake focus grab events
CendioOssman Nov 22, 2021
25f2b91
Use generic hot key combo for client control
CendioOssman Oct 31, 2017
d578511
Add hot key for full screen
CendioOssman Dec 14, 2021
32687d2
Add a bypass for hot key combinations
CendioOssman Sep 30, 2021
1e9e94d
Add hot key to release keyboard grab
CendioOssman Nov 16, 2021
0c6d46c
Add hot key to grab keyboard
CendioOssman Nov 13, 2021
d1f9705
Add support for more overlays
CendioOssman Nov 19, 2021
9336a69
Add overlays for grab and full screen
CendioOssman Nov 19, 2021
3fbdca7
Avoid repeating overlay tips
CendioOssman Dec 22, 2021
a359f8b
More dynamic window title cropping
CendioOssman Oct 14, 2022
4526d4b
Update window caption on grab
CendioOssman Dec 27, 2021
b21e248
Synchronously retry X11 keyboard grab
CendioOssman Dec 30, 2021
98294ff
Show error grabbing keyboard
CendioOssman Dec 7, 2024
476c170
TEMP remove unused actions
CendioOssman Nov 13, 2021
4991df3
TEMP: low level keyboard events debug output
CendioOssman Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion common/rfb/ClientParams.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,13 @@
#include <rfb/ledStates.h>
#include <rfb/clipboardTypes.h>
#include <rfb/ClientParams.h>
#include <rfb/LogWriter.h>
#include <rfb/util.h>

using namespace rfb;

static LogWriter vlog("ClientParams");

ClientParams::ClientParams()
: majorVersion(0), minorVersion(0),
compressLevel(2), qualityLevel(-1), fineQualityLevel(-1),
Expand Down Expand Up @@ -63,8 +66,14 @@ void ClientParams::setDimensions(int width, int height)

void ClientParams::setDimensions(int width, int height, const ScreenSet& layout)
{
if (!layout.validate(width, height))
if (!layout.validate(width, height)) {
char buffer[2048];
vlog.debug("Invalid screen layout for %dx%d:", width, height);
layout.print(buffer, sizeof(buffer));
vlog.debug("%s", buffer);

throw std::invalid_argument("Attempted to configure an invalid screen layout");
}

width_ = width;
height_ = height;
Expand Down
11 changes: 10 additions & 1 deletion common/rfb/ServerParams.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@
#include <stdexcept>

#include <rfb/ledStates.h>
#include <rfb/LogWriter.h>
#include <rfb/ServerParams.h>
#include <rfb/util.h>

using namespace rfb;

static LogWriter vlog("ServerParams");

ServerParams::ServerParams()
: majorVersion(0), minorVersion(0),
supportsQEMUKeyEvent(false),
Expand Down Expand Up @@ -60,8 +63,14 @@ void ServerParams::setDimensions(int width, int height)

void ServerParams::setDimensions(int width, int height, const ScreenSet& layout)
{
if (!layout.validate(width, height))
if (!layout.validate(width, height)) {
char buffer[2048];
vlog.debug("Invalid screen layout for %dx%d:", width, height);
layout.print(buffer, sizeof(buffer));
vlog.debug("%s", buffer);

throw std::invalid_argument("Attempted to configure an invalid screen layout");
}

width_ = width;
height_ = height;
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ target_link_libraries(gesturehandler rfb)
add_executable(hostport hostport.cxx)
target_link_libraries(hostport rfb)

add_executable(hotkeyhandler hotkeyhandler.cxx ../../vncviewer/HotKeyHandler.cxx)
target_link_libraries(hotkeyhandler rfb ${GETTEXT_LIBRARIES})

add_executable(pixelformat pixelformat.cxx)
target_link_libraries(pixelformat rfb)

Expand Down
Loading
Loading