diff options
Diffstat (limited to 'source/blender/editors/interface/interface.c')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 1894 |
1 files changed, 947 insertions, 947 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index b6821abf243..1cb51e8f6fa 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -72,16 +72,16 @@ #include "interface_intern.h" -#define MENU_WIDTH 120 -#define MENU_ITEM_HEIGHT 20 -#define MENU_SEP_HEIGHT 6 +#define MENU_WIDTH 120 +#define MENU_ITEM_HEIGHT 20 +#define MENU_SEP_HEIGHT 6 #define PRECISION_FLOAT_MAX 6 #define PRECISION_FLOAT_MAX_POW 1000000 /* pow(10, PRECISION_FLOAT_MAX) */ /* avoid unneeded calls to ui_get_but_val */ #define UI_BUT_VALUE_UNSET DBL_MAX -#define UI_GET_BUT_VALUE_INIT(_but, _value) if (_value == DBL_MAX) { (_value)= ui_get_but_val(_but); } +#define UI_GET_BUT_VALUE_INIT(_but, _value) if (_value == DBL_MAX) { (_value) = ui_get_but_val(_but); } /* * a full doc with API notes can be found in bf-blender/trunk/blender/doc/guides/interface_API.txt @@ -99,41 +99,41 @@ void ui_block_to_window_fl(const ARegion *ar, uiBlock *block, float *x, float *y float gx, gy; int sx, sy, getsizex, getsizey; - getsizex= ar->winrct.xmax-ar->winrct.xmin+1; - getsizey= ar->winrct.ymax-ar->winrct.ymin+1; - sx= ar->winrct.xmin; - sy= ar->winrct.ymin; + getsizex = ar->winrct.xmax - ar->winrct.xmin + 1; + getsizey = ar->winrct.ymax - ar->winrct.ymin + 1; + sx = ar->winrct.xmin; + sy = ar->winrct.ymin; - gx= *x; - gy= *y; + gx = *x; + gy = *y; if (block->panel) { gx += block->panel->ofsx; gy += block->panel->ofsy; } - *x= ((float)sx) + ((float)getsizex)*(0.5f+ 0.5f*(gx*block->winmat[0][0]+ gy*block->winmat[1][0]+ block->winmat[3][0])); - *y= ((float)sy) + ((float)getsizey)*(0.5f+ 0.5f*(gx*block->winmat[0][1]+ gy*block->winmat[1][1]+ block->winmat[3][1])); + *x = ((float)sx) + ((float)getsizex) * (0.5f + 0.5f * (gx * block->winmat[0][0] + gy * block->winmat[1][0] + block->winmat[3][0])); + *y = ((float)sy) + ((float)getsizey) * (0.5f + 0.5f * (gx * block->winmat[0][1] + gy * block->winmat[1][1] + block->winmat[3][1])); } void ui_block_to_window(const ARegion *ar, uiBlock *block, int *x, int *y) { float fx, fy; - fx= *x; - fy= *y; + fx = *x; + fy = *y; ui_block_to_window_fl(ar, block, &fx, &fy); - *x= (int)(fx+0.5f); - *y= (int)(fy+0.5f); + *x = (int)(fx + 0.5f); + *y = (int)(fy + 0.5f); } void ui_block_to_window_rct(const ARegion *ar, uiBlock *block, rctf *graph, rcti *winr) { rctf tmpr; - tmpr= *graph; + tmpr = *graph; ui_block_to_window_fl(ar, block, &tmpr.xmin, &tmpr.ymin); ui_block_to_window_fl(ar, block, &tmpr.xmax, &tmpr.ymax); @@ -143,29 +143,29 @@ void ui_block_to_window_rct(const ARegion *ar, uiBlock *block, rctf *graph, rcti winr->ymax = tmpr.ymax; } -void ui_window_to_block_fl(const ARegion *ar, uiBlock *block, float *x, float *y) /* for mouse cursor */ +void ui_window_to_block_fl(const ARegion *ar, uiBlock *block, float *x, float *y) /* for mouse cursor */ { float a, b, c, d, e, f, px, py; int sx, sy, getsizex, getsizey; - getsizex= ar->winrct.xmax-ar->winrct.xmin+1; - getsizey= ar->winrct.ymax-ar->winrct.ymin+1; - sx= ar->winrct.xmin; - sy= ar->winrct.ymin; + getsizex = ar->winrct.xmax - ar->winrct.xmin + 1; + getsizey = ar->winrct.ymax - ar->winrct.ymin + 1; + sx = ar->winrct.xmin; + sy = ar->winrct.ymin; - a= 0.5f*((float)getsizex)*block->winmat[0][0]; - b= 0.5f*((float)getsizex)*block->winmat[1][0]; - c= 0.5f*((float)getsizex)*(1.0f+block->winmat[3][0]); + a = 0.5f * ((float)getsizex) * block->winmat[0][0]; + b = 0.5f * ((float)getsizex) * block->winmat[1][0]; + c = 0.5f * ((float)getsizex) * (1.0f + block->winmat[3][0]); - d= 0.5f*((float)getsizey)*block->winmat[0][1]; - e= 0.5f*((float)getsizey)*block->winmat[1][1]; - f= 0.5f*((float)getsizey)*(1.0f+block->winmat[3][1]); + d = 0.5f * ((float)getsizey) * block->winmat[0][1]; + e = 0.5f * ((float)getsizey) * block->winmat[1][1]; + f = 0.5f * ((float)getsizey) * (1.0f + block->winmat[3][1]); - px= *x - sx; - py= *y - sy; + px = *x - sx; + py = *y - sy; - *y= (a*(py-f) + d*(c-px))/(a*e-d*b); - *x= (px- b*(*y)- c)/a; + *y = (a * (py - f) + d * (c - px)) / (a * e - d * b); + *x = (px - b * (*y) - c) / a; if (block->panel) { *x -= block->panel->ofsx; @@ -177,19 +177,19 @@ void ui_window_to_block(const ARegion *ar, uiBlock *block, int *x, int *y) { float fx, fy; - fx= *x; - fy= *y; + fx = *x; + fy = *y; ui_window_to_block_fl(ar, block, &fx, &fy); - *x= (int)(fx+0.5f); - *y= (int)(fy+0.5f); + *x = (int)(fx + 0.5f); + *y = (int)(fy + 0.5f); } void ui_window_to_region(const ARegion *ar, int *x, int *y) { - *x-= ar->winrct.xmin; - *y-= ar->winrct.ymin; + *x -= ar->winrct.xmin; + *y -= ar->winrct.ymin; } /* ******************* block calc ************************* */ @@ -198,7 +198,7 @@ void ui_block_translate(uiBlock *block, int x, int y) { uiBut *bt; - for (bt= block->buttons.first; bt; bt=bt->next) { + for (bt = block->buttons.first; bt; bt = bt->next) { bt->x1 += x; bt->y1 += y; bt->x2 += x; @@ -213,16 +213,16 @@ void ui_block_translate(uiBlock *block, int x, int y) static void ui_text_bounds_block(uiBlock *block, float offset) { - uiStyle *style=UI_GetStyle(); + uiStyle *style = UI_GetStyle(); uiBut *bt; - int i = 0, j, x1addval= offset, nextcol; - int lastcol= 0, col= 0; + int i = 0, j, x1addval = offset, nextcol; + int lastcol = 0, col = 0; uiStyleFontSet(&style->widget); - for (bt= block->buttons.first; bt; bt= bt->next) { - if (bt->type!=SEPR) { - j= BLF_width(style->widget.uifont_id, bt->drawstr); + for (bt = block->buttons.first; bt; bt = bt->next) { + if (bt->type != SEPR) { + j = BLF_width(style->widget.uifont_id, bt->drawstr); if (j > i) i = j; } @@ -232,26 +232,26 @@ static void ui_text_bounds_block(uiBlock *block, float offset) } /* cope with multi collumns */ - bt= block->buttons.first; + bt = block->buttons.first; while (bt) { if (bt->next && bt->x1 < bt->next->x1) { - nextcol= 1; + nextcol = 1; col++; } - else nextcol= 0; + else nextcol = 0; bt->x1 = x1addval; bt->x2 = bt->x1 + i + block->bounds; if (col == lastcol) - bt->x2= MAX2(bt->x2, offset + block->minbounds); + bt->x2 = MAX2(bt->x2, offset + block->minbounds); - ui_check_but(bt); // clips text again + ui_check_but(bt); // clips text again if (nextcol) - x1addval+= i + block->bounds; + x1addval += i + block->bounds; - bt= bt->next; + bt = bt->next; } } @@ -260,26 +260,26 @@ void ui_bounds_block(uiBlock *block) uiBut *bt; int xof; - if (block->buttons.first==NULL) { + if (block->buttons.first == NULL) { if (block->panel) { - block->minx= 0.0; block->maxx= block->panel->sizex; - block->miny= 0.0; block->maxy= block->panel->sizey; + block->minx = 0.0; block->maxx = block->panel->sizex; + block->miny = 0.0; block->maxy = block->panel->sizey; } } else { - block->minx= block->miny= 10000; - block->maxx= block->maxy= -10000; + block->minx = block->miny = 10000; + block->maxx = block->maxy = -10000; - bt= block->buttons.first; + bt = block->buttons.first; while (bt) { - if (bt->x1 < block->minx) block->minx= bt->x1; - if (bt->y1 < block->miny) block->miny= bt->y1; + if (bt->x1 < block->minx) block->minx = bt->x1; + if (bt->y1 < block->miny) block->miny = bt->y1; - if (bt->x2 > block->maxx) block->maxx= bt->x2; - if (bt->y2 > block->maxy) block->maxy= bt->y2; + if (bt->x2 > block->maxx) block->maxx = bt->x2; + if (bt->y2 > block->maxy) block->maxy = bt->y2; - bt= bt->next; + bt = bt->next; } block->minx -= block->bounds; @@ -288,22 +288,22 @@ void ui_bounds_block(uiBlock *block) block->maxy += block->bounds; } - block->maxx= block->minx + MAX2(block->maxx - block->minx, block->minbounds); + block->maxx = block->minx + MAX2(block->maxx - block->minx, block->minbounds); /* hardcoded exception... but that one is annoying with larger safety */ - bt= block->buttons.first; - if (bt && strncmp(bt->str, "ERROR", 5)==0) xof= 10; - else xof= 40; - - block->safety.xmin = block->minx-xof; - block->safety.ymin = block->miny-xof; - block->safety.xmax = block->maxx+xof; - block->safety.ymax = block->maxy+xof; + bt = block->buttons.first; + if (bt && strncmp(bt->str, "ERROR", 5) == 0) xof = 10; + else xof = 40; + + block->safety.xmin = block->minx - xof; + block->safety.ymin = block->miny - xof; + block->safety.xmax = block->maxx + xof; + block->safety.ymax = block->maxy + xof; } static void ui_centered_bounds_block(const bContext *C, uiBlock *block) { - wmWindow *window= CTX_wm_window(C); + wmWindow *window = CTX_wm_window(C); int xmax, ymax; int startx, starty; int width, height; @@ -316,8 +316,8 @@ static void ui_centered_bounds_block(const bContext *C, uiBlock *block) ui_bounds_block(block); - width= block->maxx - block->minx; - height= block->maxy - block->miny; + width = block->maxx - block->minx; + height = block->maxy - block->miny; startx = (xmax * 0.5f) - (width * 0.5f); starty = (ymax * 0.5f) - (height * 0.5f); @@ -330,60 +330,60 @@ static void ui_centered_bounds_block(const bContext *C, uiBlock *block) } static void ui_popup_bounds_block(const bContext *C, uiBlock *block, int bounds_calc) { - wmWindow *window= CTX_wm_window(C); + wmWindow *window = CTX_wm_window(C); int startx, starty, endx, endy, width, height, oldwidth, oldheight; int oldbounds, xmax, ymax; - oldbounds= block->bounds; + oldbounds = block->bounds; /* compute mouse position with user defined offset */ ui_bounds_block(block); wm_window_get_size(window, &xmax, &ymax); - oldwidth= block->maxx - block->minx; - oldheight= block->maxy - block->miny; + oldwidth = block->maxx - block->minx; + oldheight = block->maxy - block->miny; /* first we ensure wide enough text bounds */ - if (bounds_calc==UI_BLOCK_BOUNDS_POPUP_MENU) { + if (bounds_calc == UI_BLOCK_BOUNDS_POPUP_MENU) { if (block->flag & UI_BLOCK_LOOP) { - block->bounds= 50; + block->bounds = 50; ui_text_bounds_block(block, block->minx); } } /* next we recompute bounds */ - block->bounds= oldbounds; + block->bounds = oldbounds; ui_bounds_block(block); /* and we adjust the position to fit within window */ - width= block->maxx - block->minx; - height= block->maxy - block->miny; + width = block->maxx - block->minx; + height = block->maxy - block->miny; /* avoid divide by zero below, caused by calling with no UI, but better not crash */ - oldwidth= oldwidth > 0 ? oldwidth : MAX2(1, width); - oldheight= oldheight > 0 ? oldheight : MAX2(1, height); + oldwidth = oldwidth > 0 ? oldwidth : MAX2(1, width); + oldheight = oldheight > 0 ? oldheight : MAX2(1, height); /* offset block based on mouse position, user offset is scaled * along in case we resized the block in ui_text_bounds_block */ - startx= window->eventstate->x + block->minx + (block->mx*width)/oldwidth; - starty= window->eventstate->y + block->miny + (block->my*height)/oldheight; + startx = window->eventstate->x + block->minx + (block->mx * width) / oldwidth; + starty = window->eventstate->y + block->miny + (block->my * height) / oldheight; - if (startx<10) - startx= 10; - if (starty<10) - starty= 10; - - endx= startx+width; - endy= starty+height; - - if (endx>xmax) { - endx= xmax-10; - startx= endx-width; + if (startx < 10) + startx = 10; + if (starty < 10) + starty = 10; + + endx = startx + width; + endy = starty + height; + + if (endx > xmax) { + endx = xmax - 10; + startx = endx - width; } - if (endy>ymax-20) { - endy= ymax-20; - starty= endy-height; + if (endy > ymax - 20) { + endy = ymax - 20; + starty = endy - height; } ui_block_translate(block, startx - block->minx, starty - block->miny); @@ -395,43 +395,43 @@ static void ui_popup_bounds_block(const bContext *C, uiBlock *block, int bounds_ /* used for various cases */ void uiBoundsBlock(uiBlock *block, int addval) { - if (block==NULL) + if (block == NULL) return; - block->bounds= addval; - block->dobounds= UI_BLOCK_BOUNDS; + block->bounds = addval; + block->dobounds = UI_BLOCK_BOUNDS; } /* used for pulldowns */ void uiTextBoundsBlock(uiBlock *block, int addval) { - block->bounds= addval; - block->dobounds= UI_BLOCK_BOUNDS_TEXT; + block->bounds = addval; + block->dobounds = UI_BLOCK_BOUNDS_TEXT; } /* used for block popups */ void uiPopupBoundsBlock(uiBlock *block, int addval, int mx, int my) { - block->bounds= addval; - block->dobounds= UI_BLOCK_BOUNDS_POPUP_MOUSE; - block->mx= mx; - block->my= my; + block->bounds = addval; + block->dobounds = UI_BLOCK_BOUNDS_POPUP_MOUSE; + block->mx = mx; + block->my = my; } /* used for menu popups */ void uiMenuPopupBoundsBlock(uiBlock *block, int addval, int mx, int my) { - block->bounds= addval; - block->dobounds= UI_BLOCK_BOUNDS_POPUP_MENU; - block->mx= mx; - block->my= my; + block->bounds = addval; + block->dobounds = UI_BLOCK_BOUNDS_POPUP_MENU; + block->mx = mx; + block->my = my; } /* used for centered popups, i.e. splash */ void uiCenteredBoundsBlock(uiBlock *block, int addval) { - block->bounds= addval; - block->dobounds= UI_BLOCK_BOUNDS_POPUP_CENTER; + block->bounds = addval; + block->dobounds = UI_BLOCK_BOUNDS_POPUP_CENTER; } void uiExplicitBoundsBlock(uiBlock *block, int minx, int miny, int maxx, int maxy) @@ -452,26 +452,26 @@ static int ui_but_float_precision(uiBut *but, double value) int prec; /* first check if prec is 0 and fallback to a simple default */ - if ((prec= (int)but->a2) == 0) { - prec= (but->hardmax < 10.001f) ? 3 : 2; + if ((prec = (int)but->a2) == 0) { + prec = (but->hardmax < 10.001f) ? 3 : 2; } /* check on the number of decimal places need to display * the number, this is so 0.00001 is not displayed as 0.00, * _but_, this is only for small values si 10.0001 will not get * the same treatment */ - if (value != 0.0 && (value= ABS(value)) < 0.1) { - int value_i= (int)((value * PRECISION_FLOAT_MAX_POW) + 0.5); + if (value != 0.0 && (value = ABS(value)) < 0.1) { + int value_i = (int)((value * PRECISION_FLOAT_MAX_POW) + 0.5); if (value_i != 0) { - const int prec_span= 3; /* show: 0.01001, 5 would allow 0.0100001 for eg. */ + const int prec_span = 3; /* show: 0.01001, 5 would allow 0.0100001 for eg. */ int test_prec; - int prec_min= -1; - int dec_flag= 0; - int i= PRECISION_FLOAT_MAX; + int prec_min = -1; + int dec_flag = 0; + int i = PRECISION_FLOAT_MAX; while (i && value_i) { if (value_i % 10) { - dec_flag |= 1<<i; - prec_min= i; + dec_flag |= 1 << i; + prec_min = i; } value_i /= 10; i--; @@ -480,7 +480,7 @@ static int ui_but_float_precision(uiBut *but, double value) /* even though its a small value, if the second last digit is not 0, use it */ test_prec = prec_min; - dec_flag= (dec_flag >> (prec_min + 1)) & ((1 << prec_span) - 1); + dec_flag = (dec_flag >> (prec_min + 1)) & ((1 << prec_span) - 1); while (dec_flag) { test_prec++; @@ -488,7 +488,7 @@ static int ui_but_float_precision(uiBut *but, double value) } if (test_prec > prec) { - prec= test_prec; + prec = test_prec; } } } @@ -502,17 +502,17 @@ static void ui_draw_linkline(uiLinkLine *line) { rcti rect; - if (line->from==NULL || line->to==NULL) return; + if (line->from == NULL || line->to == NULL) return; - rect.xmin = (line->from->x1+line->from->x2)/2.0f; - rect.ymin = (line->from->y1+line->from->y2)/2.0f; - rect.xmax = (line->to->x1+line->to->x2)/2.0f; - rect.ymax = (line->to->y1+line->to->y2)/2.0f; + rect.xmin = (line->from->x1 + line->from->x2) / 2.0f; + rect.ymin = (line->from->y1 + line->from->y2) / 2.0f; + rect.xmax = (line->to->x1 + line->to->x2) / 2.0f; + rect.ymax = (line->to->y1 + line->to->y2) / 2.0f; if (line->flag & UI_SELECT) - glColor3ub(100,100,100); + glColor3ub(100, 100, 100); else - glColor3ub(0,0,0); + glColor3ub(0, 0, 0); ui_draw_link_bezier(&rect); } @@ -522,16 +522,16 @@ static void ui_draw_links(uiBlock *block) uiBut *but; uiLinkLine *line; - but= block->buttons.first; + but = block->buttons.first; while (but) { - if (but->type==LINK && but->link) { - line= but->link->lines.first; + if (but->type == LINK && but->link) { + line = but->link->lines.first; while (line) { ui_draw_linkline(line); - line= line->next; + line = line->next; } } - but= but->next; + but = but->next; } } @@ -550,7 +550,7 @@ static int ui_but_equals_old(uiBut *but, uiBut *oldbut) if (but->funcN != oldbut->funcN) return 0; if (oldbut->func_arg1 != oldbut && but->func_arg1 != oldbut->func_arg1) return 0; if (oldbut->func_arg2 != oldbut && but->func_arg2 != oldbut->func_arg2) return 0; - if (!but->funcN && ((but->poin != oldbut->poin && (uiBut*)oldbut->poin != oldbut) || but->pointype != oldbut->pointype)) return 0; + if (!but->funcN && ((but->poin != oldbut->poin && (uiBut *)oldbut->poin != oldbut) || but->pointype != oldbut->pointype)) return 0; if (but->optype != oldbut->optype) return 0; return 1; @@ -563,26 +563,26 @@ static void ui_but_update_linklines(uiBlock *block, uiBut *oldbut, uiBut *newbut uiBut *but; /* if active button is LINK */ - if (newbut->type==LINK && newbut->link) { + if (newbut->type == LINK && newbut->link) { SWAP(uiLink *, oldbut->link, newbut->link); - for (line= oldbut->link->lines.first; line; line= line->next) { - if (line->to==newbut) - line->to= oldbut; - if (line->from==newbut) - line->from= oldbut; + for (line = oldbut->link->lines.first; line; line = line->next) { + if (line->to == newbut) + line->to = oldbut; + if (line->from == newbut) + line->from = oldbut; } } /* check all other button links */ - for (but= block->buttons.first; but; but= but->next) { - if (but!=newbut && but->type==LINK && but->link) { - for (line= but->link->lines.first; line; line= line->next) { - if (line->to==newbut) - line->to= oldbut; - if (line->from==newbut) - line->from= oldbut; + for (but = block->buttons.first; but; but = but->next) { + if (but != newbut && but->type == LINK && but->link) { + for (line = but->link->lines.first; line; line = line->next) { + if (line->to == newbut) + line->to = oldbut; + if (line->from == newbut) + line->from = oldbut; } } } @@ -591,14 +591,14 @@ static void ui_but_update_linklines(uiBlock *block, uiBut *oldbut, uiBut *newbut static int ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBut **butpp) { uiBlock *oldblock; - uiBut *oldbut, *but= *butpp; - int found= 0; + uiBut *oldbut, *but = *butpp; + int found = 0; - oldblock= block->oldblock; + oldblock = block->oldblock; if (!oldblock) return found; - for (oldbut=oldblock->buttons.first; oldbut; oldbut=oldbut->next) { + for (oldbut = oldblock->buttons.first; oldbut; oldbut = oldbut->next) { if (ui_but_equals_old(oldbut, but)) { if (oldbut->active) { #if 0 @@ -622,19 +622,19 @@ static int ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBut // but->softmax= oldbut->softmax; // but->linkto[0]= oldbut->linkto[0]; // but->linkto[1]= oldbut->linkto[1]; - found= 1; + found = 1; // oldbut->active= NULL; /* move button over from oldblock to new block */ BLI_remlink(&oldblock->buttons, oldbut); BLI_insertlink(&block->buttons, but, oldbut); - oldbut->block= block; - *butpp= oldbut; + oldbut->block = block; + *butpp = oldbut; /* still stuff needs to be copied */ - oldbut->x1= but->x1; oldbut->y1= but->y1; - oldbut->x2= but->x2; oldbut->y2= but->y2; - oldbut->context= but->context; /* set by Layout */ + oldbut->x1 = but->x1; oldbut->y1 = but->y1; + oldbut->x2 = but->x2; oldbut->y2 = but->y2; + oldbut->context = but->context; /* set by Layout */ /* typically the same pointers, but not on undo/redo */ /* XXX some menu buttons store button itself in but->poin. Ugly */ @@ -646,7 +646,7 @@ static int ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBut /* copy hardmin for list rows to prevent 'sticking' highlight to mouse position * when scrolling without moving mouse (see [#28432]) */ if (ELEM(oldbut->type, ROW, LISTROW)) - oldbut->hardmax= but->hardmax; + oldbut->hardmax = but->hardmax; ui_but_update_linklines(block, oldbut, but); @@ -676,27 +676,27 @@ int uiButActiveOnly(const bContext *C, uiBlock *block, uiBut *but) { uiBlock *oldblock; uiBut *oldbut; - int activate= 0, found= 0, isactive= 0; + int activate = 0, found = 0, isactive = 0; - oldblock= block->oldblock; + oldblock = block->oldblock; if (!oldblock) - activate= 1; + activate = 1; else { - for (oldbut=oldblock->buttons.first; oldbut; oldbut=oldbut->next) { + for (oldbut = oldblock->buttons.first; oldbut; oldbut = oldbut->next) { if (ui_but_equals_old(oldbut, but)) { - found= 1; + found = 1; if (oldbut->active) - isactive= 1; + isactive = 1; break; } } } - if (activate || found==0) { + if (activate || found == 0) { ui_button_activate_do( (bContext *)C, CTX_wm_region(C), but); } - else if (found && isactive==0) { + else if (found && isactive == 0) { BLI_remlink(&block->buttons, but); ui_free_but(C, but); @@ -715,7 +715,7 @@ static int ui_but_is_rna_undo(uiBut *but) * we could disable undo for buttons with no ID too but may have * unforeseen consequences, so best check for ID's we _know_ are not * handled by undo - campbell */ - ID *id= but->rnapoin.id.data; + ID *id = but->rnapoin.id.data; if (ID_CHECK_UNDO(id) == FALSE) { return FALSE; } @@ -736,34 +736,34 @@ static void ui_menu_block_set_keyaccels(uiBlock *block) { uiBut *but; - unsigned int menu_key_mask= 0; + unsigned int menu_key_mask = 0; unsigned char menu_key; const char *str_pt; int pass; - int tot_missing= 0; + int tot_missing = 0; /* only do it before bounding */ if (block->minx != block->maxx) return; - for (pass=0; pass<2; pass++) { + for (pass = 0; pass < 2; pass++) { /* 2 Passes, on for first letter only, second for any letter if first fails * fun first pass on all buttons so first word chars always get first priority */ - for (but=block->buttons.first; but; but=but->next) { + for (but = block->buttons.first; but; but = but->next) { if (!ELEM4(but->type, BUT, MENU, BLOCK, PULLDOWN) || (but->flag & UI_HIDDEN)) { /* pass */ } - else if (but->menu_key=='\0') { + else if (but->menu_key == '\0') { if (but->str) { - for (str_pt= but->str; *str_pt; ) { - menu_key= tolower(*str_pt); - if ((menu_key >= 'a' && menu_key <= 'z') && !(menu_key_mask & 1<<(menu_key-'a'))) { - menu_key_mask |= 1<<(menu_key-'a'); + for (str_pt = but->str; *str_pt; ) { + menu_key = tolower(*str_pt); + if ((menu_key >= 'a' && menu_key <= 'z') && !(menu_key_mask & 1 << (menu_key - 'a'))) { + menu_key_mask |= 1 << (menu_key - 'a'); break; } - if (pass==0) { + if (pass == 0) { /* Skip to next delimiter on first pass (be picky) */ while (isalpha(*str_pt)) str_pt++; @@ -778,7 +778,7 @@ static void ui_menu_block_set_keyaccels(uiBlock *block) } if (*str_pt) { - but->menu_key= menu_key; + but->menu_key = menu_key; } else { /* run second pass */ @@ -786,7 +786,7 @@ static void ui_menu_block_set_keyaccels(uiBlock *block) } /* if all keys have been used just exit, unlikely */ - if (menu_key_mask == (1<<26)-1) { + if (menu_key_mask == (1 << 26) - 1) { return; } } @@ -807,9 +807,9 @@ void ui_but_add_shortcut(uiBut *but, const char *shortcut_str, const short do_st { if (do_strip) { - char *cpoin= strchr(but->str, '|'); + char *cpoin = strchr(but->str, '|'); if (cpoin) { - *cpoin= '\0'; + *cpoin = '\0'; } } @@ -840,36 +840,36 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block) /* for menu's */ MenuType *mt; - IDProperty *prop_menu= NULL; - IDProperty *prop_menu_name= NULL; + IDProperty *prop_menu = NULL; + IDProperty *prop_menu_name = NULL; /* only do it before bounding */ if (block->minx != block->maxx) return; - for (but=block->buttons.first; but; but=but->next) { + for (but = block->buttons.first; but; but = but->next) { if (but->optype) { - IDProperty *prop= (but->opptr)? but->opptr->data: NULL; + IDProperty *prop = (but->opptr) ? but->opptr->data : NULL; if (WM_key_event_operator_string(C, but->optype->idname, but->opcontext, prop, TRUE, - buf, sizeof(buf))) + buf, sizeof(buf))) { ui_but_add_shortcut(but, buf, FALSE); } } - else if ((mt= uiButGetMenuType(but))) { + else if ((mt = uiButGetMenuType(but))) { /* only allocate menu property once */ if (prop_menu == NULL) { /* annoying, create a property */ IDPropertyTemplate val = {0}; - prop_menu= IDP_New(IDP_GROUP, &val, __func__); /* dummy, name is unimportant */ - IDP_AddToGroup(prop_menu, (prop_menu_name= IDP_NewString("", "name", sizeof(mt->idname)))); + prop_menu = IDP_New(IDP_GROUP, &val, __func__); /* dummy, name is unimportant */ + IDP_AddToGroup(prop_menu, (prop_menu_name = IDP_NewString("", "name", sizeof(mt->idname)))); } IDP_AssignString(prop_menu_name, mt->idname, sizeof(mt->idname)); if (WM_key_event_operator_string(C, "WM_OT_call_menu", WM_OP_INVOKE_REGION_WIN, prop_menu, FALSE, - buf, sizeof(buf))) + buf, sizeof(buf))) { ui_but_add_shortcut(but, buf, FALSE); } @@ -888,41 +888,41 @@ static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block) void uiEndBlock(const bContext *C, uiBlock *block) { uiBut *but; - Scene *scene= CTX_data_scene(C); + Scene *scene = CTX_data_scene(C); /* inherit flags from 'old' buttons that was drawn here previous, based * on matching buttons, we need this to make button event handling non * blocking, while still allowing buttons to be remade each redraw as it * is expected by blender code */ - for (but=block->buttons.first; but; but=but->next) { + for (but = block->buttons.first; but; but = but->next) { if (ui_but_update_from_old_block(C, block, &but)) ui_check_but(but); /* temp? Proper check for greying out */ if (but->optype) { - wmOperatorType *ot= but->optype; + wmOperatorType *ot = but->optype; if (but->context) - CTX_store_set((bContext*)C, but->context); + CTX_store_set((bContext *)C, but->context); - if (ot == NULL || WM_operator_poll_context((bContext*)C, ot, but->opcontext)==0) { + if (ot == NULL || WM_operator_poll_context((bContext *)C, ot, but->opcontext) == 0) { but->flag |= UI_BUT_DISABLED; but->lock = 1; } if (but->context) - CTX_store_set((bContext*)C, NULL); + CTX_store_set((bContext *)C, NULL); } - ui_but_anim_flag(but, (scene)? scene->r.cfra: 0.0f); + ui_but_anim_flag(but, (scene) ? scene->r.cfra : 0.0f); } if (block->oldblock) { - block->auto_open= block->oldblock->auto_open; - block->auto_open_last= block->oldblock->auto_open_last; - block->tooltipdisabled= block->oldblock->tooltipdisabled; + block->auto_open = block->oldblock->auto_open; + block->auto_open_last = block->oldblock->auto_open_last; + block->tooltipdisabled = block->oldblock->tooltipdisabled; - block->oldblock= NULL; + block->oldblock = NULL; } /* handle pending stuff */ @@ -939,10 +939,10 @@ void uiEndBlock(const bContext *C, uiBlock *block) else if (block->dobounds == UI_BLOCK_BOUNDS_POPUP_CENTER) ui_centered_bounds_block(C, block); else if (block->dobounds) ui_popup_bounds_block(C, block, block->dobounds); - if (block->minx==0.0f && block->maxx==0.0f) uiBoundsBlock(block, 0); + if (block->minx == 0.0f && block->maxx == 0.0f) uiBoundsBlock(block, 0); if (block->flag & UI_BUT_ALIGN) uiBlockEndAlign(block); - block->endblock= 1; + block->endblock = 1; } /* ************** BLOCK DRAWING FUNCTION ************* */ @@ -950,16 +950,16 @@ void uiEndBlock(const bContext *C, uiBlock *block) void ui_fontscale(short *points, float aspect) { if (aspect < 0.9f || aspect > 1.1f) { - float pointsf= *points; + float pointsf = *points; /* for some reason scaling fonts goes too fast compared to widget size */ - aspect= sqrt(aspect); + aspect = sqrt(aspect); pointsf /= aspect; if (aspect > 1.0f) - *points= ceilf(pointsf); + *points = ceilf(pointsf); else - *points= floorf(pointsf); + *points = floorf(pointsf); } } @@ -969,42 +969,42 @@ static void ui_but_to_pixelrect(rcti *rect, const ARegion *ar, uiBlock *block, u float gx, gy; float getsizex, getsizey; - getsizex= ar->winx; - getsizey= ar->winy; + getsizex = ar->winx; + getsizey = ar->winy; - gx= (but?but->x1:block->minx) + (block->panel?block->panel->ofsx:0.0f); - gy= (but?but->y1:block->miny) + (block->panel?block->panel->ofsy:0.0f); + gx = (but ? but->x1 : block->minx) + (block->panel ? block->panel->ofsx : 0.0f); + gy = (but ? but->y1 : block->miny) + (block->panel ? block->panel->ofsy : 0.0f); - rect->xmin = floorf(getsizex*(0.5f+ 0.5f*(gx*block->winmat[0][0]+ gy*block->winmat[1][0]+ block->winmat[3][0]))); - rect->ymin = floorf(getsizey*(0.5f+ 0.5f*(gx*block->winmat[0][1]+ gy*block->winmat[1][1]+ block->winmat[3][1]))); + rect->xmin = floorf(getsizex * (0.5f + 0.5f * (gx * block->winmat[0][0] + gy * block->winmat[1][0] + block->winmat[3][0]))); + rect->ymin = floorf(getsizey * (0.5f + 0.5f * (gx * block->winmat[0][1] + gy * block->winmat[1][1] + block->winmat[3][1]))); - gx= (but?but->x2:block->maxx) + (block->panel?block->panel->ofsx:0.0f); - gy= (but?but->y2:block->maxy) + (block->panel?block->panel->ofsy:0.0f); + gx = (but ? but->x2 : block->maxx) + (block->panel ? block->panel->ofsx : 0.0f); + gy = (but ? but->y2 : block->maxy) + (block->panel ? block->panel->ofsy : 0.0f); - rect->xmax = floorf(getsizex*(0.5f+ 0.5f*(gx*block->winmat[0][0]+ gy*block->winmat[1][0]+ block->winmat[3][0]))); - rect->ymax = floorf(getsizey*(0.5f+ 0.5f*(gx*block->winmat[0][1]+ gy*block->winmat[1][1]+ block->winmat[3][1]))); + rect->xmax = floorf(getsizex * (0.5f + 0.5f * (gx * block->winmat[0][0] + gy * block->winmat[1][0] + block->winmat[3][0]))); + rect->ymax = floorf(getsizey * (0.5f + 0.5f * (gx * block->winmat[0][1] + gy * block->winmat[1][1] + block->winmat[3][1]))); } /* uses local copy of style, to scale things down, and allow widgets to change stuff */ void uiDrawBlock(const bContext *C, uiBlock *block) { - uiStyle style= *UI_GetStyle(); // XXX pass on as arg + uiStyle style = *UI_GetStyle(); // XXX pass on as arg ARegion *ar; uiBut *but; rcti rect; int multisample_enabled; /* get menu region or area region */ - ar= CTX_wm_menu(C); + ar = CTX_wm_menu(C); if (!ar) - ar= CTX_wm_region(C); + ar = CTX_wm_region(C); if (!block->endblock) uiEndBlock(C, block); /* disable AA, makes widgets too blurry */ - multisample_enabled= glIsEnabled(GL_MULTISAMPLE_ARB); + multisample_enabled = glIsEnabled(GL_MULTISAMPLE_ARB); if (multisample_enabled) glDisable(GL_MULTISAMPLE_ARB); @@ -1027,7 +1027,7 @@ void uiDrawBlock(const bContext *C, uiBlock *block) glPushMatrix(); glLoadIdentity(); - wmOrtho2(-0.01f, ar->winx-0.01f, -0.01f, ar->winy-0.01f); + wmOrtho2(-0.01f, ar->winx - 0.01f, -0.01f, ar->winy - 0.01f); /* back */ if (block->flag & UI_BLOCK_LOOP) @@ -1036,8 +1036,8 @@ void uiDrawBlock(const bContext *C, uiBlock *block) ui_draw_aligned_panel(&style, block, &rect); /* widgets */ - for (but= block->buttons.first; but; but= but->next) { - if (!(but->flag & (UI_HIDDEN|UI_SCROLLED))) { + for (but = block->buttons.first; but; but = but->next) { + if (!(but->flag & (UI_HIDDEN | UI_SCROLLED))) { ui_but_to_pixelrect(&rect, ar, block, but); /* XXX: figure out why invalid coordinates happen when closing render window */ @@ -1063,64 +1063,64 @@ void uiDrawBlock(const bContext *C, uiBlock *block) static void ui_is_but_sel(uiBut *but, double *value) { - short is_push=0, is_true=1; + short is_push = 0, is_true = 1; - if (ELEM3(but->type, TOGN, ICONTOGN, OPTIONN)) is_true= 0; + if (ELEM3(but->type, TOGN, ICONTOGN, OPTIONN)) is_true = 0; - if ( but->bit ) { + if (but->bit) { int lvalue; UI_GET_BUT_VALUE_INIT(but, *value) - lvalue= (int)*value; - if ( BTST(lvalue, (but->bitnr)) ) is_push= is_true; - else is_push= !is_true; + lvalue = (int)*value; + if (BTST(lvalue, (but->bitnr)) ) is_push = is_true; + else is_push = !is_true; } else { - switch(but->type) { - case BUT: - is_push= 2; - break; - case HOTKEYEVT: - case KEYEVT: - is_push= 2; - break; - case TOGBUT: - case TOG: - case TOGR: - case TOG3: - case BUT_TOGDUAL: - case ICONTOG: - case OPTION: - UI_GET_BUT_VALUE_INIT(but, *value) - if (*value != (double)but->hardmin) is_push= 1; - break; - case ICONTOGN: - case TOGN: - case OPTIONN: - UI_GET_BUT_VALUE_INIT(but, *value) - if (*value==0.0) is_push= 1; - break; - case ROW: - case LISTROW: - UI_GET_BUT_VALUE_INIT(but, *value) - /* support for rna enum buts */ - if (but->rnaprop && (RNA_property_flag(but->rnaprop) & PROP_ENUM_FLAG)) { - if ((int)*value & (int)but->hardmax) is_push= 1; - } - else { - if (*value == (double)but->hardmax) is_push= 1; - } - break; - case COL: - is_push= 2; - break; - default: - is_push= 2; - break; + switch (but->type) { + case BUT: + is_push = 2; + break; + case HOTKEYEVT: + case KEYEVT: + is_push = 2; + break; + case TOGBUT: + case TOG: + case TOGR: + case TOG3: + case BUT_TOGDUAL: + case ICONTOG: + case OPTION: + UI_GET_BUT_VALUE_INIT(but, *value) + if (*value != (double)but->hardmin) is_push = 1; + break; + case ICONTOGN: + case TOGN: + case OPTIONN: + UI_GET_BUT_VALUE_INIT(but, *value) + if (*value == 0.0) is_push = 1; + break; + case ROW: + case LISTROW: + UI_GET_BUT_VALUE_INIT(but, *value) + /* support for rna enum buts */ + if (but->rnaprop && (RNA_property_flag(but->rnaprop) & PROP_ENUM_FLAG)) { + if ((int)*value & (int)but->hardmax) is_push = 1; + } + else { + if (*value == (double)but->hardmax) is_push = 1; + } + break; + case COL: + is_push = 2; + break; + default: + is_push = 2; + break; } } - if (is_push==2); - else if (is_push==1) but->flag |= UI_SELECT; + if (is_push == 2) ; + else if (is_push == 1) but->flag |= UI_SELECT; else but->flag &= ~UI_SELECT; } @@ -1128,12 +1128,12 @@ static uiBut *ui_find_inlink(uiBlock *block, void *poin) { uiBut *but; - but= block->buttons.first; + but = block->buttons.first; while (but) { - if (but->type==INLINK) { + if (but->type == INLINK) { if (but->poin == poin) return but; } - but= but->next; + but = but->next; } return NULL; } @@ -1142,10 +1142,10 @@ static void ui_add_link_line(ListBase *listb, uiBut *but, uiBut *bt) { uiLinkLine *line; - line= MEM_callocN(sizeof(uiLinkLine), "linkline"); + line = MEM_callocN(sizeof(uiLinkLine), "linkline"); BLI_addtail(listb, line); - line->from= but; - line->to= bt; + line->from = but; + line->to = bt; } uiBut *uiFindInlink(uiBlock *block, void *poin) @@ -1160,31 +1160,31 @@ void uiComposeLinks(uiBlock *block) void ***ppoin; int a; - but= block->buttons.first; + but = block->buttons.first; while (but) { - if (but->type==LINK) { - link= but->link; + if (but->type == LINK) { + link = but->link; /* for all pointers in the array */ if (link) { if (link->ppoin) { - ppoin= link->ppoin; - for (a=0; a < *(link->totlink); a++) { - bt= ui_find_inlink(block, (*ppoin)[a] ); + ppoin = link->ppoin; + for (a = 0; a < *(link->totlink); a++) { + bt = ui_find_inlink(block, (*ppoin)[a]); if (bt) { ui_add_link_line(&link->lines, but, bt); } } } else if (link->poin) { - bt= ui_find_inlink(block, *(link->poin) ); + bt = ui_find_inlink(block, *(link->poin) ); if (bt) { ui_add_link_line(&link->lines, but, bt); } } } } - but= but->next; + but = but->next; } } @@ -1194,15 +1194,15 @@ void uiComposeLinks(uiBlock *block) void uiBlockSetButLock(uiBlock *block, int val, const char *lockstr) { if (val) { - block->lock= val ? 1:0; - block->lockstr= lockstr; + block->lock = val ? 1 : 0; + block->lockstr = lockstr; } } void uiBlockClearButLock(uiBlock *block) { - block->lock= 0; - block->lockstr= NULL; + block->lock = 0; + block->lockstr = NULL; } /* *************************************************************** */ @@ -1214,22 +1214,22 @@ void ui_delete_linkline(uiLinkLine *line, uiBut *but) BLI_remlink(&but->link->lines, line); - link= line->from->link; + link = line->from->link; /* are there more pointers allowed? */ if (link->ppoin) { - if (*(link->totlink)==1) { - *(link->totlink)= 0; + if (*(link->totlink) == 1) { + *(link->totlink) = 0; MEM_freeN(*(link->ppoin)); - *(link->ppoin)= NULL; + *(link->ppoin) = NULL; } else { - b= 0; - for (a=0; a< (*(link->totlink)); a++) { + b = 0; + for (a = 0; a < (*(link->totlink)); a++) { - if ( (*(link->ppoin))[a] != line->to->poin ) { - (*(link->ppoin))[b]= (*(link->ppoin))[a]; + if ( (*(link->ppoin))[a] != line->to->poin) { + (*(link->ppoin))[b] = (*(link->ppoin))[a]; b++; } } @@ -1237,7 +1237,7 @@ void ui_delete_linkline(uiLinkLine *line, uiBut *but) } } else { - *(link->poin)= NULL; + *(link->poin) = NULL; } MEM_freeN(line); @@ -1259,32 +1259,32 @@ void ui_get_but_vectorf(uiBut *but, float vec[3]) } if (but->rnaprop) { - prop= but->rnaprop; + prop = but->rnaprop; - vec[0]= vec[1]= vec[2]= 0.0f; + vec[0] = vec[1] = vec[2] = 0.0f; if (RNA_property_type(prop) == PROP_FLOAT) { - tot= RNA_property_array_length(&but->rnapoin, prop); - tot= MIN2(tot, 3); + tot = RNA_property_array_length(&but->rnapoin, prop); + tot = MIN2(tot, 3); - for (a=0; a<tot; a++) - vec[a]= RNA_property_float_get_index(&but->rnapoin, prop, a); + for (a = 0; a < tot; a++) + vec[a] = RNA_property_float_get_index(&but->rnapoin, prop, a); } } else if (but->pointype == CHA) { - char *cp= (char *)but->poin; - vec[0]= ((float)cp[0])/255.0f; - vec[1]= ((float)cp[1])/255.0f; - vec[2]= ((float)cp[2])/255.0f; + char *cp = (char *)but->poin; + vec[0] = ((float)cp[0]) / 255.0f; + vec[1] = ((float)cp[1]) / 255.0f; + vec[2] = ((float)cp[2]) / 255.0f; } else if (but->pointype == FLO) { - float *fp= (float *)but->poin; + float *fp = (float *)but->poin; copy_v3_v3(vec, fp); } else { - if (but->editvec==NULL) { + if (but->editvec == NULL) { fprintf(stderr, "ui_get_but_vectorf: can't get color, should never happen\n"); - vec[0]= vec[1]= vec[2]= 0.0f; + vec[0] = vec[1] = vec[2] = 0.0f; } } @@ -1303,35 +1303,35 @@ void ui_set_but_vectorf(uiBut *but, const float vec[3]) } if (but->rnaprop) { - prop= but->rnaprop; + prop = but->rnaprop; if (RNA_property_type(prop) == PROP_FLOAT) { int tot; int a; - tot= RNA_property_array_length(&but->rnapoin, prop); - tot= MIN2(tot, 3); + tot = RNA_property_array_length(&but->rnapoin, prop); + tot = MIN2(tot, 3); - for (a=0; a<tot; a++) { + for (a = 0; a < tot; a++) { RNA_property_float_set_index(&but->rnapoin, prop, a, vec[a]); } } } else if (but->pointype == CHA) { - char *cp= (char *)but->poin; - cp[0]= (char)(0.5f + vec[0]*255.0f); - cp[1]= (char)(0.5f + vec[1]*255.0f); - cp[2]= (char)(0.5f + vec[2]*255.0f); + char *cp = (char *)but->poin; + cp[0] = (char)(0.5f + vec[0] * 255.0f); + cp[1] = (char)(0.5f + vec[1] * 255.0f); + cp[2] = (char)(0.5f + vec[2] * 255.0f); } else if (but->pointype == FLO) { - float *fp= (float *)but->poin; + float *fp = (float *)but->poin; copy_v3_v3(fp, vec); } } int ui_is_but_float(uiBut *but) { - if (but->pointype==FLO && but->poin) + if (but->pointype == FLO && but->poin) return 1; if (but->rnaprop && RNA_property_type(but->rnaprop) == PROP_FLOAT) @@ -1342,8 +1342,8 @@ int ui_is_but_float(uiBut *but) int ui_is_but_unit(uiBut *but) { - UnitSettings *unit= but->block->unit; - const int unit_type= uiButGetUnitType(but); + UnitSettings *unit = but->block->unit; + const int unit_type = uiButGetUnitType(but); if (unit_type == PROP_UNIT_NONE) return 0; @@ -1368,7 +1368,7 @@ int ui_is_but_unit(uiBut *but) int ui_is_but_rna_valid(uiBut *but) { - if (but->rnaprop==NULL || RNA_struct_contains_property(&but->rnapoin, but->rnaprop)) { + if (but->rnaprop == NULL || RNA_struct_contains_property(&but->rnapoin, but->rnaprop)) { return TRUE; } else { @@ -1383,61 +1383,61 @@ double ui_get_but_val(uiBut *but) double value = 0.0; if (but->editval) { return *(but->editval); } - if (but->poin==NULL && but->rnapoin.data==NULL) return 0.0; + if (but->poin == NULL && but->rnapoin.data == NULL) return 0.0; if (but->rnaprop) { - prop= but->rnaprop; + prop = but->rnaprop; - switch(RNA_property_type(prop)) { + switch (RNA_property_type(prop)) { case PROP_BOOLEAN: if (RNA_property_array_check(prop)) - value= RNA_property_boolean_get_index(&but->rnapoin, prop, but->rnaindex); + value = RNA_property_boolean_get_index(&but->rnapoin, prop, but->rnaindex); else - value= RNA_property_boolean_get(&but->rnapoin, prop); + value = RNA_property_boolean_get(&but->rnapoin, prop); break; case PROP_INT: if (RNA_property_array_check(prop)) - value= RNA_property_int_get_index(&but->rnapoin, prop, but->rnaindex); + value = RNA_property_int_get_index(&but->rnapoin, prop, but->rnaindex); else - value= RNA_property_int_get(&but->rnapoin, prop); + value = RNA_property_int_get(&but->rnapoin, prop); break; case PROP_FLOAT: if (RNA_property_array_check(prop)) - value= RNA_property_float_get_index(&but->rnapoin, prop, but->rnaindex); + value = RNA_property_float_get_index(&but->rnapoin, prop, but->rnaindex); else - value= RNA_property_float_get(&but->rnapoin, prop); + value = RNA_property_float_get(&but->rnapoin, prop); break; case PROP_ENUM: - value= RNA_property_enum_get(&but->rnapoin, prop); + value = RNA_property_enum_get(&but->rnapoin, prop); break; default: - value= 0.0; + value = 0.0; break; } } - else if (but->type== HSVSLI) { + else if (but->type == HSVSLI) { float h, s, v, *fp; - fp= (but->editvec)? but->editvec: (float *)but->poin; + fp = (but->editvec) ? but->editvec : (float *)but->poin; rgb_to_hsv(fp[0], fp[1], fp[2], &h, &s, &v); - switch(but->str[0]) { - case 'H': value= h; break; - case 'S': value= s; break; - case 'V': value= v; break; + switch (but->str[0]) { + case 'H': value = h; break; + case 'S': value = s; break; + case 'V': value = v; break; } } - else if ( but->pointype == CHA ) { - value= *(char *)but->poin; + else if (but->pointype == CHA) { + value = *(char *)but->poin; } - else if ( but->pointype == SHO ) { - value= *(short *)but->poin; + else if (but->pointype == SHO) { + value = *(short *)but->poin; } - else if ( but->pointype == INT ) { - value= *(int *)but->poin; + else if (but->pointype == INT) { + value = *(int *)but->poin; } - else if ( but->pointype == FLO ) { - value= *(float *)but->poin; + else if (but->pointype == FLO) { + value = *(float *)but->poin; } return value; @@ -1449,10 +1449,10 @@ void ui_set_but_val(uiBut *but, double value) /* value is a hsv value: convert to rgb */ if (but->rnaprop) { - prop= but->rnaprop; + prop = but->rnaprop; if (RNA_property_editable(&but->rnapoin, prop)) { - switch(RNA_property_type(prop)) { + switch (RNA_property_type(prop)) { case PROP_BOOLEAN: if (RNA_property_array_length(&but->rnapoin, prop)) RNA_property_boolean_set_index(&but->rnapoin, prop, but->rnaindex, value); @@ -1473,7 +1473,7 @@ void ui_set_but_val(uiBut *but, double value) break; case PROP_ENUM: if (RNA_property_flag(prop) & PROP_ENUM_FLAG) { - int ivalue= (int)value; + int ivalue = (int)value; ivalue ^= RNA_property_enum_get(&but->rnapoin, prop); /* toggle for enum/flag buttons */ RNA_property_enum_set(&but->rnapoin, prop, ivalue); } @@ -1488,56 +1488,56 @@ void ui_set_but_val(uiBut *but, double value) /* we can't be sure what RNA set functions actually do, * so leave this unset */ - value= UI_BUT_VALUE_UNSET; + value = UI_BUT_VALUE_UNSET; } - else if (but->pointype==0); - else if (but->type==HSVSLI ) { + else if (but->pointype == 0) ; + else if (but->type == HSVSLI) { float h, s, v, *fp; - fp= (but->editvec)? but->editvec: (float *)but->poin; + fp = (but->editvec) ? but->editvec : (float *)but->poin; rgb_to_hsv(fp[0], fp[1], fp[2], &h, &s, &v); - switch(but->str[0]) { - case 'H': h= value; break; - case 'S': s= value; break; - case 'V': v= value; break; + switch (but->str[0]) { + case 'H': h = value; break; + case 'S': s = value; break; + case 'V': v = value; break; } - hsv_to_rgb(h, s, v, fp, fp+1, fp+2); + hsv_to_rgb(h, s, v, fp, fp + 1, fp + 2); } else { /* first do rounding */ - if (but->pointype==CHA) - value= (char)floor(value+0.5); - else if (but->pointype==SHO ) { + if (but->pointype == CHA) + value = (char)floor(value + 0.5); + else if (but->pointype == SHO) { /* gcc 3.2.1 seems to have problems * casting a double like 32772.0 to * a short so we cast to an int, then * to a short */ int gcckludge; - gcckludge = (int) floor(value+0.5); - value= (short)gcckludge; + gcckludge = (int) floor(value + 0.5); + value = (short)gcckludge; } - else if (but->pointype==INT ) - value= (int)floor(value+0.5); - else if (but->pointype==FLO ) { - float fval= (float)value; - if (fval>= -0.00001f && fval<= 0.00001f) fval= 0.0f; /* prevent negative zero */ - value= fval; + else if (but->pointype == INT) + value = (int)floor(value + 0.5); + else if (but->pointype == FLO) { + float fval = (float)value; + if (fval >= -0.00001f && fval <= 0.00001f) fval = 0.0f; /* prevent negative zero */ + value = fval; } /* then set value with possible edit override */ if (but->editval) - value= *but->editval= value; - else if (but->pointype==CHA) - value= *((char *)but->poin)= (char)value; - else if (but->pointype==SHO) - value= *((short *)but->poin)= (short)value; - else if (but->pointype==INT) - value= *((int *)but->poin)= (int)value; - else if (but->pointype==FLO) - value= *((float *)but->poin)= (float)value; + value = *but->editval = value; + else if (but->pointype == CHA) + value = *((char *)but->poin) = (char)value; + else if (but->pointype == SHO) + value = *((short *)but->poin) = (short)value; + else if (but->pointype == INT) + value = *((int *)but->poin) = (int)value; + else if (but->pointype == FLO) + value = *((float *)but->poin) = (float)value; } /* update select flag */ @@ -1549,15 +1549,15 @@ int ui_get_but_string_max_length(uiBut *but) if (ELEM(but->type, TEX, SEARCH_MENU)) return but->hardmax; else if (but->type == IDPOIN) - return MAX_ID_NAME-2; + return MAX_ID_NAME - 2; else return UI_MAX_DRAW_STR; } static double ui_get_but_scale_unit(uiBut *but, double value) { - UnitSettings *unit= but->block->unit; - int unit_type= uiButGetUnitType(but); + UnitSettings *unit = but->block->unit; + int unit_type = uiButGetUnitType(but); if (unit_type == PROP_UNIT_LENGTH) { return value * (double)unit->scale_length; @@ -1569,7 +1569,7 @@ static double ui_get_but_scale_unit(uiBut *but, double value) return value * pow(unit->scale_length, 3); } else if (unit_type == PROP_UNIT_TIME) { /* WARNING - using evil_C :| */ - Scene *scene= CTX_data_scene(but->block->evil_C); + Scene *scene = CTX_data_scene(but->block->evil_C); return FRA2TIME(value); } else { @@ -1581,14 +1581,14 @@ static double ui_get_but_scale_unit(uiBut *but, double value) void ui_convert_to_unit_alt_name(uiBut *but, char *str, size_t maxlen) { if (ui_is_but_unit(but)) { - UnitSettings *unit= but->block->unit; - int unit_type= uiButGetUnitType(but); + UnitSettings *unit = but->block->unit; + int unit_type = uiButGetUnitType(but); char *orig_str; - orig_str= MEM_callocN(sizeof(char)*maxlen + 1, "textedit sub str"); + orig_str = MEM_callocN(sizeof(char) * maxlen + 1, "textedit sub str"); memcpy(orig_str, str, maxlen); - bUnit_ToUnitAltName(str, maxlen, orig_str, unit->system, unit_type>>16); + bUnit_ToUnitAltName(str, maxlen, orig_str, unit->system, unit_type >> 16); MEM_freeN(orig_str); } @@ -1596,29 +1596,29 @@ void ui_convert_to_unit_alt_name(uiBut *but, char *str, size_t maxlen) static void ui_get_but_string_unit(uiBut *but, char *str, int len_max, double value, int pad) { - UnitSettings *unit= but->block->unit; - int do_split= unit->flag & USER_UNIT_OPT_SPLIT; - int unit_type= uiButGetUnitType(but); - int precision= but->a2; + UnitSettings *unit = but->block->unit; + int do_split = unit->flag & USER_UNIT_OPT_SPLIT; + int unit_type = uiButGetUnitType(but); + int precision = but->a2; - if (unit->scale_length<0.0001f) unit->scale_length= 1.0f; // XXX do_versions + if (unit->scale_length < 0.0001f) unit->scale_length = 1.0f; // XXX do_versions /* Sanity checks */ - if (precision > PRECISION_FLOAT_MAX) precision= PRECISION_FLOAT_MAX; - else if (precision==0) precision= 2; + if (precision > PRECISION_FLOAT_MAX) precision = PRECISION_FLOAT_MAX; + else if (precision == 0) precision = 2; - bUnit_AsString(str, len_max, ui_get_but_scale_unit(but, value), precision, unit->system, unit_type>>16, do_split, pad); + bUnit_AsString(str, len_max, ui_get_but_scale_unit(but, value), precision, unit->system, unit_type >> 16, do_split, pad); } static float ui_get_but_step_unit(uiBut *but, float step_default) { - int unit_type= uiButGetUnitType(but)>>16; + int unit_type = uiButGetUnitType(but) >> 16; float step; step = bUnit_ClosestScalar(ui_get_but_scale_unit(but, step_default), but->block->unit->system, unit_type); if (step > 0.0f) { /* -1 is an error value */ - return (float)((double)step/ui_get_but_scale_unit(but, 1.0))*100.0f; + return (float)((double)step / ui_get_but_scale_unit(but, 1.0)) * 100.0f; } else { return step_default; @@ -1630,19 +1630,19 @@ void ui_get_but_string(uiBut *but, char *str, size_t maxlen) { if (but->rnaprop && ELEM3(but->type, TEX, IDPOIN, SEARCH_MENU)) { PropertyType type; - char *buf= NULL; + char *buf = NULL; int buf_len; - type= RNA_property_type(but->rnaprop); + type = RNA_property_type(but->rnaprop); if (type == PROP_STRING) { /* RNA string */ - buf= RNA_property_string_get_alloc(&but->rnapoin, but->rnaprop, str, maxlen, &buf_len); + buf = RNA_property_string_get_alloc(&but->rnapoin, but->rnaprop, str, maxlen, &buf_len); } else if (type == PROP_POINTER) { /* RNA pointer */ - PointerRNA ptr= RNA_property_pointer_get(&but->rnapoin, but->rnaprop); - buf= RNA_struct_name_get_alloc(&ptr, str, maxlen, &buf_len); + PointerRNA ptr = RNA_property_pointer_get(&but->rnapoin, but->rnaprop); + buf = RNA_struct_name_get_alloc(&ptr, str, maxlen, &buf_len); } if (!buf) { @@ -1650,16 +1650,16 @@ void ui_get_but_string(uiBut *but, char *str, size_t maxlen) } else if (buf && buf != str) { /* string was too long, we have to truncate */ - memcpy(str, buf, MIN2(maxlen, buf_len+1)); + memcpy(str, buf, MIN2(maxlen, buf_len + 1)); MEM_freeN(buf); } } else if (but->type == IDPOIN) { /* ID pointer */ if (but->idpoin_idpp) { /* Can be NULL for ID properties by python */ - ID *id= *(but->idpoin_idpp); + ID *id = *(but->idpoin_idpp); if (id) { - BLI_strncpy(str, id->name+2, maxlen); + BLI_strncpy(str, id->name + 2, maxlen); return; } } @@ -1677,19 +1677,19 @@ void ui_get_but_string(uiBut *but, char *str, size_t maxlen) return; } else if (ui_but_anim_expression_get(but, str, maxlen)) - ; /* driver expression */ + ; /* driver expression */ else { /* number editing */ double value; - value= ui_get_but_val(but); + value = ui_get_but_val(but); if (ui_is_but_float(but)) { if (ui_is_but_unit(but)) { ui_get_but_string_unit(but, str, maxlen, value, 0); } else { - const int prec= ui_but_float_precision(but, value); + const int prec = ui_but_float_precision(but, value); BLI_snprintf(str, maxlen, "%.*f", prec, value); } } @@ -1703,12 +1703,12 @@ void ui_get_but_string(uiBut *but, char *str, size_t maxlen) static int ui_set_but_string_eval_num_unit(bContext *C, uiBut *but, const char *str, double *value) { char str_unit_convert[256]; - const int unit_type= uiButGetUnitType(but); + const int unit_type = uiButGetUnitType(but); BLI_strncpy(str_unit_convert, str, sizeof(str_unit_convert)); /* ugly, use the draw string to get the value, this could cause problems if it includes some text which resolves to a unit */ - bUnit_ReplaceString(str_unit_convert, sizeof(str_unit_convert), but->drawstr, ui_get_but_scale_unit(but, 1.0), but->block->unit->system, unit_type>>16); + bUnit_ReplaceString(str_unit_convert, sizeof(str_unit_convert), but->drawstr, ui_get_but_scale_unit(but, 1.0), but->block->unit->system, unit_type >> 16); return (BPY_button_exec(C, str_unit_convert, value, TRUE) != -1); } @@ -1718,28 +1718,28 @@ static int ui_set_but_string_eval_num_unit(bContext *C, uiBut *but, const char * int ui_set_but_string_eval_num(bContext *C, uiBut *but, const char *str, double *value) { - int ok= FALSE; + int ok = FALSE; #ifdef WITH_PYTHON if (str[0] != '\0') { - int is_unit_but= ui_is_but_unit(but); + int is_unit_but = ui_is_but_unit(but); /* only enable verbose if we won't run again with units */ - if (BPY_button_exec(C, str, value, is_unit_but==FALSE) != -1) { + if (BPY_button_exec(C, str, value, is_unit_but == FALSE) != -1) { /* if the value parsed ok without unit conversion this button may still need a unit multiplier */ if (is_unit_but) { char str_new[128]; BLI_snprintf(str_new, sizeof(str_new), "%f", *value); - ok= ui_set_but_string_eval_num_unit(C, but, str_new, value); + ok = ui_set_but_string_eval_num_unit(C, but, str_new, value); } else { - ok= TRUE; /* parse normal string via py (no unit conversion needed) */ + ok = TRUE; /* parse normal string via py (no unit conversion needed) */ } } else if (is_unit_but) { /* parse failed, this is a unit but so run replacements and parse again */ - ok= ui_set_but_string_eval_num_unit(C, but, str, value); + ok = ui_set_but_string_eval_num_unit(C, but, str, value); } } @@ -1763,7 +1763,7 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str) if (RNA_property_editable(&but->rnapoin, but->rnaprop)) { PropertyType type; - type= RNA_property_type(but->rnaprop); + type = RNA_property_type(but->rnaprop); if (type == PROP_STRING) { /* RNA string */ @@ -1780,8 +1780,8 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str) return 1; } else { - ptr= but->rnasearchpoin; - prop= but->rnasearchprop; + ptr = but->rnasearchpoin; + prop = but->rnasearchprop; if (prop && RNA_property_collection_lookup_string(&ptr, prop, str, &rptr)) RNA_property_pointer_set(&but->rnapoin, but->rnaprop, rptr); @@ -1801,7 +1801,7 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str) else if (but->type == TEX) { /* string */ if (ui_is_but_utf8(but)) BLI_strncpy_utf8(but->poin, str, but->hardmax); - else BLI_strncpy(but->poin, str, but->hardmax); + else BLI_strncpy(but->poin, str, but->hardmax); return 1; } @@ -1814,9 +1814,9 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str) /* driver expression */ return 1; } - else if (str[0]=='#') { + else if (str[0] == '#') { /* shortcut to create new driver expression (versus immediate Py-execution) */ - return ui_but_anim_expression_create(but, str+1); + return ui_but_anim_expression_create(but, str + 1); } else { /* number editing */ @@ -1826,12 +1826,12 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str) return 0; } - if (!ui_is_but_float(but)) value= (int)floor(value + 0.5); - if (but->type==NUMABS) value= fabs(value); + if (!ui_is_but_float(but)) value = (int)floor(value + 0.5); + if (but->type == NUMABS) value = fabs(value); /* not that we use hard limits here */ - if (value < (double)but->hardmin) value= but->hardmin; - if (value > (double)but->hardmax) value= but->hardmax; + if (value < (double)but->hardmin) value = but->hardmin; + if (value > (double)but->hardmax) value = but->hardmax; ui_set_but_val(but, value); return 1; @@ -1853,12 +1853,12 @@ void ui_set_but_default(bContext *C, short all) static double soft_range_round_up(double value, double max) { /* round up to .., 0.1, 0.2, 0.5, 1, 2, 5, 10, 20, 50, .. */ - double newmax= pow(10.0, ceil(log(value)/M_LN10)); + double newmax = pow(10.0, ceil(log(value) / M_LN10)); - if (newmax*0.2 >= max && newmax*0.2 >= value) - return newmax*0.2; - else if (newmax*0.5 >= max && newmax*0.5 >= value) - return newmax*0.5; + if (newmax * 0.2 >= max && newmax * 0.2 >= value) + return newmax * 0.2; + else if (newmax * 0.5 >= max && newmax * 0.5 >= value) + return newmax * 0.5; else return newmax; } @@ -1866,12 +1866,12 @@ static double soft_range_round_up(double value, double max) static double soft_range_round_down(double value, double max) { /* round down to .., 0.1, 0.2, 0.5, 1, 2, 5, 10, 20, 50, .. */ - double newmax= pow(10.0, floor(log(value)/M_LN10)); + double newmax = pow(10.0, floor(log(value) / M_LN10)); - if (newmax*5.0 <= max && newmax*5.0 <= value) - return newmax*5.0; - else if (newmax*2.0 <= max && newmax*2.0 <= value) - return newmax*2.0; + if (newmax * 5.0 <= max && newmax * 5.0 <= value) + return newmax * 5.0; + else if (newmax * 2.0 <= max && newmax * 2.0 <= value) + return newmax * 2.0; else return newmax; } @@ -1883,72 +1883,72 @@ void ui_set_but_soft_range(uiBut *but, double value) * which isn't so bad. */ if (but->rnaprop) { - const PropertyType type= RNA_property_type(but->rnaprop); + const PropertyType type = RNA_property_type(but->rnaprop); double softmin, softmax /*, step, precision*/; - double value_min= value; - double value_max= value; + double value_min = value; + double value_max = value; /* clamp button range to something reasonable in case * we get -inf/inf from RNA properties */ if (type == PROP_INT) { int imin, imax, istep; - const int array_len= RNA_property_array_length(&but->rnapoin, but->rnaprop); + const int array_len = RNA_property_array_length(&but->rnapoin, but->rnaprop); RNA_property_int_ui_range(&but->rnapoin, but->rnaprop, &imin, &imax, &istep); - softmin= (imin == INT_MIN)? -1e4: imin; - softmax= (imin == INT_MAX)? 1e4: imax; + softmin = (imin == INT_MIN) ? -1e4 : imin; + softmax = (imin == INT_MAX) ? 1e4 : imax; /*step= istep;*/ /*UNUSED*/ /*precision= 1;*/ /*UNUSED*/ if (array_len >= 2) { int value_range[2]; RNA_property_int_get_array_range(&but->rnapoin, but->rnaprop, value_range); - value_min= (double)value_range[0]; - value_max= (double)value_range[1]; + value_min = (double)value_range[0]; + value_max = (double)value_range[1]; } } else if (type == PROP_FLOAT) { float fmin, fmax, fstep, fprecision; - const int array_len= RNA_property_array_length(&but->rnapoin, but->rnaprop); + const int array_len = RNA_property_array_length(&but->rnapoin, but->rnaprop); RNA_property_float_ui_range(&but->rnapoin, but->rnaprop, &fmin, &fmax, &fstep, &fprecision); - softmin= (fmin == -FLT_MAX)? (float)-1e4: fmin; - softmax= (fmax == FLT_MAX)? (float)1e4: fmax; + softmin = (fmin == -FLT_MAX) ? (float)-1e4 : fmin; + softmax = (fmax == FLT_MAX) ? (float)1e4 : fmax; /*step= fstep;*/ /*UNUSED*/ /*precision= fprecision;*/ /*UNUSED*/ if (array_len >= 2) { float value_range[2]; RNA_property_float_get_array_range(&but->rnapoin, but->rnaprop, value_range); - value_min= (double)value_range[0]; - value_max= (double)value_range[1]; + value_min = (double)value_range[0]; + value_max = (double)value_range[1]; } } else return; /* if the value goes out of the soft/max range, adapt the range */ - if (value_min+1e-10 < softmin) { + if (value_min + 1e-10 < softmin) { if (value_min < 0.0) - softmin= -soft_range_round_up(-value_min, -softmin); + softmin = -soft_range_round_up(-value_min, -softmin); else - softmin= soft_range_round_down(value_min, softmin); + softmin = soft_range_round_down(value_min, softmin); if (softmin < (double)but->hardmin) - softmin= (double)but->hardmin; + softmin = (double)but->hardmin; } - if (value_max-1e-10 > softmax) { + if (value_max - 1e-10 > softmax) { if (value_max < 0.0) - softmax= -soft_range_round_down(-value_max, -softmax); + softmax = -soft_range_round_down(-value_max, -softmax); else - softmax= soft_range_round_up(value_max, softmax); + softmax = soft_range_round_up(value_max, softmax); if (softmax > (double)but->hardmax) - softmax= but->hardmax; + softmax = but->hardmax; } - but->softmin= softmin; - but->softmax= softmax; + but->softmin = softmin; + but->softmax = softmax; } } @@ -2004,7 +2004,7 @@ void uiFreeBlock(const bContext *C, uiBlock *block) { uiBut *but; - while ( (but= block->buttons.first) ) { + while ( (but = block->buttons.first) ) { BLI_remlink(&block->buttons, but); ui_free_but(C, but); } @@ -2029,7 +2029,7 @@ void uiFreeBlocks(const bContext *C, ListBase *lb) { uiBlock *block; - while ( (block= lb->first) ) { + while ( (block = lb->first) ) { BLI_remlink(lb, block); uiFreeBlock(C, block); } @@ -2039,8 +2039,8 @@ void uiFreeInactiveBlocks(const bContext *C, ListBase *lb) { uiBlock *block, *nextblock; - for (block=lb->first; block; block=nextblock) { - nextblock= block->next; + for (block = lb->first; block; block = nextblock) { + nextblock = block->next; if (!block->handle) { if (!block->active) { @@ -2048,31 +2048,31 @@ void uiFreeInactiveBlocks(const bContext *C, ListBase *lb) uiFreeBlock(C, block); } else - block->active= 0; + block->active = 0; } } } void uiBlockSetRegion(uiBlock *block, ARegion *region) { - ListBase *lb= ®ion->uiblocks; - uiBlock *oldblock= NULL; + ListBase *lb = ®ion->uiblocks; + uiBlock *oldblock = NULL; /* each listbase only has one block with this name, free block * if is already there so it can be rebuilt from scratch */ if (lb) { - oldblock= BLI_findstring(lb, block->name, offsetof(uiBlock, name)); + oldblock = BLI_findstring(lb, block->name, offsetof(uiBlock, name)); if (oldblock) { - oldblock->active= 0; - oldblock->panel= NULL; + oldblock->active = 0; + oldblock->panel = NULL; } /* at the beginning of the list! for dynamical menus/blocks */ BLI_addhead(lb, block); } - block->oldblock= oldblock; + block->oldblock = oldblock; } uiBlock *uiBeginBlock(const bContext *C, ARegion *region, const char *name, short dt) @@ -2082,19 +2082,19 @@ uiBlock *uiBeginBlock(const bContext *C, ARegion *region, const char *name, shor Scene *scn; int getsizex, getsizey; - window= CTX_wm_window(C); + window = CTX_wm_window(C); scn = CTX_data_scene(C); - block= MEM_callocN(sizeof(uiBlock), "uiBlock"); - block->active= 1; - block->dt= dt; - block->evil_C= (void*)C; // XXX + block = MEM_callocN(sizeof(uiBlock), "uiBlock"); + block->active = 1; + block->dt = dt; + block->evil_C = (void *)C; // XXX if (scn) { - block->color_profile= (scn->r.color_mgt_flag & R_COLOR_MANAGEMENT); + block->color_profile = (scn->r.color_mgt_flag & R_COLOR_MANAGEMENT); /* copy to avoid crash when scene gets deleted with ui still open */ - block->unit= MEM_mallocN(sizeof(scn->unit), "UI UnitSettings"); + block->unit = MEM_mallocN(sizeof(scn->unit), "UI UnitSettings"); memcpy(block->unit, &scn->unit, sizeof(scn->unit)); } @@ -2110,7 +2110,7 @@ uiBlock *uiBeginBlock(const bContext *C, ARegion *region, const char *name, shor /* TODO - investigate why block->winmat[0][0] is negative * in the image view when viewRedrawForce is called */ - block->aspect= 2.0/fabs( (getsizex)*block->winmat[0][0]); + block->aspect = 2.0 / fabs( (getsizex) * block->winmat[0][0]); } else { /* no subwindow created yet, for menus for example, so we @@ -2119,8 +2119,8 @@ uiBlock *uiBeginBlock(const bContext *C, ARegion *region, const char *name, shor wm_subwindow_getmatrix(window, window->screen->mainwin, block->winmat); wm_subwindow_getsize(window, window->screen->mainwin, &getsizex, &getsizey); - block->aspect= 2.0/fabs(getsizex*block->winmat[0][0]); - block->auto_open= TRUE; + block->aspect = 2.0 / fabs(getsizex * block->winmat[0][0]); + block->auto_open = TRUE; block->flag |= UI_BLOCK_LOOP; /* tag as menu */ } @@ -2134,13 +2134,13 @@ uiBlock *uiGetBlock(const char *name, ARegion *ar) void uiBlockSetEmboss(uiBlock *block, char dt) { - block->dt= dt; + block->dt = dt; } void ui_check_but(uiBut *but) { /* if something changed in the button */ - double value= UI_BUT_VALUE_UNSET; + double value = UI_BUT_VALUE_UNSET; // float okwidth; // UNUSED ui_is_but_sel(but, &value); @@ -2152,7 +2152,7 @@ void ui_check_but(uiBut *but) } /* test for min and max, icon sliders, etc */ - switch( but->type ) { + switch (but->type) { case NUM: case SLI: case SCROLL: @@ -2167,7 +2167,7 @@ void ui_check_but(uiBut *but) { double value_abs; UI_GET_BUT_VALUE_INIT(but, value) - value_abs= fabs(value); + value_abs = fabs(value); if (value_abs < (double)but->hardmin) ui_set_but_val(but, but->hardmin); else if (value_abs > (double)but->hardmax) ui_set_but_val(but, but->hardmax); break; @@ -2175,22 +2175,22 @@ void ui_check_but(uiBut *but) case ICONTOG: case ICONTOGN: if (!but->rnaprop || (RNA_property_flag(but->rnaprop) & PROP_ICONS_CONSECUTIVE)) { - if (but->flag & UI_SELECT) but->iconadd= 1; - else but->iconadd= 0; + if (but->flag & UI_SELECT) but->iconadd = 1; + else but->iconadd = 0; } break; case ICONROW: if (!but->rnaprop || (RNA_property_flag(but->rnaprop) & PROP_ICONS_CONSECUTIVE)) { UI_GET_BUT_VALUE_INIT(but, value) - but->iconadd= (int)value- (int)(but->hardmin); + but->iconadd = (int)value - (int)(but->hardmin); } break; case ICONTEXTROW: if (!but->rnaprop || (RNA_property_flag(but->rnaprop) & PROP_ICONS_CONSECUTIVE)) { UI_GET_BUT_VALUE_INIT(but, value) - but->iconadd= (int)value- (int)(but->hardmin); + but->iconadd = (int)value - (int)(but->hardmin); } break; } @@ -2200,125 +2200,125 @@ void ui_check_but(uiBut *but) // okwidth= -4 + (but->x2 - but->x1); // UNUSED /* name: */ - switch( but->type ) { + switch (but->type) { - case MENU: - case ICONTEXTROW: + case MENU: + case ICONTEXTROW: - if (but->x2 - but->x1 > 24) { - UI_GET_BUT_VALUE_INIT(but, value) - ui_set_name_menu(but, (int)value); - } - break; + if (but->x2 - but->x1 > 24) { + UI_GET_BUT_VALUE_INIT(but, value) + ui_set_name_menu(but, (int)value); + } + break; - case NUM: - case NUMSLI: - case HSVSLI: - case NUMABS: + case NUM: + case NUMSLI: + case HSVSLI: + case NUMABS: - UI_GET_BUT_VALUE_INIT(but, value) + UI_GET_BUT_VALUE_INIT(but, value) - if (ui_is_but_float(but)) { - if (value == (double) FLT_MAX) BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%sinf", but->str); - else if (value == (double) -FLT_MAX) BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s-inf", but->str); - /* support length type buttons */ - else if (ui_is_but_unit(but)) { - char new_str[sizeof(but->drawstr)]; - ui_get_but_string_unit(but, new_str, sizeof(new_str), value, TRUE); - BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%s", but->str, new_str); + if (ui_is_but_float(but)) { + if (value == (double) FLT_MAX) BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%sinf", but->str); + else if (value == (double) -FLT_MAX) BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s-inf", but->str); + /* support length type buttons */ + else if (ui_is_but_unit(but)) { + char new_str[sizeof(but->drawstr)]; + ui_get_but_string_unit(but, new_str, sizeof(new_str), value, TRUE); + BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%s", but->str, new_str); + } + else { + const int prec = ui_but_float_precision(but, value); + BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%.*f", but->str, prec, value); + } } else { - const int prec= ui_but_float_precision(but, value); - BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%.*f", but->str, prec, value); + BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%d", but->str, (int)value); } - } - else { - BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%d", but->str, (int)value); - } - if (but->rnaprop) { - PropertySubType pstype = RNA_property_subtype(but->rnaprop); + if (but->rnaprop) { + PropertySubType pstype = RNA_property_subtype(but->rnaprop); - if (pstype == PROP_PERCENTAGE) - strcat(but->drawstr, "%"); - } - break; + if (pstype == PROP_PERCENTAGE) + strcat(but->drawstr, "%"); + } + break; - case LABEL: - if (ui_is_but_float(but)) { - int prec; - UI_GET_BUT_VALUE_INIT(but, value) - prec= ui_but_float_precision(but, value); - BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%.*f", but->str, prec, value); - } - else { - BLI_strncpy(but->drawstr, but->str, UI_MAX_DRAW_STR); - } + case LABEL: + if (ui_is_but_float(but)) { + int prec; + UI_GET_BUT_VALUE_INIT(but, value) + prec = ui_but_float_precision(but, value); + BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%.*f", but->str, prec, value); + } + else { + BLI_strncpy(but->drawstr, but->str, UI_MAX_DRAW_STR); + } - break; + break; - case IDPOIN: - case TEX: - case SEARCH_MENU: - if (!but->editstr) { - char str[UI_MAX_DRAW_STR]; + case IDPOIN: + case TEX: + case SEARCH_MENU: + if (!but->editstr) { + char str[UI_MAX_DRAW_STR]; - ui_get_but_string(but, str, UI_MAX_DRAW_STR-strlen(but->str)); + ui_get_but_string(but, str, UI_MAX_DRAW_STR - strlen(but->str)); - BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%s", but->str, str); - } - break; + BLI_snprintf(but->drawstr, sizeof(but->drawstr), "%s%s", but->str, str); + } + break; - case KEYEVT: - BLI_strncpy(but->drawstr, but->str, UI_MAX_DRAW_STR); - if (but->flag & UI_SELECT) { - strcat(but->drawstr, "Press a key"); - } - else { - UI_GET_BUT_VALUE_INIT(but, value) - strcat(but->drawstr, WM_key_event_string((short)value)); - } - break; + case KEYEVT: + BLI_strncpy(but->drawstr, but->str, UI_MAX_DRAW_STR); + if (but->flag & UI_SELECT) { + strcat(but->drawstr, "Press a key"); + } + else { + UI_GET_BUT_VALUE_INIT(but, value) + strcat(but->drawstr, WM_key_event_string((short)value)); + } + break; - case HOTKEYEVT: - if (but->flag & UI_SELECT) { - but->drawstr[0]= '\0'; - - if (but->modifier_key) { - char *str= but->drawstr; - - if (but->modifier_key & KM_SHIFT) - str= strcat(str, "Shift "); - if (but->modifier_key & KM_CTRL) - str= strcat(str, "Ctrl "); - if (but->modifier_key & KM_ALT) - str= strcat(str, "Alt "); - if (but->modifier_key & KM_OSKEY) - str= strcat(str, "Cmd "); - - (void)str; /* UNUSED */ + case HOTKEYEVT: + if (but->flag & UI_SELECT) { + but->drawstr[0] = '\0'; + + if (but->modifier_key) { + char *str = but->drawstr; + + if (but->modifier_key & KM_SHIFT) + str = strcat(str, "Shift "); + if (but->modifier_key & KM_CTRL) + str = strcat(str, "Ctrl "); + if (but->modifier_key & KM_ALT) + str = strcat(str, "Alt "); + if (but->modifier_key & KM_OSKEY) + str = strcat(str, "Cmd "); + + (void)str; /* UNUSED */ + } + else + strcat(but->drawstr, "Press a key "); } else - strcat(but->drawstr, "Press a key "); - } - else - BLI_strncpy(but->drawstr, but->str, UI_MAX_DRAW_STR); + BLI_strncpy(but->drawstr, but->str, UI_MAX_DRAW_STR); + + break; - break; + case BUT_TOGDUAL: + /* trying to get the dual-icon to left of text... not very nice */ + if (but->str[0]) { + BLI_strncpy(but->drawstr, " ", UI_MAX_DRAW_STR); + BLI_strncpy(but->drawstr + 2, but->str, UI_MAX_DRAW_STR - 2); + } + break; - case BUT_TOGDUAL: - /* trying to get the dual-icon to left of text... not very nice */ - if (but->str[0]) { - BLI_strncpy(but->drawstr, " ", UI_MAX_DRAW_STR); - BLI_strncpy(but->drawstr+2, but->str, UI_MAX_DRAW_STR-2); - } - break; - - case HSVCUBE: - case HSVCIRCLE: - break; - default: - BLI_strncpy(but->drawstr, but->str, UI_MAX_DRAW_STR); + case HSVCUBE: + case HSVCIRCLE: + break; + default: + BLI_strncpy(but->drawstr, but->str, UI_MAX_DRAW_STR); } @@ -2345,8 +2345,8 @@ static int buts_are_horiz(uiBut *but1, uiBut *but2) { float dx, dy; - dx= fabs( but1->x2 - but2->x1); - dy= fabs( but1->y1 - but2->y2); + dx = fabs(but1->x2 - but2->x1); + dy = fabs(but1->y1 - but2->y2); if (dx > dy) return 0; return 1; @@ -2354,7 +2354,7 @@ static int buts_are_horiz(uiBut *but1, uiBut *but2) void uiBlockEndAlign(uiBlock *block) { - block->flag &= ~UI_BUT_ALIGN; // all 4 flags + block->flag &= ~UI_BUT_ALIGN; // all 4 flags } int ui_but_can_align(uiBut *but) @@ -2364,12 +2364,12 @@ int ui_but_can_align(uiBut *but) static void ui_block_do_align_but(uiBut *first, short nr) { - uiBut *prev, *but=NULL, *next; - int flag= 0, cols=0, rows=0; + uiBut *prev, *but = NULL, *next; + int flag = 0, cols = 0, rows = 0; /* auto align */ - for (but=first; but && but->alignnr == nr; but=but->next) { + for (but = first; but && but->alignnr == nr; but = but->next) { if (but->next && but->next->alignnr == nr) { if (buts_are_horiz(but, but->next)) cols++; else rows++; @@ -2379,60 +2379,60 @@ static void ui_block_do_align_but(uiBut *first, short nr) /* rows==0: 1 row, cols==0: 1 column */ /* note; how it uses 'flag' in loop below (either set it, or OR it) is confusing */ - for (but=first, prev=NULL; but && but->alignnr == nr; prev=but, but=but->next) { - next= but->next; + for (but = first, prev = NULL; but && but->alignnr == nr; prev = but, but = but->next) { + next = but->next; if (next && next->alignnr != nr) - next= NULL; + next = NULL; /* clear old flag */ but->flag &= ~UI_BUT_ALIGN; - if (flag==0) { /* first case */ + if (flag == 0) { /* first case */ if (next) { if (buts_are_horiz(but, next)) { - if (rows==0) - flag= UI_BUT_ALIGN_RIGHT; + if (rows == 0) + flag = UI_BUT_ALIGN_RIGHT; else - flag= UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_RIGHT; + flag = UI_BUT_ALIGN_DOWN | UI_BUT_ALIGN_RIGHT; } else { - flag= UI_BUT_ALIGN_DOWN; + flag = UI_BUT_ALIGN_DOWN; } } } - else if (next==NULL) { /* last case */ + else if (next == NULL) { /* last case */ if (prev) { if (buts_are_horiz(prev, but)) { - if (rows==0) - flag= UI_BUT_ALIGN_LEFT; + if (rows == 0) + flag = UI_BUT_ALIGN_LEFT; else - flag= UI_BUT_ALIGN_TOP|UI_BUT_ALIGN_LEFT; + flag = UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_LEFT; } - else flag= UI_BUT_ALIGN_TOP; + else flag = UI_BUT_ALIGN_TOP; } } else if (buts_are_horiz(but, next)) { /* check if this is already second row */ - if ( prev && buts_are_horiz(prev, but)==0) { + if (prev && buts_are_horiz(prev, but) == 0) { flag &= ~UI_BUT_ALIGN_LEFT; flag |= UI_BUT_ALIGN_TOP; /* exception case: bottom row */ - if (rows>0) { - uiBut *bt= but; + if (rows > 0) { + uiBut *bt = but; while (bt && bt->alignnr == nr) { - if (bt->next && bt->next->alignnr == nr && buts_are_horiz(bt, bt->next)==0 ) break; - bt= bt->next; + if (bt->next && bt->next->alignnr == nr && buts_are_horiz(bt, bt->next) == 0) break; + bt = bt->next; } - if (bt==NULL || bt->alignnr != nr) flag= UI_BUT_ALIGN_TOP|UI_BUT_ALIGN_RIGHT; + if (bt == NULL || bt->alignnr != nr) flag = UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_RIGHT; } } else flag |= UI_BUT_ALIGN_LEFT; } else { - if (cols==0) { + if (cols == 0) { flag |= UI_BUT_ALIGN_TOP; } - else { /* next button switches to new row */ + else { /* next button switches to new row */ if (prev && buts_are_horiz(prev, but)) flag |= UI_BUT_ALIGN_LEFT; @@ -2441,13 +2441,13 @@ static void ui_block_do_align_but(uiBut *first, short nr) flag |= UI_BUT_ALIGN_TOP; } - if ( (flag & UI_BUT_ALIGN_TOP)==0) { /* stil top row */ + if ( (flag & UI_BUT_ALIGN_TOP) == 0) { /* stil top row */ if (prev) { if (next && buts_are_horiz(but, next)) - flag = UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_LEFT|UI_BUT_ALIGN_RIGHT; + flag = UI_BUT_ALIGN_DOWN | UI_BUT_ALIGN_LEFT | UI_BUT_ALIGN_RIGHT; else { /* last button in top row */ - flag = UI_BUT_ALIGN_DOWN|UI_BUT_ALIGN_LEFT; + flag = UI_BUT_ALIGN_DOWN | UI_BUT_ALIGN_LEFT; } } else @@ -2463,33 +2463,33 @@ static void ui_block_do_align_but(uiBut *first, short nr) /* merge coordinates */ if (prev) { // simple cases - if (rows==0) { - but->x1= (prev->x2+but->x1)/2.0f; - prev->x2= but->x1; + if (rows == 0) { + but->x1 = (prev->x2 + but->x1) / 2.0f; + prev->x2 = but->x1; } - else if (cols==0) { - but->y2= (prev->y1+but->y2)/2.0f; - prev->y1= but->y2; + else if (cols == 0) { + but->y2 = (prev->y1 + but->y2) / 2.0f; + prev->y1 = but->y2; } else { if (buts_are_horiz(prev, but)) { - but->x1= (prev->x2+but->x1)/2.0f; - prev->x2= but->x1; + but->x1 = (prev->x2 + but->x1) / 2.0f; + prev->x2 = but->x1; /* copy height too */ - but->y2= prev->y2; + but->y2 = prev->y2; } - else if (prev->prev && buts_are_horiz(prev->prev, prev)==0) { + else if (prev->prev && buts_are_horiz(prev->prev, prev) == 0) { /* the previous button is a single one in its row */ - but->y2= (prev->y1+but->y2)/2.0f; - prev->y1= but->y2; + but->y2 = (prev->y1 + but->y2) / 2.0f; + prev->y1 = but->y2; - but->x1= prev->x1; - if (next && buts_are_horiz(but, next)==0) - but->x2= prev->x2; + but->x1 = prev->x1; + if (next && buts_are_horiz(but, next) == 0) + but->x2 = prev->x2; } else { /* the previous button is not a single one in its row */ - but->y2= prev->y1; + but->y2 = prev->y1; } } } @@ -2502,19 +2502,19 @@ void ui_block_do_align(uiBlock *block) short nr; /* align buttons with same align nr */ - for (but=block->buttons.first; but;) { + for (but = block->buttons.first; but; ) { if (but->alignnr) { - nr= but->alignnr; + nr = but->alignnr; ui_block_do_align_but(but, nr); /* skip with same number */ - for (; but && but->alignnr == nr; but=but->next); + for (; but && but->alignnr == nr; but = but->next) ; if (!but) break; } else - but= but->next; + but = but->next; } } @@ -2531,76 +2531,76 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str, uiBut *but; int slen; - if (type & BUTPOIN) { /* a pointer is required */ - if (poin==NULL) + if (type & BUTPOIN) { /* a pointer is required */ + if (poin == NULL) return NULL; } - but= MEM_callocN(sizeof(uiBut), "uiBut"); + but = MEM_callocN(sizeof(uiBut), "uiBut"); - but->type= type & BUTTYPE; - but->pointype= type & BUTPOIN; - but->bit= type & BIT; - but->bitnr= type & 31; + but->type = type & BUTTYPE; + but->pointype = type & BUTPOIN; + but->bit = type & BIT; + but->bitnr = type & 31; but->icon = ICON_NONE; - but->iconadd=0; + but->iconadd = 0; - but->retval= retval; + but->retval = retval; - slen= strlen(str); - if (slen >= UI_MAX_NAME_STR-1) { - but->str= MEM_mallocN(slen+2, "ui_def_but str"); /* why +2 ? */ + slen = strlen(str); + if (slen >= UI_MAX_NAME_STR - 1) { + but->str = MEM_mallocN(slen + 2, "ui_def_but str"); /* why +2 ? */ } else { - but->str= but->strdata; + but->str = but->strdata; } - memcpy(but->str, str, slen+1); + memcpy(but->str, str, slen + 1); - but->x1= x1; - but->y1= y1; - but->x2= (x1+x2); - but->y2= (y1+y2); - - but->poin= poin; - but->hardmin= but->softmin= min; - but->hardmax= but->softmax= max; - but->a1= a1; - but->a2= a2; - but->tip= tip; - - but->lock= block->lock; - but->lockstr= block->lockstr; - but->dt= block->dt; + but->x1 = x1; + but->y1 = y1; + but->x2 = (x1 + x2); + but->y2 = (y1 + y2); + + but->poin = poin; + but->hardmin = but->softmin = min; + but->hardmax = but->softmax = max; + but->a1 = a1; + but->a2 = a2; + but->tip = tip; - but->aspect= 1.0f; //XXX block->aspect; - but->block= block; // pointer back, used for frontbuffer status, and picker + but->lock = block->lock; + but->lockstr = block->lockstr; + but->dt = block->dt; + + but->aspect = 1.0f; //XXX block->aspect; + but->block = block; // pointer back, used for frontbuffer status, and picker if ((block->flag & UI_BUT_ALIGN) && ui_but_can_align(but)) - but->alignnr= block->alignnr; + but->alignnr = block->alignnr; - but->func= block->func; - but->func_arg1= block->func_arg1; - but->func_arg2= block->func_arg2; + but->func = block->func; + but->func_arg1 = block->func_arg1; + but->func_arg2 = block->func_arg2; - but->funcN= block->funcN; + but->funcN = block->funcN; if (block->func_argN) - but->func_argN= MEM_dupallocN(block->func_argN); + but->func_argN = MEM_dupallocN(block->func_argN); - but->pos= -1; /* cursor invisible */ + but->pos = -1; /* cursor invisible */ - if (ELEM4(but->type, NUM, NUMABS, NUMSLI, HSVSLI)) { /* add a space to name */ + if (ELEM4(but->type, NUM, NUMABS, NUMSLI, HSVSLI)) { /* add a space to name */ /* slen remains unchanged from previous assignment, ensure this stays true */ - if (slen>0 && slen<UI_MAX_NAME_STR-2) { - if (but->str[slen-1]!=' ') { - but->str[slen]= ' '; - but->str[slen+1]= 0; + if (slen > 0 && slen < UI_MAX_NAME_STR - 2) { + if (but->str[slen - 1] != ' ') { + but->str[slen] = ' '; + but->str[slen + 1] = 0; } } } if ((block->flag & UI_BLOCK_LOOP) || ELEM8(but->type, MENU, TEX, LABEL, IDPOIN, BLOCK, BUTM, SEARCH_MENU, PROGRESSBAR)) - but->flag |= (UI_TEXT_LEFT|UI_ICON_LEFT); - else if (but->type==BUT_TOGDUAL) + but->flag |= (UI_TEXT_LEFT | UI_ICON_LEFT); + else if (but->type == BUT_TOGDUAL) but->flag |= UI_ICON_LEFT; but->flag |= (block->flag & UI_BUT_ALIGN); @@ -2612,9 +2612,9 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str, } /* keep track of UI_interface.h */ - if (ELEM7(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX, BUTM)); - else if (ELEM3(but->type, SCROLL, SEPR, FTPREVIEW)); - else if (but->type >= SEARCH_MENU); + if (ELEM7(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX, BUTM)) ; + else if (ELEM3(but->type, SCROLL, SEPR, FTPREVIEW)) ; + else if (but->type >= SEARCH_MENU) ; else but->flag |= UI_BUT_UNDO; BLI_addtail(&block->buttons, but); @@ -2641,16 +2641,16 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str, */ #define UI_DEF_BUT_RNA_DISABLE(but) \ - but->flag |= UI_BUT_DISABLED; \ - but->lock = 1; \ - but->lockstr = "" + but->flag |= UI_BUT_DISABLED; \ + but->lock = 1; \ + but->lockstr = "" static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *str, int x1, int y1, short x2, short y2, PointerRNA *ptr, PropertyRNA *prop, int index, float min, float max, float a1, float a2, const char *tip) { - const PropertyType proptype= RNA_property_type(prop); + const PropertyType proptype = RNA_property_type(prop); uiBut *but; - int freestr= 0, icon= 0; + int freestr = 0, icon = 0; /* use rna values if parameters are not specified */ if (!str) { @@ -2660,11 +2660,11 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s int i, totitem, value, free; RNA_property_enum_items_gettexted(block->evil_C, ptr, prop, &item, &totitem, &free); - value= RNA_property_enum_get(ptr, prop); + value = RNA_property_enum_get(ptr, prop); - dynstr= BLI_dynstr_new(); + dynstr = BLI_dynstr_new(); BLI_dynstr_appendf(dynstr, "%s%%t", RNA_property_ui_name(prop)); - for (i=0; i<totitem; i++) { + for (i = 0; i < totitem; i++) { if (!item[i].identifier[0]) { if (item[i].name) BLI_dynstr_appendf(dynstr, "|%s%%l", item[i].name); @@ -2677,26 +2677,26 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s BLI_dynstr_appendf(dynstr, "|%s %%x%d", item[i].name, item[i].value); if (value == item[i].value) - icon= item[i].icon; + icon = item[i].icon; } - str= BLI_dynstr_get_cstring(dynstr); + str = BLI_dynstr_get_cstring(dynstr); BLI_dynstr_free(dynstr); if (free) { MEM_freeN(item); } - freestr= 1; + freestr = 1; } else if (ELEM(type, ROW, LISTROW) && proptype == PROP_ENUM) { EnumPropertyItem *item; int i, totitem, free; RNA_property_enum_items_gettexted(block->evil_C, ptr, prop, &item, &totitem, &free); - for (i=0; i<totitem; i++) { + for (i = 0; i < totitem; i++) { if (item[i].identifier[0] && item[i].value == (int)max) { - str= item[i].name; - icon= item[i].icon; + str = item[i].name; + icon = item[i].icon; } } @@ -2708,13 +2708,13 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s } } else { - str= RNA_property_ui_name(prop); - icon= RNA_property_ui_icon(prop); + str = RNA_property_ui_name(prop); + icon = RNA_property_ui_icon(prop); } } if (!tip && proptype != PROP_ENUM) - tip= RNA_property_ui_description(prop); + tip = RNA_property_ui_description(prop); if (min == max || a1 == -1 || a2 == -1) { if (proptype == PROP_INT) { @@ -2724,13 +2724,13 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s RNA_property_int_ui_range(ptr, prop, &softmin, &softmax, &step); if (!ELEM(type, ROW, LISTROW) && min == max) { - min= hardmin; - max= hardmax; + min = hardmin; + max = hardmax; } if (a1 == -1) - a1= step; + a1 = step; if (a2 == -1) - a2= 0; + a2 = 0; } else if (proptype == PROP_FLOAT) { float hardmin, hardmax, softmin, softmax, step, precision; @@ -2739,37 +2739,37 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s RNA_property_float_ui_range(ptr, prop, &softmin, &softmax, &step, &precision); if (!ELEM(type, ROW, LISTROW) && min == max) { - min= hardmin; - max= hardmax; + min = hardmin; + max = hardmax; } if (a1 == -1) - a1= step; + a1 = step; if (a2 == -1) - a2= precision; + a2 = precision; } else if (proptype == PROP_STRING) { - min= 0; - max= RNA_property_string_maxlength(prop); + min = 0; + max = RNA_property_string_maxlength(prop); if (max == 0) /* interface code should ideally support unlimited length */ - max= UI_MAX_DRAW_STR; + max = UI_MAX_DRAW_STR; } } /* now create button */ - but= ui_def_but(block, type, retval, str, x1, y1, x2, y2, NULL, min, max, a1, a2, tip); + but = ui_def_but(block, type, retval, str, x1, y1, x2, y2, NULL, min, max, a1, a2, tip); - but->rnapoin= *ptr; - but->rnaprop= prop; + but->rnapoin = *ptr; + but->rnaprop = prop; if (RNA_property_array_length(&but->rnapoin, but->rnaprop)) - but->rnaindex= index; + but->rnaindex = index; else - but->rnaindex= 0; + but->rnaindex = 0; if (icon) { - but->icon= (BIFIconID)icon; + but->icon = (BIFIconID)icon; but->flag |= UI_HAS_ICON; - but->flag|= UI_ICON_LEFT; + but->flag |= UI_ICON_LEFT; } if (!RNA_property_editable(&but->rnapoin, prop)) { @@ -2782,7 +2782,7 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s /* If this button uses units, calculate the step from this */ if ((proptype == PROP_FLOAT) && ui_is_but_unit(but)) { - but->a1= ui_get_but_step_unit(but, but->a1); + but->a1 = ui_get_but_step_unit(but, but->a1); } if (freestr) { @@ -2794,14 +2794,14 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s static uiBut *ui_def_but_rna_propname(uiBlock *block, int type, int retval, const char *str, int x1, int y1, short x2, short y2, PointerRNA *ptr, const char *propname, int index, float min, float max, float a1, float a2, const char *tip) { - PropertyRNA *prop= RNA_struct_find_property(ptr, propname); + PropertyRNA *prop = RNA_struct_find_property(ptr, propname); uiBut *but; if (prop) { - but= ui_def_but_rna(block, type, retval, str, x1, y1, x2, y2, ptr, prop, index, min, max, a1, a2, tip); + but = ui_def_but_rna(block, type, retval, str, x1, y1, x2, y2, ptr, prop, index, min, max, a1, a2, tip); } else { - but= ui_def_but(block, type, retval, propname, x1, y1, x2, y2, NULL, min, max, a1, a2, tip); + but = ui_def_but(block, type, retval, propname, x1, y1, x2, y2, NULL, min, max, a1, a2, tip); UI_DEF_BUT_RNA_DISABLE(but); } @@ -2820,13 +2820,13 @@ static uiBut *ui_def_but_operator_ptr(uiBlock *block, int type, wmOperatorType * str = ""; } - if ((!tip || tip[0]=='\0') && ot && ot->srna) { + if ((!tip || tip[0] == '\0') && ot && ot->srna) { tip = RNA_struct_ui_description(ot->srna); } - but= ui_def_but(block, type, -1, str, x1, y1, x2, y2, NULL, 0, 0, 0, 0, tip); - but->optype= ot; - but->opcontext= opcontext; + but = ui_def_but(block, type, -1, str, x1, y1, x2, y2, NULL, 0, 0, 0, 0, tip); + but->optype = ot; + but->opcontext = opcontext; but->flag &= ~UI_BUT_UNDO; /* no need for ui_but_is_undo(), we never need undo here */ if (!ot) { @@ -2839,7 +2839,7 @@ static uiBut *ui_def_but_operator_ptr(uiBlock *block, int type, wmOperatorType * } #if 0 /* UNUSED */ -static uiBut *UNUSED_FUNCTION(ui_def_but_operator)(uiBlock *block, int type, const char *opname, int opcontext, const char *str, int x1, int y1, short x2, short y2, const char *tip) +static uiBut *UNUSED_FUNCTION(ui_def_but_operator) (uiBlock * block, int type, const char *opname, int opcontext, const char *str, int x1, int y1, short x2, short y2, const char *tip) { wmOperatorType *ot = WM_operatortype_find(opname, 0); if (str == NULL && ot == NULL) str = opname; @@ -2852,20 +2852,20 @@ static uiBut *ui_def_but_operator_text(uiBlock *block, int type, const char *opn uiBut *but; wmOperatorType *ot; - ot= WM_operatortype_find(opname, 0); + ot = WM_operatortype_find(opname, 0); if (!str) { - if (ot) str= ot->name; - else str= opname; + if (ot) str = ot->name; + else str = opname; } - if ((!tip || tip[0]=='\0') && ot && ot->description) { - tip= ot->description; + if ((!tip || tip[0] == '\0') && ot && ot->description) { + tip = ot->description; } - but= ui_def_but(block, type, -1, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); - but->optype= ot; - but->opcontext= opcontext; + but = ui_def_but(block, type, -1, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); + but->optype = ot; + but->opcontext = opcontext; but->flag &= ~UI_BUT_UNDO; /* no need for ui_but_is_undo(), we never need undo here */ if (!ot) { @@ -2879,30 +2879,30 @@ static uiBut *ui_def_but_operator_text(uiBlock *block, int type, const char *opn uiBut *uiDefBut(uiBlock *block, int type, int retval, const char *str, int x1, int y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, const char *tip) { - uiBut *but= ui_def_but(block, type, retval, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); + uiBut *but = ui_def_but(block, type, retval, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); ui_check_but(but); return but; } - /* if _x_ is a power of two (only one bit) return the power, - * otherwise return -1. - * (1<<findBitIndex(x))==x for powers of two. - */ +/* if _x_ is a power of two (only one bit) return the power, + * otherwise return -1. + * (1<<findBitIndex(x))==x for powers of two. + */ static int findBitIndex(unsigned int x) { if (!x || !is_power_of_2_i(x)) { /* is_power_of_2_i(x) strips lowest bit */ return -1; } else { - int idx= 0; + int idx = 0; - if (x&0xFFFF0000) idx+=16, x>>=16; - if (x&0xFF00) idx+=8, x>>=8; - if (x&0xF0) idx+=4, x>>=4; - if (x&0xC) idx+=2, x>>=2; - if (x&0x2) idx+=1; + if (x & 0xFFFF0000) idx += 16, x >>= 16; + if (x & 0xFF00) idx += 8, x >>= 8; + if (x & 0xF0) idx += 4, x >>= 4; + if (x & 0xC) idx += 2, x >>= 2; + if (x & 0x2) idx += 1; return idx; } @@ -2919,38 +2919,38 @@ AutoComplete *autocomplete_begin(const char *startname, size_t maxlen) { AutoComplete *autocpl; - autocpl= MEM_callocN(sizeof(AutoComplete), "AutoComplete"); - autocpl->maxlen= maxlen; - autocpl->truncate= MEM_callocN(sizeof(char)*maxlen, "AutoCompleteTruncate"); - autocpl->startname= startname; + autocpl = MEM_callocN(sizeof(AutoComplete), "AutoComplete"); + autocpl->maxlen = maxlen; + autocpl->truncate = MEM_callocN(sizeof(char) * maxlen, "AutoCompleteTruncate"); + autocpl->startname = startname; return autocpl; } void autocomplete_do_name(AutoComplete *autocpl, const char *name) { - char *truncate= autocpl->truncate; - const char *startname= autocpl->startname; + char *truncate = autocpl->truncate; + const char *startname = autocpl->startname; int a; - for (a=0; a<autocpl->maxlen-1; a++) { - if (startname[a]==0 || startname[a]!=name[a]) + for (a = 0; a < autocpl->maxlen - 1; a++) { + if (startname[a] == 0 || startname[a] != name[a]) break; } /* found a match */ - if (startname[a]==0) { + if (startname[a] == 0) { /* first match */ - if (truncate[0]==0) + if (truncate[0] == 0) BLI_strncpy(truncate, name, autocpl->maxlen); else { /* remove from truncate what is not in bone->name */ - for (a=0; a<autocpl->maxlen-1; a++) { + for (a = 0; a < autocpl->maxlen - 1; a++) { if (name[a] == 0) { - truncate[a]= 0; + truncate[a] = 0; break; } - else if (truncate[a]!=name[a]) - truncate[a]= 0; + else if (truncate[a] != name[a]) + truncate[a] = 0; } } } @@ -2971,18 +2971,18 @@ void autocomplete_end(AutoComplete *autocpl, char *autoname) /* autocomplete callback for ID buttons */ static void autocomplete_id(bContext *C, char *str, void *arg_v) { - int blocktype= (intptr_t)arg_v; - ListBase *listb= which_libbase(CTX_data_main(C), blocktype); + int blocktype = (intptr_t)arg_v; + ListBase *listb = which_libbase(CTX_data_main(C), blocktype); - if (listb==NULL) return; + if (listb == NULL) return; /* search if str matches the beginning of an ID struct */ if (str[0]) { - AutoComplete *autocpl= autocomplete_begin(str, MAX_ID_NAME-2); + AutoComplete *autocpl = autocomplete_begin(str, MAX_ID_NAME - 2); ID *id; - for (id= listb->first; id; id= id->next) - autocomplete_do_name(autocpl, id->name+2); + for (id = listb->first; id; id = id->next) + autocomplete_do_name(autocpl, id->name + 2); autocomplete_end(autocpl, str); } @@ -2991,8 +2991,8 @@ static void autocomplete_id(bContext *C, char *str, void *arg_v) static void ui_check_but_and_iconize(uiBut *but, int icon) { if (icon) { - but->icon= (BIFIconID) icon; - but->flag|= UI_HAS_ICON; + but->icon = (BIFIconID) icon; + but->flag |= UI_HAS_ICON; } ui_check_but(but); @@ -3000,57 +3000,57 @@ static void ui_check_but_and_iconize(uiBut *but, int icon) static uiBut *uiDefButBit(uiBlock *block, int type, int bit, int retval, const char *str, int x1, int y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, const char *tip) { - int bitIdx= findBitIndex(bit); - if (bitIdx==-1) { + int bitIdx = findBitIndex(bit); + if (bitIdx == -1) { return NULL; } else { - return uiDefBut(block, type|BIT|bitIdx, retval, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); + return uiDefBut(block, type | BIT | bitIdx, retval, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); } } uiBut *uiDefButF(uiBlock *block, int type, int retval, const char *str, int x1, int y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefBut(block, type|FLO, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefBut(block, type | FLO, retval, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefButBitF(uiBlock *block, int type, int bit, int retval, const char *str, int x1, int y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefButBit(block, type|FLO, bit, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefButBit(block, type | FLO, bit, retval, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefButI(uiBlock *block, int type, int retval, const char *str, int x1, int y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefBut(block, type|INT, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefBut(block, type | INT, retval, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefButBitI(uiBlock *block, int type, int bit, int retval, const char *str, int x1, int y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefButBit(block, type|INT, bit, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefButBit(block, type | INT, bit, retval, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefButS(uiBlock *block, int type, int retval, const char *str, int x1, int y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefBut(block, type|SHO, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefBut(block, type | SHO, retval, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefButBitS(uiBlock *block, int type, int bit, int retval, const char *str, int x1, int y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefButBit(block, type|SHO, bit, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefButBit(block, type | SHO, bit, retval, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefButC(uiBlock *block, int type, int retval, const char *str, int x1, int y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefBut(block, type|CHA, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefBut(block, type | CHA, retval, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefButBitC(uiBlock *block, int type, int bit, int retval, const char *str, int x1, int y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefButBit(block, type|CHA, bit, retval, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefButBit(block, type | CHA, bit, retval, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefButR(uiBlock *block, int type, int retval, const char *str, int x1, int y1, short x2, short y2, PointerRNA *ptr, const char *propname, int index, float min, float max, float a1, float a2, const char *tip) { uiBut *but; - but= ui_def_but_rna_propname(block, type, retval, str, x1, y1, x2, y2, ptr, propname, index, min, max, a1, a2, tip); + but = ui_def_but_rna_propname(block, type, retval, str, x1, y1, x2, y2, ptr, propname, index, min, max, a1, a2, tip); ui_check_but(but); return but; } uiBut *uiDefButR_prop(uiBlock *block, int type, int retval, const char *str, int x1, int y1, short x2, short y2, PointerRNA *ptr, PropertyRNA *prop, int index, float min, float max, float a1, float a2, const char *tip) { uiBut *but; - but= ui_def_but_rna(block, type, retval, str, x1, y1, x2, y2, ptr, prop, index, min, max, a1, a2, tip); + but = ui_def_but_rna(block, type, retval, str, x1, y1, x2, y2, ptr, prop, index, min, max, a1, a2, tip); ui_check_but(but); return but; } @@ -3058,7 +3058,7 @@ uiBut *uiDefButR_prop(uiBlock *block, int type, int retval, const char *str, int uiBut *uiDefButO_ptr(uiBlock *block, int type, wmOperatorType *ot, int opcontext, const char *str, int x1, int y1, short x2, short y2, const char *tip) { uiBut *but; - but= ui_def_but_operator_ptr(block, type, ot, opcontext, str, x1, y1, x2, y2, tip); + but = ui_def_but_operator_ptr(block, type, ot, opcontext, str, x1, y1, x2, y2, tip); ui_check_but(but); return but; } @@ -3071,7 +3071,7 @@ uiBut *uiDefButO(uiBlock *block, int type, const char *opname, int opcontext, co uiBut *uiDefButTextO(uiBlock *block, int type, const char *opname, int opcontext, const char *str, int x1, int y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, const char *tip) { - uiBut *but= ui_def_but_operator_text(block, type, opname, opcontext, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); + uiBut *but = ui_def_but_operator_text(block, type, opname, opcontext, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); ui_check_but(but); return but; } @@ -3079,64 +3079,64 @@ uiBut *uiDefButTextO(uiBlock *block, int type, const char *opname, int opcontext /* if a1==1.0 then a2 is an extra icon blending factor (alpha 0.0 - 1.0) */ uiBut *uiDefIconBut(uiBlock *block, int type, int retval, int icon, int x1, int y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, const char *tip) { - uiBut *but= ui_def_but(block, type, retval, "", x1, y1, x2, y2, poin, min, max, a1, a2, tip); + uiBut *but = ui_def_but(block, type, retval, "", x1, y1, x2, y2, poin, min, max, a1, a2, tip); ui_check_but_and_iconize(but, icon); return but; } static uiBut *uiDefIconButBit(uiBlock *block, int type, int bit, int retval, int icon, int x1, int y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, const char *tip) { - int bitIdx= findBitIndex(bit); - if (bitIdx==-1) { + int bitIdx = findBitIndex(bit); + if (bitIdx == -1) { return NULL; } else { - return uiDefIconBut(block, type|BIT|bitIdx, retval, icon, x1, y1, x2, y2, poin, min, max, a1, a2, tip); + return uiDefIconBut(block, type | BIT | bitIdx, retval, icon, x1, y1, x2, y2, poin, min, max, a1, a2, tip); } } uiBut *uiDefIconButF(uiBlock *block, int type, int retval, int icon, int x1, int y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconBut(block, type|FLO, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconBut(block, type | FLO, retval, icon, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconButBitF(uiBlock *block, int type, int bit, int retval, int icon, int x1, int y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconButBit(block, type|FLO, bit, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconButBit(block, type | FLO, bit, retval, icon, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconButI(uiBlock *block, int type, int retval, int icon, int x1, int y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconBut(block, type|INT, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconBut(block, type | INT, retval, icon, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconButBitI(uiBlock *block, int type, int bit, int retval, int icon, int x1, int y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconButBit(block, type|INT, bit, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconButBit(block, type | INT, bit, retval, icon, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconButS(uiBlock *block, int type, int retval, int icon, int x1, int y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconBut(block, type|SHO, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconBut(block, type | SHO, retval, icon, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconButBitS(uiBlock *block, int type, int bit, int retval, int icon, int x1, int y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconButBit(block, type|SHO, bit, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconButBit(block, type | SHO, bit, retval, icon, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconButC(uiBlock *block, int type, int retval, int icon, int x1, int y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconBut(block, type|CHA, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconBut(block, type | CHA, retval, icon, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconButBitC(uiBlock *block, int type, int bit, int retval, int icon, int x1, int y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconButBit(block, type|CHA, bit, retval, icon, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconButBit(block, type | CHA, bit, retval, icon, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconButR(uiBlock *block, int type, int retval, int icon, int x1, int y1, short x2, short y2, PointerRNA *ptr, const char *propname, int index, float min, float max, float a1, float a2, const char *tip) { uiBut *but; - but= ui_def_but_rna_propname(block, type, retval, "", x1, y1, x2, y2, ptr, propname, index, min, max, a1, a2, tip); + but = ui_def_but_rna_propname(block, type, retval, "", x1, y1, x2, y2, ptr, propname, index, min, max, a1, a2, tip); ui_check_but_and_iconize(but, icon); return but; } uiBut *uiDefIconButR_prop(uiBlock *block, int type, int retval, int icon, int x1, int y1, short x2, short y2, PointerRNA *ptr, PropertyRNA *prop, int index, float min, float max, float a1, float a2, const char *tip) { uiBut *but; - but= ui_def_but_rna(block, type, retval, "", x1, y1, x2, y2, ptr, prop, index, min, max, a1, a2, tip); + but = ui_def_but_rna(block, type, retval, "", x1, y1, x2, y2, ptr, prop, index, min, max, a1, a2, tip); ui_check_but_and_iconize(but, icon); return but; } @@ -3144,7 +3144,7 @@ uiBut *uiDefIconButR_prop(uiBlock *block, int type, int retval, int icon, int x1 uiBut *uiDefIconButO_ptr(uiBlock *block, int type, wmOperatorType *ot, int opcontext, int icon, int x1, int y1, short x2, short y2, const char *tip) { uiBut *but; - but= ui_def_but_operator_ptr(block, type, ot, opcontext, "", x1, y1, x2, y2, tip); + but = ui_def_but_operator_ptr(block, type, ot, opcontext, "", x1, y1, x2, y2, tip); ui_check_but_and_iconize(but, icon); return but; } @@ -3157,76 +3157,76 @@ uiBut *uiDefIconButO(uiBlock *block, int type, const char *opname, int opcontext /* Button containing both string label and icon */ uiBut *uiDefIconTextBut(uiBlock *block, int type, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, const char *tip) { - uiBut *but= ui_def_but(block, type, retval, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); + uiBut *but = ui_def_but(block, type, retval, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); ui_check_but_and_iconize(but, icon); - but->flag|= UI_ICON_LEFT; + but->flag |= UI_ICON_LEFT; return but; } static uiBut *uiDefIconTextButBit(uiBlock *block, int type, int bit, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, const char *tip) { - int bitIdx= findBitIndex(bit); - if (bitIdx==-1) { + int bitIdx = findBitIndex(bit); + if (bitIdx == -1) { return NULL; } else { - return uiDefIconTextBut(block, type|BIT|bitIdx, retval, icon, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); + return uiDefIconTextBut(block, type | BIT | bitIdx, retval, icon, str, x1, y1, x2, y2, poin, min, max, a1, a2, tip); } } uiBut *uiDefIconTextButF(uiBlock *block, int type, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconTextBut(block, type|FLO, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconTextBut(block, type | FLO, retval, icon, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconTextButBitF(uiBlock *block, int type, int bit, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconTextButBit(block, type|FLO, bit, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconTextButBit(block, type | FLO, bit, retval, icon, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconTextButI(uiBlock *block, int type, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconTextBut(block, type|INT, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconTextBut(block, type | INT, retval, icon, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconTextButBitI(uiBlock *block, int type, int bit, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconTextButBit(block, type|INT, bit, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconTextButBit(block, type | INT, bit, retval, icon, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconTextButS(uiBlock *block, int type, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconTextBut(block, type|SHO, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconTextBut(block, type | SHO, retval, icon, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconTextButBitS(uiBlock *block, int type, int bit, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconTextButBit(block, type|SHO, bit, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconTextButBit(block, type | SHO, bit, retval, icon, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconTextButC(uiBlock *block, int type, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconTextBut(block, type|CHA, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconTextBut(block, type | CHA, retval, icon, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconTextButBitC(uiBlock *block, int type, int bit, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, const char *tip) { - return uiDefIconTextButBit(block, type|CHA, bit, retval, icon, str, x1, y1, x2, y2, (void*) poin, min, max, a1, a2, tip); + return uiDefIconTextButBit(block, type | CHA, bit, retval, icon, str, x1, y1, x2, y2, (void *) poin, min, max, a1, a2, tip); } uiBut *uiDefIconTextButR(uiBlock *block, int type, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, PointerRNA *ptr, const char *propname, int index, float min, float max, float a1, float a2, const char *tip) { uiBut *but; - but= ui_def_but_rna_propname(block, type, retval, str, x1, y1, x2, y2, ptr, propname, index, min, max, a1, a2, tip); + but = ui_def_but_rna_propname(block, type, retval, str, x1, y1, x2, y2, ptr, propname, index, min, max, a1, a2, tip); ui_check_but_and_iconize(but, icon); - but->flag|= UI_ICON_LEFT; + but->flag |= UI_ICON_LEFT; return but; } uiBut *uiDefIconTextButR_prop(uiBlock *block, int type, int retval, int icon, const char *str, int x1, int y1, short x2, short y2, PointerRNA *ptr, PropertyRNA *prop, int index, float min, float max, float a1, float a2, const char *tip) { uiBut *but; - but= ui_def_but_rna(block, type, retval, str, x1, y1, x2, y2, ptr, prop, index, min, max, a1, a2, tip); + but = ui_def_but_rna(block, type, retval, str, x1, y1, x2, y2, ptr, prop, index, min, max, a1, a2, tip); ui_check_but_and_iconize(but, icon); - but->flag|= UI_ICON_LEFT; + but->flag |= UI_ICON_LEFT; return but; } uiBut *uiDefIconTextButO_ptr(uiBlock *block, int type, wmOperatorType *ot, int opcontext, int icon, const char *str, int x1, int y1, short x2, short y2, const char *tip) { uiBut *but; - but= ui_def_but_operator_ptr(block, type, ot, opcontext, str, x1, y1, x2, y2, tip); + but = ui_def_but_operator_ptr(block, type, ot, opcontext, str, x1, y1, x2, y2, tip); ui_check_but_and_iconize(but, icon); - but->flag|= UI_ICON_LEFT; + but->flag |= UI_ICON_LEFT; return but; } uiBut *uiDefIconTextButO(uiBlock *block, int type, const char *opname, int opcontext, int icon, const char *str, int x1, int y1, short x2, short y2, const char *tip) @@ -3241,13 +3241,13 @@ void uiSetButLink(uiBut *but, void **poin, void ***ppoin, short *tot, int from, { uiLink *link; - link= but->link= MEM_callocN(sizeof(uiLink), "new uilink"); + link = but->link = MEM_callocN(sizeof(uiLink), "new uilink"); - link->poin= poin; - link->ppoin= ppoin; - link->totlink= tot; - link->fromcode= from; - link->tocode= to; + link->poin = poin; + link->ppoin = ppoin; + link->totlink = tot; + link->fromcode = from; + link->tocode = to; } /* cruft to make uiBlock and uiBut private */ @@ -3255,18 +3255,18 @@ void uiSetButLink(uiBut *but, void **poin, void ***ppoin, short *tot, int from, int uiBlocksGetYMin(ListBase *lb) { uiBlock *block; - int min= 0; + int min = 0; - for (block= lb->first; block; block= block->next) - if (block==lb->first || block->miny<min) - min= block->miny; + for (block = lb->first; block; block = block->next) + if (block == lb->first || block->miny < min) + min = block->miny; return min; } void uiBlockSetDirection(uiBlock *block, int direction) { - block->direction= direction; + block->direction = direction; } /* this call escapes if there's alignment flags */ @@ -3274,62 +3274,62 @@ void uiBlockFlipOrder(uiBlock *block) { ListBase lb; uiBut *but, *next; - float centy, miny=10000, maxy= -10000; + float centy, miny = 10000, maxy = -10000; if (U.uiflag & USER_MENUFIXEDORDER) return; else if (block->flag & UI_BLOCK_NO_FLIP) return; - for (but= block->buttons.first; but; but= but->next) { + for (but = block->buttons.first; but; but = but->next) { if (but->flag & UI_BUT_ALIGN) return; - if (but->y1 < miny) miny= but->y1; - if (but->y2 > maxy) maxy= but->y2; + if (but->y1 < miny) miny = but->y1; + if (but->y2 > maxy) maxy = but->y2; } /* mirror trick */ - centy= (miny+maxy)/2.0f; - for (but= block->buttons.first; but; but= but->next) { - but->y1 = centy-(but->y1-centy); - but->y2 = centy-(but->y2-centy); + centy = (miny + maxy) / 2.0f; + for (but = block->buttons.first; but; but = but->next) { + but->y1 = centy - (but->y1 - centy); + but->y2 = centy - (but->y2 - centy); SWAP(float, but->y1, but->y2); } /* also flip order in block itself, for example for arrowkey */ - lb.first= lb.last= NULL; - but= block->buttons.first; + lb.first = lb.last = NULL; + but = block->buttons.first; while (but) { - next= but->next; + next = but->next; BLI_remlink(&block->buttons, but); BLI_addtail(&lb, but); - but= next; + but = next; } - block->buttons= lb; + block->buttons = lb; } void uiBlockSetFlag(uiBlock *block, int flag) { - block->flag|= flag; + block->flag |= flag; } void uiBlockClearFlag(uiBlock *block, int flag) { - block->flag&= ~flag; + block->flag &= ~flag; } void uiBlockSetXOfs(uiBlock *block, int xofs) { - block->xofs= xofs; + block->xofs = xofs; } void uiButSetFlag(uiBut *but, int flag) { - but->flag|= flag; + but->flag |= flag; } void uiButClearFlag(uiBut *but, int flag) { - but->flag&= ~flag; + but->flag &= ~flag; } int uiButGetRetVal(uiBut *but) @@ -3339,47 +3339,47 @@ int uiButGetRetVal(uiBut *but) void uiButSetDragID(uiBut *but, ID *id) { - but->dragtype= WM_DRAG_ID; - but->dragpoin= (void *)id; + but->dragtype = WM_DRAG_ID; + but->dragpoin = (void *)id; } void uiButSetDragRNA(uiBut *but, PointerRNA *ptr) { - but->dragtype= WM_DRAG_RNA; - but->dragpoin= (void *)ptr; + but->dragtype = WM_DRAG_RNA; + but->dragpoin = (void *)ptr; } void uiButSetDragPath(uiBut *but, const char *path) { - but->dragtype= WM_DRAG_PATH; - but->dragpoin= (void *)path; + but->dragtype = WM_DRAG_PATH; + but->dragpoin = (void *)path; } void uiButSetDragName(uiBut *but, const char *name) { - but->dragtype= WM_DRAG_NAME; - but->dragpoin= (void *)name; + but->dragtype = WM_DRAG_NAME; + but->dragpoin = (void *)name; } /* value from button itself */ void uiButSetDragValue(uiBut *but) { - but->dragtype= WM_DRAG_VALUE; + but->dragtype = WM_DRAG_VALUE; } void uiButSetDragImage(uiBut *but, const char *path, int icon, struct ImBuf *imb, float scale) { - but->dragtype= WM_DRAG_PATH; - but->icon= icon; /* no flag UI_HAS_ICON, so icon doesnt draw in button */ - but->dragpoin= (void *)path; - but->imb= imb; - but->imb_scale= scale; + but->dragtype = WM_DRAG_PATH; + but->icon = icon; /* no flag UI_HAS_ICON, so icon doesnt draw in button */ + but->dragpoin = (void *)path; + but->imb = imb; + but->imb_scale = scale; } PointerRNA *uiButGetOperatorPtrRNA(uiBut *but) { if (but->optype && !but->opptr) { - but->opptr= MEM_callocN(sizeof(PointerRNA), "uiButOpPtr"); + but->opptr = MEM_callocN(sizeof(PointerRNA), "uiButOpPtr"); WM_operator_properties_create_ptr(but->opptr, but->optype); } @@ -3388,7 +3388,7 @@ PointerRNA *uiButGetOperatorPtrRNA(uiBut *but) void uiButSetUnitType(uiBut *but, const int unit_type) { - but->unit_type= (unsigned char)(unit_type>>16); + but->unit_type = (unsigned char)(unit_type >> 16); } int uiButGetUnitType(uiBut *but) @@ -3409,21 +3409,21 @@ int uiButGetUnitType(uiBut *but) void uiBlockSetHandleFunc(uiBlock *block, uiBlockHandleFunc func, void *arg) { - block->handle_func= func; - block->handle_func_arg= arg; + block->handle_func = func; + block->handle_func_arg = arg; } void uiBlockSetButmFunc(uiBlock *block, uiMenuHandleFunc func, void *arg) { - block->butm_func= func; - block->butm_func_arg= arg; + block->butm_func = func; + block->butm_func_arg = arg; } void uiBlockSetFunc(uiBlock *block, uiButHandleFunc func, void *arg1, void *arg2) { - block->func= func; - block->func_arg1= arg1; - block->func_arg2= arg2; + block->func = func; + block->func_arg1 = arg1; + block->func_arg2 = arg2; } void uiBlockSetNFunc(uiBlock *block, uiButHandleFunc func, void *argN, void *arg2) @@ -3432,29 +3432,29 @@ void uiBlockSetNFunc(uiBlock *block, uiButHandleFunc func, void *argN, void *arg MEM_freeN(block->func_argN); } - block->funcN= func; - block->func_argN= argN; - block->func_arg2= arg2; + block->funcN = func; + block->func_argN = argN; + block->func_arg2 = arg2; } void uiButSetRenameFunc(uiBut *but, uiButHandleRenameFunc func, void *arg1) { - but->rename_func= func; - but->rename_arg1= arg1; + but->rename_func = func; + but->rename_arg1 = arg1; } void uiBlockSetDrawExtraFunc(uiBlock *block, void (*func)(const bContext *C, void *idv, void *arg1, void *arg2, rcti *rect), void *arg1, void *arg2) { - block->drawextra= func; - block->drawextra_arg1= arg1; - block->drawextra_arg2= arg2; + block->drawextra = func; + block->drawextra_arg1 = arg1; + block->drawextra_arg2 = arg2; } void uiButSetFunc(uiBut *but, uiButHandleFunc func, void *arg1, void *arg2) { - but->func= func; - but->func_arg1= arg1; - but->func_arg2= arg2; + but->func = func; + but->func_arg1 = arg1; + but->func_arg2 = arg2; } void uiButSetNFunc(uiBut *but, uiButHandleNFunc funcN, void *argN, void *arg2) @@ -3463,22 +3463,22 @@ void uiButSetNFunc(uiBut *but, uiButHandleNFunc funcN, void *argN, void *arg2) MEM_freeN(but->func_argN); } - but->funcN= funcN; - but->func_argN= argN; - but->func_arg2= arg2; + but->funcN = funcN; + but->func_argN = argN; + but->func_arg2 = arg2; } void uiButSetCompleteFunc(uiBut *but, uiButCompleteFunc func, void *arg) { - but->autocomplete_func= func; - but->autofunc_arg= arg; + but->autocomplete_func = func; + but->autofunc_arg = arg; } uiBut *uiDefIDPoinBut(uiBlock *block, uiIDPoinFuncFP func, short blocktype, int retval, const char *str, int x1, int y1, short x2, short y2, void *idpp, const char *tip) { - uiBut *but= ui_def_but(block, IDPOIN, retval, str, x1, y1, x2, y2, NULL, 0.0, 0.0, 0.0, 0.0, tip); - but->idpoin_func= func; - but->idpoin_idpp= (ID**) idpp; + uiBut *but = ui_def_but(block, IDPOIN, retval, str, x1, y1, x2, y2, NULL, 0.0, 0.0, 0.0, 0.0, tip); + but->idpoin_func = func; + but->idpoin_idpp = (ID **) idpp; ui_check_but(but); if (blocktype) @@ -3489,20 +3489,20 @@ uiBut *uiDefIDPoinBut(uiBlock *block, uiIDPoinFuncFP func, short blocktype, int uiBut *uiDefBlockBut(uiBlock *block, uiBlockCreateFunc func, void *arg, const char *str, int x1, int y1, short x2, short y2, const char *tip) { - uiBut *but= ui_def_but(block, BLOCK, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); - but->block_create_func= func; + uiBut *but = ui_def_but(block, BLOCK, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); + but->block_create_func = func; ui_check_but(but); return but; } uiBut *uiDefBlockButN(uiBlock *block, uiBlockCreateFunc func, void *argN, const char *str, int x1, int y1, short x2, short y2, const char *tip) { - uiBut *but= ui_def_but(block, BLOCK, 0, str, x1, y1, x2, y2, NULL, 0.0, 0.0, 0.0, 0.0, tip); - but->block_create_func= func; + uiBut *but = ui_def_but(block, BLOCK, 0, str, x1, y1, x2, y2, NULL, 0.0, 0.0, 0.0, 0.0, tip); + but->block_create_func = func; if (but->func_argN) { MEM_freeN(but->func_argN); } - but->func_argN= argN; + but->func_argN = argN; ui_check_but(but); return but; } @@ -3510,31 +3510,31 @@ uiBut *uiDefBlockButN(uiBlock *block, uiBlockCreateFunc func, void *argN, const uiBut *uiDefPulldownBut(uiBlock *block, uiBlockCreateFunc func, void *arg, const char *str, int x1, int y1, short x2, short y2, const char *tip) { - uiBut *but= ui_def_but(block, PULLDOWN, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); - but->block_create_func= func; + uiBut *but = ui_def_but(block, PULLDOWN, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); + but->block_create_func = func; ui_check_but(but); return but; } uiBut *uiDefMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, const char *str, int x1, int y1, short x2, short y2, const char *tip) { - uiBut *but= ui_def_but(block, PULLDOWN, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); - but->menu_create_func= func; + uiBut *but = ui_def_but(block, PULLDOWN, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); + but->menu_create_func = func; ui_check_but(but); return but; } uiBut *uiDefIconTextMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, int icon, const char *str, int x1, int y1, short x2, short y2, const char *tip) { - uiBut *but= ui_def_but(block, PULLDOWN, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); + uiBut *but = ui_def_but(block, PULLDOWN, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); - but->icon= (BIFIconID) icon; - but->flag|= UI_HAS_ICON; + but->icon = (BIFIconID) icon; + but->flag |= UI_HAS_ICON; - but->flag|= UI_ICON_LEFT; - but->flag|= UI_ICON_SUBMENU; + but->flag |= UI_ICON_LEFT; + but->flag |= UI_ICON_SUBMENU; - but->menu_create_func= func; + but->menu_create_func = func; ui_check_but(but); return but; @@ -3542,13 +3542,13 @@ uiBut *uiDefIconTextMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, in uiBut *uiDefIconMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, int icon, int x1, int y1, short x2, short y2, const char *tip) { - uiBut *but= ui_def_but(block, PULLDOWN, 0, "", x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); + uiBut *but = ui_def_but(block, PULLDOWN, 0, "", x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); - but->icon= (BIFIconID) icon; + but->icon = (BIFIconID) icon; but->flag |= UI_HAS_ICON; - but->flag &=~ UI_ICON_LEFT; + but->flag &= ~UI_ICON_LEFT; - but->menu_create_func= func; + but->menu_create_func = func; ui_check_but(but); return but; @@ -3557,17 +3557,17 @@ uiBut *uiDefIconMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, int ic /* Block button containing both string label and icon */ uiBut *uiDefIconTextBlockBut(uiBlock *block, uiBlockCreateFunc func, void *arg, int icon, const char *str, int x1, int y1, short x2, short y2, const char *tip) { - uiBut *but= ui_def_but(block, BLOCK, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); + uiBut *but = ui_def_but(block, BLOCK, 0, str, x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); /* XXX temp, old menu calls pass on icon arrow, which is now UI_ICON_SUBMENU flag */ - if (icon!=ICON_RIGHTARROW_THIN) { - but->icon= (BIFIconID) icon; - but->flag|= UI_ICON_LEFT; + if (icon != ICON_RIGHTARROW_THIN) { + but->icon = (BIFIconID) icon; + but->flag |= UI_ICON_LEFT; } - but->flag|= UI_HAS_ICON; - but->flag|= UI_ICON_SUBMENU; + but->flag |= UI_HAS_ICON; + but->flag |= UI_ICON_SUBMENU; - but->block_create_func= func; + but->block_create_func = func; ui_check_but(but); return but; @@ -3576,14 +3576,14 @@ uiBut *uiDefIconTextBlockBut(uiBlock *block, uiBlockCreateFunc func, void *arg, /* Block button containing icon */ uiBut *uiDefIconBlockBut(uiBlock *block, uiBlockCreateFunc func, void *arg, int retval, int icon, int x1, int y1, short x2, short y2, const char *tip) { - uiBut *but= ui_def_but(block, BLOCK, retval, "", x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); + uiBut *but = ui_def_but(block, BLOCK, retval, "", x1, y1, x2, y2, arg, 0.0, 0.0, 0.0, 0.0, tip); - but->icon= (BIFIconID) icon; - but->flag|= UI_HAS_ICON; + but->icon = (BIFIconID) icon; + but->flag |= UI_HAS_ICON; - but->flag|= UI_ICON_LEFT; + but->flag |= UI_ICON_LEFT; - but->block_create_func= func; + but->block_create_func = func; ui_check_but(but); return but; @@ -3591,7 +3591,7 @@ uiBut *uiDefIconBlockBut(uiBlock *block, uiBlockCreateFunc func, void *arg, int uiBut *uiDefKeyevtButS(uiBlock *block, int retval, const char *str, int x1, int y1, short x2, short y2, short *spoin, const char *tip) { - uiBut *but= ui_def_but(block, KEYEVT|SHO, retval, str, x1, y1, x2, y2, spoin, 0.0, 0.0, 0.0, 0.0, tip); + uiBut *but = ui_def_but(block, KEYEVT | SHO, retval, str, x1, y1, x2, y2, spoin, 0.0, 0.0, 0.0, 0.0, tip); ui_check_but(but); return but; } @@ -3600,8 +3600,8 @@ uiBut *uiDefKeyevtButS(uiBlock *block, int retval, const char *str, int x1, int /* modkeypoin will be set to KM_SHIFT, KM_ALT, KM_CTRL, KM_OSKEY bits */ uiBut *uiDefHotKeyevtButS(uiBlock *block, int retval, const char *str, int x1, int y1, short x2, short y2, short *keypoin, short *modkeypoin, const char *tip) { - uiBut *but= ui_def_but(block, HOTKEYEVT|SHO, retval, str, x1, y1, x2, y2, keypoin, 0.0, 0.0, 0.0, 0.0, tip); - but->modifier_key= *modkeypoin; + uiBut *but = ui_def_but(block, HOTKEYEVT | SHO, retval, str, x1, y1, x2, y2, keypoin, 0.0, 0.0, 0.0, 0.0, tip); + but->modifier_key = *modkeypoin; ui_check_but(but); return but; } @@ -3611,12 +3611,12 @@ uiBut *uiDefHotKeyevtButS(uiBlock *block, int retval, const char *str, int x1, i /* here a1 and a2, if set, control thumbnail preview rows/cols */ uiBut *uiDefSearchBut(uiBlock *block, void *arg, int retval, int icon, int maxlen, int x1, int y1, short x2, short y2, float a1, float a2, const char *tip) { - uiBut *but= ui_def_but(block, SEARCH_MENU, retval, "", x1, y1, x2, y2, arg, 0.0, maxlen, a1, a2, tip); + uiBut *but = ui_def_but(block, SEARCH_MENU, retval, "", x1, y1, x2, y2, arg, 0.0, maxlen, a1, a2, tip); - but->icon= (BIFIconID) icon; - but->flag|= UI_HAS_ICON; + but->icon = (BIFIconID) icon; + but->flag |= UI_HAS_ICON; - but->flag|= UI_ICON_LEFT|UI_TEXT_LEFT; + but->flag |= UI_ICON_LEFT | UI_TEXT_LEFT; ui_check_but(but); @@ -3628,13 +3628,13 @@ uiBut *uiDefSearchBut(uiBlock *block, void *arg, int retval, int icon, int maxle /* if active set, button opens with this item visible and selected */ void uiButSetSearchFunc(uiBut *but, uiButSearchFunc sfunc, void *arg, uiButHandleFunc bfunc, void *active) { - but->search_func= sfunc; - but->search_arg= arg; + but->search_func = sfunc; + but->search_arg = arg; uiButSetFunc(but, bfunc, arg, active); /* search buttons show red-alert if item doesn't exist, not for menus */ - if (0==(but->block->flag & UI_BLOCK_LOOP)) { + if (0 == (but->block->flag & UI_BLOCK_LOOP)) { /* skip empty buttons, not all buttons need input, we only show invalid */ if (but->drawstr[0]) ui_but_search_test(but); @@ -3648,11 +3648,11 @@ void uiButSetFocusOnEnter(wmWindow *win, uiBut *but) { wmEvent event; - event= *(win->eventstate); - event.type= EVT_BUT_OPEN; - event.val= KM_PRESS; - event.customdata= but; - event.customdatafree= FALSE; + event = *(win->eventstate); + event.type = EVT_BUT_OPEN; + event.val = KM_PRESS; + event.customdata = but; + event.customdatafree = FALSE; wm_event_add(win, &event); } |