Add IOKit graphics submodule

Author: madsmtm

crates/header-translator/src/expr.rs

@@ -248,7 +248,7 @@ impl Expr {
                     if ident == "CFSTR" {
                         Token::CFStringBegin
                     } else if ident == "CFUUIDGetConstantUUIDWithBytes" {
-                        i += tokens.len();
+                        i = tokens.len() - i - 1;
                         Token::CFUUID("todo".into())
                     } else if let Some(expr) = declaration_references.get(&ident) {
                         Token::Expr(expr.clone())

crates/objc2/src/topics/about_generated/CHANGELOG.md

@@ -48,7 +48,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - `IntentsUI` / `objc2-intents-ui`.
   - `IOBluetooth` / `objc2-io-bluetooth`.
   - `IOBluetoothUI` / `objc2-io-bluetooth-ui`.
-  - `IOKit` / `objc2-io-kit` (currently only `usb` submodule).
+  - `IOKit` / `objc2-io-kit` (currently only `usb` and `graphics` submodules).
   - `IOUSBHost` / `objc2-io-usb-host`.
   - `iTunesLibrary` / `objc2-itunes-library`.
   - `JavaScriptCore` / `objc2-java-script-core`.

framework-crates/objc2-io-kit/Cargo.toml

@@ -39,6 +39,8 @@ pub(crate) type Boolean = u8;
 pub(crate) type AbsoluteTime = i32;
 #[allow(dead_code)]
 pub(crate) type NumVersion = u32; // Actually a struct with 4 u8s
+#[allow(dead_code)]
+pub(crate) type FourCharCode = u32;
 
 // device/device_types.h
 #[allow(dead_code, non_camel_case_types)]

framework-crates/objc2-io-kit/src/lib.rs

@@ -51,6 +51,12 @@ macro_rules! iokit_usb_msg {
     };
 }
 
+macro_rules! IO_FOUR_CHAR_CODE {
+    ($code:expr) => {
+        $code
+    };
+}
+
 pub(crate) use err_sub;
 pub(crate) use err_system;
 pub(crate) use iokit_common_msg;
@@ -66,3 +72,4 @@ pub(crate) use IOUSBBitRange as IOUSBHostFamilyBitRange;
 pub(crate) use IOUSBBitRangePhase;
 pub(crate) use IOUSBBitRangePhase as USBBitRangePhase;
 pub(crate) use IOUSBBitRangePhase as IOUSBHostFamilyBitRangePhase;
+pub(crate) use IO_FOUR_CHAR_CODE;

framework-crates/objc2-io-kit/src/macros.rs

@@ -11,7 +11,6 @@ visionos = "1.0"
 module.audio.skipped = true
 module.avc.skipped = true
 module.firewire.skipped = true
-module.graphics.skipped = true
 module.hid.skipped = true
 module.hidsystem.skipped = true
 module.i2c.skipped = true
@@ -104,6 +103,8 @@ const.kUSBDeviceContainerID.skipped = true
 const.kIOUSB30Bitrate5Gbps.skipped = true
 const.kIOUSB30Bitrate10Gbps.skipped = true
 const.kIOUSB32Bitrate20Gbps.skipped = true
+const.kIODisplayModeIDBootProgrammable.skipped = true
+const.kIODisplayModeIDReservedBase.skipped = true
 
 # Emit these.
 const.IO1BitIndexedPixels.skipped = false
@@ -117,3 +118,35 @@ const.IO8BitOverlayPixels.skipped = false
 const.IOPagedPixels.skipped = false
 const.IO_SampleTypeAlpha.skipped = false
 const.IO_SampleTypeSkip.skipped = false
+
+# https://github.com/shurizzle/rust-four-char-code/issues/2
+const.kConnectionIgnore.skipped = true
+const.kConnectionControllerDepthsSupported.skipped = true
+const.kConnectionControllerColorDepth.skipped = true
+const.kConnectionControllerDitherControl.skipped = true
+
+# Needs OSSpinLock
+struct.StdFBShmem_t.skipped = true
+typedef.StdFBShmem_t.skipped = true
+struct.IOGraphicsEngineContext.skipped = true
+typedef.IOGraphicsEngineContext.skipped = true
+const.kIOGraphicsEngineContext.skipped = true
+const.kIOGraphicsEngineContextVersion.skipped = true
+struct._NXEQElStruct.skipped = true
+typedef._NXEQElStruct.skipped = true
+struct._evGlobals.skipped = true
+typedef._evGlobals.skipped = true
+const.IOSharedLockData.skipped = true
+const.ev_lock_data_t.skipped = true
+
+# Needs `task_port_t` to be available in `libc`
+fn.IOFramebufferOpen.skipped = true
+
+# Unknown ABI
+typedef.IOPixelEncoding.skipped = true
+struct.IOPixelInformation.skipped = true
+typedef.IOPixelInformation.skipped = true
+struct.bm12Cursor.skipped = true
+struct.bm18Cursor.skipped = true
+struct.bm34Cursor.skipped = true
+struct.bm38Cursor.skipped = true