this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Implement KBGetLayoutType(), some housecleaning in frameworks/Carbon

+189 -143
+1
src/frameworks/Carbon/CMakeLists.txt
··· 11 11 SOURCES 12 12 src/Carbon.c 13 13 src/constants.c 14 + HIToolbox/Keyboards.cpp 14 15 HIToolbox/Events.cpp 15 16 HIToolbox/MacWindows.cpp 16 17 HIToolbox/TextInputSources.mm
+1 -1
src/frameworks/Carbon/HIToolbox/Events.cpp
··· 1 - #include "Events.h" 1 + #include <HIToolbox/Events.h> 2 2 3 3 UInt8 LMGetKbdType(void) 4 4 {
-134
src/frameworks/Carbon/HIToolbox/Events.h
··· 1 - #ifndef HITOOLBOX_EVENTS_H 2 - #define HITOOLBOX_EVENTS_H 3 - #include <CoreFoundation/CFBase.h> 4 - 5 - #ifdef __cplusplus 6 - extern "C" { 7 - #endif 8 - 9 - extern UInt8 LMGetKbdType(void); 10 - 11 - enum { 12 - kVK_ANSI_A = 0x00, 13 - kVK_ANSI_S = 0x01, 14 - kVK_ANSI_D = 0x02, 15 - kVK_ANSI_F = 0x03, 16 - kVK_ANSI_H = 0x04, 17 - kVK_ANSI_G = 0x05, 18 - kVK_ANSI_Z = 0x06, 19 - kVK_ANSI_X = 0x07, 20 - kVK_ANSI_C = 0x08, 21 - kVK_ANSI_V = 0x09, 22 - kVK_ANSI_B = 0x0B, 23 - kVK_ANSI_Q = 0x0C, 24 - kVK_ANSI_W = 0x0D, 25 - kVK_ANSI_E = 0x0E, 26 - kVK_ANSI_R = 0x0F, 27 - kVK_ANSI_Y = 0x10, 28 - kVK_ANSI_T = 0x11, 29 - kVK_ANSI_1 = 0x12, 30 - kVK_ANSI_2 = 0x13, 31 - kVK_ANSI_3 = 0x14, 32 - kVK_ANSI_4 = 0x15, 33 - kVK_ANSI_6 = 0x16, 34 - kVK_ANSI_5 = 0x17, 35 - kVK_ANSI_Equal = 0x18, 36 - kVK_ANSI_9 = 0x19, 37 - kVK_ANSI_7 = 0x1A, 38 - kVK_ANSI_Minus = 0x1B, 39 - kVK_ANSI_8 = 0x1C, 40 - kVK_ANSI_0 = 0x1D, 41 - kVK_ANSI_RightBracket = 0x1E, 42 - kVK_ANSI_O = 0x1F, 43 - kVK_ANSI_U = 0x20, 44 - kVK_ANSI_LeftBracket = 0x21, 45 - kVK_ANSI_I = 0x22, 46 - kVK_ANSI_P = 0x23, 47 - kVK_ANSI_L = 0x25, 48 - kVK_ANSI_J = 0x26, 49 - kVK_ANSI_Quote = 0x27, 50 - kVK_ANSI_K = 0x28, 51 - kVK_ANSI_Semicolon = 0x29, 52 - kVK_ANSI_Backslash = 0x2A, 53 - kVK_ANSI_Comma = 0x2B, 54 - kVK_ANSI_Slash = 0x2C, 55 - kVK_ANSI_N = 0x2D, 56 - kVK_ANSI_M = 0x2E, 57 - kVK_ANSI_Period = 0x2F, 58 - kVK_ANSI_Grave = 0x32, 59 - kVK_ANSI_KeypadDecimal = 0x41, 60 - kVK_ANSI_KeypadMultiply = 0x43, 61 - kVK_ANSI_KeypadPlus = 0x45, 62 - kVK_ANSI_KeypadClear = 0x47, 63 - kVK_ANSI_KeypadDivide = 0x4B, 64 - kVK_ANSI_KeypadEnter = 0x4C, 65 - kVK_ANSI_KeypadMinus = 0x4E, 66 - kVK_ANSI_KeypadEquals = 0x51, 67 - kVK_ANSI_Keypad0 = 0x52, 68 - kVK_ANSI_Keypad1 = 0x53, 69 - kVK_ANSI_Keypad2 = 0x54, 70 - kVK_ANSI_Keypad3 = 0x55, 71 - kVK_ANSI_Keypad4 = 0x56, 72 - kVK_ANSI_Keypad5 = 0x57, 73 - kVK_ANSI_Keypad6 = 0x58, 74 - kVK_ANSI_Keypad7 = 0x59, 75 - kVK_ANSI_Keypad8 = 0x5B, 76 - kVK_ANSI_Keypad9 = 0x5C 77 - }; 78 - 79 - // independent of keyboard layout 80 - enum { 81 - kVK_Return = 0x24, 82 - kVK_Tab = 0x30, 83 - kVK_Space = 0x31, 84 - kVK_Delete = 0x33, 85 - kVK_Escape = 0x35, 86 - kVK_Command = 0x37, 87 - kVK_Shift = 0x38, 88 - kVK_CapsLock = 0x39, 89 - kVK_Option = 0x3A, 90 - kVK_Control = 0x3B, 91 - kVK_RightShift = 0x3C, 92 - kVK_RightOption = 0x3D, 93 - kVK_RightControl = 0x3E, 94 - kVK_Function = 0x3F, 95 - kVK_F17 = 0x40, 96 - kVK_VolumeUp = 0x48, 97 - kVK_VolumeDown = 0x49, 98 - kVK_Mute = 0x4A, 99 - kVK_F18 = 0x4F, 100 - kVK_F19 = 0x50, 101 - kVK_F20 = 0x5A, 102 - kVK_F5 = 0x60, 103 - kVK_F6 = 0x61, 104 - kVK_F7 = 0x62, 105 - kVK_F3 = 0x63, 106 - kVK_F8 = 0x64, 107 - kVK_F9 = 0x65, 108 - kVK_F11 = 0x67, 109 - kVK_F13 = 0x69, 110 - kVK_F16 = 0x6A, 111 - kVK_F14 = 0x6B, 112 - kVK_F10 = 0x6D, 113 - kVK_F12 = 0x6F, 114 - kVK_F15 = 0x71, 115 - kVK_Help = 0x72, 116 - kVK_Home = 0x73, 117 - kVK_PageUp = 0x74, 118 - kVK_ForwardDelete = 0x75, 119 - kVK_F4 = 0x76, 120 - kVK_End = 0x77, 121 - kVK_F2 = 0x78, 122 - kVK_PageDown = 0x79, 123 - kVK_F1 = 0x7A, 124 - kVK_LeftArrow = 0x7B, 125 - kVK_RightArrow = 0x7C, 126 - kVK_DownArrow = 0x7D, 127 - kVK_UpArrow = 0x7E 128 - }; 129 - 130 - #ifdef __cplusplus 131 - } 132 - #endif 133 - 134 - #endif
+7
src/frameworks/Carbon/HIToolbox/Keyboards.cpp
··· 1 + #include <HIToolbox/Keyboards.h> 2 + 3 + PhysicalKeyboardLayoutType KBGetLayoutType(SInt16 iKeyboardType) 4 + { 5 + // We behave like ANSI 6 + return kKeyboardANSI; 7 + }
+20 -8
src/frameworks/Carbon/include/HIToolbox/CarbonEventsCore.h
··· 1 1 #ifndef _Carbon_Carbon_Events_Core_H_ 2 2 #define _Carbon_Carbon_Events_Core_H_ 3 3 4 + #include <CoreFoundation/CFBase.h> 5 + #include <CoreServices/MacTypes.h> 6 + #include <HIToolbox/Menus.h> 7 + 4 8 #ifdef __cplusplus 5 9 extern "C" { 6 10 #endif 7 11 8 - typedef int EventRef; 12 + typedef struct OpaqueEventRef* EventRef; 9 13 typedef void* EventHandlerCallRef; 10 14 typedef OSType EventParamType; 11 15 12 16 typedef double EventTime; 13 - typedef uint32_t EventMask; 17 + typedef UInt16 EventMask; 18 + typedef UInt16 EventKind; 14 19 typedef void* EventTargetRef; 15 20 typedef OSType EventParamName; 16 - typedef struct EventTypeSpec { uint32_t params[2]; } EventTypeSpec; 21 + typedef struct EventTypeSpec { OSType eventClass; UInt32 eventKind; } EventTypeSpec; 17 22 typedef EventTime EventTimeout; 18 23 typedef void* EventHandlerProcPtr; 19 - typedef uint32_t EventAttributes; 20 - typedef uint32_t EventQueueRef; 24 + typedef UInt32 EventAttributes; 25 + typedef struct OpaqueEventQueueRef* EventQueueRef; 21 26 typedef void* EventHandlerUPP; 22 - typedef int16_t EventPriority; 27 + typedef SInt16 EventPriority; 23 28 typedef void* EventHandlerRef; 24 29 25 30 26 - typedef struct HICommand { uint8_t data[16]; } HICommand; 27 - typedef struct KeyMap { char data[16]; } KeyMap; 31 + typedef struct HICommand { 32 + UInt32 attributes; 33 + UInt32 commandID; 34 + struct { 35 + MenuRef menuRef; 36 + MenuItemIndex menuItemIndex; 37 + } menu; 38 + } HICommand; 39 + typedef UInt32 KeyMap[4]; 28 40 29 41 30 42 OSStatus CallNextEventHandler(EventHandlerCallRef a, EventRef b);
+129
src/frameworks/Carbon/include/HIToolbox/Events.h
··· 5 5 extern "C" { 6 6 #endif 7 7 8 + #include <CoreServices/MacTypes.h> 9 + #include <HIToolbox/CarbonEventsCore.h> 10 + 11 + typedef OSType EventParamName; 12 + typedef OSType EventParamType; 13 + 8 14 void GetKeys(KeyMap theKeys); 9 15 void FlushEvents(EventMask a, EventMask b); 10 16 11 17 OSStatus SetEventMask(EventMask a); 12 18 OSStatus SetEventParameter(EventRef a, EventParamName b, EventParamType c, UInt32 d, const void * e); 19 + 20 + 21 + extern UInt8 LMGetKbdType(void); 22 + 23 + enum { 24 + kVK_ANSI_A = 0x00, 25 + kVK_ANSI_S = 0x01, 26 + kVK_ANSI_D = 0x02, 27 + kVK_ANSI_F = 0x03, 28 + kVK_ANSI_H = 0x04, 29 + kVK_ANSI_G = 0x05, 30 + kVK_ANSI_Z = 0x06, 31 + kVK_ANSI_X = 0x07, 32 + kVK_ANSI_C = 0x08, 33 + kVK_ANSI_V = 0x09, 34 + kVK_ANSI_B = 0x0B, 35 + kVK_ANSI_Q = 0x0C, 36 + kVK_ANSI_W = 0x0D, 37 + kVK_ANSI_E = 0x0E, 38 + kVK_ANSI_R = 0x0F, 39 + kVK_ANSI_Y = 0x10, 40 + kVK_ANSI_T = 0x11, 41 + kVK_ANSI_1 = 0x12, 42 + kVK_ANSI_2 = 0x13, 43 + kVK_ANSI_3 = 0x14, 44 + kVK_ANSI_4 = 0x15, 45 + kVK_ANSI_6 = 0x16, 46 + kVK_ANSI_5 = 0x17, 47 + kVK_ANSI_Equal = 0x18, 48 + kVK_ANSI_9 = 0x19, 49 + kVK_ANSI_7 = 0x1A, 50 + kVK_ANSI_Minus = 0x1B, 51 + kVK_ANSI_8 = 0x1C, 52 + kVK_ANSI_0 = 0x1D, 53 + kVK_ANSI_RightBracket = 0x1E, 54 + kVK_ANSI_O = 0x1F, 55 + kVK_ANSI_U = 0x20, 56 + kVK_ANSI_LeftBracket = 0x21, 57 + kVK_ANSI_I = 0x22, 58 + kVK_ANSI_P = 0x23, 59 + kVK_ANSI_L = 0x25, 60 + kVK_ANSI_J = 0x26, 61 + kVK_ANSI_Quote = 0x27, 62 + kVK_ANSI_K = 0x28, 63 + kVK_ANSI_Semicolon = 0x29, 64 + kVK_ANSI_Backslash = 0x2A, 65 + kVK_ANSI_Comma = 0x2B, 66 + kVK_ANSI_Slash = 0x2C, 67 + kVK_ANSI_N = 0x2D, 68 + kVK_ANSI_M = 0x2E, 69 + kVK_ANSI_Period = 0x2F, 70 + kVK_ANSI_Grave = 0x32, 71 + kVK_ANSI_KeypadDecimal = 0x41, 72 + kVK_ANSI_KeypadMultiply = 0x43, 73 + kVK_ANSI_KeypadPlus = 0x45, 74 + kVK_ANSI_KeypadClear = 0x47, 75 + kVK_ANSI_KeypadDivide = 0x4B, 76 + kVK_ANSI_KeypadEnter = 0x4C, 77 + kVK_ANSI_KeypadMinus = 0x4E, 78 + kVK_ANSI_KeypadEquals = 0x51, 79 + kVK_ANSI_Keypad0 = 0x52, 80 + kVK_ANSI_Keypad1 = 0x53, 81 + kVK_ANSI_Keypad2 = 0x54, 82 + kVK_ANSI_Keypad3 = 0x55, 83 + kVK_ANSI_Keypad4 = 0x56, 84 + kVK_ANSI_Keypad5 = 0x57, 85 + kVK_ANSI_Keypad6 = 0x58, 86 + kVK_ANSI_Keypad7 = 0x59, 87 + kVK_ANSI_Keypad8 = 0x5B, 88 + kVK_ANSI_Keypad9 = 0x5C 89 + }; 90 + 91 + // independent of keyboard layout 92 + enum { 93 + kVK_Return = 0x24, 94 + kVK_Tab = 0x30, 95 + kVK_Space = 0x31, 96 + kVK_Delete = 0x33, 97 + kVK_Escape = 0x35, 98 + kVK_Command = 0x37, 99 + kVK_Shift = 0x38, 100 + kVK_CapsLock = 0x39, 101 + kVK_Option = 0x3A, 102 + kVK_Control = 0x3B, 103 + kVK_RightShift = 0x3C, 104 + kVK_RightOption = 0x3D, 105 + kVK_RightControl = 0x3E, 106 + kVK_Function = 0x3F, 107 + kVK_F17 = 0x40, 108 + kVK_VolumeUp = 0x48, 109 + kVK_VolumeDown = 0x49, 110 + kVK_Mute = 0x4A, 111 + kVK_F18 = 0x4F, 112 + kVK_F19 = 0x50, 113 + kVK_F20 = 0x5A, 114 + kVK_F5 = 0x60, 115 + kVK_F6 = 0x61, 116 + kVK_F7 = 0x62, 117 + kVK_F3 = 0x63, 118 + kVK_F8 = 0x64, 119 + kVK_F9 = 0x65, 120 + kVK_F11 = 0x67, 121 + kVK_F13 = 0x69, 122 + kVK_F16 = 0x6A, 123 + kVK_F14 = 0x6B, 124 + kVK_F10 = 0x6D, 125 + kVK_F12 = 0x6F, 126 + kVK_F15 = 0x71, 127 + kVK_Help = 0x72, 128 + kVK_Home = 0x73, 129 + kVK_PageUp = 0x74, 130 + kVK_ForwardDelete = 0x75, 131 + kVK_F4 = 0x76, 132 + kVK_End = 0x77, 133 + kVK_F2 = 0x78, 134 + kVK_PageDown = 0x79, 135 + kVK_F1 = 0x7A, 136 + kVK_LeftArrow = 0x7B, 137 + kVK_RightArrow = 0x7C, 138 + kVK_DownArrow = 0x7D, 139 + kVK_UpArrow = 0x7E 140 + }; 141 + 13 142 14 143 #ifdef __cplusplus 15 144 }
+26
src/frameworks/Carbon/include/HIToolbox/Keyboards.h
··· 1 + #ifndef HITOOLBOX_KEYBOARDS_H 2 + #define HITOOLBOX_KEYBOARDS_H 3 + 4 + #include "CoreServices/MacTypes.h" 5 + 6 + #ifdef __cplusplus 7 + extern "C" { 8 + #endif 9 + 10 + 11 + enum { 12 + kKeyboardJIS = 'JIS ', 13 + kKeyboardANSI = 'ANSI', 14 + kKeyboardISO = 'ISO ', 15 + kKeyboardUnknown = '????' 16 + }; 17 + 18 + typedef OSType PhysicalKeyboardLayoutType; 19 + 20 + extern PhysicalKeyboardLayoutType KBGetLayoutType(SInt16 iKeyboardType); 21 + 22 + #ifdef __cplusplus 23 + } 24 + #endif 25 + 26 + #endif
+5
src/frameworks/Carbon/include/HIToolbox/Menus.h
··· 1 1 #ifndef _Carbon_Menus_H_ 2 2 #define _Carbon_Menus_H_ 3 3 4 + #include <CoreServices/MacTypes.h> 5 + 4 6 #ifdef __cplusplus 5 7 extern "C" { 6 8 #endif 9 + 10 + typedef struct OpaqueMenuRef* MenuRef; 11 + typedef UInt16 MenuItemIndex; 7 12 8 13 void ShowMenuBar(void); 9 14 void HideMenuBar(void);