clouds56
diff --git a/‎scripts/rust_gen_convert.py‎
Lines changed: 1 addition & 1 deletion b/‎scripts/rust_gen_convert.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/convert/_build.rs‎
Lines changed: 5 additions & 3 deletions b/‎src/convert/_build.rs‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎src/convert/convert.csv‎
Lines changed: 2 additions & 2 deletions b/‎src/convert/convert.csv‎
Lines changed: 2 additions & 2 deletions
@@ -227,7 +227,7 @@ def fix_macos_impl_value(v: str):
   # if v.startswith("ANSI_"): return "KeyCode::" + v
   if v.startswith("return Err(())"): return None
   if v.startswith("ANSI_"): return "KeyCodeExt::kVK_ANSI_" + v.removeprefix("ANSI_").title().replace("_", "")
-  try: return f"CGKeyCode::from({int(v)})"
+  try: return f"CGKeyCode({int(v)}).0"
   except: pass
   return v
 key_map_enigo_cg = {k.replace("Key::", "Enigo::"): fix_macos_impl_value(v) for k,v in data if "Key::" in k and "(" not in k} | \
 
@@ -302,7 +302,7 @@ impl KeyType {
       ],
       KeyType::KeySym => unimplemented!(),
       KeyType::CG => vec![
-        ConvertImportEntry::new("any(dep_macos, mirror_macos)", "#[cfg(dep_macos)]\nuse crate::deps::macos::KeyCode;\n#[cfg(not(dep_macos))]\n#[cfg(mirror_macos)]\nuse crate::mirror::macos::KeyCode;\nuse crate::mirror::macos_ext::{CGKeyCode, KeyCodeExt};\nuse crate::convert::Into_;"),
+        ConvertImportEntry::new("any(dep_macos, mirror_macos)", "#[cfg(dep_macos)]\nuse crate::deps::macos::KeyCode;\n#[cfg(not(dep_macos))]\n#[cfg(mirror_macos)]\nuse crate::mirror::macos::KeyCode;\nuse crate::mirror::macos_ext::{CGKeyCode, KeyCodeExt};"),
       ],
       _ => return vec![],
     }
@@ -355,14 +355,15 @@ impl KeyType {
   pub fn as_value_prefix(self) -> Option<&'static str> {
     match self {
       KeyType::WinVk => Some("keys::"),
+      KeyType::CG => Some("CGKeyCode( "),
       _ => None,
     }
   }
 
   pub fn as_value_suffix(self) -> Option<&'static str> {
     match self {
       KeyType::HUT => Some(".usage()"),
-      KeyType::CG => Some(".into_::<CGKeyCode>()"),
+      KeyType::CG => Some(" )"),
       _ => None
     }
   }
@@ -402,7 +403,8 @@ impl KeyType {
       KeyType::HUT => false,
       KeyType::Winput => true,
       KeyType::WinVk => true,
-      _ => false,
+      KeyType::CG => true,
+      _ => true,
     }
   }
 
 
@@ -176,13 +176,13 @@
  todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::IlluminationDown                 , #[macos]           , todo!(Keysym)                     , todo!(CG)                               ,        ,
  todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::IlluminationToggle               , #[macos]           , todo!(Keysym)                     , todo!(CG)                               ,        ,
  todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::IlluminationUp                   , #[macos]           , todo!(Keysym)                     , todo!(CG)                               ,        ,
- todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::Launchpad                        , #[macos]           , todo!(Keysym)                     , CGKeyCode::from(131)                    ,  0x83  ,
+ todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::Launchpad                        , #[macos]           , todo!(Keysym)                     , CGKeyCode(131).0                        ,  0x83  ,
  todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::LaunchPanel                      , #[macos]           , todo!(Keysym)                     , todo!(CG)                               ,        ,
  todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::Linefeed                         , #[linux]           , Keysym::Linefeed                  , todo!(CG)                               ,        ,
  todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::MediaFast                        , #[macos]           , todo!(Keysym)                     , todo!(CG)                               ,        ,
  todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::MediaRewind                      , #[macos]           , todo!(Keysym)                     , todo!(CG)                               ,        ,
  todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::MicMute                          , #[linux]           , Keysym::XF86_AudioMicMute         , todo!(CG)                               ,        ,
- todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::MissionControl                   , #[macos]           , todo!(Keysym)                     , CGKeyCode::from(160)                    ,  0xA0  ,
+ todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::MissionControl                   , #[macos]           , todo!(Keysym)                     , CGKeyCode(160).0                        ,  0xA0  ,
  todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::Power                            , #[macos]           , todo!(Keysym)                     , todo!(CG)                               ,        ,
  todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::RCommand                         , #[macos]           , todo!(Keysym)                     , KeyCode::RIGHT_COMMAND                  ,  0x36  ,
  todo!(HUT)                                                ,           , na!(Vk)                 , todo!(VK_)                             ,        , Enigo::Redo                             , #[linux]           , Keysym::Redo                      , todo!(CG)                               ,        ,
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ impl KeyType {`
`302`	`302`	`],`
`303`	`303`	`KeyType::KeySym => unimplemented!(),`
`304`	`304`	`KeyType::CG => vec![`
`305`		`- ConvertImportEntry::new("any(dep_macos, mirror_macos)", "#[cfg(dep_macos)]\nuse crate::deps::macos::KeyCode;\n#[cfg(not(dep_macos))]\n#[cfg(mirror_macos)]\nuse crate::mirror::macos::KeyCode;\nuse crate::mirror::macos_ext::{CGKeyCode, KeyCodeExt};\nuse crate::convert::Into_;"),`
	`305`	`+ ConvertImportEntry::new("any(dep_macos, mirror_macos)", "#[cfg(dep_macos)]\nuse crate::deps::macos::KeyCode;\n#[cfg(not(dep_macos))]\n#[cfg(mirror_macos)]\nuse crate::mirror::macos::KeyCode;\nuse crate::mirror::macos_ext::{CGKeyCode, KeyCodeExt};"),`
`306`	`306`	`],`
`307`	`307`	`_ => return vec![],`
`308`	`308`	`}`
`@@ -355,14 +355,15 @@ impl KeyType {`
`355`	`355`	`pub fn as_value_prefix(self) -> Option<&'static str> {`
`356`	`356`	`match self {`
`357`	`357`	`KeyType::WinVk => Some("keys::"),`
	`358`	`+ KeyType::CG => Some("CGKeyCode( "),`
`358`	`359`	`_ => None,`
`359`	`360`	`}`
`360`	`361`	`}`
`361`	`362`
`362`	`363`	`pub fn as_value_suffix(self) -> Option<&'static str> {`
`363`	`364`	`match self {`
`364`	`365`	`KeyType::HUT => Some(".usage()"),`
`365`		`- KeyType::CG => Some(".into_::<CGKeyCode>()"),`
	`366`	`+ KeyType::CG => Some(" )"),`
`366`	`367`	`_ => None`
`367`	`368`	`}`
`368`	`369`	`}`
`@@ -402,7 +403,8 @@ impl KeyType {`
`402`	`403`	`KeyType::HUT => false,`
`403`	`404`	`KeyType::Winput => true,`
`404`	`405`	`KeyType::WinVk => true,`
`405`		`- _ => false,`
	`406`	`+ KeyType::CG => true,`
	`407`	`+ _ => true,`
`406`	`408`	`}`
`407`	`409`	`}`
`408`	`410`