Skip to content

Commit a4d971d

Browse files
wysiwyswysiwys
authored
Update to match xorgproto 2024.1
Also use the archlinux based image to do generation, since it's the most up to date one.
1 parent e94ff66 commit a4d971d

File tree

2 files changed

+117
-2
lines changed

2 files changed

+117
-2
lines changed

‎Justfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ keysyms:
2020
docker container run --rm \
2121
--name keysym_generator \
2222
--mount type=bind,source="$(pwd)",target=/xkeysym \
23-
rust:slim \
24-
sh -c "apt-get update -y && apt-get install x11proto-core-dev -y --no-install-recommends && \
23+
archlinux:base \
24+
sh -c "pacman -Syu rust xorgproto --noconfirm && \
2525
cargo run --manifest-path /xkeysym/keysym-generator/Cargo.toml \
2626
/xkeysym/src/automatically_generated.rs"
2727

‎src/automatically_generated.rs‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,10 +551,16 @@ pub mod key {
551551
pub const dead_U: RawKeysym = 0xfe89;
552552
#[doc(alias = "XK_dead_small_schwa")]
553553
pub const dead_small_schwa: RawKeysym = 0xfe8a;
554+
#[doc(alias = "XK_dead_schwa")]
555+
pub const dead_schwa: RawKeysym = 0xfe8a;
554556
#[doc(alias = "XK_dead_capital_schwa")]
555557
pub const dead_capital_schwa: RawKeysym = 0xfe8b;
558+
#[doc(alias = "XK_dead_SCHWA")]
559+
pub const dead_SCHWA: RawKeysym = 0xfe8b;
556560
#[doc(alias = "XK_dead_greek")]
557561
pub const dead_greek: RawKeysym = 0xfe8c;
562+
#[doc(alias = "XK_dead_hamza")]
563+
pub const dead_hamza: RawKeysym = 0xfe8d;
558564
#[doc(alias = "XK_First_Virtual_Screen")]
559565
pub const First_Virtual_Screen: RawKeysym = 0xfed0;
560566
#[doc(alias = "XK_Prev_Virtual_Screen")]
@@ -937,6 +943,8 @@ pub mod key {
937943
pub const ordfeminine: RawKeysym = 0xaa;
938944
#[doc(alias = "XK_guillemotleft")]
939945
pub const guillemotleft: RawKeysym = 0xab;
946+
#[doc(alias = "XK_guillemetleft")]
947+
pub const guillemetleft: RawKeysym = 0xab;
940948
#[doc(alias = "XK_notsign")]
941949
pub const notsign: RawKeysym = 0xac;
942950
#[doc(alias = "XK_hyphen")]
@@ -967,8 +975,12 @@ pub mod key {
967975
pub const onesuperior: RawKeysym = 0xb9;
968976
#[doc(alias = "XK_masculine")]
969977
pub const masculine: RawKeysym = 0xba;
978+
#[doc(alias = "XK_ordmasculine")]
979+
pub const ordmasculine: RawKeysym = 0xba;
970980
#[doc(alias = "XK_guillemotright")]
971981
pub const guillemotright: RawKeysym = 0xbb;
982+
#[doc(alias = "XK_guillemetright")]
983+
pub const guillemetright: RawKeysym = 0xbb;
972984
#[doc(alias = "XK_onequarter")]
973985
pub const onequarter: RawKeysym = 0xbc;
974986
#[doc(alias = "XK_onehalf")]
@@ -4741,6 +4753,12 @@ pub mod key {
47414753
pub const XF86_EmojiPicker: RawKeysym = 0x10081249;
47424754
#[doc(alias = "XF86XK_Dictate")]
47434755
pub const XF86_Dictate: RawKeysym = 0x1008124a;
4756+
#[doc(alias = "XF86XK_CameraAccessEnable")]
4757+
pub const XF86_CameraAccessEnable: RawKeysym = 0x1008124b;
4758+
#[doc(alias = "XF86XK_CameraAccessDisable")]
4759+
pub const XF86_CameraAccessDisable: RawKeysym = 0x1008124c;
4760+
#[doc(alias = "XF86XK_CameraAccessToggle")]
4761+
pub const XF86_CameraAccessToggle: RawKeysym = 0x1008124d;
47444762
#[doc(alias = "XF86XK_BrightnessMin")]
47454763
pub const XF86_BrightnessMin: RawKeysym = 0x10081250;
47464764
#[doc(alias = "XF86XK_BrightnessMax")]
@@ -4799,6 +4817,34 @@ pub mod key {
47994817
pub const XF86_PrivacyScreenToggle: RawKeysym = 0x10081279;
48004818
#[doc(alias = "XF86XK_SelectiveScreenshot")]
48014819
pub const XF86_SelectiveScreenshot: RawKeysym = 0x1008127a;
4820+
#[doc(alias = "XF86XK_NextElement")]
4821+
pub const XF86_NextElement: RawKeysym = 0x1008127b;
4822+
#[doc(alias = "XF86XK_PreviousElement")]
4823+
pub const XF86_PreviousElement: RawKeysym = 0x1008127c;
4824+
#[doc(alias = "XF86XK_AutopilotEngageToggle")]
4825+
pub const XF86_AutopilotEngageToggle: RawKeysym = 0x1008127d;
4826+
#[doc(alias = "XF86XK_MarkWaypoint")]
4827+
pub const XF86_MarkWaypoint: RawKeysym = 0x1008127e;
4828+
#[doc(alias = "XF86XK_Sos")]
4829+
pub const XF86_Sos: RawKeysym = 0x1008127f;
4830+
#[doc(alias = "XF86XK_NavChart")]
4831+
pub const XF86_NavChart: RawKeysym = 0x10081280;
4832+
#[doc(alias = "XF86XK_FishingChart")]
4833+
pub const XF86_FishingChart: RawKeysym = 0x10081281;
4834+
#[doc(alias = "XF86XK_SingleRangeRadar")]
4835+
pub const XF86_SingleRangeRadar: RawKeysym = 0x10081282;
4836+
#[doc(alias = "XF86XK_DualRangeRadar")]
4837+
pub const XF86_DualRangeRadar: RawKeysym = 0x10081283;
4838+
#[doc(alias = "XF86XK_RadarOverlay")]
4839+
pub const XF86_RadarOverlay: RawKeysym = 0x10081284;
4840+
#[doc(alias = "XF86XK_TraditionalSonar")]
4841+
pub const XF86_TraditionalSonar: RawKeysym = 0x10081285;
4842+
#[doc(alias = "XF86XK_ClearvuSonar")]
4843+
pub const XF86_ClearvuSonar: RawKeysym = 0x10081286;
4844+
#[doc(alias = "XF86XK_SidevuSonar")]
4845+
pub const XF86_SidevuSonar: RawKeysym = 0x10081287;
4846+
#[doc(alias = "XF86XK_NavInfo")]
4847+
pub const XF86_NavInfo: RawKeysym = 0x10081288;
48024848
#[doc(alias = "XF86XK_Macro1")]
48034849
pub const XF86_Macro1: RawKeysym = 0x10081290;
48044850
#[doc(alias = "XF86XK_Macro2")]
@@ -5658,10 +5704,16 @@ impl Keysym {
56585704
pub const dead_U: Keysym = Keysym(key::dead_U);
56595705
#[doc(alias = "XK_dead_small_schwa")]
56605706
pub const dead_small_schwa: Keysym = Keysym(key::dead_small_schwa);
5707+
#[doc(alias = "XK_dead_schwa")]
5708+
pub const dead_schwa: Keysym = Keysym(key::dead_schwa);
56615709
#[doc(alias = "XK_dead_capital_schwa")]
56625710
pub const dead_capital_schwa: Keysym = Keysym(key::dead_capital_schwa);
5711+
#[doc(alias = "XK_dead_SCHWA")]
5712+
pub const dead_SCHWA: Keysym = Keysym(key::dead_SCHWA);
56635713
#[doc(alias = "XK_dead_greek")]
56645714
pub const dead_greek: Keysym = Keysym(key::dead_greek);
5715+
#[doc(alias = "XK_dead_hamza")]
5716+
pub const dead_hamza: Keysym = Keysym(key::dead_hamza);
56655717
#[doc(alias = "XK_First_Virtual_Screen")]
56665718
pub const First_Virtual_Screen: Keysym = Keysym(key::First_Virtual_Screen);
56675719
#[doc(alias = "XK_Prev_Virtual_Screen")]
@@ -6044,6 +6096,8 @@ impl Keysym {
60446096
pub const ordfeminine: Keysym = Keysym(key::ordfeminine);
60456097
#[doc(alias = "XK_guillemotleft")]
60466098
pub const guillemotleft: Keysym = Keysym(key::guillemotleft);
6099+
#[doc(alias = "XK_guillemetleft")]
6100+
pub const guillemetleft: Keysym = Keysym(key::guillemetleft);
60476101
#[doc(alias = "XK_notsign")]
60486102
pub const notsign: Keysym = Keysym(key::notsign);
60496103
#[doc(alias = "XK_hyphen")]
@@ -6074,8 +6128,12 @@ impl Keysym {
60746128
pub const onesuperior: Keysym = Keysym(key::onesuperior);
60756129
#[doc(alias = "XK_masculine")]
60766130
pub const masculine: Keysym = Keysym(key::masculine);
6131+
#[doc(alias = "XK_ordmasculine")]
6132+
pub const ordmasculine: Keysym = Keysym(key::ordmasculine);
60776133
#[doc(alias = "XK_guillemotright")]
60786134
pub const guillemotright: Keysym = Keysym(key::guillemotright);
6135+
#[doc(alias = "XK_guillemetright")]
6136+
pub const guillemetright: Keysym = Keysym(key::guillemetright);
60796137
#[doc(alias = "XK_onequarter")]
60806138
pub const onequarter: Keysym = Keysym(key::onequarter);
60816139
#[doc(alias = "XK_onehalf")]
@@ -9848,6 +9906,12 @@ impl Keysym {
98489906
pub const XF86_EmojiPicker: Keysym = Keysym(key::XF86_EmojiPicker);
98499907
#[doc(alias = "XF86XK_Dictate")]
98509908
pub const XF86_Dictate: Keysym = Keysym(key::XF86_Dictate);
9909+
#[doc(alias = "XF86XK_CameraAccessEnable")]
9910+
pub const XF86_CameraAccessEnable: Keysym = Keysym(key::XF86_CameraAccessEnable);
9911+
#[doc(alias = "XF86XK_CameraAccessDisable")]
9912+
pub const XF86_CameraAccessDisable: Keysym = Keysym(key::XF86_CameraAccessDisable);
9913+
#[doc(alias = "XF86XK_CameraAccessToggle")]
9914+
pub const XF86_CameraAccessToggle: Keysym = Keysym(key::XF86_CameraAccessToggle);
98519915
#[doc(alias = "XF86XK_BrightnessMin")]
98529916
pub const XF86_BrightnessMin: Keysym = Keysym(key::XF86_BrightnessMin);
98539917
#[doc(alias = "XF86XK_BrightnessMax")]
@@ -9906,6 +9970,34 @@ impl Keysym {
99069970
pub const XF86_PrivacyScreenToggle: Keysym = Keysym(key::XF86_PrivacyScreenToggle);
99079971
#[doc(alias = "XF86XK_SelectiveScreenshot")]
99089972
pub const XF86_SelectiveScreenshot: Keysym = Keysym(key::XF86_SelectiveScreenshot);
9973+
#[doc(alias = "XF86XK_NextElement")]
9974+
pub const XF86_NextElement: Keysym = Keysym(key::XF86_NextElement);
9975+
#[doc(alias = "XF86XK_PreviousElement")]
9976+
pub const XF86_PreviousElement: Keysym = Keysym(key::XF86_PreviousElement);
9977+
#[doc(alias = "XF86XK_AutopilotEngageToggle")]
9978+
pub const XF86_AutopilotEngageToggle: Keysym = Keysym(key::XF86_AutopilotEngageToggle);
9979+
#[doc(alias = "XF86XK_MarkWaypoint")]
9980+
pub const XF86_MarkWaypoint: Keysym = Keysym(key::XF86_MarkWaypoint);
9981+
#[doc(alias = "XF86XK_Sos")]
9982+
pub const XF86_Sos: Keysym = Keysym(key::XF86_Sos);
9983+
#[doc(alias = "XF86XK_NavChart")]
9984+
pub const XF86_NavChart: Keysym = Keysym(key::XF86_NavChart);
9985+
#[doc(alias = "XF86XK_FishingChart")]
9986+
pub const XF86_FishingChart: Keysym = Keysym(key::XF86_FishingChart);
9987+
#[doc(alias = "XF86XK_SingleRangeRadar")]
9988+
pub const XF86_SingleRangeRadar: Keysym = Keysym(key::XF86_SingleRangeRadar);
9989+
#[doc(alias = "XF86XK_DualRangeRadar")]
9990+
pub const XF86_DualRangeRadar: Keysym = Keysym(key::XF86_DualRangeRadar);
9991+
#[doc(alias = "XF86XK_RadarOverlay")]
9992+
pub const XF86_RadarOverlay: Keysym = Keysym(key::XF86_RadarOverlay);
9993+
#[doc(alias = "XF86XK_TraditionalSonar")]
9994+
pub const XF86_TraditionalSonar: Keysym = Keysym(key::XF86_TraditionalSonar);
9995+
#[doc(alias = "XF86XK_ClearvuSonar")]
9996+
pub const XF86_ClearvuSonar: Keysym = Keysym(key::XF86_ClearvuSonar);
9997+
#[doc(alias = "XF86XK_SidevuSonar")]
9998+
pub const XF86_SidevuSonar: Keysym = Keysym(key::XF86_SidevuSonar);
9999+
#[doc(alias = "XF86XK_NavInfo")]
10000+
pub const XF86_NavInfo: Keysym = Keysym(key::XF86_NavInfo);
990910001
#[doc(alias = "XF86XK_Macro1")]
991010002
pub const XF86_Macro1: Keysym = Keysym(key::XF86_Macro1);
991110003
#[doc(alias = "XF86XK_Macro2")]
@@ -10505,8 +10597,11 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
1050510597
Keysym::dead_u => Some("XK_dead_u"),
1050610598
Keysym::dead_U => Some("XK_dead_U"),
1050710599
Keysym::dead_small_schwa => Some("XK_dead_small_schwa"),
10600+
Keysym::dead_schwa => Some("XK_dead_schwa"),
1050810601
Keysym::dead_capital_schwa => Some("XK_dead_capital_schwa"),
10602+
Keysym::dead_SCHWA => Some("XK_dead_SCHWA"),
1050910603
Keysym::dead_greek => Some("XK_dead_greek"),
10604+
Keysym::dead_hamza => Some("XK_dead_hamza"),
1051010605
Keysym::First_Virtual_Screen => Some("XK_First_Virtual_Screen"),
1051110606
Keysym::Prev_Virtual_Screen => Some("XK_Prev_Virtual_Screen"),
1051210607
Keysym::Next_Virtual_Screen => Some("XK_Next_Virtual_Screen"),
@@ -10698,6 +10793,7 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
1069810793
Keysym::copyright => Some("XK_copyright"),
1069910794
Keysym::ordfeminine => Some("XK_ordfeminine"),
1070010795
Keysym::guillemotleft => Some("XK_guillemotleft"),
10796+
Keysym::guillemetleft => Some("XK_guillemetleft"),
1070110797
Keysym::notsign => Some("XK_notsign"),
1070210798
Keysym::hyphen => Some("XK_hyphen"),
1070310799
Keysym::registered => Some("XK_registered"),
@@ -10713,7 +10809,9 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
1071310809
Keysym::cedilla => Some("XK_cedilla"),
1071410810
Keysym::onesuperior => Some("XK_onesuperior"),
1071510811
Keysym::masculine => Some("XK_masculine"),
10812+
Keysym::ordmasculine => Some("XK_ordmasculine"),
1071610813
Keysym::guillemotright => Some("XK_guillemotright"),
10814+
Keysym::guillemetright => Some("XK_guillemetright"),
1071710815
Keysym::onequarter => Some("XK_onequarter"),
1071810816
Keysym::onehalf => Some("XK_onehalf"),
1071910817
Keysym::threequarters => Some("XK_threequarters"),
@@ -12600,6 +12698,9 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
1260012698
Keysym::XF86_Assistant => Some("XF86XK_Assistant"),
1260112699
Keysym::XF86_EmojiPicker => Some("XF86XK_EmojiPicker"),
1260212700
Keysym::XF86_Dictate => Some("XF86XK_Dictate"),
12701+
Keysym::XF86_CameraAccessEnable => Some("XF86XK_CameraAccessEnable"),
12702+
Keysym::XF86_CameraAccessDisable => Some("XF86XK_CameraAccessDisable"),
12703+
Keysym::XF86_CameraAccessToggle => Some("XF86XK_CameraAccessToggle"),
1260312704
Keysym::XF86_BrightnessMin => Some("XF86XK_BrightnessMin"),
1260412705
Keysym::XF86_BrightnessMax => Some("XF86XK_BrightnessMax"),
1260512706
Keysym::XF86_KbdInputAssistPrev => Some("XF86XK_KbdInputAssistPrev"),
@@ -12629,6 +12730,20 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
1262912730
Keysym::XF86_OnScreenKeyboard => Some("XF86XK_OnScreenKeyboard"),
1263012731
Keysym::XF86_PrivacyScreenToggle => Some("XF86XK_PrivacyScreenToggle"),
1263112732
Keysym::XF86_SelectiveScreenshot => Some("XF86XK_SelectiveScreenshot"),
12733+
Keysym::XF86_NextElement => Some("XF86XK_NextElement"),
12734+
Keysym::XF86_PreviousElement => Some("XF86XK_PreviousElement"),
12735+
Keysym::XF86_AutopilotEngageToggle => Some("XF86XK_AutopilotEngageToggle"),
12736+
Keysym::XF86_MarkWaypoint => Some("XF86XK_MarkWaypoint"),
12737+
Keysym::XF86_Sos => Some("XF86XK_Sos"),
12738+
Keysym::XF86_NavChart => Some("XF86XK_NavChart"),
12739+
Keysym::XF86_FishingChart => Some("XF86XK_FishingChart"),
12740+
Keysym::XF86_SingleRangeRadar => Some("XF86XK_SingleRangeRadar"),
12741+
Keysym::XF86_DualRangeRadar => Some("XF86XK_DualRangeRadar"),
12742+
Keysym::XF86_RadarOverlay => Some("XF86XK_RadarOverlay"),
12743+
Keysym::XF86_TraditionalSonar => Some("XF86XK_TraditionalSonar"),
12744+
Keysym::XF86_ClearvuSonar => Some("XF86XK_ClearvuSonar"),
12745+
Keysym::XF86_SidevuSonar => Some("XF86XK_SidevuSonar"),
12746+
Keysym::XF86_NavInfo => Some("XF86XK_NavInfo"),
1263212747
Keysym::XF86_Macro1 => Some("XF86XK_Macro1"),
1263312748
Keysym::XF86_Macro2 => Some("XF86XK_Macro2"),
1263412749
Keysym::XF86_Macro3 => Some("XF86XK_Macro3"),

0 commit comments

Comments
 (0)