diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-31 12:53:30 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-31 12:53:30 +0200 |
| commit | 3f7bb584e1b56f787cc0b4bef684afc669359e83 (patch) | |
| tree | 164b21be69dce127910dacfb27647da0b42681ea /nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | |
| parent | 4904bfe1f57d50134fd12a08424d299ef4094ef5 (diff) | |
| parent | 49d63d92a81ff5157c18bbdc9a3b0cba1b70d425 (diff) | |
| download | nx-libs-3f7bb584e1b56f787cc0b4bef684afc669359e83.tar.gz nx-libs-3f7bb584e1b56f787cc0b4bef684afc669359e83.tar.bz2 nx-libs-3f7bb584e1b56f787cc0b4bef684afc669359e83.zip | |
Merge branch 'uli42-pr/clipboard_dump' into 3.6.x
Attributes GH PR #918: https://github.com/ArcticaProject/nx-libs/pull/918
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keystroke.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c index 73a5901f8..d6c659fec 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c @@ -102,6 +102,8 @@ char * nxagentSpecialKeystrokeNames[] = { "autograb", + "dump_clipboard", + NULL, }; @@ -142,6 +144,7 @@ struct nxagentSpecialKeystrokeMap default_map[] = { {KEYSTROKE_VIEWPORT_SCROLL_DOWN, ControlMask, True, XK_KP_Down}, {KEYSTROKE_REREAD_KEYSTROKES, ControlMask, True, XK_k}, {KEYSTROKE_AUTOGRAB, ControlMask, True, XK_g}, + {KEYSTROKE_DUMP_CLIPBOARD, ControlMask | ShiftMask, True, XK_c}, {KEYSTROKE_END_MARKER, 0, False, NoSymbol}, }; struct nxagentSpecialKeystrokeMap *map = default_map; @@ -715,6 +718,9 @@ Bool nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) case KEYSTROKE_AUTOGRAB: *result = doAutoGrab; break; + case KEYSTROKE_DUMP_CLIPBOARD: + *result = doDumpClipboard; + break; case KEYSTROKE_NOTHING: /* do nothing. difference to KEYSTROKE_IGNORE is the return value */ case KEYSTROKE_END_MARKER: /* just to make gcc STFU */ case KEYSTROKE_MAX: |