Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

x11: Support xcb-keysyms as fallback when XKB support not available #679

Merged
merged 3 commits into from
Nov 30, 2023
Merged

x11: Support xcb-keysyms as fallback when XKB support not available #679

merged 3 commits into from
Nov 30, 2023

Commits on Nov 30, 2023

  1. x11: Support using xcb-keysyms as fallback for XKB 

    Massage the parts from #303 which deal with input using xcb-keysyms to
be included in the x11 platform plug-in. This provides a fallback that
can be used when XKB initialization fails, typically in cases where the
X server does not support XKB or has the support disabled. XKB is a X11
protocol extension after all, and it is wrong to assume that it will be
always available. While at it, allow running without keyboard support,
producing a warning in this case.
    @aperezdc
    aperezdc committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    57f637e View commit details
    Browse the repository at this point in the history

  2. x11: Make XKB support optional at build time 

    Allow disabling the XKB support in the x11 platform plug-in at build
time. For this, introduce a new "x11_keyboard" Meson build option that
can be set to use xkb, xcb-keysyms, both, or none. Preprocessor guards
are introduced where needed to skip the XKB code.
    @aperezdc
    aperezdc committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    1f400fb View commit details
    Browse the repository at this point in the history

  3. meson: Add a Wrap subproject for xcb-keysyms 

    Add a Wrap subproject definition for the xcb-keysyms dependency. It is
a very simple library with a single C source file, so it is easy to make
Meson build definitions for it that get added on top of the tarball
release fetched by Meson if xcb-keysyms is not available. This way it is
guaranteed that there will be at least some support for keyboard input
if the XKB extension is not available in the X server, or not enabled at
build time.
    @aperezdc
    aperezdc committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    891c33c View commit details
    Browse the repository at this point in the history