@@ -16,10 +16,10 @@ use std::os::raw::c_void;
16
16
17
17
#[ derive( Debug ) ]
18
18
enum DictEntryValue {
19
- _Number ( i64 ) ,
20
- _Bool ( bool ) ,
21
- _String ( String ) ,
22
- _Unknown ,
19
+ Number ( i64 ) ,
20
+ Bool ( bool ) ,
21
+ String ( String ) ,
22
+ Unknown ,
23
23
}
24
24
25
25
///
@@ -56,7 +56,7 @@ pub fn window_list() -> Result<WindowList> {
56
56
}
57
57
let window_owner = get_from_dict ( dic_ref, "kCGWindowOwnerName" ) ;
58
58
let window_id = get_from_dict ( dic_ref, "kCGWindowNumber" ) ;
59
- if let ( DictEntryValue :: _String ( name) , DictEntryValue :: _Number ( win_id) ) =
59
+ if let ( DictEntryValue :: String ( name) , DictEntryValue :: Number ( win_id) ) =
60
60
( window_owner, window_id)
61
61
{
62
62
win_list. push ( ( Some ( name) , win_id as u64 ) ) ;
@@ -83,29 +83,29 @@ fn get_from_dict(dict: CFDictionaryRef, key: &str) -> DictEntryValue {
83
83
let out_value: * mut i64 = & mut value_i64;
84
84
let converted = unsafe { CFNumberGetValue ( value, I64 , out_value. cast ( ) ) } ;
85
85
if converted {
86
- return DictEntryValue :: _Number ( value_i64) ;
86
+ return DictEntryValue :: Number ( value_i64) ;
87
87
}
88
88
}
89
89
I32 => {
90
90
let mut value_i32 = 0_i32 ;
91
91
let out_value: * mut i32 = & mut value_i32;
92
92
let converted = unsafe { CFNumberGetValue ( value, I32 , out_value. cast ( ) ) } ;
93
93
if converted {
94
- return DictEntryValue :: _Number ( value_i32 as i64 ) ;
94
+ return DictEntryValue :: Number ( value_i32 as i64 ) ;
95
95
}
96
96
}
97
97
n => {
98
98
eprintln ! ( "Unsupported Number of typeId: {}" , n) ;
99
99
}
100
100
}
101
101
} else if type_id == unsafe { CFBooleanGetTypeID ( ) } {
102
- return DictEntryValue :: _Bool ( unsafe { CFBooleanGetValue ( value. cast ( ) ) } ) ;
102
+ return DictEntryValue :: Bool ( unsafe { CFBooleanGetValue ( value. cast ( ) ) } ) ;
103
103
} else if type_id == unsafe { CFStringGetTypeID ( ) } {
104
104
let c_ptr = unsafe { CFStringGetCStringPtr ( value. cast ( ) , kCFStringEncodingUTF8) } ;
105
105
return if !c_ptr. is_null ( ) {
106
106
let c_result = unsafe { CStr :: from_ptr ( c_ptr) } ;
107
107
let result = String :: from ( c_result. to_str ( ) . unwrap ( ) ) ;
108
- DictEntryValue :: _String ( result)
108
+ DictEntryValue :: String ( result)
109
109
} else {
110
110
// in this case there is a high chance we got a `NSString` instead of `CFString`
111
111
// we have to use the objc runtime to fetch it
@@ -115,14 +115,14 @@ fn get_from_dict(dict: CFDictionaryRef, key: &str) -> DictEntryValue {
115
115
let str = std:: str:: from_utf8 ( nss. deref ( ) . as_str ( ) . as_bytes ( ) ) ;
116
116
117
117
match str {
118
- Ok ( s) => DictEntryValue :: _String ( s. to_owned ( ) ) ,
119
- Err ( _) => DictEntryValue :: _Unknown ,
118
+ Ok ( s) => DictEntryValue :: String ( s. to_owned ( ) ) ,
119
+ Err ( _) => DictEntryValue :: Unknown ,
120
120
}
121
121
} ;
122
122
} else {
123
123
eprintln ! ( "Unexpected type: {}" , type_id) ;
124
124
}
125
125
}
126
126
127
- DictEntryValue :: _Unknown
127
+ DictEntryValue :: Unknown
128
128
}
0 commit comments