diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d3fadba
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "wf-json"]
+ path = subprojects/wf-json
+ url = git@github.com:WayfireWM/wf-json.git
diff --git a/data/layouts/ansi.xml b/data/layouts/ansi.xml
new file mode 100644
index 0000000..2f79878
--- /dev/null
+++ b/data/layouts/ansi.xml
@@ -0,0 +1,426 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/data/layouts/iso.xml b/data/layouts/iso.xml
new file mode 100644
index 0000000..de40aee
--- /dev/null
+++ b/data/layouts/iso.xml
@@ -0,0 +1,440 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 0000000..4b0915b
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,4 @@
+layout_dir = join_paths(get_option('prefix'), 'share', 'wf-osk', 'layouts')
+
+install_data(join_paths('layouts', 'ansi.xml'), install_dir: layout_dir)
+install_data(join_paths('layouts', 'iso.xml'), install_dir: layout_dir)
\ No newline at end of file
diff --git a/meson.build b/meson.build
index b9e368d..447f353 100644
--- a/meson.build
+++ b/meson.build
@@ -1,30 +1,39 @@
project(
'wf-simple-osk',
- 'c',
+ 'c',
'cpp',
version: '0.1',
license: 'MIT',
meson_version: '>=0.43.0',
default_options: [
'cpp_std=c++17',
- 'c_std=c11',
+ 'c_std=c11',
'warning_level=2',
'werror=false',
],
)
-gtkmm = dependency('gtkmm-3.0')
+wayfire = dependency('wayfire')
+gtkmm = dependency('gtkmm-4.0')
+xkb = dependency('xkbcommon')
+xkbregistry = dependency('xkbregistry')
wayland_client = dependency('wayland-client')
wayland_protos = dependency('wayland-protocols')
-gtkls = dependency('gtk-layer-shell-0')
+gtkls = dependency('gtk4-layer-shell-0', version: '>=1.3.0')
+json = subproject('wf-json').get_variable('wfjson')
-add_project_link_arguments(['-rdynamic'], language:'cpp')
+resource_dir = join_paths(get_option('prefix'), 'share', 'wf-osk')
+metadata_dir = join_paths(resource_dir, 'metadata')
+
+add_project_link_arguments(['-rdynamic'], language: 'cpp')
add_project_arguments(['-Wno-unused-parameter'], language: 'cpp')
+subdir('metadata')
+subdir('data')
subdir('proto')
subdir('src')
install_data(
- 'wf-osk.desktop',
- install_dir: '@0@/share/applications'.format(get_option('prefix'))
- )
+ 'wf-osk.desktop',
+ install_dir: '@0@/share/applications'.format(get_option('prefix')),
+)
\ No newline at end of file
diff --git a/metadata/meson.build b/metadata/meson.build
new file mode 100644
index 0000000..9685aa0
--- /dev/null
+++ b/metadata/meson.build
@@ -0,0 +1 @@
+install_data('osk.xml', install_dir: metadata_dir)
\ No newline at end of file
diff --git a/metadata/osk.xml b/metadata/osk.xml
new file mode 100644
index 0000000..ec1d17f
--- /dev/null
+++ b/metadata/osk.xml
@@ -0,0 +1,43 @@
+
+
+
+ <_short>Onscreen Keyboard
+ Shell
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/proto/input-method-unstable-v2.xml b/proto/input-method-unstable-v2.xml
new file mode 100644
index 0000000..1853f69
--- /dev/null
+++ b/proto/input-method-unstable-v2.xml
@@ -0,0 +1,494 @@
+
+
+
+
+ Copyright © 2008-2011 Kristian Høgsberg
+ Copyright © 2010-2011 Intel Corporation
+ Copyright © 2012-2013 Collabora, Ltd.
+ Copyright © 2012, 2013 Intel Corporation
+ Copyright © 2015, 2016 Jan Arne Petersen
+ Copyright © 2017, 2018 Red Hat, Inc.
+ Copyright © 2018 Purism SPC
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+
+
+ This protocol allows applications to act as input methods for compositors.
+
+ An input method context is used to manage the state of the input method.
+
+ Text strings are UTF-8 encoded, their indices and lengths are in bytes.
+
+ This document adheres to the RFC 2119 when using words like "must",
+ "should", "may", etc.
+
+ Warning! The protocol described in this file is experimental and
+ backward incompatible changes may be made. Backward compatible changes
+ may be added together with the corresponding interface version bump.
+ Backward incompatible changes are done by bumping the version number in
+ the protocol and interface names and resetting the interface version.
+ Once the protocol is to be declared stable, the 'z' prefix and the
+ version number in the protocol and interface names are removed and the
+ interface version number is reset.
+
+
+
+
+ An input method object allows for clients to compose text.
+
+ The objects connects the client to a text input in an application, and
+ lets the client to serve as an input method for a seat.
+
+ The zwp_input_method_v2 object can occupy two distinct states: active and
+ inactive. In the active state, the object is associated to and
+ communicates with a text input. In the inactive state, there is no
+ associated text input, and the only communication is with the compositor.
+ Initially, the input method is in the inactive state.
+
+ Requests issued in the inactive state must be accepted by the compositor.
+ Because of the serial mechanism, and the state reset on activate event,
+ they will not have any effect on the state of the next text input.
+
+ There must be no more than one input method object per seat.
+
+
+
+
+
+
+
+
+ Notification that a text input focused on this seat requested the input
+ method to be activated.
+
+ This event serves the purpose of providing the compositor with an
+ active input method.
+
+ This event resets all state associated with previous enable, disable,
+ surrounding_text, text_change_cause, and content_type events, as well
+ as the state associated with set_preedit_string, commit_string, and
+ delete_surrounding_text requests. In addition, it marks the
+ zwp_input_method_v2 object as active, and makes any existing
+ zwp_input_popup_surface_v2 objects visible.
+
+ The surrounding_text, and content_type events must follow before the
+ next done event if the text input supports the respective
+ functionality.
+
+ State set with this event is double-buffered. It will get applied on
+ the next zwp_input_method_v2.done event, and stay valid until changed.
+
+
+
+
+
+ Notification that no focused text input currently needs an active
+ input method on this seat.
+
+ This event marks the zwp_input_method_v2 object as inactive. The
+ compositor must make all existing zwp_input_popup_surface_v2 objects
+ invisible until the next activate event.
+
+ State set with this event is double-buffered. It will get applied on
+ the next zwp_input_method_v2.done event, and stay valid until changed.
+
+
+
+
+
+ Updates the surrounding plain text around the cursor, excluding the
+ preedit text.
+
+ If any preedit text is present, it is replaced with the cursor for the
+ purpose of this event.
+
+ The argument text is a buffer containing the preedit string, and must
+ include the cursor position, and the complete selection. It should
+ contain additional characters before and after these. There is a
+ maximum length of wayland messages, so text can not be longer than 4000
+ bytes.
+
+ cursor is the byte offset of the cursor within the text buffer.
+
+ anchor is the byte offset of the selection anchor within the text
+ buffer. If there is no selected text, anchor must be the same as
+ cursor.
+
+ If this event does not arrive before the first done event, the input
+ method may assume that the text input does not support this
+ functionality and ignore following surrounding_text events.
+
+ Values set with this event are double-buffered. They will get applied
+ and set to initial values on the next zwp_input_method_v2.done
+ event.
+
+ The initial state for affected fields is empty, meaning that the text
+ input does not support sending surrounding text. If the empty values
+ get applied, subsequent attempts to change them may have no effect.
+
+
+
+
+
+
+
+
+ Tells the input method why the text surrounding the cursor changed.
+
+ Whenever the client detects an external change in text, cursor, or
+ anchor position, it must issue this request to the compositor. This
+ request is intended to give the input method a chance to update the
+ preedit text in an appropriate way, e.g. by removing it when the user
+ starts typing with a keyboard.
+
+ cause describes the source of the change.
+
+ The value set with this event is double-buffered. It will get applied
+ and set to its initial value on the next zwp_input_method_v2.done
+ event.
+
+ The initial value of cause is input_method.
+
+
+
+
+
+
+ Indicates the content type and hint for the current
+ zwp_input_method_v2 instance.
+
+ Values set with this event are double-buffered. They will get applied
+ on the next zwp_input_method_v2.done event.
+
+ The initial value for hint is none, and the initial value for purpose
+ is normal.
+
+
+
+
+
+
+
+ Atomically applies state changes recently sent to the client.
+
+ The done event establishes and updates the state of the client, and
+ must be issued after any changes to apply them.
+
+ Text input state (content purpose, content hint, surrounding text, and
+ change cause) is conceptually double-buffered within an input method
+ context.
+
+ Events modify the pending state, as opposed to the current state in use
+ by the input method. A done event atomically applies all pending state,
+ replacing the current state. After done, the new pending state is as
+ documented for each related request.
+
+ Events must be applied in the order of arrival.
+
+ Neither current nor pending state are modified unless noted otherwise.
+
+
+
+
+
+ Send the commit string text for insertion to the application.
+
+ Inserts a string at current cursor position (see commit event
+ sequence). The string to commit could be either just a single character
+ after a key press or the result of some composing.
+
+ The argument text is a buffer containing the string to insert. There is
+ a maximum length of wayland messages, so text can not be longer than
+ 4000 bytes.
+
+ Values set with this event are double-buffered. They must be applied
+ and reset to initial on the next zwp_text_input_v3.commit request.
+
+ The initial value of text is an empty string.
+
+
+
+
+
+
+ Send the pre-edit string text to the application text input.
+
+ Place a new composing text (pre-edit) at the current cursor position.
+ Any previously set composing text must be removed. Any previously
+ existing selected text must be removed. The cursor is moved to a new
+ position within the preedit string.
+
+ The argument text is a buffer containing the preedit string. There is
+ a maximum length of wayland messages, so text can not be longer than
+ 4000 bytes.
+
+ The arguments cursor_begin and cursor_end are counted in bytes relative
+ to the beginning of the submitted string buffer. Cursor should be
+ hidden by the text input when both are equal to -1.
+
+ cursor_begin indicates the beginning of the cursor. cursor_end
+ indicates the end of the cursor. It may be equal or different than
+ cursor_begin.
+
+ Values set with this event are double-buffered. They must be applied on
+ the next zwp_input_method_v2.commit event.
+
+ The initial value of text is an empty string. The initial value of
+ cursor_begin, and cursor_end are both 0.
+
+
+
+
+
+
+
+
+ Remove the surrounding text.
+
+ before_length and after_length are the number of bytes before and after
+ the current cursor index (excluding the preedit text) to delete.
+
+ If any preedit text is present, it is replaced with the cursor for the
+ purpose of this event. In effect before_length is counted from the
+ beginning of preedit text, and after_length from its end (see commit
+ event sequence).
+
+ Values set with this event are double-buffered. They must be applied
+ and reset to initial on the next zwp_input_method_v2.commit request.
+
+ The initial values of both before_length and after_length are 0.
+
+
+
+
+
+
+
+ Apply state changes from commit_string, set_preedit_string and
+ delete_surrounding_text requests.
+
+ The state relating to these events is double-buffered, and each one
+ modifies the pending state. This request replaces the current state
+ with the pending state.
+
+ The connected text input is expected to proceed by evaluating the
+ changes in the following order:
+
+ 1. Replace existing preedit string with the cursor.
+ 2. Delete requested surrounding text.
+ 3. Insert commit string with the cursor at its end.
+ 4. Calculate surrounding text to send.
+ 5. Insert new preedit text in cursor position.
+ 6. Place cursor inside preedit text.
+
+ The serial number reflects the last state of the zwp_input_method_v2
+ object known to the client. The value of the serial argument must be
+ equal to the number of done events already issued by that object. When
+ the compositor receives a commit request with a serial different than
+ the number of past done events, it must proceed as normal, except it
+ should not change the current state of the zwp_input_method_v2 object.
+
+
+
+
+
+
+ Creates a new zwp_input_popup_surface_v2 object wrapping a given
+ surface.
+
+ The surface gets assigned the "input_popup" role. If the surface
+ already has an assigned role, the compositor must issue a protocol
+ error.
+
+
+
+
+
+
+
+ Allow an input method to receive hardware keyboard input and process
+ key events to generate text events (with pre-edit) over the wire. This
+ allows input methods which compose multiple key events for inputting
+ text like it is done for CJK languages.
+
+ The compositor should send all keyboard events on the seat to the grab
+ holder via the returned wl_keyboard object. Nevertheless, the
+ compositor may decide not to forward any particular event. The
+ compositor must not further process any event after it has been
+ forwarded to the grab holder.
+
+ Releasing the resulting wl_keyboard object releases the grab.
+
+
+
+
+
+
+ The input method ceased to be available.
+
+ The compositor must issue this event as the only event on the object if
+ there was another input_method object associated with the same seat at
+ the time of its creation.
+
+ The compositor must issue this request when the object is no longer
+ usable, e.g. due to seat removal.
+
+ The input method context becomes inert and should be destroyed after
+ deactivation is handled. Any further requests and events except for the
+ destroy request must be ignored.
+
+
+
+
+
+ Destroys the zwp_text_input_v2 object and any associated child
+ objects, i.e. zwp_input_popup_surface_v2 and
+ zwp_input_method_keyboard_grab_v2.
+
+
+
+
+
+
+ This interface marks a surface as a popup for interacting with an input
+ method.
+
+ The compositor should place it near the active text input area. It must
+ be visible if and only if the input method is in the active state.
+
+ The client must not destroy the underlying wl_surface while the
+ zwp_input_popup_surface_v2 object exists.
+
+
+
+
+ Notify about the position of the area of the text input expressed as a
+ rectangle in surface local coordinates.
+
+ This is a hint to the input method telling it the relative position of
+ the text being entered.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The zwp_input_method_keyboard_grab_v2 interface represents an exclusive
+ grab of the wl_keyboard interface associated with the seat.
+
+
+
+
+ This event provides a file descriptor to the client which can be
+ memory-mapped to provide a keyboard mapping description.
+
+
+
+
+
+
+
+
+ A key was pressed or released.
+ The time argument is a timestamp with millisecond granularity, with an
+ undefined base.
+
+
+
+
+
+
+
+
+
+ Notifies clients that the modifier and/or group state has changed, and
+ it should update its local state.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Informs the client about the keyboard's repeat rate and delay.
+
+ This event is sent as soon as the zwp_input_method_keyboard_grab_v2
+ object has been created, and is guaranteed to be received by the
+ client before any key press event.
+
+ Negative values for either rate or delay are illegal. A rate of zero
+ will disable any repeating (regardless of the value of delay).
+
+ This event can be sent later on as well with a new value if necessary,
+ so clients should continue listening for the event past the creation
+ of zwp_input_method_keyboard_grab_v2.
+
+
+
+
+
+
+
+
+ The input method manager allows the client to become the input method on
+ a chosen seat.
+
+ No more than one input method must be associated with any seat at any
+ given time.
+
+
+
+
+ Request a new input zwp_input_method_v2 object associated with a given
+ seat.
+
+
+
+
+
+
+
+ Destroys the zwp_input_method_manager_v2 object.
+
+ The zwp_input_method_v2 objects originating from it remain valid.
+
+
+
+
\ No newline at end of file
diff --git a/proto/meson.build b/proto/meson.build
index eb07910..37465de 100644
--- a/proto/meson.build
+++ b/proto/meson.build
@@ -15,8 +15,9 @@ wayland_scanner_client = generator(
)
client_protocols = [
- ['wayfire-shell-unstable-v2.xml'],
- ['virtual-keyboard-unstable-v1.xml']
+ ['wayfire-shell-unstable-v2.xml'],
+ ['virtual-keyboard-unstable-v1.xml'],
+ ['input-method-unstable-v2.xml'],
]
wl_protos_src = []
@@ -28,10 +29,13 @@ foreach p : client_protocols
wl_protos_src += wayland_scanner_code.process(xml)
endforeach
-lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers,
- dependencies: [wayland_client]) # for the include directory
+lib_wl_protos = static_library(
+ 'wl_protos',
+ wl_protos_src + wl_protos_headers,
+ dependencies: [wayland_client],
+) # for the include directory
wf_protos = declare_dependency(
link_with: lib_wl_protos,
sources: wl_protos_headers,
-)
+)
\ No newline at end of file
diff --git a/src/keymap.tpp b/src/keymap.tpp
index d97c6ca..eb47233 100644
--- a/src/keymap.tpp
+++ b/src/keymap.tpp
@@ -1,4 +1,5 @@
-static const char keymap[] = "xkb_keymap {\
+static const char keymap[] =
+ "xkb_keymap {\
xkb_keycodes \"(unnamed)\" {\
minimum = 8;\
maximum = 255;\
@@ -1168,67 +1169,67 @@ xkb_compatibility \"(unnamed)\" {\
xkb_symbols \"(unnamed)\" {\
name[group1]=\"English (US)\";\
\
- key { [ Escape ] };\
- key { [ 1, exclam ] };\
- key { [ 2, at ] };\
- key { [ 3, numbersign ] };\
- key { [ 4, dollar ] };\
- key { [ 5, percent ] };\
- key { [ 6, asciicircum ] };\
- key { [ 7, ampersand ] };\
- key { [ 8, asterisk ] };\
- key { [ 9, parenleft ] };\
- key { [ 0, parenright ] };\
- key { [ minus, underscore ] };\
- key { [ equal, plus ] };\
- key { [ BackSpace, BackSpace ] };\
- key { [ Tab, ISO_Left_Tab ] };\
- key { [ q, Q, 1 ] };\
- key { [ w, W, 2 ] };\
- key { [ e, E, 3 ] };\
- key { [ r, R, 4 ] };\
- key { [ t, T, 5 ] };\
- key { [ y, Y, 6 ] };\
- key { [ u, U, 7 ] };\
- key { [ i, I, 8 ] };\
- key { [ o, O, 9 ] };\
- key { [ p, P, 0 ] };\
- key { [ bracketleft, braceleft ] };\
- key { [ bracketright, braceright ] };\
- key { [ Return ] };\
- key { [ Control_L ] };\
- key { [ a, A, minus ] };\
- key { [ s, S, at ] };\
- key { [ d, D, asterisk ] };\
- key { [ f, F, asciicircum ] };\
- key { [ g, G, colon ] };\
- key { [ h, H, semicolon ] };\
- key { [ j, J, parenleft ] };\
- key { [ k, K, parenright ] };\
- key { [ l, L, asciitilde ] };\
- key { [ semicolon, colon ] };\
- key { [ apostrophe, quotedbl ] };\
- key { [ grave, asciitilde ] };\
- key { [ Shift_L ] };\
- key { [ backslash, bar ] };\
- key { [ z, Z, slash ] };\
- key { [ x, X, apostrophe ] };\
- key { [ c, C, quotedbl ] };\
- key { [ v, V, plus ] };\
- key { [ b, B, equal ] };\
- key { [ n, N, question ] };\
- key { [ m, M, exclam ] };\
- key { [ comma, less, backslash] };\
- key { [ period, greater, bar ] };\
- key { [ slash, question ] };\
- key { [ Shift_R ] };\
+ key {\t[ Escape ] };\
+ key {\t[ 1, exclam ] };\
+ key {\t[ 2, at ] };\
+ key {\t[ 3, numbersign ] };\
+ key {\t[ 4, dollar ] };\
+ key {\t[ 5, percent ] };\
+ key {\t[ 6, asciicircum ] };\
+ key {\t[ 7, ampersand ] };\
+ key {\t[ 8, asterisk ] };\
+ key {\t[ 9, parenleft ] };\
+ key {\t[ 0, parenright ] };\
+ key {\t[ minus, underscore ] };\
+ key {\t[ equal, plus ] };\
+ key {\t[ BackSpace, BackSpace ] };\
+ key {\t[ Tab, ISO_Left_Tab ] };\
+ key {\t[ q, Q, 1 ] };\
+ key {\t[ w, W, 2 ] };\
+ key {\t[ e, E, 3 ] };\
+ key {\t[ r, R, 4 ] };\
+ key {\t[ t, T, 5 ] };\
+ key {\t[ y, Y, 6 ] };\
+ key {\t[ u, U, 7 ] };\
+ key {\t[ i, I, 8 ] };\
+ key {\t[ o, O, 9 ] };\
+ key {\t[ p, P, 0 ] };\
+ key {\t[ bracketleft, braceleft ] };\
+ key {\t[ bracketright, braceright ] };\
+ key {\t[ Return ] };\
+ key {\t[ Control_L ] };\
+ key {\t[ a, A, minus ] };\
+ key {\t[ s, S, at ] };\
+ key {\t[ d, D, asterisk ] };\
+ key {\t[ f, F, asciicircum ] };\
+ key {\t[ g, G, colon ] };\
+ key {\t[ h, H, semicolon ] };\
+ key {\t[ j, J, parenleft ] };\
+ key {\t[ k, K, parenright ] };\
+ key {\t[ l, L, asciitilde ] };\
+ key {\t[ semicolon, colon ] };\
+ key {\t[ apostrophe, quotedbl ] };\
+ key {\t[ grave, asciitilde ] };\
+ key {\t[ Shift_L ] };\
+ key {\t[ backslash, bar ] };\
+ key {\t[ z, Z, slash ] };\
+ key {\t[ x, X, apostrophe ] };\
+ key {\t[ c, C, quotedbl ] };\
+ key {\t[ v, V, plus ] };\
+ key {\t[ b, B, equal ] };\
+ key {\t[ n, N, question ] };\
+ key {\t[ m, M, exclam ] };\
+ key {\t[ comma, less, backslash] };\
+ key {\t[ period, greater, bar ] };\
+ key {\t[ slash, question ] };\
+ key {\t[ Shift_R ] };\
key {\
type= \"CTRL+ALT\",\
symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86ClearGrab ]\
};\
- key { [ Alt_L, Meta_L ] };\
- key { [ space ] };\
- key { [ Caps_Lock ] };\
+ key {\t[ Alt_L, Meta_L ] };\
+ key {\t[ space ] };\
+ key {\t[ Caps_Lock ] };\
key {\
type= \"CTRL+ALT\",\
symbols[Group1]= [ F1, F1, F1, F1, XF86Switch_VT_1 ]\
@@ -1269,29 +1270,29 @@ xkb_symbols \"(unnamed)\" {\
type= \"CTRL+ALT\",\
symbols[Group1]= [ F10, F10, F10, F10, XF86Switch_VT_10 ]\
};\
- key { [ Num_Lock ] };\
- key { [ Scroll_Lock ] };\
- key { [ KP_Home, KP_7 ] };\
- key { [ KP_Up, KP_8 ] };\
- key { [ KP_Prior, KP_9 ] };\
+ key {\t[ Num_Lock ] };\
+ key {\t[ Scroll_Lock ] };\
+ key {\t[ KP_Home, KP_7 ] };\
+ key {\t[ KP_Up, KP_8 ] };\
+ key {\t[ KP_Prior, KP_9 ] };\
key {\
type= \"CTRL+ALT\",\
symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86Prev_VMode ]\
};\
- key { [ KP_Left, KP_4 ] };\
- key { [ KP_Begin, KP_5 ] };\
- key { [ KP_Right, KP_6 ] };\
+ key {\t[ KP_Left, KP_4 ] };\
+ key {\t[ KP_Begin, KP_5 ] };\
+ key {\t[ KP_Right, KP_6 ] };\
key {\
type= \"CTRL+ALT\",\
symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86Next_VMode ]\
};\
- key { [ KP_End, KP_1 ] };\
- key { [ KP_Down, KP_2 ] };\
- key { [ KP_Next, KP_3 ] };\
- key { [ KP_Insert, KP_0 ] };\
- key { [ KP_Delete, KP_Decimal ] };\
- key { [ ISO_Level3_Shift ] };\
- key { [ less, greater, bar, brokenbar ] };\
+ key {\t[ KP_End, KP_1 ] };\
+ key {\t[ KP_Down, KP_2 ] };\
+ key {\t[ KP_Next, KP_3 ] };\
+ key {\t[ KP_Insert, KP_0 ] };\
+ key {\t[ KP_Delete, KP_Decimal ] };\
+ key {\t[ ISO_Level3_Shift ] };\
+ key {\t[ less, greater, bar, brokenbar ] };\
key {\
type= \"CTRL+ALT\",\
symbols[Group1]= [ F11, F11, F11, F11, XF86Switch_VT_11 ]\
@@ -1300,13 +1301,13 @@ xkb_symbols \"(unnamed)\" {\
type= \"CTRL+ALT\",\
symbols[Group1]= [ F12, F12, F12, F12, XF86Switch_VT_12 ]\
};\
- key { [ Katakana ] };\
- key { [ Hiragana ] };\
- key { [ Henkan_Mode ] };\
- key { [ Hiragana_Katakana ] };\
- key { [ Muhenkan ] };\
- key { [ KP_Enter ] };\
- key { [ Control_R ] };\
+ key {\t[ Katakana ] };\
+ key {\t[ Hiragana ] };\
+ key {\t[ Henkan_Mode ] };\
+ key {\t[ Hiragana_Katakana ] };\
+ key {\t[ Muhenkan ] };\
+ key {\t[ KP_Enter ] };\
+ key {\t[ Control_R ] };\
key {\
type= \"CTRL+ALT\",\
symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86Ungrab ]\
@@ -1319,136 +1320,136 @@ xkb_symbols \"(unnamed)\" {\
type= \"TWO_LEVEL\",\
symbols[Group1]= [ Alt_R, Meta_R ]\
};\
- key { [ Linefeed ] };\
- key { [ Home ] };\
- key { [ Up ] };\
- key { [ Prior ] };\
- key { [ Left ] };\
- key { [ Right ] };\
- key { [ End ] };\
- key { [ Down ] };\
- key { [ Next ] };\
- key { [ Insert ] };\
- key { [ Delete ] };\
- key { [ XF86AudioMute ] };\
- key { [ XF86AudioLowerVolume ] };\
- key { [ XF86AudioRaiseVolume ] };\
- key { [ XF86PowerOff ] };\
- key { [ KP_Equal ] };\
- key { [ plusminus ] };\
+ key {\t[ Linefeed ] };\
+ key {\t[ Home ] };\
+ key {\t[ Up ] };\
+ key {\t[ Prior ] };\
+ key {\t[ Left ] };\
+ key {\t[ Right ] };\
+ key {\t[ End ] };\
+ key {\t[ Down ] };\
+ key {\t[ Next ] };\
+ key {\t[ Insert ] };\
+ key {\t[ Delete ] };\
+ key {\t[ XF86AudioMute ] };\
+ key {\t[ XF86AudioLowerVolume ] };\
+ key {\t[ XF86AudioRaiseVolume ] };\
+ key {\t[ XF86PowerOff ] };\
+ key {\t[ KP_Equal ] };\
+ key {\t[ plusminus ] };\
key {\
type= \"PC_CONTROL_LEVEL2\",\
symbols[Group1]= [ Pause, Break ]\
};\
- key { [ XF86LaunchA ] };\
- key { [ KP_Decimal, KP_Decimal ] };\
- key { [ Hangul ] };\
- key { [ Hangul_Hanja ] };\
- key { [ Super_L ] };\
- key { [ Super_R ] };\
- key { [ Menu ] };\
- key { [ Cancel ] };\
- key { [ Redo ] };\
- key { [ SunProps ] };\
- key { [ Undo ] };\
- key { [ SunFront ] };\
- key { [ XF86Copy ] };\
- key { [ XF86Open ] };\
- key { [ XF86Paste ] };\
- key { [ Find ] };\
- key { [ XF86Cut ] };\
- key { [ Help ] };\
- key { [ XF86MenuKB ] };\
- key { [ XF86Calculator ] };\
- key { [ XF86Sleep ] };\
- key { [ XF86WakeUp ] };\
- key { [ XF86Explorer ] };\
- key { [ XF86Send ] };\
- key { [ XF86Xfer ] };\
- key { [ XF86Launch1 ] };\
- key { [ XF86Launch2 ] };\
- key { [ XF86WWW ] };\
- key { [ XF86DOS ] };\
- key { [ XF86ScreenSaver ] };\
- key { [ XF86RotateWindows ] };\
- key { [ XF86TaskPane ] };\
- key { [ XF86Mail ] };\
- key { [ XF86Favorites ] };\
- key { [ XF86MyComputer ] };\
- key { [ XF86Back ] };\
- key { [ XF86Forward ] };\
- key { [ XF86Eject ] };\
- key { [ XF86Eject, XF86Eject ] };\
- key { [ XF86AudioNext ] };\
- key { [ XF86AudioPlay, XF86AudioPause ] };\
- key { [ XF86AudioPrev ] };\
- key { [ XF86AudioStop, XF86Eject ] };\
- key { [ XF86AudioRecord ] };\
- key { [ XF86AudioRewind ] };\
- key { [ XF86Phone ] };\
- key { [ XF86Tools ] };\
- key { [ XF86HomePage ] };\
- key { [ XF86Reload ] };\
- key { [ XF86Close ] };\
- key { [ XF86ScrollUp ] };\
- key { [ XF86ScrollDown ] };\
- key { [ parenleft ] };\
- key { [ parenright ] };\
- key