Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | nxagent: bypass X2go's keyboard configuration hack | Ulrich Sibiller | 2018-12-19 | 1 | -31/+80 |
| | | | | | | | | | | | | If X2go runs in auto keyboard mode it will pass keyboard=null/null to the agent and set the keyboard afterwards with setxkbmap. This patch lets nxagent handle that situation internally (null/null will be interpreted as clone) and disables X2go's mechanism (by creating a dir that effectively blocks it; see x2gosetkeyboard) This is only activated if the agent is run as "x2goagent". Fixes ArcticaProject/nx-libs#368 | ||||
* | Keyboard.c: add static keyword where appropriate | Ulrich Sibiller | 2018-12-19 | 1 | -5/+5 |
| | |||||
* | nxagent: simplify keycode conversion setup | Ulrich Sibiller | 2018-12-19 | 1 | -14/+5 |
| | |||||
* | nxagent: store remote keyboard in global variables | Ulrich Sibiller | 2018-12-19 | 1 | -111/+102 |
| | | | | This avoids some roundtrips. | ||||
* | nxagent: add additional keyboard config option rmlvo | Ulrich Sibiller | 2018-12-19 | 1 | -5/+29 |
| | | | | Add possibility to pass more than model and layout via the keyboard parameter. | ||||
* | nxagent: add keyboard=clone configuration option | Ulrich Sibiller | 2018-12-19 | 1 | -5/+34 |
| | | | | | | | | | | | | | | | | Specifying -keyboard clone (or keyboard=clone in options) will clone XKB keyboard from the remote x server. This way many keyboard problems will hopefully never return... Should be the default but is not (yet) for compatibility reasons. Fixes ArcticaProject/nx-libs#373 (except the "do autoconf if no keyboard is provided" feature.) References: ArcticaProject/nx-libs#240 ArcticaProject/nx-libs#368 | ||||
* | Keyboard.c: remove non-fitting comment | Ulrich Sibiller | 2018-12-19 | 1 | -6/+0 |
| | | | | Describes a check we are not doing here anymore... | ||||
* | Keyboard.c: improve creation of keyboard config file | Ulrich Sibiller | 2018-12-19 | 1 | -16/+28 |
| | | | | | | | | It will now create better working config files. References: ArcticaProject/nx-libs#239 ArcticaProject/nx-libs#368 | ||||
* | Keyboard.c: reformat nxagentKeycodeConversionSetup | Ulrich Sibiller | 2018-12-19 | 1 | -19/+18 |
| | |||||
* | Keyboard.c: use 'variant' all over the place | Ulrich Sibiller | 2018-12-19 | 1 | -4/+4 |
| | | | | avoid mix of 'variant' and 'variants' | ||||
* | Keyboard.c: rename variables to better reflect their meaning | Ulrich Sibiller | 2018-12-19 | 1 | -25/+25 |
| | |||||
* | Keyboard.c: refactor keycode conversion | Ulrich Sibiller | 2018-12-19 | 1 | -38/+56 |
| | | | | we'll need the remote xkb in KeyboardProc in future so let's move it up. | ||||
* | Keyboard.c: move keyboard file creation to extra function | Ulrich Sibiller | 2018-12-19 | 1 | -51/+57 |
| | |||||
* | Keyboard.c: simplify even more: free stuff at one place | Ulrich Sibiller | 2018-11-09 | 1 | -16/+8 |
| | |||||
* | Keyboard.c: fix keyboard=query logic | Ulrich Sibiller | 2018-11-09 | 1 | -1/+1 |
| | | | | an empty nxagentKeyboard variable is no reason to fall back to no-XKB mode | ||||
* | Keyboard.c: greatly simplify the code in nxagentKeyboardProc | Ulrich Sibiller | 2018-11-09 | 1 | -31/+13 |
| | | | | most of the code was existing twice | ||||
* | Keyboard.c: guard XkbFreeKeyboard calls | Ulrich Sibiller | 2018-11-09 | 1 | -5/+10 |
| | | | | manpage does not tell us if NULL is valid | ||||
* | Keyboard.c: simplify over-specific if | Ulrich Sibiller | 2018-11-09 | 1 | -2/+1 |
| | |||||
* | Keyboard.c: simplify RLMVO string handling | Ulrich Sibiller | 2018-11-09 | 1 | -37/+9 |
| | |||||
* | Keyboard.c: always ask for remote XKB | Ulrich Sibiller | 2018-11-09 | 1 | -12/+12 |
| | |||||
* | Keyboard.c: do not define own RLMVO defaults | Ulrich Sibiller | 2018-11-09 | 1 | -94/+5 |
| | | | | use the ones from xkb | ||||
* | no more own XkbBaseDirectory handling | Ulrich Sibiller | 2018-11-09 | 1 | -33/+0 |
| | | | | Just use the existing xkb code | ||||
* | Keyboard.c: remove unused defines | Ulrich Sibiller | 2018-11-09 | 1 | -6/+0 |
| | | | | Defines regarding XKB-BASE_DIRECTORY are used only xkb. | ||||
* | Keyboard.c: remove unnecessary includes | Ulrich Sibiller | 2018-11-09 | 1 | -7/+0 |
| | |||||
* | Keyboard.c: Remove (now) unused defines | Ulrich Sibiller | 2018-11-09 | 1 | -6/+0 |
| | |||||
* | Lift xkb to XORG-1.2.0 state | Ulrich Sibiller | 2018-11-09 | 1 | -1/+1 |
| | |||||
* | Xserver/xkb: Remove -xkbmap argument. | Daniel Stone | 2018-07-03 | 1 | -11/+0 |
| | | | | | | | | | | | | Backported from X.org: commit fd8bde8bb0f9d796b3464973b53285c0a6d22a31 Author: Daniel Stone <daniel@fooishbar.org> Date: Mon May 29 11:14:03 2006 +0000 Remove -xkbmap argument. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | ||||
* | hw/nxagent/Keyboard.c: Drop support for loading XKB config from file. | Mike Gabriel | 2018-07-03 | 1 | -97/+7 |
| | | | | | | * Support for XkbCF has been dropped in XKB extension by X.org * Has never been used in recent NXv3 implementations (e.g. X2Go) * Config file parsing is error prone, use setxkbmap API instead | ||||
* | Some small Keyboard.c improvements | Ulrich Sibiller | 2018-07-03 | 1 | -4/+4 |
| | | | | as in xorg-xserver upstream's hw/xnest/Keyboard.c | ||||
* | hw/nxagent/: Use <function>(void) rather than <function>(). | Mike Gabriel | 2018-02-26 | 1 | -1/+1 |
| | |||||
* | Keyboard.c: rework string allocation/building | Ulrich Sibiller | 2018-01-07 | 1 | -14/+10 |
| | |||||
* | Keyboard.c: replace malloc + strcpy by asprintf | Ulrich Sibiller | 2018-01-07 | 1 | -6/+4 |
| | |||||
* | Keyboard.c: improve user messages for keyboard file handling | Ulrich Sibiller | 2018-01-07 | 1 | -1/+1 |
| | |||||
* | Keyboard.c: fix memory leak | Ulrich Sibiller | 2018-01-07 | 1 | -1/+3 |
| | |||||
* | Keyboard.c: Replace some memsets by zero initialization | Ulrich Sibiller | 2017-12-14 | 1 | -6/+3 |
| | |||||
* | Keyboard.c: Fix indentation | Ulrich Sibiller | 2017-12-14 | 1 | -13/+13 |
| | |||||
* | Keyboard.c: set variables to NULL after free | Ulrich Sibiller | 2017-12-14 | 1 | -0/+3 |
| | |||||
* | Keyboard.c: XkbDfltRepeatDelay and XkbDfltRepeatIntervall are int not uint | Ulrich Sibiller | 2017-12-14 | 1 | -1/+1 |
| | |||||
* | Keyboard.c: Use calloc instead of malloc + memset | Ulrich Sibiller | 2017-12-14 | 1 | -5/+1 |
| | |||||
* | Keyboard.c: Make xkblock more robust | Ulrich Sibiller | 2017-12-14 | 1 | -1/+21 |
| | | | | | | | If xorg upstream xkb gets extended one day the previous code would not block new xkb calls even if they would change keyboard settings. So only act on the currently known calls and throw an error for all unknown calls. | ||||
* | Keyboard.c: Some code cleanups | Ulrich Sibiller | 2017-12-14 | 1 | -57/+46 |
| | |||||
* | Keyboard.c: Add some comments with changelog explanations | Ulrich Sibiller | 2017-12-14 | 1 | -0/+21 |
| | | | | This helps understanding the intention of the following code. | ||||
* | Keyboard.c: print message class for user messages | Ulrich Sibiller | 2017-12-14 | 1 | -4/+4 |
| | |||||
* | Keyboard.c: Improve TEST output | Ulrich Sibiller | 2017-12-14 | 1 | -1/+16 |
| | |||||
* | Keyboard.c: make nxagentKeycodeConversion a Boolean | Ulrich Sibiller | 2017-11-23 | 1 | -1/+1 |
| | |||||
* | add option keyconv=(auto|on|off) | Ulrich Sibiller | 2017-11-23 | 1 | -0/+18 |
| | | | | | | | | | | | | Adds a new option called "keyconv" to control keycode conversion. Before commit 2f2ade61a8823bad012737b2b388dcc168cccbbf keycode conversion was activated if the client was Linux and client side rules and/or model was "evdev". The only (and undocumented) way to disable that was providing a value different from "linux" for the "client" option (which had no other effect). The mentioned commit removed the dependency on Linux and so there was no way anymore to disable keycode conversion. | ||||
* | Keyboard.c: Use booleans for nxagentKeycodeConversion | Ulrich Sibiller | 2017-11-23 | 1 | -5/+5 |
| | |||||
* | Keystroke.c: ignore CapsLock and NumLock most of the time | Ulrich Sibiller | 2017-03-19 | 1 | -3/+19 |
| | | | | | | CapsLock and NumLock will only be taken into account for keystrokes that explicitly require them. This is implemented for convenience and fixes ArcticaProject/nx-libs#397 | ||||
* | Keyboard.c: Introduce separate masks for Alt and Meta | Ulrich Sibiller | 2017-03-13 | 1 | -0/+8 |
| | | | | Unclear why they have been merged at all. | ||||
* | Keyboard.c: Simplify if clause | Ulrich Sibiller | 2017-03-10 | 1 | -4/+2 |
| |