diff options
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_cursors.c | 468 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 18 |
2 files changed, 267 insertions, 219 deletions
diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 45f56968a32..58cfc350b17 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -386,13 +386,17 @@ void WM_cursor_time(wmWindow *win, int nr) * I define 2 pretty brain-dead macros so it's obvious what the extra "[]" * are for */ -#define BEGIN_CURSOR_BLOCK { -#define END_CURSOR_BLOCK } +#define BEGIN_CURSOR_BLOCK \ + { \ + ((void)0) +#define END_CURSOR_BLOCK \ + } \ + ((void)0) void wm_init_cursor_data(void) { /********************** NW_ARROW Cursor **************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char nw_sbm[] = { 0x03, 0x00, 0x05, 0x00, 0x09, 0x00, 0x11, 0x00, 0x21, 0x00, 0x41, 0x00, 0x81, 0x00, 0x01, 0x01, 0x01, 0x02, 0xc1, 0x03, 0x49, 0x00, @@ -426,10 +430,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_NW_ARROWCURSOR] = &NWArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; ///********************** NS_ARROW Cursor *************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char ns_sbm[] = { 0x40, 0x01, 0x20, 0x02, 0x10, 0x04, 0x08, 0x08, 0x04, 0x10, 0x3c, 0x1e, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0x3c, 0x1e, @@ -464,9 +468,9 @@ void wm_init_cursor_data(void) BlenderCursor[BC_NS_ARROWCURSOR] = &NSArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** EW_ARROW Cursor *************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char ew_sbm[] = { 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x38, 0x1c, 0x2c, 0x34, 0xe6, 0x67, 0x03, 0xc0, 0x01, 0x80, 0x03, 0xc0, 0xe6, 0x67, 0x2c, 0x34, @@ -500,10 +504,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_EW_ARROWCURSOR] = &EWArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Wait Cursor *****************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char wait_sbm[] = { 0xfe, 0x7f, 0x02, 0x40, 0x02, 0x40, 0x84, 0x21, 0xc8, 0x13, 0xd0, 0x0b, 0xa0, 0x04, 0x20, 0x05, 0xa0, 0x04, 0x10, 0x09, 0x88, 0x11, @@ -561,10 +565,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_WAITCURSOR] = &WaitCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Cross Cursor ***************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char cross_sbm[] = { 0x00, 0x00, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x7e, 0x7e, 0x7e, 0x7e, 0x80, 0x01, 0x80, 0x01, @@ -621,10 +625,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_CROSSCURSOR] = &CrossCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** EditCross Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char editcross_sbm[] = { 0x0e, 0x00, 0x11, 0x00, 0x1d, 0x00, 0x19, 0x03, 0x1d, 0x03, 0x11, 0x03, 0x0e, 0x03, 0x00, 0x03, 0xf8, 0x7c, 0xf8, 0x7c, 0x00, 0x03, @@ -658,10 +662,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_EDITCROSSCURSOR] = &EditCrossCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Box Select *************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char box_sbm[32] = { 0x7f, 0x00, 0x41, 0x00, 0x41, 0x00, 0x41, 0x06, 0x41, 0x06, 0x41, 0x06, 0x7f, 0x06, 0x00, 0x06, 0xe0, 0x79, 0xe0, 0x79, 0x00, 0x06, @@ -696,9 +700,9 @@ void wm_init_cursor_data(void) BlenderCursor[BC_BOXSELCURSOR] = &BoxSelCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Knife Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char knife_sbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x2c, 0x00, 0x5a, 0x00, 0x34, 0x00, 0x2a, 0x00, 0x17, 0x80, 0x06, 0x40, 0x03, 0xa0, 0x03, @@ -757,10 +761,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_KNIFECURSOR] = &KnifeCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Loop Select Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char vloop_sbm[] = { 0x00, 0x00, 0x7e, 0x00, 0x3e, 0x00, 0x1e, 0x00, 0x0e, 0x00, 0x66, @@ -820,10 +824,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_VLOOPCURSOR] = &VLoopCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** TextEdit Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char textedit_sbm[] = { 0xe0, 0x03, 0x10, 0x04, 0x60, 0x03, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, @@ -857,10 +861,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_TEXTEDITCURSOR] = &TextEditCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Paintbrush Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char paintbrush_sbm[] = { 0x00, 0xe0, 0x00, 0x98, 0x00, 0x44, 0x00, 0x42, 0x00, 0x21, 0x80, @@ -895,10 +899,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_PAINTBRUSHCURSOR] = &PaintBrushCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Hand Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char hand_sbm[] = { 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x80, 0x0d, 0x98, 0x6d, 0x98, @@ -934,10 +938,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_HANDCURSOR] = &HandCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** NSEW Scroll Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char nsewscroll_sbm[] = { 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, @@ -973,10 +977,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_NSEW_SCROLLCURSOR] = &NSEWScrollCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** NS Scroll Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char nsscroll_sbm[] = { 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, @@ -1012,10 +1016,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_NS_SCROLLCURSOR] = &NSScrollCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** EW Scroll Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char ewscroll_sbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1051,10 +1055,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_EW_SCROLLCURSOR] = &EWScrollCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Eyedropper Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char eyedropper_sbm[] = { 0x00, 0x30, 0x00, 0x48, 0x00, 0x85, 0x80, 0x82, 0x40, 0x40, 0x80, @@ -1090,10 +1094,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_EYEDROPPER_CURSOR] = &EyedropperCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Swap Area Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char swap_sbm[] = { 0xc0, 0xff, 0x40, 0x80, 0x40, 0x80, 0x40, 0x9c, 0x40, 0x98, 0x40, 0x94, 0x00, 0x82, 0xfe, 0x80, 0x7e, 0xfd, 0xbe, 0x01, 0xda, 0x01, @@ -1128,18 +1132,22 @@ void wm_init_cursor_data(void) BlenderCursor[BC_SWAPAREA_CURSOR] = &SwapCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Horizontal Split Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char hsplit_sbm[] = {0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x88, - 0x08, 0x8C, 0x18, 0x8E, 0x38, 0x8C, 0x18, 0x88, 0x08, 0x80, 0x00, - 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char hsplit_sbm[] = { + 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x88, + 0x08, 0x8C, 0x18, 0x8E, 0x38, 0x8C, 0x18, 0x88, 0x08, 0x80, 0x00, + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, + }; - static char hsplit_smsk[] = {0xC0, 0x01, 0xC0, 0x01, 0xC0, 0x01, 0xD0, 0x05, 0xD8, 0x0D, 0xDC, - 0x1D, 0xDE, 0x3D, 0xDF, 0x7D, 0xDE, 0x3D, 0xDC, 0x1D, 0xD8, 0x0D, - 0xD0, 0x05, 0xC0, 0x01, 0xC0, 0x01, 0xC0, 0x01, 0x00, 0x00}; + static char hsplit_smsk[] = { + 0xC0, 0x01, 0xC0, 0x01, 0xC0, 0x01, 0xD0, 0x05, 0xD8, 0x0D, 0xDC, + 0x1D, 0xDE, 0x3D, 0xDF, 0x7D, 0xDE, 0x3D, 0xDC, 0x1D, 0xD8, 0x0D, + 0xD0, 0x05, 0xC0, 0x01, 0xC0, 0x01, 0xC0, 0x01, 0x00, 0x00, + }; static char hsplit_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, @@ -1163,38 +1171,44 @@ void wm_init_cursor_data(void) 0xC8, 0x03, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}; - static BCursor HSplitCursor = {/*small*/ - hsplit_sbm, - hsplit_smsk, - 16, - 16, - 7, - 7, - /*big*/ - hsplit_lbm, - hsplit_lmsk, - 32, - 32, - 15, - 15, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor HSplitCursor = { + /*small*/ + hsplit_sbm, + hsplit_smsk, + 16, + 16, + 7, + 7, + /*big*/ + hsplit_lbm, + hsplit_lmsk, + 32, + 32, + 15, + 15, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_H_SPLITCURSOR] = &HSplitCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Vertical Split Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char vsplit_sbm[] = {0x00, 0x00, 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xFE, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char vsplit_sbm[] = { + 0x00, 0x00, 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFE, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, + }; - static char vsplit_smsk[] = {0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, 0x0F, 0x00, - 0x00, 0xFF, 0x7F, 0xFF, 0x7F, 0xFF, 0x7F, 0x00, 0x00, 0xF8, 0x0F, - 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00}; + static char vsplit_smsk[] = { + 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, 0x0F, 0x00, + 0x00, 0xFF, 0x7F, 0xFF, 0x7F, 0xFF, 0x7F, 0x00, 0x00, 0xF8, 0x0F, + 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00, + }; static char vsplit_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, @@ -1218,38 +1232,44 @@ void wm_init_cursor_data(void) 0xF8, 0x0F, 0x00, 0x00, 0xF0, 0x07, 0x00, 0x00, 0xE0, 0x03, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - static BCursor VSplitCursor = {/*small*/ - vsplit_sbm, - vsplit_smsk, - 16, - 16, - 7, - 7, - /*big*/ - vsplit_lbm, - vsplit_lmsk, - 32, - 32, - 15, - 15, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor VSplitCursor = { + /*small*/ + vsplit_sbm, + vsplit_smsk, + 16, + 16, + 7, + 7, + /*big*/ + vsplit_lbm, + vsplit_lmsk, + 32, + 32, + 15, + 15, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_V_SPLITCURSOR] = &VSplitCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** North Arrow Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char narrow_sbm[] = {0x00, 0x00, 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, - 0x0F, 0xFC, 0x1F, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char narrow_sbm[] = { + 0x00, 0x00, 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, + 0x0F, 0xFC, 0x1F, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; - static char narrow_smsk[] = {0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, 0x0F, 0xFC, - 0x1F, 0xFE, 0x3F, 0xFF, 0x7F, 0xF0, 0x07, 0xF0, 0x07, 0xF0, 0x07, - 0xF0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char narrow_smsk[] = { + 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, 0x0F, 0xFC, + 0x1F, 0xFE, 0x3F, 0xFF, 0x7F, 0xF0, 0x07, 0xF0, 0x07, 0xF0, 0x07, + 0xF0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; static char narrow_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xC0, 0x01, @@ -1273,38 +1293,44 @@ void wm_init_cursor_data(void) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - static BCursor NArrowCursor = {/*small*/ - narrow_sbm, - narrow_smsk, - 16, - 16, - 7, - 4, - /*big*/ - narrow_lbm, - narrow_lmsk, - 32, - 32, - 15, - 10, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor NArrowCursor = { + /*small*/ + narrow_sbm, + narrow_smsk, + 16, + 16, + 7, + 4, + /*big*/ + narrow_lbm, + narrow_lmsk, + 32, + 32, + 15, + 10, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_N_ARROWCURSOR] = &NArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** South Arrow Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char sarrow_sbm[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, - 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xFC, 0x1F, 0xF8, 0x0F, - 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00}; + static char sarrow_sbm[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, + 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xFC, 0x1F, 0xF8, 0x0F, + 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00, + }; - static char sarrow_smsk[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x07, 0xF0, - 0x07, 0xF0, 0x07, 0xF0, 0x07, 0xFF, 0x7F, 0xFE, 0x3F, 0xFC, 0x1F, - 0xF8, 0x0F, 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00}; + static char sarrow_smsk[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x07, 0xF0, + 0x07, 0xF0, 0x07, 0xF0, 0x07, 0xFF, 0x7F, 0xFE, 0x3F, 0xFC, 0x1F, + 0xF8, 0x0F, 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, + }; static char sarrow_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1328,38 +1354,44 @@ void wm_init_cursor_data(void) 0xFC, 0x1F, 0x00, 0x00, 0xF8, 0x0F, 0x00, 0x00, 0xF0, 0x07, 0x00, 0x00, 0xE0, 0x03, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00}; - static BCursor SArrowCursor = {/*small*/ - sarrow_sbm, - sarrow_smsk, - 16, - 16, - 7, - 11, - /*big*/ - sarrow_lbm, - sarrow_lmsk, - 32, - 32, - 15, - 21, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor SArrowCursor = { + /*small*/ + sarrow_sbm, + sarrow_smsk, + 16, + 16, + 7, + 11, + /*big*/ + sarrow_lbm, + sarrow_lmsk, + 32, + 32, + 15, + 21, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_S_ARROWCURSOR] = &SArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** East Arrow Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char earrow_sbm[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x0E, 0xE0, - 0x1F, 0xE0, 0x3F, 0xE0, 0x7F, 0xE0, 0x3F, 0xE0, 0x1F, 0x00, 0x0E, - 0x00, 0x06, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char earrow_sbm[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x0E, 0xE0, + 0x1F, 0xE0, 0x3F, 0xE0, 0x7F, 0xE0, 0x3F, 0xE0, 0x1F, 0x00, 0x0E, + 0x00, 0x06, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; - static char earrow_smsk[] = {0x00, 0x01, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0F, 0xF0, 0x1F, 0xF0, - 0x3F, 0xF0, 0x7F, 0xF0, 0xFF, 0xF0, 0x7F, 0xF0, 0x3F, 0xF0, 0x1F, - 0x00, 0x0F, 0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00}; + static char earrow_smsk[] = { + 0x00, 0x01, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0F, 0xF0, 0x1F, 0xF0, + 0x3F, 0xF0, 0x7F, 0xF0, 0xFF, 0xF0, 0x7F, 0xF0, 0x3F, 0xF0, 0x1F, + 0x00, 0x0F, 0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, + }; static char earrow_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, @@ -1383,38 +1415,44 @@ void wm_init_cursor_data(void) 0x00, 0x1F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00}; - static BCursor EArrowCursor = {/*small*/ - earrow_sbm, - earrow_smsk, - 16, - 16, - 11, - 7, - /*big*/ - earrow_lbm, - earrow_lmsk, - 32, - 32, - 15, - 22, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor EArrowCursor = { + /*small*/ + earrow_sbm, + earrow_smsk, + 16, + 16, + 11, + 7, + /*big*/ + earrow_lbm, + earrow_lmsk, + 32, + 32, + 15, + 22, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_E_ARROWCURSOR] = &EArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** West Arrow Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char warrow_sbm[] = {0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x60, 0x00, 0x70, 0x00, 0xF8, - 0x07, 0xFC, 0x07, 0xFE, 0x07, 0xFC, 0x07, 0xF8, 0x07, 0x70, 0x00, - 0x60, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char warrow_sbm[] = { + 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x60, 0x00, 0x70, 0x00, 0xF8, + 0x07, 0xFC, 0x07, 0xFE, 0x07, 0xFC, 0x07, 0xF8, 0x07, 0x70, 0x00, + 0x60, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; - static char warrow_smsk[] = {0x80, 0x00, 0xC0, 0x00, 0xE0, 0x00, 0xF0, 0x00, 0xF8, 0x0F, 0xFC, - 0x0F, 0xFE, 0x0F, 0xFF, 0x0F, 0xFE, 0x0F, 0xFC, 0x0F, 0xF8, 0x0F, - 0xF0, 0x00, 0xE0, 0x00, 0xC0, 0x00, 0x80, 0x00, 0x00, 0x00}; + static char warrow_smsk[] = { + 0x80, 0x00, 0xC0, 0x00, 0xE0, 0x00, 0xF0, 0x00, 0xF8, 0x0F, 0xFC, + 0x0F, 0xFE, 0x0F, 0xFF, 0x0F, 0xFE, 0x0F, 0xFC, 0x0F, 0xF8, 0x0F, + 0xF0, 0x00, 0xE0, 0x00, 0xC0, 0x00, 0x80, 0x00, 0x00, 0x00, + }; static char warrow_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, @@ -1438,38 +1476,44 @@ void wm_init_cursor_data(void) 0xF8, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - static BCursor WArrowCursor = {/*small*/ - warrow_sbm, - warrow_smsk, - 16, - 16, - 4, - 7, - /*big*/ - warrow_lbm, - warrow_lmsk, - 32, - 32, - 15, - 15, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor WArrowCursor = { + /*small*/ + warrow_sbm, + warrow_smsk, + 16, + 16, + 4, + 7, + /*big*/ + warrow_lbm, + warrow_lmsk, + 32, + 32, + 15, + 15, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_W_ARROWCURSOR] = &WArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Stop Sign Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char stop_sbm[] = {0x00, 0x00, 0xE0, 0x07, 0x38, 0x1C, 0x1C, 0x30, 0x3C, 0x20, 0x76, - 0x60, 0xE2, 0x40, 0xC2, 0x41, 0x82, 0x43, 0x02, 0x47, 0x06, 0x6E, - 0x04, 0x3C, 0x0C, 0x38, 0x38, 0x1C, 0xE0, 0x07, 0x00, 0x00}; + static char stop_sbm[] = { + 0x00, 0x00, 0xE0, 0x07, 0x38, 0x1C, 0x1C, 0x30, 0x3C, 0x20, 0x76, + 0x60, 0xE2, 0x40, 0xC2, 0x41, 0x82, 0x43, 0x02, 0x47, 0x06, 0x6E, + 0x04, 0x3C, 0x0C, 0x38, 0x38, 0x1C, 0xE0, 0x07, 0x00, 0x00, + }; - static char stop_smsk[] = {0xE0, 0x07, 0xF8, 0x1F, 0xFC, 0x3F, 0x3E, 0x7C, 0x7E, 0x70, 0xFF, - 0xF0, 0xF7, 0xE1, 0xE7, 0xE3, 0xC7, 0xE7, 0x87, 0xEF, 0x0F, 0xFF, - 0x0E, 0x7E, 0x3E, 0x7C, 0xFC, 0x3F, 0xF8, 0x1F, 0xE0, 0x07}; + static char stop_smsk[] = { + 0xE0, 0x07, 0xF8, 0x1F, 0xFC, 0x3F, 0x3E, 0x7C, 0x7E, 0x70, 0xFF, + 0xF0, 0xF7, 0xE1, 0xE7, 0xE3, 0xC7, 0xE7, 0x87, 0xEF, 0x0F, 0xFF, + 0x0E, 0x7E, 0x3E, 0x7C, 0xFC, 0x3F, 0xF8, 0x1F, 0xE0, 0x07, + }; static char stop_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x0F, 0x00, 0x00, 0xFE, 0x7F, 0x00, 0x00, 0x0F, 0xF0, @@ -1493,27 +1537,29 @@ void wm_init_cursor_data(void) 0x03, 0xC0, 0x0F, 0xE0, 0x1F, 0xF8, 0x07, 0xC0, 0xFF, 0xFF, 0x03, 0x80, 0xFF, 0xFF, 0x01, 0x00, 0xFE, 0x7F, 0x00, 0x00, 0xF0, 0x0F, 0x00}; - static BCursor StopCursor = {/*small*/ - stop_sbm, - stop_smsk, - 16, - 16, - 7, - 7, - /*big*/ - stop_lbm, - stop_lmsk, - 32, - 32, - 15, - 15, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor StopCursor = { + /*small*/ + stop_sbm, + stop_smsk, + 16, + 16, + 7, + 7, + /*big*/ + stop_lbm, + stop_lmsk, + 32, + 32, + 15, + 15, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_STOPCURSOR] = &StopCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Put the cursors in the array ***********************/ } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 701aae20cd3..20f6162f9d4 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3343,14 +3343,16 @@ static const EnumPropertyItem preview_id_type_items[] = { static int previews_clear_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); - ListBase *lb[] = {&bmain->objects, - &bmain->collections, - &bmain->materials, - &bmain->worlds, - &bmain->lights, - &bmain->textures, - &bmain->images, - NULL}; + ListBase *lb[] = { + &bmain->objects, + &bmain->collections, + &bmain->materials, + &bmain->worlds, + &bmain->lights, + &bmain->textures, + &bmain->images, + NULL, + }; int i; const int id_filters = RNA_enum_get(op->ptr, "id_type"); |