@@ -127,30 +127,46 @@ pub unsafe fn convert(
127127 let code = code. try_into ( ) . ok ( ) ?;
128128 let flags = cg_event. get_flags ( ) ;
129129 let key = key_from_code ( code) ;
130-
130+
131131 // Determine if this is a press or release based on flag changes
132- let event = if flags. contains ( CGEventFlags :: CGEventFlagShift ) && !LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagShift ) {
132+ let event = if flags. contains ( CGEventFlags :: CGEventFlagShift )
133+ && !LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagShift )
134+ {
133135 LAST_FLAGS = flags;
134136 Some ( EventType :: KeyPress ( key) )
135- } else if !flags. contains ( CGEventFlags :: CGEventFlagShift ) && LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagShift ) {
137+ } else if !flags. contains ( CGEventFlags :: CGEventFlagShift )
138+ && LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagShift )
139+ {
136140 LAST_FLAGS = flags;
137141 Some ( EventType :: KeyRelease ( key) )
138- } else if flags. contains ( CGEventFlags :: CGEventFlagControl ) && !LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagControl ) {
142+ } else if flags. contains ( CGEventFlags :: CGEventFlagControl )
143+ && !LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagControl )
144+ {
139145 LAST_FLAGS = flags;
140146 Some ( EventType :: KeyPress ( key) )
141- } else if !flags. contains ( CGEventFlags :: CGEventFlagControl ) && LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagControl ) {
147+ } else if !flags. contains ( CGEventFlags :: CGEventFlagControl )
148+ && LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagControl )
149+ {
142150 LAST_FLAGS = flags;
143151 Some ( EventType :: KeyRelease ( key) )
144- } else if flags. contains ( CGEventFlags :: CGEventFlagAlternate ) && !LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagAlternate ) {
152+ } else if flags. contains ( CGEventFlags :: CGEventFlagAlternate )
153+ && !LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagAlternate )
154+ {
145155 LAST_FLAGS = flags;
146156 Some ( EventType :: KeyPress ( key) )
147- } else if !flags. contains ( CGEventFlags :: CGEventFlagAlternate ) && LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagAlternate ) {
157+ } else if !flags. contains ( CGEventFlags :: CGEventFlagAlternate )
158+ && LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagAlternate )
159+ {
148160 LAST_FLAGS = flags;
149161 Some ( EventType :: KeyRelease ( key) )
150- } else if flags. contains ( CGEventFlags :: CGEventFlagCommand ) && !LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagCommand ) {
162+ } else if flags. contains ( CGEventFlags :: CGEventFlagCommand )
163+ && !LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagCommand )
164+ {
151165 LAST_FLAGS = flags;
152166 Some ( EventType :: KeyPress ( key) )
153- } else if !flags. contains ( CGEventFlags :: CGEventFlagCommand ) && LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagCommand ) {
167+ } else if !flags. contains ( CGEventFlags :: CGEventFlagCommand )
168+ && LAST_FLAGS . contains ( CGEventFlags :: CGEventFlagCommand )
169+ {
154170 LAST_FLAGS = flags;
155171 Some ( EventType :: KeyRelease ( key) )
156172 } else {
0 commit comments