diff --git a/source/blender/blenlib/BLI_string_utf8_symbols.h b/source/blender/blenlib/BLI_string_utf8_symbols.h index 5b4f41bdc21..484beca0a3e 100644 --- a/source/blender/blenlib/BLI_string_utf8_symbols.h +++ b/source/blender/blenlib/BLI_string_utf8_symbols.h @@ -45,6 +45,10 @@ extern "C" { #define BLI_STR_UTF8_DOWNWARDS_ARROW "\xe2\x86\x93" /** u21E7: `⇧` */ #define BLI_STR_UTF8_UPWARDS_WHITE_ARROW "\xe2\x87\xa7" +/** u21FF: `⇪` For caps lock */ +#define BLI_STR_UTF8_UPWARDS_UP_ARROW_FROM_BAR "\xe2\x87\xaa" +/** u2277: `≷` Greater than / Less than */ +#define BLI_STR_UTF8_GREATER_THAN_OR_LESS_THAN "\xe2\x89\xb7" /** u2303: `⌃` */ #define BLI_STR_UTF8_UP_ARROWHEAD "\xe2\x8c\x83" /** u2318: `⌘` */ @@ -67,12 +71,22 @@ extern "C" { #define BLI_STR_UTF8_BLACK_SQUARE_FOR_STOP "\xe2\x8f\xb9" /** u2423: `␣` */ #define BLI_STR_UTF8_OPEN_BOX "\xe2\x90\xa3" +/** u25A6: `▦` */ +#define BLI_STR_UTF8_SQUARE_WITH_ORTHOGONAL_CROSSHATCH "\xe2\x96\xa6" /** u25B8: `▸` */ #define BLI_STR_UTF8_BLACK_RIGHT_POINTING_SMALL_TRIANGLE "\xe2\x96\xb8" /** u2B7E: `⭾` */ #define BLI_STR_UTF8_HORIZONTAL_TAB_KEY "\xe2\xad\xbe" +/** u270E: `✎` Tablet Pen */ +#define BLI_STR_UTF8_LOWER_RIGHT_PENCIL "\xe2\x9c\x8e" +/** u2710: `✐` Tablet Eraser */ +#define BLI_STR_UTF8_UPPER_RIGHT_PENCIL "\xe2\x9c\x90" /** u2756: `❖` */ #define BLI_STR_UTF8_BLACK_DIAMOND_MINUS_WHITE_X "\xe2\x9d\x96" +/** u29BE: `⦾` Use for 3D Mice */ +#define BLI_STR_UTF8_CIRCLED_WHITE_BULLET "\xe2\xa6\xbe" +/** u2B2E: `⬮` Generic Mouse */ +#define BLI_STR_UTF8_BLACK_VERTICAL_ELLIPSE "\xe2\xac\xae" #ifdef __cplusplus } diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh index 8c94ed9c632..354cc7b01a5 100644 --- a/source/blender/editors/include/UI_icons.hh +++ b/source/blender/editors/include/UI_icons.hh @@ -1048,6 +1048,123 @@ DEF_ICON_COLOR(EVENT_PAGEUP) DEF_ICON_COLOR(EVENT_PAGEDOWN) DEF_ICON_COLOR(EVENT_RETURN) DEF_ICON_COLOR(EVENT_SPACEKEY) + +DEF_ICON_COLOR(EVENT_ZEROKEY) +DEF_ICON_COLOR(EVENT_ONEKEY) +DEF_ICON_COLOR(EVENT_TWOKEY) +DEF_ICON_COLOR(EVENT_THREEKEY) +DEF_ICON_COLOR(EVENT_FOURKEY) +DEF_ICON_COLOR(EVENT_FIVEKEY) +DEF_ICON_COLOR(EVENT_SIXKEY) +DEF_ICON_COLOR(EVENT_SEVENKEY) +DEF_ICON_COLOR(EVENT_EIGHTKEY) +DEF_ICON_COLOR(EVENT_NINEKEY) + +DEF_ICON_COLOR(EVENT_PAD0) +DEF_ICON_COLOR(EVENT_PAD1) +DEF_ICON_COLOR(EVENT_PAD2) +DEF_ICON_COLOR(EVENT_PAD3) +DEF_ICON_COLOR(EVENT_PAD4) +DEF_ICON_COLOR(EVENT_PAD5) +DEF_ICON_COLOR(EVENT_PAD6) +DEF_ICON_COLOR(EVENT_PAD7) +DEF_ICON_COLOR(EVENT_PAD8) +DEF_ICON_COLOR(EVENT_PAD9) +DEF_ICON_COLOR(EVENT_PADASTER) +DEF_ICON_COLOR(EVENT_PADSLASH) +DEF_ICON_COLOR(EVENT_PADMINUS) +DEF_ICON_COLOR(EVENT_PADENTER) +DEF_ICON_COLOR(EVENT_PADPLUS) +DEF_ICON_COLOR(EVENT_PADPERIOD) + +DEF_ICON_COLOR(EVENT_MOUSE_4) +DEF_ICON_COLOR(EVENT_MOUSE_5) +DEF_ICON_COLOR(EVENT_MOUSE_6) +DEF_ICON_COLOR(EVENT_MOUSE_7) +DEF_ICON_COLOR(EVENT_TABLET_STYLUS) +DEF_ICON_COLOR(EVENT_TABLET_ERASER) +DEF_ICON_COLOR(EVENT_LEFT_ARROW) +DEF_ICON_COLOR(EVENT_DOWN_ARROW) +DEF_ICON_COLOR(EVENT_RIGHT_ARROW) +DEF_ICON_COLOR(EVENT_UP_ARROW) +DEF_ICON_COLOR(EVENT_PAUSE) +DEF_ICON_COLOR(EVENT_INSERT) +DEF_ICON_COLOR(EVENT_HOME) +DEF_ICON_COLOR(EVENT_END) +DEF_ICON_COLOR(EVENT_UNKNOWN) +DEF_ICON_COLOR(EVENT_GRLESS) +DEF_ICON_COLOR(EVENT_MEDIAPLAY) +DEF_ICON_COLOR(EVENT_MEDIASTOP) +DEF_ICON_COLOR(EVENT_MEDIAFIRST) +DEF_ICON_COLOR(EVENT_MEDIALAST) +DEF_ICON_COLOR(EVENT_APP) +DEF_ICON_COLOR(EVENT_CAPSLOCK) +DEF_ICON_COLOR(EVENT_BACKSPACE) +DEF_ICON_COLOR(EVENT_DEL) +DEF_ICON_COLOR(EVENT_SEMICOLON) +DEF_ICON_COLOR(EVENT_PERIOD) +DEF_ICON_COLOR(EVENT_COMMA) +DEF_ICON_COLOR(EVENT_QUOTE) +DEF_ICON_COLOR(EVENT_ACCENTGRAVE) +DEF_ICON_COLOR(EVENT_MINUS) +DEF_ICON_COLOR(EVENT_PLUS) +DEF_ICON_COLOR(EVENT_SLASH) +DEF_ICON_COLOR(EVENT_BACKSLASH) +DEF_ICON_COLOR(EVENT_EQUAL) +DEF_ICON_COLOR(EVENT_LEFTBRACKET) +DEF_ICON_COLOR(EVENT_RIGHTBRACKET) + +DEF_ICON_COLOR(EVENT_F13) +DEF_ICON_COLOR(EVENT_F14) +DEF_ICON_COLOR(EVENT_F15) +DEF_ICON_COLOR(EVENT_F16) +DEF_ICON_COLOR(EVENT_F17) +DEF_ICON_COLOR(EVENT_F18) +DEF_ICON_COLOR(EVENT_F19) +DEF_ICON_COLOR(EVENT_F20) +DEF_ICON_COLOR(EVENT_F21) +DEF_ICON_COLOR(EVENT_F22) +DEF_ICON_COLOR(EVENT_F23) +DEF_ICON_COLOR(EVENT_F24) + +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_V1) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_V2) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_V3) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_1) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_2) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_3) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_4) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_5) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_6) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_7) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_8) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_9) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_10) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_A) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_B) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_C) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_MENU) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_FIT) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_TOP) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_BOTTOM) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_LEFT) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_RIGHT) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_FRONT) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_BACK) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_ISO1) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_ISO2) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_ROLL_CW) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_ROLL_CCW) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_SPIN_CW) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_SPIN_CCW) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_TILT_CW) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_TILT_CCW) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_ROTATE) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_PANZOOM) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_DOMINANT) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_PLUS) +DEF_ICON_COLOR(EVENT_NDOF_BUTTON_MINUS) + /* add as needed. */ /* Undefine all types. */ diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc index bad4b176707..1c93af5a3c8 100644 --- a/source/blender/editors/interface/interface_icons.cc +++ b/source/blender/editors/interface/interface_icons.cc @@ -743,6 +743,122 @@ static void init_event_icons() INIT_EVENT_ICON(ICON_EVENT_RETURN, EVT_RETKEY, KM_ANY); INIT_EVENT_ICON(ICON_EVENT_SPACEKEY, EVT_SPACEKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_ZEROKEY, EVT_ZEROKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_ONEKEY, EVT_ONEKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_TWOKEY, EVT_TWOKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_THREEKEY, EVT_THREEKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_FOURKEY, EVT_FOURKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_FIVEKEY, EVT_FIVEKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_SIXKEY, EVT_SIXKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_SEVENKEY, EVT_SEVENKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_EIGHTKEY, EVT_EIGHTKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NINEKEY, EVT_NINEKEY, KM_ANY); + + INIT_EVENT_ICON(ICON_EVENT_PAD0, EVT_PAD0, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAD1, EVT_PAD1, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAD2, EVT_PAD2, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAD3, EVT_PAD3, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAD4, EVT_PAD4, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAD5, EVT_PAD5, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAD6, EVT_PAD6, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAD7, EVT_PAD7, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAD8, EVT_PAD8, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAD9, EVT_PAD9, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PADASTER, EVT_PADASTERKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PADSLASH, EVT_PADSLASHKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PADMINUS, EVT_PADMINUS, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PADENTER, EVT_PADENTER, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PADPLUS, EVT_PADPLUSKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PADPERIOD, EVT_PADPERIOD, KM_ANY); + + INIT_EVENT_ICON(ICON_EVENT_MOUSE_4, BUTTON4MOUSE, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_MOUSE_5, BUTTON5MOUSE, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_MOUSE_6, BUTTON6MOUSE, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_MOUSE_7, BUTTON7MOUSE, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_TABLET_STYLUS, TABLET_STYLUS, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_TABLET_ERASER, TABLET_ERASER, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_LEFT_ARROW, EVT_LEFTARROWKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_DOWN_ARROW, EVT_DOWNARROWKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_RIGHT_ARROW, EVT_RIGHTARROWKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_UP_ARROW, EVT_UPARROWKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PAUSE, EVT_PAUSEKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_INSERT, EVT_INSERTKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_HOME, EVT_HOMEKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_END, EVT_ENDKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_UNKNOWN, EVT_UNKNOWNKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_GRLESS, EVT_GRLESSKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_MEDIAPLAY, EVT_MEDIAPLAY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_MEDIASTOP, EVT_MEDIASTOP, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_MEDIAFIRST, EVT_MEDIAFIRST, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_MEDIALAST, EVT_MEDIALAST, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_APP, EVT_APPKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_CAPSLOCK, EVT_CAPSLOCKKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_BACKSPACE, EVT_BACKSPACEKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_DEL, EVT_DELKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_SEMICOLON, EVT_SEMICOLONKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PERIOD, EVT_PERIODKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_COMMA, EVT_COMMAKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_QUOTE, EVT_QUOTEKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_ACCENTGRAVE, EVT_ACCENTGRAVEKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_MINUS, EVT_MINUSKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_PLUS, EVT_PLUSKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_SLASH, EVT_SLASHKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_BACKSLASH, EVT_BACKSLASHKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_EQUAL, EVT_EQUALKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_LEFTBRACKET, EVT_LEFTBRACKETKEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_RIGHTBRACKET, EVT_RIGHTBRACKETKEY, KM_ANY); + + INIT_EVENT_ICON(ICON_EVENT_F13, EVT_F13KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F14, EVT_F14KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F15, EVT_F15KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F16, EVT_F16KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F17, EVT_F17KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F18, EVT_F18KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F19, EVT_F19KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F20, EVT_F20KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F21, EVT_F21KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F22, EVT_F22KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F23, EVT_F23KEY, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_F24, EVT_F24KEY, KM_ANY); + + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_V1, NDOF_BUTTON_V1, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_V2, NDOF_BUTTON_V2, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_V3, NDOF_BUTTON_V3, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_1, NDOF_BUTTON_1, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_2, NDOF_BUTTON_2, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_3, NDOF_BUTTON_3, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_4, NDOF_BUTTON_4, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_5, NDOF_BUTTON_5, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_6, NDOF_BUTTON_6, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_7, NDOF_BUTTON_7, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_8, NDOF_BUTTON_8, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_9, NDOF_BUTTON_9, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_10, NDOF_BUTTON_10, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_A, NDOF_BUTTON_A, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_B, NDOF_BUTTON_B, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_C, NDOF_BUTTON_C, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_MENU, NDOF_BUTTON_MENU, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_FIT, NDOF_BUTTON_FIT, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_TOP, NDOF_BUTTON_TOP, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_BOTTOM, NDOF_BUTTON_BOTTOM, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_LEFT, NDOF_BUTTON_LEFT, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_RIGHT, NDOF_BUTTON_RIGHT, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_FRONT, NDOF_BUTTON_FRONT, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_BACK, NDOF_BUTTON_BACK, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_ISO1, NDOF_BUTTON_ISO1, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_ISO2, NDOF_BUTTON_ISO2, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_ROLL_CW, NDOF_BUTTON_ROLL_CW, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_ROLL_CCW, NDOF_BUTTON_ROLL_CCW, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_SPIN_CW, NDOF_BUTTON_SPIN_CW, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_SPIN_CCW, NDOF_BUTTON_SPIN_CCW, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_TILT_CW, NDOF_BUTTON_TILT_CW, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_TILT_CCW, NDOF_BUTTON_TILT_CCW, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_ROTATE, NDOF_BUTTON_ROTATE, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_PANZOOM, NDOF_BUTTON_PANZOOM, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_DOMINANT, NDOF_BUTTON_DOMINANT, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_PLUS, NDOF_BUTTON_PLUS, KM_ANY); + INIT_EVENT_ICON(ICON_EVENT_NDOF_BUTTON_MINUS, NDOF_BUTTON_MINUS, KM_ANY); + g_di_event_list = di_next; # undef INIT_EVENT_ICON diff --git a/source/blender/editors/interface/interface_icons_event.cc b/source/blender/editors/interface/interface_icons_event.cc index 9fbf3440b77..417e652bf88 100644 --- a/source/blender/editors/interface/interface_icons_event.cc +++ b/source/blender/editors/interface/interface_icons_event.cc @@ -79,9 +79,9 @@ void icon_draw_rect_input( } else if (event_type == EVT_LEFTSHIFTKEY) { /* Right Shift has already been converted to left. */ const char str[] = BLI_STR_UTF8_UPWARDS_WHITE_ARROW; - icon_draw_rect_input_text(&rect, color, str, 16.0f, 0.0f); + icon_draw_rect_input_text(&rect, color, str, 14.0f, 0.0f); } - else if (event_type == EVT_LEFTCTRLKEY) { /* Right Shift has already been converted to left. */ + else if (event_type == EVT_LEFTCTRLKEY) { /* Right Ctrl has already been converted to left. */ if (platform == MACOS) { const char str[] = BLI_STR_UTF8_UP_ARROWHEAD; icon_draw_rect_input_text(&rect, color, str, 21.0f, -8.0f); @@ -96,17 +96,17 @@ void icon_draw_rect_input( icon_draw_rect_input_text(&rect, color, str, 13.0f, 0.0f); } else { - icon_draw_rect_input_text(&rect, color, "Alt", 10.0f, 0.0f); + icon_draw_rect_input_text(&rect, color, "Alt", 11.0f, 0.0f); } } else if (event_type == EVT_OSKEY) { if (platform == MACOS) { const char str[] = BLI_STR_UTF8_PLACE_OF_INTEREST_SIGN; - icon_draw_rect_input_text(&rect, color, str, 16.0f, 0.0f); + icon_draw_rect_input_text(&rect, color, str, 13.0f, 0.0f); } else if (platform == MSWIN) { const char str[] = BLI_STR_UTF8_BLACK_DIAMOND_MINUS_WHITE_X; - icon_draw_rect_input_text(&rect, color, str, 16.0f, 0.0f); + icon_draw_rect_input_text(&rect, color, str, 12.0f, 1.5f); } else { icon_draw_rect_input_text(&rect, color, "OS", 10.0f, 0.0f); @@ -120,35 +120,35 @@ void icon_draw_rect_input( icon_draw_rect_input_text(&rect, color, str, 18.0f, -1.5f); } else if (event_type == EVT_HOMEKEY) { - icon_draw_rect_input_text(&rect, color, "Home", 6.0f, 0.0f); + icon_draw_rect_input_text(&rect, color, "Home", 5.5f, 0.0f); } else if (event_type == EVT_ENDKEY) { icon_draw_rect_input_text(&rect, color, "End", 8.0f, 0.0f); } else if (event_type == EVT_RETKEY) { const char str[] = BLI_STR_UTF8_RETURN_SYMBOL; - icon_draw_rect_input_text(&rect, color, str, 17.0f, -1.0f); + icon_draw_rect_input_text(&rect, color, str, 16.0f, -2.0f); } else if (event_type == EVT_ESCKEY) { if (platform == MACOS) { const char str[] = BLI_STR_UTF8_BROKEN_CIRCLE_WITH_NORTHWEST_ARROW; - icon_draw_rect_input_text(&rect, color, str, 21.0f, -1.0f); + icon_draw_rect_input_text(&rect, color, str, 16.0f, 0.0f); } else { - icon_draw_rect_input_text(&rect, color, "Esc", 8.5f, 0.0f); + icon_draw_rect_input_text(&rect, color, "Esc", 9.0f, 0.0f); } } else if (event_type == EVT_PAGEUPKEY) { const char str[] = "P" BLI_STR_UTF8_UPWARDS_ARROW; - icon_draw_rect_input_text(&rect, color, str, 12.0f, 0.0f); + icon_draw_rect_input_text(&rect, color, str, 10.0f, 0.0f); } else if (event_type == EVT_PAGEDOWNKEY) { const char str[] = "P" BLI_STR_UTF8_DOWNWARDS_ARROW; - icon_draw_rect_input_text(&rect, color, str, 12.0f, 0.0f); + icon_draw_rect_input_text(&rect, color, str, 10.0f, 0.0f); } else if (event_type == EVT_LEFTARROWKEY) { const char str[] = BLI_STR_UTF8_LEFTWARDS_ARROW; - icon_draw_rect_input_text(&rect, color, str, 18.0f, -1.5f); + icon_draw_rect_input_text(&rect, color, str, 18.0f, 0.0f); } else if (event_type == EVT_UPARROWKEY) { const char str[] = BLI_STR_UTF8_UPWARDS_ARROW; @@ -156,7 +156,7 @@ void icon_draw_rect_input( } else if (event_type == EVT_RIGHTARROWKEY) { const char str[] = BLI_STR_UTF8_RIGHTWARDS_ARROW; - icon_draw_rect_input_text(&rect, color, str, 18.0f, -1.5f); + icon_draw_rect_input_text(&rect, color, str, 18.0f, 0.0f); } else if (event_type == EVT_DOWNARROWKEY) { const char str[] = BLI_STR_UTF8_DOWNWARDS_ARROW; @@ -166,4 +166,227 @@ void icon_draw_rect_input( const char str[] = BLI_STR_UTF8_OPEN_BOX; icon_draw_rect_input_text(&rect, color, str, 20.0f, 2.0f); } + else if (event_type == BUTTON4MOUSE) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_BLACK_VERTICAL_ELLIPSE "4", 12.0f, 0.0f); + } + else if (event_type == BUTTON5MOUSE) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_BLACK_VERTICAL_ELLIPSE "5", 12.0f, 0.0f); + } + else if (event_type == BUTTON6MOUSE) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_BLACK_VERTICAL_ELLIPSE "6", 12.0f, 0.0f); + } + else if (event_type == BUTTON7MOUSE) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_BLACK_VERTICAL_ELLIPSE "7", 12.0f, 0.0f); + } + else if (event_type == TABLET_STYLUS) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_LOWER_RIGHT_PENCIL, 16.0f, 0.0f); + } + else if (event_type == TABLET_ERASER) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_UPPER_RIGHT_PENCIL, 16.0f, 0.0f); + } + else if ((event_type >= EVT_ZEROKEY) && (event_type <= EVT_NINEKEY)) { + const char str[2] = {char('0' + (event_type - EVT_ZEROKEY)), '\0'}; + icon_draw_rect_input_text(&rect, color, str, 13.0f, 0.0f); + } + else if ((event_type >= EVT_PAD0) && (event_type <= EVT_PAD9)) { + char str[5]; + SNPRINTF(str, "%s%i", BLI_STR_UTF8_SQUARE_WITH_ORTHOGONAL_CROSSHATCH, event_type - EVT_PAD0); + icon_draw_rect_input_text(&rect, color, str, 9.0f, 0.0f); + } + else if (event_type == EVT_PADASTERKEY) { + icon_draw_rect_input_text( + &rect, color, BLI_STR_UTF8_SQUARE_WITH_ORTHOGONAL_CROSSHATCH "6", 9.0f, 0.0f); + } + else if (event_type == EVT_PADSLASHKEY) { + icon_draw_rect_input_text( + &rect, color, BLI_STR_UTF8_SQUARE_WITH_ORTHOGONAL_CROSSHATCH "/", 9.0f, 0.0f); + } + else if (event_type == EVT_PADMINUS) { + icon_draw_rect_input_text( + &rect, color, BLI_STR_UTF8_SQUARE_WITH_ORTHOGONAL_CROSSHATCH "-", 9.0f, 0.0f); + } + else if (event_type == EVT_PADENTER) { + icon_draw_rect_input_text( + &rect, + color, + BLI_STR_UTF8_SQUARE_WITH_ORTHOGONAL_CROSSHATCH BLI_STR_UTF8_RETURN_SYMBOL, + 8.0f, + 0.0f); + } + else if (event_type == EVT_PADPLUSKEY) { + icon_draw_rect_input_text( + &rect, color, BLI_STR_UTF8_SQUARE_WITH_ORTHOGONAL_CROSSHATCH "+", 9.0f, 0.0f); + } + else if (event_type == EVT_PAUSEKEY) { + icon_draw_rect_input_text(&rect, color, "Pause", 5.0f, 0.0f); + } + else if (event_type == EVT_INSERTKEY) { + icon_draw_rect_input_text(&rect, color, "Insert", 5.5f, 0.0f); + } + else if (event_type == EVT_UNKNOWNKEY) { + icon_draw_rect_input_text(&rect, color, " ", 12.0f, 0.0f); + } + else if (event_type == EVT_GRLESSKEY) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_GREATER_THAN_OR_LESS_THAN, 16.0f, 0.0f); + } + else if (event_type == EVT_MEDIAPLAY) { + icon_draw_rect_input_text(&rect, + color, + BLI_STR_UTF8_BLACK_RIGHT_POINTING_TRIANGLE_WITH_DOUBLE_VERTICAL_BAR, + 10.0f, + 1.0f); + } + else if (event_type == EVT_MEDIASTOP) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_BLACK_SQUARE_FOR_STOP, 10.0f, 1.0f); + } + else if (event_type == EVT_MEDIAFIRST) { + icon_draw_rect_input_text(&rect, + color, + BLI_STR_UTF8_BLACK_LEFT_POINTING_DOUBLE_TRIANGLE_WITH_VERTICAL_BAR, + 11.0f, + 1.0f); + } + else if (event_type == EVT_MEDIALAST) { + icon_draw_rect_input_text(&rect, + color, + BLI_STR_UTF8_BLACK_RIGHT_POINTING_DOUBLE_TRIANGLE_WITH_VERTICAL_BAR, + 10.0f, + 1.0f); + } + else if (event_type == EVT_APPKEY) { + icon_draw_rect_input_text(&rect, color, "App", 8.0f, 1.0f); + } + else if (event_type == EVT_PADPERIOD) { + icon_draw_rect_input_text( + &rect, color, BLI_STR_UTF8_SQUARE_WITH_ORTHOGONAL_CROSSHATCH ".", 9.0f, 0.0f); + } + else if (event_type == EVT_CAPSLOCKKEY) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_UPWARDS_UP_ARROW_FROM_BAR, 14.0f, 2.0f); + } + else if (event_type == EVT_LINEFEEDKEY) { + icon_draw_rect_input_text(&rect, color, "LF", 12.0f, 0.0f); + } + else if (event_type == EVT_BACKSPACEKEY) { + const char str[] = BLI_STR_UTF8_ERASE_TO_THE_LEFT; + icon_draw_rect_input_text(&rect, color, str, 14.0f, 0.0f); + } + else if (event_type == EVT_SEMICOLONKEY) { + icon_draw_rect_input_text(&rect, color, ";", 16.0f, 1.5f); + } + else if (event_type == EVT_PERIODKEY) { + icon_draw_rect_input_text(&rect, color, ".", 18.0f, -2.0f); + } + else if (event_type == EVT_COMMAKEY) { + icon_draw_rect_input_text(&rect, color, ",", 18.0f, 0.0f); + } + else if (event_type == EVT_QUOTEKEY) { + icon_draw_rect_input_text(&rect, color, "'", 18.0f, -6.0f); + } + else if (event_type == EVT_ACCENTGRAVEKEY) { + icon_draw_rect_input_text(&rect, color, "`", 18.0f, -7.0f); + } + else if (event_type == EVT_MINUSKEY) { + icon_draw_rect_input_text(&rect, color, "-", 18.0f, -5.0f); + } + else if (event_type == EVT_PLUSKEY) { + icon_draw_rect_input_text(&rect, color, "+", 18.0f, -1.0f); + } + else if (event_type == EVT_SLASHKEY) { + icon_draw_rect_input_text(&rect, color, "/", 13.0f, 1.0f); + } + else if (event_type == EVT_BACKSLASHKEY) { + icon_draw_rect_input_text(&rect, color, "\\", 13.0f, 1.0f); + } + else if (event_type == EVT_EQUALKEY) { + icon_draw_rect_input_text(&rect, color, "=", 18.0f, -2.5f); + } + else if (event_type == EVT_LEFTBRACKETKEY) { + icon_draw_rect_input_text(&rect, color, "[", 12.0f, 1.5f); + } + else if (event_type == EVT_RIGHTBRACKETKEY) { + icon_draw_rect_input_text(&rect, color, "]", 12.0f, 1.5f); + } + else if ((event_type >= NDOF_BUTTON_MENU) && (event_type <= NDOF_BUTTON_C)) { + if ((event_type >= NDOF_BUTTON_V1) && (event_type <= NDOF_BUTTON_V3)) { + char str[7]; + SNPRINTF(str, "%sv%i", BLI_STR_UTF8_CIRCLED_WHITE_BULLET, 1 + event_type - NDOF_BUTTON_V1); + icon_draw_rect_input_text(&rect, color, str, 7.5f, 0.0f); + } + else if ((event_type >= NDOF_BUTTON_1) && (event_type <= NDOF_BUTTON_9)) { + char str[6]; + SNPRINTF(str, "%s%i", BLI_STR_UTF8_CIRCLED_WHITE_BULLET, 1 + event_type - NDOF_BUTTON_1); + icon_draw_rect_input_text(&rect, color, str, 9.0f, 0.0f); + } + else if ((event_type == NDOF_BUTTON_10)) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "10", 7.5f, 0.0f); + } + else if ((event_type >= NDOF_BUTTON_A) && (event_type <= NDOF_BUTTON_C)) { + char str[6]; + SNPRINTF(str, "%s%c", BLI_STR_UTF8_CIRCLED_WHITE_BULLET, 'A' + event_type - NDOF_BUTTON_A); + icon_draw_rect_input_text(&rect, color, str, 9.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_MENU) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Me", 6.5f, 0.0f); + } + else if (event_type == NDOF_BUTTON_FIT) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Ft", 7.5f, 0.0f); + } + else if (event_type == NDOF_BUTTON_TOP) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Tp", 7.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_BOTTOM) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Bt", 7.5f, 0.0f); + } + else if (event_type == NDOF_BUTTON_LEFT) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Le", 7.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_RIGHT) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Ri", 7.5f, 0.0f); + } + else if (event_type == NDOF_BUTTON_FRONT) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Fr", 7.5f, 0.0f); + } + else if (event_type == NDOF_BUTTON_BACK) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Bk", 7.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_ISO1) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "I1", 7.5f, 0.0f); + } + else if (event_type == NDOF_BUTTON_ISO2) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "I2", 7.5f, 0.0f); + } + else if (event_type == NDOF_BUTTON_ROLL_CW) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Rl", 7.5f, 0.0f); + } + else if (event_type == NDOF_BUTTON_ROLL_CCW) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Rc", 7.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_SPIN_CW) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Sp", 7.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_SPIN_CCW) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Sc", 7.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_TILT_CW) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Ti", 8.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_TILT_CCW) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Tc", 7.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_ROTATE) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Ro", 7.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_PANZOOM) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "PZ", 7.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_DOMINANT) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "Dm", 6.5f, 0.0f); + } + else if (event_type == NDOF_BUTTON_PLUS) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "+", 10.0f, 0.0f); + } + else if (event_type == NDOF_BUTTON_MINUS) { + icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_CIRCLED_WHITE_BULLET "-", 10.0f, 0.0f); + } + } }