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

Update to match xorgproto 2024.1 #29

Merged
merged 3 commits into from
Apr 14, 2024
Merged

Update to match xorgproto 2024.1 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84c841c
Update to use latest xorgproto keysyms
Apr 1, 2024
ddd27f0
Use `archlinux:base` container instead of `archlinux:base-devel`
Apr 1, 2024
4c25a16
Improve `pacman` commands
wysiwys Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ keysyms:
docker container run --rm \
--name keysym_generator \
--mount type=bind,source="$(pwd)",target=/xkeysym \
rust:slim \
sh -c "apt-get update -y && apt-get install x11proto-core-dev -y --no-install-recommends && \
archlinux:base \
sh -c "pacman -Syu rust xorgproto --noconfirm && \
cargo run --manifest-path /xkeysym/keysym-generator/Cargo.toml \
/xkeysym/src/automatically_generated.rs"

115 changes: 115 additions & 0 deletions src/automatically_generated.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,10 +551,16 @@ pub mod key {
pub const dead_U: RawKeysym = 0xfe89;
#[doc(alias = "XK_dead_small_schwa")]
pub const dead_small_schwa: RawKeysym = 0xfe8a;
#[doc(alias = "XK_dead_schwa")]
pub const dead_schwa: RawKeysym = 0xfe8a;
#[doc(alias = "XK_dead_capital_schwa")]
pub const dead_capital_schwa: RawKeysym = 0xfe8b;
#[doc(alias = "XK_dead_SCHWA")]
pub const dead_SCHWA: RawKeysym = 0xfe8b;
#[doc(alias = "XK_dead_greek")]
pub const dead_greek: RawKeysym = 0xfe8c;
#[doc(alias = "XK_dead_hamza")]
pub const dead_hamza: RawKeysym = 0xfe8d;
#[doc(alias = "XK_First_Virtual_Screen")]
pub const First_Virtual_Screen: RawKeysym = 0xfed0;
#[doc(alias = "XK_Prev_Virtual_Screen")]
Expand Down Expand Up @@ -937,6 +943,8 @@ pub mod key {
pub const ordfeminine: RawKeysym = 0xaa;
#[doc(alias = "XK_guillemotleft")]
pub const guillemotleft: RawKeysym = 0xab;
#[doc(alias = "XK_guillemetleft")]
pub const guillemetleft: RawKeysym = 0xab;
#[doc(alias = "XK_notsign")]
pub const notsign: RawKeysym = 0xac;
#[doc(alias = "XK_hyphen")]
Expand Down Expand Up @@ -967,8 +975,12 @@ pub mod key {
pub const onesuperior: RawKeysym = 0xb9;
#[doc(alias = "XK_masculine")]
pub const masculine: RawKeysym = 0xba;
#[doc(alias = "XK_ordmasculine")]
pub const ordmasculine: RawKeysym = 0xba;
#[doc(alias = "XK_guillemotright")]
pub const guillemotright: RawKeysym = 0xbb;
#[doc(alias = "XK_guillemetright")]
pub const guillemetright: RawKeysym = 0xbb;
#[doc(alias = "XK_onequarter")]
pub const onequarter: RawKeysym = 0xbc;
#[doc(alias = "XK_onehalf")]
Expand Down Expand Up @@ -4741,6 +4753,12 @@ pub mod key {
pub const XF86_EmojiPicker: RawKeysym = 0x10081249;
#[doc(alias = "XF86XK_Dictate")]
pub const XF86_Dictate: RawKeysym = 0x1008124a;
#[doc(alias = "XF86XK_CameraAccessEnable")]
pub const XF86_CameraAccessEnable: RawKeysym = 0x1008124b;
#[doc(alias = "XF86XK_CameraAccessDisable")]
pub const XF86_CameraAccessDisable: RawKeysym = 0x1008124c;
#[doc(alias = "XF86XK_CameraAccessToggle")]
pub const XF86_CameraAccessToggle: RawKeysym = 0x1008124d;
#[doc(alias = "XF86XK_BrightnessMin")]
pub const XF86_BrightnessMin: RawKeysym = 0x10081250;
#[doc(alias = "XF86XK_BrightnessMax")]
Expand Down Expand Up @@ -4799,6 +4817,34 @@ pub mod key {
pub const XF86_PrivacyScreenToggle: RawKeysym = 0x10081279;
#[doc(alias = "XF86XK_SelectiveScreenshot")]
pub const XF86_SelectiveScreenshot: RawKeysym = 0x1008127a;
#[doc(alias = "XF86XK_NextElement")]
pub const XF86_NextElement: RawKeysym = 0x1008127b;
#[doc(alias = "XF86XK_PreviousElement")]
pub const XF86_PreviousElement: RawKeysym = 0x1008127c;
#[doc(alias = "XF86XK_AutopilotEngageToggle")]
pub const XF86_AutopilotEngageToggle: RawKeysym = 0x1008127d;
#[doc(alias = "XF86XK_MarkWaypoint")]
pub const XF86_MarkWaypoint: RawKeysym = 0x1008127e;
#[doc(alias = "XF86XK_Sos")]
pub const XF86_Sos: RawKeysym = 0x1008127f;
#[doc(alias = "XF86XK_NavChart")]
pub const XF86_NavChart: RawKeysym = 0x10081280;
#[doc(alias = "XF86XK_FishingChart")]
pub const XF86_FishingChart: RawKeysym = 0x10081281;
#[doc(alias = "XF86XK_SingleRangeRadar")]
pub const XF86_SingleRangeRadar: RawKeysym = 0x10081282;
#[doc(alias = "XF86XK_DualRangeRadar")]
pub const XF86_DualRangeRadar: RawKeysym = 0x10081283;
#[doc(alias = "XF86XK_RadarOverlay")]
pub const XF86_RadarOverlay: RawKeysym = 0x10081284;
#[doc(alias = "XF86XK_TraditionalSonar")]
pub const XF86_TraditionalSonar: RawKeysym = 0x10081285;
#[doc(alias = "XF86XK_ClearvuSonar")]
pub const XF86_ClearvuSonar: RawKeysym = 0x10081286;
#[doc(alias = "XF86XK_SidevuSonar")]
pub const XF86_SidevuSonar: RawKeysym = 0x10081287;
#[doc(alias = "XF86XK_NavInfo")]
pub const XF86_NavInfo: RawKeysym = 0x10081288;
#[doc(alias = "XF86XK_Macro1")]
pub const XF86_Macro1: RawKeysym = 0x10081290;
#[doc(alias = "XF86XK_Macro2")]
Expand Down Expand Up @@ -5658,10 +5704,16 @@ impl Keysym {
pub const dead_U: Keysym = Keysym(key::dead_U);
#[doc(alias = "XK_dead_small_schwa")]
pub const dead_small_schwa: Keysym = Keysym(key::dead_small_schwa);
#[doc(alias = "XK_dead_schwa")]
pub const dead_schwa: Keysym = Keysym(key::dead_schwa);
#[doc(alias = "XK_dead_capital_schwa")]
pub const dead_capital_schwa: Keysym = Keysym(key::dead_capital_schwa);
#[doc(alias = "XK_dead_SCHWA")]
pub const dead_SCHWA: Keysym = Keysym(key::dead_SCHWA);
#[doc(alias = "XK_dead_greek")]
pub const dead_greek: Keysym = Keysym(key::dead_greek);
#[doc(alias = "XK_dead_hamza")]
pub const dead_hamza: Keysym = Keysym(key::dead_hamza);
#[doc(alias = "XK_First_Virtual_Screen")]
pub const First_Virtual_Screen: Keysym = Keysym(key::First_Virtual_Screen);
#[doc(alias = "XK_Prev_Virtual_Screen")]
Expand Down Expand Up @@ -6044,6 +6096,8 @@ impl Keysym {
pub const ordfeminine: Keysym = Keysym(key::ordfeminine);
#[doc(alias = "XK_guillemotleft")]
pub const guillemotleft: Keysym = Keysym(key::guillemotleft);
#[doc(alias = "XK_guillemetleft")]
pub const guillemetleft: Keysym = Keysym(key::guillemetleft);
#[doc(alias = "XK_notsign")]
pub const notsign: Keysym = Keysym(key::notsign);
#[doc(alias = "XK_hyphen")]
Expand Down Expand Up @@ -6074,8 +6128,12 @@ impl Keysym {
pub const onesuperior: Keysym = Keysym(key::onesuperior);
#[doc(alias = "XK_masculine")]
pub const masculine: Keysym = Keysym(key::masculine);
#[doc(alias = "XK_ordmasculine")]
pub const ordmasculine: Keysym = Keysym(key::ordmasculine);
#[doc(alias = "XK_guillemotright")]
pub const guillemotright: Keysym = Keysym(key::guillemotright);
#[doc(alias = "XK_guillemetright")]
pub const guillemetright: Keysym = Keysym(key::guillemetright);
#[doc(alias = "XK_onequarter")]
pub const onequarter: Keysym = Keysym(key::onequarter);
#[doc(alias = "XK_onehalf")]
Expand Down Expand Up @@ -9848,6 +9906,12 @@ impl Keysym {
pub const XF86_EmojiPicker: Keysym = Keysym(key::XF86_EmojiPicker);
#[doc(alias = "XF86XK_Dictate")]
pub const XF86_Dictate: Keysym = Keysym(key::XF86_Dictate);
#[doc(alias = "XF86XK_CameraAccessEnable")]
pub const XF86_CameraAccessEnable: Keysym = Keysym(key::XF86_CameraAccessEnable);
#[doc(alias = "XF86XK_CameraAccessDisable")]
pub const XF86_CameraAccessDisable: Keysym = Keysym(key::XF86_CameraAccessDisable);
#[doc(alias = "XF86XK_CameraAccessToggle")]
pub const XF86_CameraAccessToggle: Keysym = Keysym(key::XF86_CameraAccessToggle);
#[doc(alias = "XF86XK_BrightnessMin")]
pub const XF86_BrightnessMin: Keysym = Keysym(key::XF86_BrightnessMin);
#[doc(alias = "XF86XK_BrightnessMax")]
Expand Down Expand Up @@ -9906,6 +9970,34 @@ impl Keysym {
pub const XF86_PrivacyScreenToggle: Keysym = Keysym(key::XF86_PrivacyScreenToggle);
#[doc(alias = "XF86XK_SelectiveScreenshot")]
pub const XF86_SelectiveScreenshot: Keysym = Keysym(key::XF86_SelectiveScreenshot);
#[doc(alias = "XF86XK_NextElement")]
pub const XF86_NextElement: Keysym = Keysym(key::XF86_NextElement);
#[doc(alias = "XF86XK_PreviousElement")]
pub const XF86_PreviousElement: Keysym = Keysym(key::XF86_PreviousElement);
#[doc(alias = "XF86XK_AutopilotEngageToggle")]
pub const XF86_AutopilotEngageToggle: Keysym = Keysym(key::XF86_AutopilotEngageToggle);
#[doc(alias = "XF86XK_MarkWaypoint")]
pub const XF86_MarkWaypoint: Keysym = Keysym(key::XF86_MarkWaypoint);
#[doc(alias = "XF86XK_Sos")]
pub const XF86_Sos: Keysym = Keysym(key::XF86_Sos);
#[doc(alias = "XF86XK_NavChart")]
pub const XF86_NavChart: Keysym = Keysym(key::XF86_NavChart);
#[doc(alias = "XF86XK_FishingChart")]
pub const XF86_FishingChart: Keysym = Keysym(key::XF86_FishingChart);
#[doc(alias = "XF86XK_SingleRangeRadar")]
pub const XF86_SingleRangeRadar: Keysym = Keysym(key::XF86_SingleRangeRadar);
#[doc(alias = "XF86XK_DualRangeRadar")]
pub const XF86_DualRangeRadar: Keysym = Keysym(key::XF86_DualRangeRadar);
#[doc(alias = "XF86XK_RadarOverlay")]
pub const XF86_RadarOverlay: Keysym = Keysym(key::XF86_RadarOverlay);
#[doc(alias = "XF86XK_TraditionalSonar")]
pub const XF86_TraditionalSonar: Keysym = Keysym(key::XF86_TraditionalSonar);
#[doc(alias = "XF86XK_ClearvuSonar")]
pub const XF86_ClearvuSonar: Keysym = Keysym(key::XF86_ClearvuSonar);
#[doc(alias = "XF86XK_SidevuSonar")]
pub const XF86_SidevuSonar: Keysym = Keysym(key::XF86_SidevuSonar);
#[doc(alias = "XF86XK_NavInfo")]
pub const XF86_NavInfo: Keysym = Keysym(key::XF86_NavInfo);
#[doc(alias = "XF86XK_Macro1")]
pub const XF86_Macro1: Keysym = Keysym(key::XF86_Macro1);
#[doc(alias = "XF86XK_Macro2")]
Expand Down Expand Up @@ -10505,8 +10597,11 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
Keysym::dead_u => Some("XK_dead_u"),
Keysym::dead_U => Some("XK_dead_U"),
Keysym::dead_small_schwa => Some("XK_dead_small_schwa"),
Keysym::dead_schwa => Some("XK_dead_schwa"),
Keysym::dead_capital_schwa => Some("XK_dead_capital_schwa"),
Keysym::dead_SCHWA => Some("XK_dead_SCHWA"),
Keysym::dead_greek => Some("XK_dead_greek"),
Keysym::dead_hamza => Some("XK_dead_hamza"),
Keysym::First_Virtual_Screen => Some("XK_First_Virtual_Screen"),
Keysym::Prev_Virtual_Screen => Some("XK_Prev_Virtual_Screen"),
Keysym::Next_Virtual_Screen => Some("XK_Next_Virtual_Screen"),
Expand Down Expand Up @@ -10698,6 +10793,7 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
Keysym::copyright => Some("XK_copyright"),
Keysym::ordfeminine => Some("XK_ordfeminine"),
Keysym::guillemotleft => Some("XK_guillemotleft"),
Keysym::guillemetleft => Some("XK_guillemetleft"),
Keysym::notsign => Some("XK_notsign"),
Keysym::hyphen => Some("XK_hyphen"),
Keysym::registered => Some("XK_registered"),
Expand All @@ -10713,7 +10809,9 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
Keysym::cedilla => Some("XK_cedilla"),
Keysym::onesuperior => Some("XK_onesuperior"),
Keysym::masculine => Some("XK_masculine"),
Keysym::ordmasculine => Some("XK_ordmasculine"),
Keysym::guillemotright => Some("XK_guillemotright"),
Keysym::guillemetright => Some("XK_guillemetright"),
Keysym::onequarter => Some("XK_onequarter"),
Keysym::onehalf => Some("XK_onehalf"),
Keysym::threequarters => Some("XK_threequarters"),
Expand Down Expand Up @@ -12600,6 +12698,9 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
Keysym::XF86_Assistant => Some("XF86XK_Assistant"),
Keysym::XF86_EmojiPicker => Some("XF86XK_EmojiPicker"),
Keysym::XF86_Dictate => Some("XF86XK_Dictate"),
Keysym::XF86_CameraAccessEnable => Some("XF86XK_CameraAccessEnable"),
Keysym::XF86_CameraAccessDisable => Some("XF86XK_CameraAccessDisable"),
Keysym::XF86_CameraAccessToggle => Some("XF86XK_CameraAccessToggle"),
Keysym::XF86_BrightnessMin => Some("XF86XK_BrightnessMin"),
Keysym::XF86_BrightnessMax => Some("XF86XK_BrightnessMax"),
Keysym::XF86_KbdInputAssistPrev => Some("XF86XK_KbdInputAssistPrev"),
Expand Down Expand Up @@ -12629,6 +12730,20 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
Keysym::XF86_OnScreenKeyboard => Some("XF86XK_OnScreenKeyboard"),
Keysym::XF86_PrivacyScreenToggle => Some("XF86XK_PrivacyScreenToggle"),
Keysym::XF86_SelectiveScreenshot => Some("XF86XK_SelectiveScreenshot"),
Keysym::XF86_NextElement => Some("XF86XK_NextElement"),
Keysym::XF86_PreviousElement => Some("XF86XK_PreviousElement"),
Keysym::XF86_AutopilotEngageToggle => Some("XF86XK_AutopilotEngageToggle"),
Keysym::XF86_MarkWaypoint => Some("XF86XK_MarkWaypoint"),
Keysym::XF86_Sos => Some("XF86XK_Sos"),
Keysym::XF86_NavChart => Some("XF86XK_NavChart"),
Keysym::XF86_FishingChart => Some("XF86XK_FishingChart"),
Keysym::XF86_SingleRangeRadar => Some("XF86XK_SingleRangeRadar"),
Keysym::XF86_DualRangeRadar => Some("XF86XK_DualRangeRadar"),
Keysym::XF86_RadarOverlay => Some("XF86XK_RadarOverlay"),
Keysym::XF86_TraditionalSonar => Some("XF86XK_TraditionalSonar"),
Keysym::XF86_ClearvuSonar => Some("XF86XK_ClearvuSonar"),
Keysym::XF86_SidevuSonar => Some("XF86XK_SidevuSonar"),
Keysym::XF86_NavInfo => Some("XF86XK_NavInfo"),
Keysym::XF86_Macro1 => Some("XF86XK_Macro1"),
Keysym::XF86_Macro2 => Some("XF86XK_Macro2"),
Keysym::XF86_Macro3 => Some("XF86XK_Macro3"),
Expand Down