Skip to content

Commit 71a88ee

Browse files
clouds56clouds56
committed
fix connection of some RWin, RMenu etc.
1 parent 37278b5 commit 71a88ee

16 files changed

+109
-85
lines changed

‎scripts/cache/numeric/hut_04.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ KeyboardKeypad::KeyboardLeftAlt* , 0x700E2,
9191
KeyboardKeypad::KeyboardLeftAposandDouble , 0x70034,
9292
KeyboardKeypad::KeyboardLeftArrow , 0x70050,
9393
KeyboardKeypad::KeyboardLeftBrace , 0x7002F,
94-
KeyboardKeypad::KeyboardLeftControl , 0x700E0,
94+
KeyboardKeypad::KeyboardLeftControl* , 0x700E0,
9595
KeyboardKeypad::KeyboardLeftControl , 0x700E0,
9696
KeyboardKeypad::KeyboardLeftGUI , 0x700E3,
9797
KeyboardKeypad::KeyboardLeftGUI* , 0x700E3,
@@ -115,10 +115,12 @@ KeyboardKeypad::KeyboardQ , 0x70014,
115115
KeyboardKeypad::KeyboardR , 0x70015,
116116
KeyboardKeypad::KeyboardReturnEnter , 0x70028,
117117
KeyboardKeypad::KeyboardRightAlt , 0x700E6,
118+
KeyboardKeypad::KeyboardRightAlt* , 0x700E6,
118119
KeyboardKeypad::KeyboardRightArrow , 0x7004F,
119120
KeyboardKeypad::KeyboardRightBrace , 0x70030,
120121
KeyboardKeypad::KeyboardRightControl , 0x700E4,
121122
KeyboardKeypad::KeyboardRightGUI , 0x700E7,
123+
KeyboardKeypad::KeyboardRightGUI* , 0x700E7,
122124
KeyboardKeypad::KeyboardRightShift , 0x700E5,
123125
KeyboardKeypad::KeyboardS , 0x70016,
124126
KeyboardKeypad::KeyboardScrollLock , 0x70047,
@@ -289,5 +291,3 @@ None , ,
289291
None , ,
290292
None , ,
291293
None , ,
292-
None , ,
293-
None , ,

‎scripts/cache/numeric/macos.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,20 @@ None , ,
8585
KeyCodeExt::kVK_ANSI_J , 0x26,
8686
KeyCodeExt::kVK_ANSI_K , 0x28,
8787
KeyCodeExt::kVK_ANSI_L , 0x25,
88-
None , ,
89-
KeyCode::OPTION , 0x3A,
88+
KeyCode::OPTION* , 0x3A,
89+
KeyCode::OPTION* , 0x3A,
9090
KeyCode::OPTION , 0x3A,
9191
None , ,
9292
KeyCode::LEFT_ARROW , 0x7B,
9393
None , ,
9494
KeyCode::CONTROL , 0x3B,
9595
KeyCode::CONTROL , 0x3B,
96-
None , ,
97-
KeyCode::COMMAND , 0x37,
96+
KeyCode::COMMAND* , 0x37,
97+
KeyCode::COMMAND* , 0x37,
9898
KeyCode::COMMAND , 0x37,
99-
KeyCode::COMMAND , 0x37,
100-
KeyCode::COMMAND , 0x37,
101-
KeyCode::SHIFT , 0x38,
99+
KeyCode::COMMAND* , 0x37,
100+
KeyCode::COMMAND* , 0x37,
101+
KeyCode::SHIFT* , 0x38,
102102
KeyCode::SHIFT , 0x38,
103103
KeyCodeExt::kVK_ANSI_M , 0x2E,
104104
KeyCodeExt::kVK_ANSI_N , 0x2D,
@@ -114,11 +114,13 @@ None , ,
114114
KeyCodeExt::kVK_ANSI_Q , 0x0C,
115115
KeyCodeExt::kVK_ANSI_R , 0x0F,
116116
KeyCode::RETURN , 0x24,
117-
None , ,
117+
KeyCode::RIGHT_OPTION* , 0x3D,
118+
KeyCode::RIGHT_OPTION , 0x3D,
118119
KeyCode::RIGHT_ARROW , 0x7C,
119120
None , ,
120121
KeyCode::RIGHT_CONTROL , 0x3E,
121-
None , ,
122+
KeyCode::RIGHT_COMMAND* , 0x36,
123+
KeyCode::RIGHT_COMMAND , 0x36,
122124
KeyCode::RIGHT_SHIFT , 0x3C,
123125
KeyCodeExt::kVK_ANSI_S , 0x01,
124126
None , ,
@@ -175,17 +177,15 @@ KeyCode::FUNCTION , 0x3F,
175177
None , ,
176178
None , ,
177179
None , ,
178-
CGKeyCode::from(131) , 0x83,
180+
CGKeyCode(131).0 , 0x83,
179181
None , ,
180182
None , ,
181183
None , ,
182184
None , ,
183185
None , ,
184-
CGKeyCode::from(160) , 0xA0,
186+
CGKeyCode(160).0 , 0xA0,
185187
None , ,
186-
KeyCode::RIGHT_COMMAND , 0x36,
187188
None , ,
188-
KeyCode::RIGHT_OPTION , 0x3D,
189189
None , ,
190190
None , ,
191191
None , ,

‎scripts/cache/numeric/windows.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@ VK_K , 0x4B,
8787
VK_L , 0x4C,
8888
VK_LMENU , 0xA4,
8989
VK_MENU , 0x12,
90-
VK_MENU , 0x12,
90+
VK_MENU* , 0x12,
9191
VK_OEM_7 , 0xDE,
9292
VK_LEFT , 0x25,
9393
VK_OEM_4 , 0xDB,
9494
VK_CONTROL , 0x11,
9595
VK_LCONTROL , 0xA2,
9696
VK_LWIN , 0x5B,
97-
VK_LWIN , 0x5B,
98-
VK_LWIN , 0x5B,
99-
VK_LWIN , 0x5B,
100-
VK_LWIN , 0x5B,
97+
VK_LWIN* , 0x5B,
98+
VK_LWIN* , 0x5B,
99+
VK_LWIN* , 0x5B,
100+
VK_LWIN* , 0x5B,
101101
VK_LSHIFT , 0xA0,
102102
VK_SHIFT , 0x10,
103103
VK_M , 0x4D,
@@ -115,10 +115,12 @@ VK_Q , 0x51,
115115
VK_R , 0x52,
116116
VK_RETURN , 0x0D,
117117
VK_RMENU , 0xA5,
118+
VK_RMENU* , 0xA5,
118119
VK_RIGHT , 0x27,
119120
VK_OEM_6 , 0xDD,
120121
VK_RCONTROL , 0xA3,
121122
VK_RWIN , 0x5C,
123+
VK_RWIN* , 0x5C,
122124
VK_RSHIFT , 0xA1,
123125
VK_S , 0x53,
124126
VK_SCROLL , 0x91,
@@ -189,8 +191,6 @@ None , ,
189191
None , ,
190192
None , ,
191193
None , ,
192-
None , ,
193-
None , ,
194194
VK_ABNT_C1 , 0xC1,
195195
VK_ABNT_C2 , 0xC2,
196196
VK_ATTN , 0xF6,

‎scripts/example_gen_numeric.rs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ fn print_hut_04(w: &mut dyn std::io::Write, any: bool) -> std::io::Result<()>{
115115
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardLeftAposandDouble", KeyboardKeypad::KeyboardLeftAposandDouble.usage_value())?;
116116
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardLeftArrow", KeyboardKeypad::KeyboardLeftArrow.usage_value())?;
117117
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardLeftBrace", KeyboardKeypad::KeyboardLeftBrace.usage_value())?;
118-
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardLeftControl", KeyboardKeypad::KeyboardLeftControl.usage_value())?;
118+
if any {writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardLeftControl*", KeyboardKeypad::KeyboardLeftControl.usage_value())?;}
119119
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardLeftControl", KeyboardKeypad::KeyboardLeftControl.usage_value())?;
120120
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardLeftGUI", KeyboardKeypad::KeyboardLeftGUI.usage_value())?;
121121
if any {writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardLeftGUI*", KeyboardKeypad::KeyboardLeftGUI.usage_value())?;}
@@ -139,10 +139,12 @@ fn print_hut_04(w: &mut dyn std::io::Write, any: bool) -> std::io::Result<()>{
139139
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardR", KeyboardKeypad::KeyboardR.usage_value())?;
140140
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardReturnEnter", KeyboardKeypad::KeyboardReturnEnter.usage_value())?;
141141
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardRightAlt", KeyboardKeypad::KeyboardRightAlt.usage_value())?;
142+
if any {writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardRightAlt*", KeyboardKeypad::KeyboardRightAlt.usage_value())?;}
142143
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardRightArrow", KeyboardKeypad::KeyboardRightArrow.usage_value())?;
143144
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardRightBrace", KeyboardKeypad::KeyboardRightBrace.usage_value())?;
144145
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardRightControl", KeyboardKeypad::KeyboardRightControl.usage_value())?;
145146
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardRightGUI", KeyboardKeypad::KeyboardRightGUI.usage_value())?;
147+
if any {writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardRightGUI*", KeyboardKeypad::KeyboardRightGUI.usage_value())?;}
146148
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardRightShift", KeyboardKeypad::KeyboardRightShift.usage_value())?;
147149
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardS", KeyboardKeypad::KeyboardS.usage_value())?;
148150
writeln!(w, "{:52}, 0x{:X},", "KeyboardKeypad::KeyboardScrollLock", KeyboardKeypad::KeyboardScrollLock.usage_value())?;
@@ -313,8 +315,6 @@ fn print_hut_04(w: &mut dyn std::io::Write, any: bool) -> std::io::Result<()>{
313315
if any { writeln!(w, "{:52}, {},", "None", " ")?; }
314316
if any { writeln!(w, "{:52}, {},", "None", " ")?; }
315317
if any { writeln!(w, "{:52}, {},", "None", " ")?; }
316-
if any { writeln!(w, "{:52}, {},", "None", " ")?; }
317-
if any { writeln!(w, "{:52}, {},", "None", " ")?; }
318318
Ok(())
319319
}
320320

@@ -410,17 +410,17 @@ fn print_windows(w: &mut dyn std::io::Write, any: bool) -> std::io::Result<()>{
410410
writeln!(w, "{:35}, 0x{:02X},", "VK_L", keys::VK_L.0)?;
411411
writeln!(w, "{:35}, 0x{:02X},", "VK_LMENU", keys::VK_LMENU.0)?;
412412
writeln!(w, "{:35}, 0x{:02X},", "VK_MENU", keys::VK_MENU.0)?;
413-
writeln!(w, "{:35}, 0x{:02X},", "VK_MENU", keys::VK_MENU.0)?;
413+
if any {writeln!(w, "{:35}, 0x{:02X},", "VK_MENU*", keys::VK_MENU.0)?;}
414414
writeln!(w, "{:35}, 0x{:02X},", "VK_OEM_7", keys::VK_OEM_7.0)?;
415415
writeln!(w, "{:35}, 0x{:02X},", "VK_LEFT", keys::VK_LEFT.0)?;
416416
writeln!(w, "{:35}, 0x{:02X},", "VK_OEM_4", keys::VK_OEM_4.0)?;
417417
writeln!(w, "{:35}, 0x{:02X},", "VK_CONTROL", keys::VK_CONTROL.0)?;
418418
writeln!(w, "{:35}, 0x{:02X},", "VK_LCONTROL", keys::VK_LCONTROL.0)?;
419419
writeln!(w, "{:35}, 0x{:02X},", "VK_LWIN", keys::VK_LWIN.0)?;
420-
writeln!(w, "{:35}, 0x{:02X},", "VK_LWIN", keys::VK_LWIN.0)?;
421-
writeln!(w, "{:35}, 0x{:02X},", "VK_LWIN", keys::VK_LWIN.0)?;
422-
writeln!(w, "{:35}, 0x{:02X},", "VK_LWIN", keys::VK_LWIN.0)?;
423-
writeln!(w, "{:35}, 0x{:02X},", "VK_LWIN", keys::VK_LWIN.0)?;
420+
if any {writeln!(w, "{:35}, 0x{:02X},", "VK_LWIN*", keys::VK_LWIN.0)?;}
421+
if any {writeln!(w, "{:35}, 0x{:02X},", "VK_LWIN*", keys::VK_LWIN.0)?;}
422+
if any {writeln!(w, "{:35}, 0x{:02X},", "VK_LWIN*", keys::VK_LWIN.0)?;}
423+
if any {writeln!(w, "{:35}, 0x{:02X},", "VK_LWIN*", keys::VK_LWIN.0)?;}
424424
writeln!(w, "{:35}, 0x{:02X},", "VK_LSHIFT", keys::VK_LSHIFT.0)?;
425425
writeln!(w, "{:35}, 0x{:02X},", "VK_SHIFT", keys::VK_SHIFT.0)?;
426426
writeln!(w, "{:35}, 0x{:02X},", "VK_M", keys::VK_M.0)?;
@@ -438,10 +438,12 @@ fn print_windows(w: &mut dyn std::io::Write, any: bool) -> std::io::Result<()>{
438438
writeln!(w, "{:35}, 0x{:02X},", "VK_R", keys::VK_R.0)?;
439439
writeln!(w, "{:35}, 0x{:02X},", "VK_RETURN", keys::VK_RETURN.0)?;
440440
writeln!(w, "{:35}, 0x{:02X},", "VK_RMENU", keys::VK_RMENU.0)?;
441+
if any {writeln!(w, "{:35}, 0x{:02X},", "VK_RMENU*", keys::VK_RMENU.0)?;}
441442
writeln!(w, "{:35}, 0x{:02X},", "VK_RIGHT", keys::VK_RIGHT.0)?;
442443
writeln!(w, "{:35}, 0x{:02X},", "VK_OEM_6", keys::VK_OEM_6.0)?;
443444
writeln!(w, "{:35}, 0x{:02X},", "VK_RCONTROL", keys::VK_RCONTROL.0)?;
444445
writeln!(w, "{:35}, 0x{:02X},", "VK_RWIN", keys::VK_RWIN.0)?;
446+
if any {writeln!(w, "{:35}, 0x{:02X},", "VK_RWIN*", keys::VK_RWIN.0)?;}
445447
writeln!(w, "{:35}, 0x{:02X},", "VK_RSHIFT", keys::VK_RSHIFT.0)?;
446448
writeln!(w, "{:35}, 0x{:02X},", "VK_S", keys::VK_S.0)?;
447449
writeln!(w, "{:35}, 0x{:02X},", "VK_SCROLL", keys::VK_SCROLL.0)?;
@@ -511,8 +513,6 @@ fn print_windows(w: &mut dyn std::io::Write, any: bool) -> std::io::Result<()>{
511513
if any { writeln!(w, "{:35}, {},", "None", " ")?; }
512514
if any { writeln!(w, "{:35}, {},", "None", " ")?; }
513515
if any { writeln!(w, "{:35}, {},", "None", " ")?; }
514-
if any { writeln!(w, "{:35}, {},", "None", " ")?; }
515-
if any { writeln!(w, "{:35}, {},", "None", " ")?; }
516516
if any { writeln!(w, "{:35}, {},", "None", " ")?; }
517517
writeln!(w, "{:35}, 0x{:02X},", "VK_ABNT_C1", keys::VK_ABNT_C1.0)?;
518518
writeln!(w, "{:35}, 0x{:02X},", "VK_ABNT_C2", keys::VK_ABNT_C2.0)?;
@@ -707,20 +707,20 @@ fn print_macos(w: &mut dyn std::io::Write, any: bool) -> std::io::Result<()>{
707707
writeln!(w, "{:36}, 0x{:02X},", "KeyCodeExt::kVK_ANSI_J", CGKeyCode::from(KeyCodeExt::kVK_ANSI_J).0)?;
708708
writeln!(w, "{:36}, 0x{:02X},", "KeyCodeExt::kVK_ANSI_K", CGKeyCode::from(KeyCodeExt::kVK_ANSI_K).0)?;
709709
writeln!(w, "{:36}, 0x{:02X},", "KeyCodeExt::kVK_ANSI_L", CGKeyCode::from(KeyCodeExt::kVK_ANSI_L).0)?;
710-
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
711-
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::OPTION", CGKeyCode::from(KeyCode::OPTION).0)?;
710+
if any {writeln!(w, "{:36}, 0x{:02X},", "KeyCode::OPTION*", CGKeyCode::from(KeyCode::OPTION).0)?;}
711+
if any {writeln!(w, "{:36}, 0x{:02X},", "KeyCode::OPTION*", CGKeyCode::from(KeyCode::OPTION).0)?;}
712712
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::OPTION", CGKeyCode::from(KeyCode::OPTION).0)?;
713713
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
714714
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::LEFT_ARROW", CGKeyCode::from(KeyCode::LEFT_ARROW).0)?;
715715
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
716716
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::CONTROL", CGKeyCode::from(KeyCode::CONTROL).0)?;
717717
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::CONTROL", CGKeyCode::from(KeyCode::CONTROL).0)?;
718-
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
719-
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::COMMAND", CGKeyCode::from(KeyCode::COMMAND).0)?;
720-
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::COMMAND", CGKeyCode::from(KeyCode::COMMAND).0)?;
718+
if any {writeln!(w, "{:36}, 0x{:02X},", "KeyCode::COMMAND*", CGKeyCode::from(KeyCode::COMMAND).0)?;}
719+
if any {writeln!(w, "{:36}, 0x{:02X},", "KeyCode::COMMAND*", CGKeyCode::from(KeyCode::COMMAND).0)?;}
721720
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::COMMAND", CGKeyCode::from(KeyCode::COMMAND).0)?;
722-
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::COMMAND", CGKeyCode::from(KeyCode::COMMAND).0)?;
723-
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::SHIFT", CGKeyCode::from(KeyCode::SHIFT).0)?;
721+
if any {writeln!(w, "{:36}, 0x{:02X},", "KeyCode::COMMAND*", CGKeyCode::from(KeyCode::COMMAND).0)?;}
722+
if any {writeln!(w, "{:36}, 0x{:02X},", "KeyCode::COMMAND*", CGKeyCode::from(KeyCode::COMMAND).0)?;}
723+
if any {writeln!(w, "{:36}, 0x{:02X},", "KeyCode::SHIFT*", CGKeyCode::from(KeyCode::SHIFT).0)?;}
724724
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::SHIFT", CGKeyCode::from(KeyCode::SHIFT).0)?;
725725
writeln!(w, "{:36}, 0x{:02X},", "KeyCodeExt::kVK_ANSI_M", CGKeyCode::from(KeyCodeExt::kVK_ANSI_M).0)?;
726726
writeln!(w, "{:36}, 0x{:02X},", "KeyCodeExt::kVK_ANSI_N", CGKeyCode::from(KeyCodeExt::kVK_ANSI_N).0)?;
@@ -736,11 +736,13 @@ fn print_macos(w: &mut dyn std::io::Write, any: bool) -> std::io::Result<()>{
736736
writeln!(w, "{:36}, 0x{:02X},", "KeyCodeExt::kVK_ANSI_Q", CGKeyCode::from(KeyCodeExt::kVK_ANSI_Q).0)?;
737737
writeln!(w, "{:36}, 0x{:02X},", "KeyCodeExt::kVK_ANSI_R", CGKeyCode::from(KeyCodeExt::kVK_ANSI_R).0)?;
738738
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::RETURN", CGKeyCode::from(KeyCode::RETURN).0)?;
739-
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
739+
if any {writeln!(w, "{:36}, 0x{:02X},", "KeyCode::RIGHT_OPTION*", CGKeyCode::from(KeyCode::RIGHT_OPTION).0)?;}
740+
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::RIGHT_OPTION", CGKeyCode::from(KeyCode::RIGHT_OPTION).0)?;
740741
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::RIGHT_ARROW", CGKeyCode::from(KeyCode::RIGHT_ARROW).0)?;
741742
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
742743
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::RIGHT_CONTROL", CGKeyCode::from(KeyCode::RIGHT_CONTROL).0)?;
743-
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
744+
if any {writeln!(w, "{:36}, 0x{:02X},", "KeyCode::RIGHT_COMMAND*", CGKeyCode::from(KeyCode::RIGHT_COMMAND).0)?;}
745+
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::RIGHT_COMMAND", CGKeyCode::from(KeyCode::RIGHT_COMMAND).0)?;
744746
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::RIGHT_SHIFT", CGKeyCode::from(KeyCode::RIGHT_SHIFT).0)?;
745747
writeln!(w, "{:36}, 0x{:02X},", "KeyCodeExt::kVK_ANSI_S", CGKeyCode::from(KeyCodeExt::kVK_ANSI_S).0)?;
746748
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
@@ -797,17 +799,15 @@ fn print_macos(w: &mut dyn std::io::Write, any: bool) -> std::io::Result<()>{
797799
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
798800
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
799801
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
800-
writeln!(w, "{:36}, 0x{:02X},", "CGKeyCode::from(131)", CGKeyCode::from(CGKeyCode::from(131)).0)?;
802+
writeln!(w, "{:36}, 0x{:02X},", "CGKeyCode(131).0", CGKeyCode::from(CGKeyCode(131).0).0)?;
801803
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
802804
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
803805
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
804806
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
805807
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
806-
writeln!(w, "{:36}, 0x{:02X},", "CGKeyCode::from(160)", CGKeyCode::from(CGKeyCode::from(160)).0)?;
808+
writeln!(w, "{:36}, 0x{:02X},", "CGKeyCode(160).0", CGKeyCode::from(CGKeyCode(160).0).0)?;
807809
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
808-
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::RIGHT_COMMAND", CGKeyCode::from(KeyCode::RIGHT_COMMAND).0)?;
809810
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
810-
writeln!(w, "{:36}, 0x{:02X},", "KeyCode::RIGHT_OPTION", CGKeyCode::from(KeyCode::RIGHT_OPTION).0)?;
811811
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
812812
if any { writeln!(w, "{:36}, {},", "None", " ")?; }
813813
if any { writeln!(w, "{:36}, {},", "None", " ")?; }

‎scripts/rust_gen_convert.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ def build_code(df: pl.DataFrame, col: str, format: str, value_prefix: str = "",
260260
max_len = df[col].str.len_chars().max() + 1 if max_len is None else max_len
261261
for i in df[col]:
262262
i: str | None = i
263-
print(i)
264263
if i:
265264
line = f'writeln!(w, "{{:{max_len}}}, {format},", "{i}", {value_prefix}{i.strip('*')}{value_suffix})?;'
266265
if i and not i.endswith('*'):

0 commit comments

Comments
 (0)