GUACAMOLE-2207: Add support for Cmd(Meta)-based click modifiers#1155
Open
sschiffli wants to merge 1 commit intoapache:staging/1.6.1from
Open
GUACAMOLE-2207: Add support for Cmd(Meta)-based click modifiers#1155sschiffli wants to merge 1 commit intoapache:staging/1.6.1from
sschiffli wants to merge 1 commit intoapache:staging/1.6.1from
Conversation
8251d0b to
43e6214
Compare
sschiffli
commented
Jan 30, 2026
| // never be sent in Chrome (bug #108404). Modifier keys are excluded | ||
| // from this workaround as they have reliable keyup events and need | ||
| // to be held down simultaneously with Meta. | ||
| if (this.modifiers.meta && !isModifierKey(this.keysym)) |
Contributor
Author
There was a problem hiding this comment.
I could see an argument where this should be a separate issue, as this is needed to support CMD+Shift+Click (not CMD+Click), so let me know what you think or if a rewording of the JIRA/PR would be sufficient.
Contributor
There was a problem hiding this comment.
I think it's fine in here. You can reword the Jira issue if you want to make it more clear that it's working to support both Shift+CMD an Cmd, but no major concerns from me.
43e6214 to
c71339f
Compare
bbennett-ks
approved these changes
Feb 3, 2026
| keyboard.listenTo(sink.getElement()); | ||
|
|
||
| // Resolve deferred Meta key events on mouse click to enable Cmd+Click | ||
| $scope.$on('guacBeforeClientMouseDown', function(event, mouseEvent, client) { |
There was a problem hiding this comment.
Will unused argument (client) cause lint errors?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Forward guacClientMouseDown events from the Mouse module to the Keyboard module via a new handleMouseEvent() method. When a mouse click occurs with the Meta modifier pressed and there's a pending Meta keydown event, the mouse event is added to the keyboard event log to provide the context needed to resolve the deferred Meta key. This enables the Meta key to be sent before the mouse click, properly delivering Cmd+Click to the backend.