StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: move the remaining tools from test to here 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
master
Peter Hutterer 2020-06-23 16:20:08 +10:00
parent f525f9f040
commit 3adbe54eac
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/quick-guide.md
View File

@ -16,11 +16,11 @@ the library. We will employ a few use-cases to lead the examples:
The snippets are not complete, and some support code is omitted. You The snippets are not complete, and some support code is omitted. You
can find complete and more complex examples in the source directory: can find complete and more complex examples in the source directory:
1. test/interactive-evdev.c contains an interactive evdev client. 1. tools/interactive-evdev.c contains an interactive evdev client.
2. test/interactive-x11.c contains an interactive X11 client. 2. tools/interactive-x11.c contains an interactive X11 client.
3. test/interactive-wayland.c contains an interactive Wayland client. 3. tools/interactive-wayland.c contains an interactive Wayland client.
Also, the library contains many more functions for examining and using Also, the library contains many more functions for examining and using
the library context, the keymap and the keyboard state. See the the library context, the keymap and the keyboard state. See the

6
meson.build
View File

@ -462,7 +462,7 @@ if cc.has_header_symbol('getopt.h', 'getopt_long', prefix: '#define _GNU_SOURCE'
executable('how-to-type', 'tools/how-to-type.c', dependencies: tools_dep) executable('how-to-type', 'tools/how-to-type.c', dependencies: tools_dep)
endif endif
if cc.has_header('linux/input.h') if cc.has_header('linux/input.h')
executable('interactive-evdev', 'test/interactive-evdev.c', dependencies: tools_dep) executable('interactive-evdev', 'tools/interactive-evdev.c', dependencies: tools_dep)
endif endif
if get_option('enable-x11') if get_option('enable-x11')
x11_tools_dep = declare_dependency( x11_tools_dep = declare_dependency(
@ -473,7 +473,7 @@ if get_option('enable-x11')
xcb_xkb_dep, xcb_xkb_dep,
], ],
) )
executable('interactive-x11', 'test/interactive-x11.c', dependencies: x11_tools_dep) executable('interactive-x11', 'tools/interactive-x11.c', dependencies: x11_tools_dep)
endif endif
if get_option('enable-wayland') if get_option('enable-wayland')
wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false) wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false)
@ -502,7 +502,7 @@ You can disable the Wayland demo programs with -Denable-wayland=false.''')
wayland_scanner_client_header_gen.process(xdg_shell_xml), wayland_scanner_client_header_gen.process(xdg_shell_xml),
] ]
executable('interactive-wayland', executable('interactive-wayland',
'test/interactive-wayland.c', 'tools/interactive-wayland.c',
xdg_shell_sources, xdg_shell_sources,
dependencies: [tools_dep, wayland_client_dep]) dependencies: [tools_dep, wayland_client_dep])
endif endif

0
test/interactive-evdev.c → tools/interactive-evdev.c
View File

0
test/interactive-wayland.c → tools/interactive-wayland.c
View File

2
test/interactive-x11.c → tools/interactive-x11.c
View File

@ -33,7 +33,7 @@
/* /*
* Note: This program only handles the core keyboard device for now. * Note: This program only handles the core keyboard device for now.
* It should be straigtforward to change struct keyboard to a list of * It should be straigtforward to change struct keyboard to a list of
* keyboards with device IDs, as in test/interactive-evdev.c. This would * keyboards with device IDs, as in tools/interactive-evdev.c. This would
* require: * require:
* *
* - Initially listing the keyboard devices. * - Initially listing the keyboard devices.

2
xkbcommon/xkbcommon-x11.h
View File

@ -54,7 +54,7 @@ extern "C" {
* can be used as a replacement for Xlib's keyboard handling. * can be used as a replacement for Xlib's keyboard handling.
* *
* Following is an example workflow using xkbcommon-x11. A complete * Following is an example workflow using xkbcommon-x11. A complete
* example may be found in the test/interactive-x11.c file in the * example may be found in the tools/interactive-x11.c file in the
* xkbcommon source repository. On startup: * xkbcommon source repository. On startup:
* *
* 1. Connect to the X server using xcb_connect(). * 1. Connect to the X server using xcb_connect().