summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2014-10-18 14:12:14 +0300
committerRan Benita <ran234@gmail.com>2014-10-18 15:05:30 +0300
commit49dc91cedb3f7a8205c1f346f8b2e891decf9209 (patch)
tree1fdc80595860119c615ad99c48727edd285c4b12
parentbac0c323b6559e37af04c4d6c8eb118d926ce07c (diff)
downloadxorg-lib-libxkbcommon-49dc91cedb3f7a8205c1f346f8b2e891decf9209.tar.gz
doc/quick-guide: some improvements
Signed-off-by: Ran Benita <ran234@gmail.com>
-rw-r--r--doc/quick-guide.md20
1 files changed, 15 insertions, 5 deletions
diff --git a/doc/quick-guide.md b/doc/quick-guide.md
index a8634fd..3cf5b3b 100644
--- a/doc/quick-guide.md
+++ b/doc/quick-guide.md
@@ -1,6 +1,6 @@
# Quick Guide
-## Intro
+## Introduction
This document contains a quick walk-through of the often-used parts of
the library. We will employ a few use-cases to lead the examples:
@@ -42,8 +42,9 @@ let's create one:
The xkb_context contains the keymap include paths, the log level and
functions, and other general customizable administrativia.
-Next we need to create a keymap, xkb_keymap. There are different ways to
-do this.
+Next we need to create a keymap, xkb_keymap. This is an immutable object
+which contains all of the information about the keys, layouts, etc. There
+are different ways to do this.
If we are an evdev client, we have nothing to go by, so we need to ask
the user for his/her keymap preferences (for example, an Icelandic
@@ -54,7 +55,14 @@ passing NULL chooses the system's default.
~~~{.c}
struct xkb_keymap *keymap;
- struct xkb_rule_names names = <...>;
+ /* Example RMLVO for Icelandic Dvorak. */
+ struct xkb_rule_names names = {
+ .rules = NULL,
+ .model = "pc105",
+ .layout = "is",
+ .variant = "dvorak",
+ .options = "terminate:ctrl_alt_bksp"
+ };
keymap = xkb_keymap_new_from_names(ctx, &names,
XKB_KEYMAP_COMPILE_NO_FLAGS);
@@ -65,6 +73,7 @@ If we are a Wayland client, the compositor gives us a string complete
with a keymap. In this case, we can create the keymap object like this:
~~~{.c}
+ /* From the wl_keyboard::keymap event. */
const char *keymap_string = <...>;
keymap = xkb_keymap_new_from_string(ctx, keymap_string,
@@ -92,7 +101,8 @@ we will use the core keyboard device:
~~~
Now that we have the keymap, we are ready to handle the keyboard devices.
-For each device, we create an xkb_state:
+For each device, we create an xkb_state, which remembers things like which
+keyboard modifiers and LEDs are active:
~~~{.c}
struct xkb_state *state;