@@ -4109,6 +4109,19 @@ pub const PROCESSING_KEY_F9: u32 = 298;
41094109pub const PROCESSING_KEY_F10 : u32 = 299 ;
41104110pub const PROCESSING_KEY_F11 : u32 = 300 ;
41114111pub const PROCESSING_KEY_F12 : u32 = 301 ;
4112+ pub const PROCESSING_KEY_F13 : u32 = 302 ;
4113+ pub const PROCESSING_KEY_F14 : u32 = 303 ;
4114+ pub const PROCESSING_KEY_F15 : u32 = 304 ;
4115+ pub const PROCESSING_KEY_F16 : u32 = 305 ;
4116+ pub const PROCESSING_KEY_F17 : u32 = 306 ;
4117+ pub const PROCESSING_KEY_F18 : u32 = 307 ;
4118+ pub const PROCESSING_KEY_F19 : u32 = 308 ;
4119+ pub const PROCESSING_KEY_F20 : u32 = 309 ;
4120+ pub const PROCESSING_KEY_F21 : u32 = 310 ;
4121+ pub const PROCESSING_KEY_F22 : u32 = 311 ;
4122+ pub const PROCESSING_KEY_F23 : u32 = 312 ;
4123+ pub const PROCESSING_KEY_F24 : u32 = 313 ;
4124+ pub const PROCESSING_KEY_F25 : u32 = 314 ;
41124125pub const PROCESSING_KEY_NUMPAD_0 : u32 = 320 ;
41134126pub const PROCESSING_KEY_NUMPAD_1 : u32 = 321 ;
41144127pub const PROCESSING_KEY_NUMPAD_2 : u32 = 322 ;
@@ -4327,7 +4340,8 @@ pub extern "C" fn processing_key() -> u32 {
43274340#[ unsafe( no_mangle) ]
43284341pub extern "C" fn processing_key_code ( ) -> u32 {
43294342 error:: clear_error ( ) ;
4330- error:: check ( || input_key_code ( ) . map ( |opt| opt. map ( key_code_to_u32) . unwrap_or ( 0 ) ) ) . unwrap_or ( 0 )
4343+ error:: check ( || input_key_code ( ) . map ( |opt| opt. and_then ( key_code_to_u32) . unwrap_or ( 0 ) ) )
4344+ . unwrap_or ( 0 )
43314345}
43324346
43334347#[ unsafe( no_mangle) ]
@@ -4347,227 +4361,3 @@ pub extern "C" fn processing_mouse_wheel() -> f32 {
43474361 error:: clear_error ( ) ;
43484362 error:: check ( input_mouse_wheel) . unwrap_or ( 0.0 )
43494363}
4350-
4351- fn key_code_from_u32 ( val : u32 ) -> processing:: prelude:: error:: Result < KeyCode > {
4352- match val {
4353- PROCESSING_KEY_SPACE => Ok ( KeyCode :: Space ) ,
4354- PROCESSING_KEY_QUOTE => Ok ( KeyCode :: Quote ) ,
4355- PROCESSING_KEY_COMMA => Ok ( KeyCode :: Comma ) ,
4356- PROCESSING_KEY_MINUS => Ok ( KeyCode :: Minus ) ,
4357- PROCESSING_KEY_PERIOD => Ok ( KeyCode :: Period ) ,
4358- PROCESSING_KEY_SLASH => Ok ( KeyCode :: Slash ) ,
4359- PROCESSING_KEY_0 => Ok ( KeyCode :: Digit0 ) ,
4360- PROCESSING_KEY_1 => Ok ( KeyCode :: Digit1 ) ,
4361- PROCESSING_KEY_2 => Ok ( KeyCode :: Digit2 ) ,
4362- PROCESSING_KEY_3 => Ok ( KeyCode :: Digit3 ) ,
4363- PROCESSING_KEY_4 => Ok ( KeyCode :: Digit4 ) ,
4364- PROCESSING_KEY_5 => Ok ( KeyCode :: Digit5 ) ,
4365- PROCESSING_KEY_6 => Ok ( KeyCode :: Digit6 ) ,
4366- PROCESSING_KEY_7 => Ok ( KeyCode :: Digit7 ) ,
4367- PROCESSING_KEY_8 => Ok ( KeyCode :: Digit8 ) ,
4368- PROCESSING_KEY_9 => Ok ( KeyCode :: Digit9 ) ,
4369- PROCESSING_KEY_SEMICOLON => Ok ( KeyCode :: Semicolon ) ,
4370- PROCESSING_KEY_EQUAL => Ok ( KeyCode :: Equal ) ,
4371- PROCESSING_KEY_A => Ok ( KeyCode :: KeyA ) ,
4372- PROCESSING_KEY_B => Ok ( KeyCode :: KeyB ) ,
4373- PROCESSING_KEY_C => Ok ( KeyCode :: KeyC ) ,
4374- PROCESSING_KEY_D => Ok ( KeyCode :: KeyD ) ,
4375- PROCESSING_KEY_E => Ok ( KeyCode :: KeyE ) ,
4376- PROCESSING_KEY_F => Ok ( KeyCode :: KeyF ) ,
4377- PROCESSING_KEY_G => Ok ( KeyCode :: KeyG ) ,
4378- PROCESSING_KEY_H => Ok ( KeyCode :: KeyH ) ,
4379- PROCESSING_KEY_I => Ok ( KeyCode :: KeyI ) ,
4380- PROCESSING_KEY_J => Ok ( KeyCode :: KeyJ ) ,
4381- PROCESSING_KEY_K => Ok ( KeyCode :: KeyK ) ,
4382- PROCESSING_KEY_L => Ok ( KeyCode :: KeyL ) ,
4383- PROCESSING_KEY_M => Ok ( KeyCode :: KeyM ) ,
4384- PROCESSING_KEY_N => Ok ( KeyCode :: KeyN ) ,
4385- PROCESSING_KEY_O => Ok ( KeyCode :: KeyO ) ,
4386- PROCESSING_KEY_P => Ok ( KeyCode :: KeyP ) ,
4387- PROCESSING_KEY_Q => Ok ( KeyCode :: KeyQ ) ,
4388- PROCESSING_KEY_R => Ok ( KeyCode :: KeyR ) ,
4389- PROCESSING_KEY_S => Ok ( KeyCode :: KeyS ) ,
4390- PROCESSING_KEY_T => Ok ( KeyCode :: KeyT ) ,
4391- PROCESSING_KEY_U => Ok ( KeyCode :: KeyU ) ,
4392- PROCESSING_KEY_V => Ok ( KeyCode :: KeyV ) ,
4393- PROCESSING_KEY_W => Ok ( KeyCode :: KeyW ) ,
4394- PROCESSING_KEY_X => Ok ( KeyCode :: KeyX ) ,
4395- PROCESSING_KEY_Y => Ok ( KeyCode :: KeyY ) ,
4396- PROCESSING_KEY_Z => Ok ( KeyCode :: KeyZ ) ,
4397- PROCESSING_KEY_BRACKET_LEFT => Ok ( KeyCode :: BracketLeft ) ,
4398- PROCESSING_KEY_BACKSLASH => Ok ( KeyCode :: Backslash ) ,
4399- PROCESSING_KEY_BRACKET_RIGHT => Ok ( KeyCode :: BracketRight ) ,
4400- PROCESSING_KEY_BACKQUOTE => Ok ( KeyCode :: Backquote ) ,
4401- PROCESSING_KEY_ESCAPE => Ok ( KeyCode :: Escape ) ,
4402- PROCESSING_KEY_ENTER => Ok ( KeyCode :: Enter ) ,
4403- PROCESSING_KEY_TAB => Ok ( KeyCode :: Tab ) ,
4404- PROCESSING_KEY_BACKSPACE => Ok ( KeyCode :: Backspace ) ,
4405- PROCESSING_KEY_INSERT => Ok ( KeyCode :: Insert ) ,
4406- PROCESSING_KEY_DELETE => Ok ( KeyCode :: Delete ) ,
4407- PROCESSING_KEY_RIGHT => Ok ( KeyCode :: ArrowRight ) ,
4408- PROCESSING_KEY_LEFT => Ok ( KeyCode :: ArrowLeft ) ,
4409- PROCESSING_KEY_DOWN => Ok ( KeyCode :: ArrowDown ) ,
4410- PROCESSING_KEY_UP => Ok ( KeyCode :: ArrowUp ) ,
4411- PROCESSING_KEY_PAGE_UP => Ok ( KeyCode :: PageUp ) ,
4412- PROCESSING_KEY_PAGE_DOWN => Ok ( KeyCode :: PageDown ) ,
4413- PROCESSING_KEY_HOME => Ok ( KeyCode :: Home ) ,
4414- PROCESSING_KEY_END => Ok ( KeyCode :: End ) ,
4415- PROCESSING_KEY_CAPS_LOCK => Ok ( KeyCode :: CapsLock ) ,
4416- PROCESSING_KEY_SCROLL_LOCK => Ok ( KeyCode :: ScrollLock ) ,
4417- PROCESSING_KEY_NUM_LOCK => Ok ( KeyCode :: NumLock ) ,
4418- PROCESSING_KEY_PRINT_SCREEN => Ok ( KeyCode :: PrintScreen ) ,
4419- PROCESSING_KEY_PAUSE => Ok ( KeyCode :: Pause ) ,
4420- PROCESSING_KEY_F1 => Ok ( KeyCode :: F1 ) ,
4421- PROCESSING_KEY_F2 => Ok ( KeyCode :: F2 ) ,
4422- PROCESSING_KEY_F3 => Ok ( KeyCode :: F3 ) ,
4423- PROCESSING_KEY_F4 => Ok ( KeyCode :: F4 ) ,
4424- PROCESSING_KEY_F5 => Ok ( KeyCode :: F5 ) ,
4425- PROCESSING_KEY_F6 => Ok ( KeyCode :: F6 ) ,
4426- PROCESSING_KEY_F7 => Ok ( KeyCode :: F7 ) ,
4427- PROCESSING_KEY_F8 => Ok ( KeyCode :: F8 ) ,
4428- PROCESSING_KEY_F9 => Ok ( KeyCode :: F9 ) ,
4429- PROCESSING_KEY_F10 => Ok ( KeyCode :: F10 ) ,
4430- PROCESSING_KEY_F11 => Ok ( KeyCode :: F11 ) ,
4431- PROCESSING_KEY_F12 => Ok ( KeyCode :: F12 ) ,
4432- PROCESSING_KEY_NUMPAD_0 => Ok ( KeyCode :: Numpad0 ) ,
4433- PROCESSING_KEY_NUMPAD_1 => Ok ( KeyCode :: Numpad1 ) ,
4434- PROCESSING_KEY_NUMPAD_2 => Ok ( KeyCode :: Numpad2 ) ,
4435- PROCESSING_KEY_NUMPAD_3 => Ok ( KeyCode :: Numpad3 ) ,
4436- PROCESSING_KEY_NUMPAD_4 => Ok ( KeyCode :: Numpad4 ) ,
4437- PROCESSING_KEY_NUMPAD_5 => Ok ( KeyCode :: Numpad5 ) ,
4438- PROCESSING_KEY_NUMPAD_6 => Ok ( KeyCode :: Numpad6 ) ,
4439- PROCESSING_KEY_NUMPAD_7 => Ok ( KeyCode :: Numpad7 ) ,
4440- PROCESSING_KEY_NUMPAD_8 => Ok ( KeyCode :: Numpad8 ) ,
4441- PROCESSING_KEY_NUMPAD_9 => Ok ( KeyCode :: Numpad9 ) ,
4442- PROCESSING_KEY_NUMPAD_DECIMAL => Ok ( KeyCode :: NumpadDecimal ) ,
4443- PROCESSING_KEY_NUMPAD_DIVIDE => Ok ( KeyCode :: NumpadDivide ) ,
4444- PROCESSING_KEY_NUMPAD_MULTIPLY => Ok ( KeyCode :: NumpadMultiply ) ,
4445- PROCESSING_KEY_NUMPAD_SUBTRACT => Ok ( KeyCode :: NumpadSubtract ) ,
4446- PROCESSING_KEY_NUMPAD_ADD => Ok ( KeyCode :: NumpadAdd ) ,
4447- PROCESSING_KEY_NUMPAD_ENTER => Ok ( KeyCode :: NumpadEnter ) ,
4448- PROCESSING_KEY_NUMPAD_EQUAL => Ok ( KeyCode :: NumpadEqual ) ,
4449- PROCESSING_KEY_SHIFT_LEFT => Ok ( KeyCode :: ShiftLeft ) ,
4450- PROCESSING_KEY_CONTROL_LEFT => Ok ( KeyCode :: ControlLeft ) ,
4451- PROCESSING_KEY_ALT_LEFT => Ok ( KeyCode :: AltLeft ) ,
4452- PROCESSING_KEY_SUPER_LEFT => Ok ( KeyCode :: SuperLeft ) ,
4453- PROCESSING_KEY_SHIFT_RIGHT => Ok ( KeyCode :: ShiftRight ) ,
4454- PROCESSING_KEY_CONTROL_RIGHT => Ok ( KeyCode :: ControlRight ) ,
4455- PROCESSING_KEY_ALT_RIGHT => Ok ( KeyCode :: AltRight ) ,
4456- PROCESSING_KEY_SUPER_RIGHT => Ok ( KeyCode :: SuperRight ) ,
4457- PROCESSING_KEY_CONTEXT_MENU => Ok ( KeyCode :: ContextMenu ) ,
4458- _ => Err ( ProcessingError :: InvalidArgument ( format ! (
4459- "unknown key code: {val}"
4460- ) ) ) ,
4461- }
4462- }
4463-
4464- fn key_code_to_u32 ( kc : KeyCode ) -> u32 {
4465- match kc {
4466- KeyCode :: Space => PROCESSING_KEY_SPACE ,
4467- KeyCode :: Quote => PROCESSING_KEY_QUOTE ,
4468- KeyCode :: Comma => PROCESSING_KEY_COMMA ,
4469- KeyCode :: Minus => PROCESSING_KEY_MINUS ,
4470- KeyCode :: Period => PROCESSING_KEY_PERIOD ,
4471- KeyCode :: Slash => PROCESSING_KEY_SLASH ,
4472- KeyCode :: Digit0 => PROCESSING_KEY_0 ,
4473- KeyCode :: Digit1 => PROCESSING_KEY_1 ,
4474- KeyCode :: Digit2 => PROCESSING_KEY_2 ,
4475- KeyCode :: Digit3 => PROCESSING_KEY_3 ,
4476- KeyCode :: Digit4 => PROCESSING_KEY_4 ,
4477- KeyCode :: Digit5 => PROCESSING_KEY_5 ,
4478- KeyCode :: Digit6 => PROCESSING_KEY_6 ,
4479- KeyCode :: Digit7 => PROCESSING_KEY_7 ,
4480- KeyCode :: Digit8 => PROCESSING_KEY_8 ,
4481- KeyCode :: Digit9 => PROCESSING_KEY_9 ,
4482- KeyCode :: Semicolon => PROCESSING_KEY_SEMICOLON ,
4483- KeyCode :: Equal => PROCESSING_KEY_EQUAL ,
4484- KeyCode :: KeyA => PROCESSING_KEY_A ,
4485- KeyCode :: KeyB => PROCESSING_KEY_B ,
4486- KeyCode :: KeyC => PROCESSING_KEY_C ,
4487- KeyCode :: KeyD => PROCESSING_KEY_D ,
4488- KeyCode :: KeyE => PROCESSING_KEY_E ,
4489- KeyCode :: KeyF => PROCESSING_KEY_F ,
4490- KeyCode :: KeyG => PROCESSING_KEY_G ,
4491- KeyCode :: KeyH => PROCESSING_KEY_H ,
4492- KeyCode :: KeyI => PROCESSING_KEY_I ,
4493- KeyCode :: KeyJ => PROCESSING_KEY_J ,
4494- KeyCode :: KeyK => PROCESSING_KEY_K ,
4495- KeyCode :: KeyL => PROCESSING_KEY_L ,
4496- KeyCode :: KeyM => PROCESSING_KEY_M ,
4497- KeyCode :: KeyN => PROCESSING_KEY_N ,
4498- KeyCode :: KeyO => PROCESSING_KEY_O ,
4499- KeyCode :: KeyP => PROCESSING_KEY_P ,
4500- KeyCode :: KeyQ => PROCESSING_KEY_Q ,
4501- KeyCode :: KeyR => PROCESSING_KEY_R ,
4502- KeyCode :: KeyS => PROCESSING_KEY_S ,
4503- KeyCode :: KeyT => PROCESSING_KEY_T ,
4504- KeyCode :: KeyU => PROCESSING_KEY_U ,
4505- KeyCode :: KeyV => PROCESSING_KEY_V ,
4506- KeyCode :: KeyW => PROCESSING_KEY_W ,
4507- KeyCode :: KeyX => PROCESSING_KEY_X ,
4508- KeyCode :: KeyY => PROCESSING_KEY_Y ,
4509- KeyCode :: KeyZ => PROCESSING_KEY_Z ,
4510- KeyCode :: BracketLeft => PROCESSING_KEY_BRACKET_LEFT ,
4511- KeyCode :: Backslash => PROCESSING_KEY_BACKSLASH ,
4512- KeyCode :: BracketRight => PROCESSING_KEY_BRACKET_RIGHT ,
4513- KeyCode :: Backquote => PROCESSING_KEY_BACKQUOTE ,
4514- KeyCode :: Escape => PROCESSING_KEY_ESCAPE ,
4515- KeyCode :: Enter => PROCESSING_KEY_ENTER ,
4516- KeyCode :: Tab => PROCESSING_KEY_TAB ,
4517- KeyCode :: Backspace => PROCESSING_KEY_BACKSPACE ,
4518- KeyCode :: Insert => PROCESSING_KEY_INSERT ,
4519- KeyCode :: Delete => PROCESSING_KEY_DELETE ,
4520- KeyCode :: ArrowRight => PROCESSING_KEY_RIGHT ,
4521- KeyCode :: ArrowLeft => PROCESSING_KEY_LEFT ,
4522- KeyCode :: ArrowDown => PROCESSING_KEY_DOWN ,
4523- KeyCode :: ArrowUp => PROCESSING_KEY_UP ,
4524- KeyCode :: PageUp => PROCESSING_KEY_PAGE_UP ,
4525- KeyCode :: PageDown => PROCESSING_KEY_PAGE_DOWN ,
4526- KeyCode :: Home => PROCESSING_KEY_HOME ,
4527- KeyCode :: End => PROCESSING_KEY_END ,
4528- KeyCode :: CapsLock => PROCESSING_KEY_CAPS_LOCK ,
4529- KeyCode :: ScrollLock => PROCESSING_KEY_SCROLL_LOCK ,
4530- KeyCode :: NumLock => PROCESSING_KEY_NUM_LOCK ,
4531- KeyCode :: PrintScreen => PROCESSING_KEY_PRINT_SCREEN ,
4532- KeyCode :: Pause => PROCESSING_KEY_PAUSE ,
4533- KeyCode :: F1 => PROCESSING_KEY_F1 ,
4534- KeyCode :: F2 => PROCESSING_KEY_F2 ,
4535- KeyCode :: F3 => PROCESSING_KEY_F3 ,
4536- KeyCode :: F4 => PROCESSING_KEY_F4 ,
4537- KeyCode :: F5 => PROCESSING_KEY_F5 ,
4538- KeyCode :: F6 => PROCESSING_KEY_F6 ,
4539- KeyCode :: F7 => PROCESSING_KEY_F7 ,
4540- KeyCode :: F8 => PROCESSING_KEY_F8 ,
4541- KeyCode :: F9 => PROCESSING_KEY_F9 ,
4542- KeyCode :: F10 => PROCESSING_KEY_F10 ,
4543- KeyCode :: F11 => PROCESSING_KEY_F11 ,
4544- KeyCode :: F12 => PROCESSING_KEY_F12 ,
4545- KeyCode :: Numpad0 => PROCESSING_KEY_NUMPAD_0 ,
4546- KeyCode :: Numpad1 => PROCESSING_KEY_NUMPAD_1 ,
4547- KeyCode :: Numpad2 => PROCESSING_KEY_NUMPAD_2 ,
4548- KeyCode :: Numpad3 => PROCESSING_KEY_NUMPAD_3 ,
4549- KeyCode :: Numpad4 => PROCESSING_KEY_NUMPAD_4 ,
4550- KeyCode :: Numpad5 => PROCESSING_KEY_NUMPAD_5 ,
4551- KeyCode :: Numpad6 => PROCESSING_KEY_NUMPAD_6 ,
4552- KeyCode :: Numpad7 => PROCESSING_KEY_NUMPAD_7 ,
4553- KeyCode :: Numpad8 => PROCESSING_KEY_NUMPAD_8 ,
4554- KeyCode :: Numpad9 => PROCESSING_KEY_NUMPAD_9 ,
4555- KeyCode :: NumpadDecimal => PROCESSING_KEY_NUMPAD_DECIMAL ,
4556- KeyCode :: NumpadDivide => PROCESSING_KEY_NUMPAD_DIVIDE ,
4557- KeyCode :: NumpadMultiply => PROCESSING_KEY_NUMPAD_MULTIPLY ,
4558- KeyCode :: NumpadSubtract => PROCESSING_KEY_NUMPAD_SUBTRACT ,
4559- KeyCode :: NumpadAdd => PROCESSING_KEY_NUMPAD_ADD ,
4560- KeyCode :: NumpadEnter => PROCESSING_KEY_NUMPAD_ENTER ,
4561- KeyCode :: NumpadEqual => PROCESSING_KEY_NUMPAD_EQUAL ,
4562- KeyCode :: ShiftLeft => PROCESSING_KEY_SHIFT_LEFT ,
4563- KeyCode :: ControlLeft => PROCESSING_KEY_CONTROL_LEFT ,
4564- KeyCode :: AltLeft => PROCESSING_KEY_ALT_LEFT ,
4565- KeyCode :: SuperLeft => PROCESSING_KEY_SUPER_LEFT ,
4566- KeyCode :: ShiftRight => PROCESSING_KEY_SHIFT_RIGHT ,
4567- KeyCode :: ControlRight => PROCESSING_KEY_CONTROL_RIGHT ,
4568- KeyCode :: AltRight => PROCESSING_KEY_ALT_RIGHT ,
4569- KeyCode :: SuperRight => PROCESSING_KEY_SUPER_RIGHT ,
4570- KeyCode :: ContextMenu => PROCESSING_KEY_CONTEXT_MENU ,
4571- _ => 0 ,
4572- }
4573- }
0 commit comments