diff options
Diffstat (limited to 'source/blender/editors/screen/screen_edit.c')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 954 |
1 files changed, 479 insertions, 475 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index b2a2a371a1a..d714f82b58b 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -66,16 +66,16 @@ /* XXX actually should be not here... solve later */ #include "wm_subwindow.h" -#include "screen_intern.h" /* own module include */ +#include "screen_intern.h" /* own module include */ /* ******************* screen vert, edge, area managing *********************** */ static ScrVert *screen_addvert(bScreen *sc, short x, short y) { - ScrVert *sv= MEM_callocN(sizeof(ScrVert), "addscrvert"); - sv->vec.x= x; - sv->vec.y= y; + ScrVert *sv = MEM_callocN(sizeof(ScrVert), "addscrvert"); + sv->vec.x = x; + sv->vec.y = y; BLI_addtail(&sc->vertbase, sv); return sv; @@ -86,19 +86,19 @@ static void sortscrvert(ScrVert **v1, ScrVert **v2) ScrVert *tmp; if (*v1 > *v2) { - tmp= *v1; - *v1= *v2; - *v2= tmp; + tmp = *v1; + *v1 = *v2; + *v2 = tmp; } } static ScrEdge *screen_addedge(bScreen *sc, ScrVert *v1, ScrVert *v2) { - ScrEdge *se= MEM_callocN(sizeof(ScrEdge), "addscredge"); + ScrEdge *se = MEM_callocN(sizeof(ScrEdge), "addscredge"); sortscrvert(&v1, &v2); - se->v1= v1; - se->v2= v2; + se->v1 = v1; + se->v2 = v2; BLI_addtail(&sc->edgebase, se); return se; @@ -110,8 +110,8 @@ ScrEdge *screen_findedge(bScreen *sc, ScrVert *v1, ScrVert *v2) ScrEdge *se; sortscrvert(&v1, &v2); - for (se= sc->edgebase.first; se; se= se->next) - if (se->v1==v1 && se->v2==v2) + for (se = sc->edgebase.first; se; se = se->next) + if (se->v1 == v1 && se->v2 == v2) return se; return NULL; @@ -123,50 +123,50 @@ void removedouble_scrverts(bScreen *sc) ScrEdge *se; ScrArea *sa; - verg= sc->vertbase.first; + verg = sc->vertbase.first; while (verg) { - if (verg->newv==NULL) { /* !!! */ - v1= verg->next; + if (verg->newv == NULL) { /* !!! */ + v1 = verg->next; while (v1) { - if (v1->newv==NULL) { /* !?! */ - if (v1->vec.x==verg->vec.x && v1->vec.y==verg->vec.y) { + if (v1->newv == NULL) { /* !?! */ + if (v1->vec.x == verg->vec.x && v1->vec.y == verg->vec.y) { /* printf("doublevert\n"); */ - v1->newv= verg; + v1->newv = verg; } } - v1= v1->next; + v1 = v1->next; } } - verg= verg->next; + verg = verg->next; } /* replace pointers in edges and faces */ - se= sc->edgebase.first; + se = sc->edgebase.first; while (se) { - if (se->v1->newv) se->v1= se->v1->newv; - if (se->v2->newv) se->v2= se->v2->newv; + if (se->v1->newv) se->v1 = se->v1->newv; + if (se->v2->newv) se->v2 = se->v2->newv; /* edges changed: so.... */ sortscrvert(&(se->v1), &(se->v2)); - se= se->next; + se = se->next; } - sa= sc->areabase.first; + sa = sc->areabase.first; while (sa) { - if (sa->v1->newv) sa->v1= sa->v1->newv; - if (sa->v2->newv) sa->v2= sa->v2->newv; - if (sa->v3->newv) sa->v3= sa->v3->newv; - if (sa->v4->newv) sa->v4= sa->v4->newv; - sa= sa->next; + if (sa->v1->newv) sa->v1 = sa->v1->newv; + if (sa->v2->newv) sa->v2 = sa->v2->newv; + if (sa->v3->newv) sa->v3 = sa->v3->newv; + if (sa->v4->newv) sa->v4 = sa->v4->newv; + sa = sa->next; } /* remove */ - verg= sc->vertbase.first; + verg = sc->vertbase.first; while (verg) { - v1= verg->next; + v1 = verg->next; if (verg->newv) { BLI_remlink(&sc->vertbase, verg); MEM_freeN(verg); } - verg= v1; + verg = v1; } } @@ -178,22 +178,22 @@ void removenotused_scrverts(bScreen *sc) /* we assume edges are ok */ - se= sc->edgebase.first; + se = sc->edgebase.first; while (se) { - se->v1->flag= 1; - se->v2->flag= 1; - se= se->next; + se->v1->flag = 1; + se->v2->flag = 1; + se = se->next; } - sv= sc->vertbase.first; + sv = sc->vertbase.first; while (sv) { - svn= sv->next; - if (sv->flag==0) { + svn = sv->next; + if (sv->flag == 0) { BLI_remlink(&sc->vertbase, sv); MEM_freeN(sv); } - else sv->flag= 0; - sv= svn; + else sv->flag = 0; + sv = svn; } } @@ -202,18 +202,18 @@ void removedouble_scredges(bScreen *sc) ScrEdge *verg, *se, *sn; /* compare */ - verg= sc->edgebase.first; + verg = sc->edgebase.first; while (verg) { - se= verg->next; + se = verg->next; while (se) { - sn= se->next; - if (verg->v1==se->v1 && verg->v2==se->v2) { + sn = se->next; + if (verg->v1 == se->v1 && verg->v2 == se->v2) { BLI_remlink(&sc->edgebase, se); MEM_freeN(se); } - se= sn; + se = sn; } - verg= verg->next; + verg = verg->next; } } @@ -221,35 +221,35 @@ void removenotused_scredges(bScreen *sc) { ScrEdge *se, *sen; ScrArea *sa; - int a=0; + int a = 0; /* sets flags when edge is used in area */ - sa= sc->areabase.first; + sa = sc->areabase.first; while (sa) { - se= screen_findedge(sc, sa->v1, sa->v2); - if (se==NULL) printf("error: area %d edge 1 doesn't exist\n", a); - else se->flag= 1; - se= screen_findedge(sc, sa->v2, sa->v3); - if (se==NULL) printf("error: area %d edge 2 doesn't exist\n", a); - else se->flag= 1; - se= screen_findedge(sc, sa->v3, sa->v4); - if (se==NULL) printf("error: area %d edge 3 doesn't exist\n", a); - else se->flag= 1; - se= screen_findedge(sc, sa->v4, sa->v1); - if (se==NULL) printf("error: area %d edge 4 doesn't exist\n", a); - else se->flag= 1; - sa= sa->next; + se = screen_findedge(sc, sa->v1, sa->v2); + if (se == NULL) printf("error: area %d edge 1 doesn't exist\n", a); + else se->flag = 1; + se = screen_findedge(sc, sa->v2, sa->v3); + if (se == NULL) printf("error: area %d edge 2 doesn't exist\n", a); + else se->flag = 1; + se = screen_findedge(sc, sa->v3, sa->v4); + if (se == NULL) printf("error: area %d edge 3 doesn't exist\n", a); + else se->flag = 1; + se = screen_findedge(sc, sa->v4, sa->v1); + if (se == NULL) printf("error: area %d edge 4 doesn't exist\n", a); + else se->flag = 1; + sa = sa->next; a++; } - se= sc->edgebase.first; + se = sc->edgebase.first; while (se) { - sen= se->next; - if (se->flag==0) { + sen = se->next; + if (se->flag == 0) { BLI_remlink(&sc->edgebase, se); MEM_freeN(se); } - else se->flag= 0; - se= sen; + else se->flag = 0; + se = sen; } } @@ -262,21 +262,21 @@ ScrEdge *screen_find_active_scredge(bScreen *sc, int mx, int my) { ScrEdge *se; - for (se= sc->edgebase.first; se; se= se->next) { + for (se = sc->edgebase.first; se; se = se->next) { if (scredge_is_horizontal(se)) { short min, max; - min= MIN2(se->v1->vec.x, se->v2->vec.x); - max= MAX2(se->v1->vec.x, se->v2->vec.x); + min = MIN2(se->v1->vec.x, se->v2->vec.x); + max = MAX2(se->v1->vec.x, se->v2->vec.x); - if (abs(my-se->v1->vec.y)<=2 && mx>=min && mx<=max) + if (abs(my - se->v1->vec.y) <= 2 && mx >= min && mx <= max) return se; } else { short min, max; - min= MIN2(se->v1->vec.y, se->v2->vec.y); - max= MAX2(se->v1->vec.y, se->v2->vec.y); + min = MIN2(se->v1->vec.y, se->v2->vec.y); + max = MAX2(se->v1->vec.y, se->v2->vec.y); - if (abs(mx-se->v1->vec.x)<=2 && my>=min && my<=max) + if (abs(mx - se->v1->vec.x) <= 2 && my >= min && my <= max) return se; } } @@ -289,13 +289,13 @@ ScrEdge *screen_find_active_scredge(bScreen *sc, int mx, int my) /* adds no space data */ static ScrArea *screen_addarea(bScreen *sc, ScrVert *v1, ScrVert *v2, ScrVert *v3, ScrVert *v4, short headertype, short spacetype) { - ScrArea *sa= MEM_callocN(sizeof(ScrArea), "addscrarea"); - sa->v1= v1; - sa->v2= v2; - sa->v3= v3; - sa->v4= v4; - sa->headertype= headertype; - sa->spacetype= sa->butspacetype= spacetype; + ScrArea *sa = MEM_callocN(sizeof(ScrArea), "addscrarea"); + sa->v1 = v1; + sa->v2 = v2; + sa->v3 = v3; + sa->v4 = v4; + sa->headertype = headertype; + sa->spacetype = sa->butspacetype = spacetype; BLI_addtail(&sc->areabase, sa); @@ -320,31 +320,31 @@ static short testsplitpoint(ScrArea *sa, char dir, float fac) short x, y; // area big enough? - if (dir=='v' && (sa->v4->vec.x- sa->v1->vec.x <= 2*AREAMINX)) return 0; - if (dir=='h' && (sa->v2->vec.y- sa->v1->vec.y <= 2*AREAMINY)) return 0; + if (dir == 'v' && (sa->v4->vec.x - sa->v1->vec.x <= 2 * AREAMINX)) return 0; + if (dir == 'h' && (sa->v2->vec.y - sa->v1->vec.y <= 2 * AREAMINY)) return 0; // to be sure CLAMP(fac, 0.0f, 1.0f); - if (dir=='h') { - y= sa->v1->vec.y+ fac*(sa->v2->vec.y- sa->v1->vec.y); + if (dir == 'h') { + y = sa->v1->vec.y + fac * (sa->v2->vec.y - sa->v1->vec.y); - if (y- sa->v1->vec.y < AREAMINY) - y= sa->v1->vec.y+ AREAMINY; - else if (sa->v2->vec.y- y < AREAMINY) - y= sa->v2->vec.y- AREAMINY; - else y-= (y % AREAGRID); + if (y - sa->v1->vec.y < AREAMINY) + y = sa->v1->vec.y + AREAMINY; + else if (sa->v2->vec.y - y < AREAMINY) + y = sa->v2->vec.y - AREAMINY; + else y -= (y % AREAGRID); return y; } else { - x= sa->v1->vec.x+ fac*(sa->v4->vec.x- sa->v1->vec.x); + x = sa->v1->vec.x + fac * (sa->v4->vec.x - sa->v1->vec.x); - if (x- sa->v1->vec.x < AREAMINX) - x= sa->v1->vec.x+ AREAMINX; - else if (sa->v4->vec.x- x < AREAMINX) - x= sa->v4->vec.x- AREAMINX; - else x-= (x % AREAGRID); + if (x - sa->v1->vec.x < AREAMINX) + x = sa->v1->vec.x + AREAMINX; + else if (sa->v4->vec.x - x < AREAMINX) + x = sa->v4->vec.x - AREAMINX; + else x -= (x % AREAGRID); return x; } @@ -352,19 +352,19 @@ static short testsplitpoint(ScrArea *sa, char dir, float fac) ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge) { - ScrArea *newa=NULL; + ScrArea *newa = NULL; ScrVert *sv1, *sv2; short split; - if (sa==NULL) return NULL; + if (sa == NULL) return NULL; - split= testsplitpoint(sa, dir, fac); - if (split==0) return NULL; + split = testsplitpoint(sa, dir, fac); + if (split == 0) return NULL; - if (dir=='h') { + if (dir == 'h') { /* new vertices */ - sv1= screen_addvert(sc, sa->v1->vec.x, split); - sv2= screen_addvert(sc, sa->v4->vec.x, split); + sv1 = screen_addvert(sc, sa->v1->vec.x, split); + sv2 = screen_addvert(sc, sa->v4->vec.x, split); /* new edges */ screen_addedge(sc, sa->v1, sv1); @@ -374,18 +374,18 @@ ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge) screen_addedge(sc, sv1, sv2); /* new areas: top */ - newa= screen_addarea(sc, sv1, sa->v2, sa->v3, sv2, sa->headertype, sa->spacetype); + newa = screen_addarea(sc, sv1, sa->v2, sa->v3, sv2, sa->headertype, sa->spacetype); area_copy_data(newa, sa, 0); /* area below */ - sa->v2= sv1; - sa->v3= sv2; + sa->v2 = sv1; + sa->v3 = sv2; } else { /* new vertices */ - sv1= screen_addvert(sc, split, sa->v1->vec.y); - sv2= screen_addvert(sc, split, sa->v2->vec.y); + sv1 = screen_addvert(sc, split, sa->v1->vec.y); + sv2 = screen_addvert(sc, split, sa->v2->vec.y); /* new edges */ screen_addedge(sc, sa->v1, sv1); @@ -395,12 +395,12 @@ ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge) screen_addedge(sc, sv1, sv2); /* new areas: left */ - newa= screen_addarea(sc, sa->v1, sa->v2, sv2, sv1, sa->headertype, sa->spacetype); + newa = screen_addarea(sc, sa->v1, sa->v2, sv2, sv1, sa->headertype, sa->spacetype); area_copy_data(newa, sa, 0); /* area right */ - sa->v1= sv1; - sa->v2= sv2; + sa->v1 = sv1; + sa->v2 = sv2; } /* remove double vertices en edges */ @@ -419,16 +419,16 @@ bScreen *ED_screen_add(wmWindow *win, Scene *scene, const char *name) bScreen *sc; ScrVert *sv1, *sv2, *sv3, *sv4; - sc= BKE_libblock_alloc(&G.main->screen, ID_SCR, name); - sc->scene= scene; - sc->do_refresh= 1; - sc->redraws_flag= TIME_ALL_3D_WIN|TIME_ALL_ANIM_WIN; - sc->winid= win->winid; - - sv1= screen_addvert(sc, 0, 0); - sv2= screen_addvert(sc, 0, win->sizey-1); - sv3= screen_addvert(sc, win->sizex-1, win->sizey-1); - sv4= screen_addvert(sc, win->sizex-1, 0); + sc = BKE_libblock_alloc(&G.main->screen, ID_SCR, name); + sc->scene = scene; + sc->do_refresh = 1; + sc->redraws_flag = TIME_ALL_3D_WIN | TIME_ALL_ANIM_WIN; + sc->winid = win->winid; + + sv1 = screen_addvert(sc, 0, 0); + sv2 = screen_addvert(sc, 0, win->sizey - 1); + sv3 = screen_addvert(sc, win->sizex - 1, win->sizey - 1); + sv4 = screen_addvert(sc, win->sizex - 1, 0); screen_addedge(sc, sv1, sv2); screen_addedge(sc, sv2, sv3); @@ -453,37 +453,37 @@ static void screen_copy(bScreen *to, bScreen *from) BLI_duplicatelist(&to->vertbase, &from->vertbase); BLI_duplicatelist(&to->edgebase, &from->edgebase); BLI_duplicatelist(&to->areabase, &from->areabase); - to->regionbase.first= to->regionbase.last= NULL; + to->regionbase.first = to->regionbase.last = NULL; - s2= to->vertbase.first; - for (s1= from->vertbase.first; s1; s1= s1->next, s2= s2->next) { - s1->newv= s2; + s2 = to->vertbase.first; + for (s1 = from->vertbase.first; s1; s1 = s1->next, s2 = s2->next) { + s1->newv = s2; } - for (se= to->edgebase.first; se; se= se->next) { - se->v1= se->v1->newv; - se->v2= se->v2->newv; + for (se = to->edgebase.first; se; se = se->next) { + se->v1 = se->v1->newv; + se->v2 = se->v2->newv; sortscrvert(&(se->v1), &(se->v2)); } - saf= from->areabase.first; - for (sa= to->areabase.first; sa; sa= sa->next, saf= saf->next) { - sa->v1= sa->v1->newv; - sa->v2= sa->v2->newv; - sa->v3= sa->v3->newv; - sa->v4= sa->v4->newv; - - sa->spacedata.first= sa->spacedata.last= NULL; - sa->regionbase.first= sa->regionbase.last= NULL; - sa->actionzones.first= sa->actionzones.last= NULL; - sa->handlers.first= sa->handlers.last= NULL; + saf = from->areabase.first; + for (sa = to->areabase.first; sa; sa = sa->next, saf = saf->next) { + sa->v1 = sa->v1->newv; + sa->v2 = sa->v2->newv; + sa->v3 = sa->v3->newv; + sa->v4 = sa->v4->newv; + + sa->spacedata.first = sa->spacedata.last = NULL; + sa->regionbase.first = sa->regionbase.last = NULL; + sa->actionzones.first = sa->actionzones.last = NULL; + sa->handlers.first = sa->handlers.last = NULL; area_copy_data(sa, saf, 0); } /* put at zero (needed?) */ - for (s1= from->vertbase.first; s1; s1= s1->next) - s1->newv= NULL; + for (s1 = from->vertbase.first; s1; s1 = s1->next) + s1->newv = NULL; } @@ -496,27 +496,27 @@ int area_getorientation(ScrArea *sa, ScrArea *sb) ScrVert *sav1, *sav2, *sav3, *sav4; ScrVert *sbv1, *sbv2, *sbv3, *sbv4; - if (sa==NULL || sb==NULL) return -1; + if (sa == NULL || sb == NULL) return -1; - sav1= sa->v1; - sav2= sa->v2; - sav3= sa->v3; - sav4= sa->v4; - sbv1= sb->v1; - sbv2= sb->v2; - sbv3= sb->v3; - sbv4= sb->v4; + sav1 = sa->v1; + sav2 = sa->v2; + sav3 = sa->v3; + sav4 = sa->v4; + sbv1 = sb->v1; + sbv2 = sb->v2; + sbv3 = sb->v3; + sbv4 = sb->v4; - if (sav1==sbv4 && sav2==sbv3) { /* sa to right of sb = W */ + if (sav1 == sbv4 && sav2 == sbv3) { /* sa to right of sb = W */ return 0; } - else if (sav2==sbv1 && sav3==sbv4) { /* sa to bottom of sb = N */ + else if (sav2 == sbv1 && sav3 == sbv4) { /* sa to bottom of sb = N */ return 1; } - else if (sav3==sbv2 && sav4==sbv1) { /* sa to left of sb = E */ + else if (sav3 == sbv2 && sav4 == sbv1) { /* sa to left of sb = E */ return 2; } - else if (sav1==sbv2 && sav4==sbv3) { /* sa on top of sb = S*/ + else if (sav1 == sbv2 && sav4 == sbv3) { /* sa on top of sb = S*/ return 3; } @@ -524,9 +524,9 @@ int area_getorientation(ScrArea *sa, ScrArea *sb) } /* Helper function to join 2 areas, it has a return value, 0=failed 1=success - * used by the split, join operators + * used by the split, join operators */ -int screen_area_join(bContext *C, bScreen* scr, ScrArea *sa1, ScrArea *sa2) +int screen_area_join(bContext *C, bScreen *scr, ScrArea *sa1, ScrArea *sa2) { int dir; @@ -534,32 +534,32 @@ int screen_area_join(bContext *C, bScreen* scr, ScrArea *sa1, ScrArea *sa2) /*printf("dir is : %i\n", dir);*/ if (dir < 0) { - if (sa1 ) sa1->flag &= ~AREA_FLAG_DRAWJOINFROM; - if (sa2 ) sa2->flag &= ~AREA_FLAG_DRAWJOINTO; + if (sa1) sa1->flag &= ~AREA_FLAG_DRAWJOINFROM; + if (sa2) sa2->flag &= ~AREA_FLAG_DRAWJOINTO; return 0; } if (dir == 0) { - sa1->v1= sa2->v1; - sa1->v2= sa2->v2; + sa1->v1 = sa2->v1; + sa1->v2 = sa2->v2; screen_addedge(scr, sa1->v2, sa1->v3); screen_addedge(scr, sa1->v1, sa1->v4); } else if (dir == 1) { - sa1->v2= sa2->v2; - sa1->v3= sa2->v3; + sa1->v2 = sa2->v2; + sa1->v3 = sa2->v3; screen_addedge(scr, sa1->v1, sa1->v2); screen_addedge(scr, sa1->v3, sa1->v4); } else if (dir == 2) { - sa1->v3= sa2->v3; - sa1->v4= sa2->v4; + sa1->v3 = sa2->v3; + sa1->v4 = sa2->v4; screen_addedge(scr, sa1->v2, sa1->v3); screen_addedge(scr, sa1->v1, sa1->v4); } else if (dir == 3) { - sa1->v1= sa2->v1; - sa1->v4= sa2->v4; + sa1->v1 = sa2->v1; + sa1->v4 = sa2->v4; screen_addedge(scr, sa1->v1, sa1->v2); screen_addedge(scr, sa1->v3, sa1->v4); } @@ -581,34 +581,38 @@ void select_connected_scredge(bScreen *sc, ScrEdge *edge) /* select connected, only in the right direction */ /* 'dir' is the direction of EDGE */ - if (edge->v1->vec.x==edge->v2->vec.x) dir= 'v'; - else dir= 'h'; + if (edge->v1->vec.x == edge->v2->vec.x) dir = 'v'; + else dir = 'h'; - sv= sc->vertbase.first; + sv = sc->vertbase.first; while (sv) { sv->flag = 0; - sv= sv->next; + sv = sv->next; } - edge->v1->flag= 1; - edge->v2->flag= 1; + edge->v1->flag = 1; + edge->v2->flag = 1; - oneselected= 1; + oneselected = 1; while (oneselected) { - se= sc->edgebase.first; - oneselected= 0; + se = sc->edgebase.first; + oneselected = 0; while (se) { - if (se->v1->flag + se->v2->flag==1) { - if (dir=='h') if (se->v1->vec.y==se->v2->vec.y) { - se->v1->flag= se->v2->flag= 1; - oneselected= 1; + if (se->v1->flag + se->v2->flag == 1) { + if (dir == 'h') { + if (se->v1->vec.y == se->v2->vec.y) { + se->v1->flag = se->v2->flag = 1; + oneselected = 1; + } } - if (dir=='v') if (se->v1->vec.x==se->v2->vec.x) { - se->v1->flag= se->v2->flag= 1; - oneselected= 1; + if (dir == 'v') { + if (se->v1->vec.x == se->v2->vec.x) { + se->v1->flag = se->v2->flag = 1; + oneselected = 1; } + } } - se= se->next; + se = se->next; } } } @@ -616,52 +620,52 @@ void select_connected_scredge(bScreen *sc, ScrEdge *edge) /* test if screen vertices should be scaled */ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) { - ScrVert *sv=NULL; + ScrVert *sv = NULL; ScrArea *sa; int sizex, sizey; float facx, facy, tempf, min[2], max[2]; /* calculate size */ - min[0]= min[1]= 10000.0f; - max[0]= max[1]= 0.0f; + min[0] = min[1] = 10000.0f; + max[0] = max[1] = 0.0f; - for (sv= sc->vertbase.first; sv; sv= sv->next) { - min[0]= MIN2(min[0], sv->vec.x); - min[1]= MIN2(min[1], sv->vec.y); - max[0]= MAX2(max[0], sv->vec.x); - max[1]= MAX2(max[1], sv->vec.y); + for (sv = sc->vertbase.first; sv; sv = sv->next) { + min[0] = MIN2(min[0], sv->vec.x); + min[1] = MIN2(min[1], sv->vec.y); + max[0] = MAX2(max[0], sv->vec.x); + max[1] = MAX2(max[1], sv->vec.y); } /* always make 0.0 left under */ - for (sv= sc->vertbase.first; sv; sv= sv->next) { + for (sv = sc->vertbase.first; sv; sv = sv->next) { sv->vec.x -= min[0]; sv->vec.y -= min[1]; } - sizex= max[0]-min[0]; - sizey= max[1]-min[1]; + sizex = max[0] - min[0]; + sizey = max[1] - min[1]; - if (sizex!= winsizex || sizey!= winsizey) { - facx= winsizex; - facx/= (float)sizex; - facy= winsizey; - facy/= (float)sizey; + if (sizex != winsizex || sizey != winsizey) { + facx = winsizex; + facx /= (float)sizex; + facy = winsizey; + facy /= (float)sizey; /* make sure it fits! */ - for (sv= sc->vertbase.first; sv; sv= sv->next) { + for (sv = sc->vertbase.first; sv; sv = sv->next) { /* FIXME, this re-sizing logic is no good when re-sizing the window + redrawing [#24428] * need some way to store these as floats internally and re-apply from there. */ - tempf= ((float)sv->vec.x)*facx; - sv->vec.x= (short)(tempf+0.5f); - sv->vec.x+= AREAGRID-1; - sv->vec.x-= (sv->vec.x % AREAGRID); + tempf = ((float)sv->vec.x) * facx; + sv->vec.x = (short)(tempf + 0.5f); + sv->vec.x += AREAGRID - 1; + sv->vec.x -= (sv->vec.x % AREAGRID); CLAMP(sv->vec.x, 0, winsizex); - tempf= ((float)sv->vec.y)*facy; - sv->vec.y= (short)(tempf+0.5f); - sv->vec.y+= AREAGRID-1; - sv->vec.y-= (sv->vec.y % AREAGRID); + tempf = ((float)sv->vec.y) * facy; + sv->vec.y = (short)(tempf + 0.5f); + sv->vec.y += AREAGRID - 1; + sv->vec.y -= (sv->vec.y % AREAGRID); CLAMP(sv->vec.y, 0, winsizey); } @@ -671,26 +675,26 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey) /* ton: removed option now, it needs Context... */ /* make each window at least ED_area_headersize() high */ - for (sa= sc->areabase.first; sa; sa= sa->next) { - int headery= ED_area_headersize()+1; + for (sa = sc->areabase.first; sa; sa = sa->next) { + int headery = ED_area_headersize() + 1; - if (sa->v1->vec.y+headery > sa->v2->vec.y) { + if (sa->v1->vec.y + headery > sa->v2->vec.y) { /* lower edge */ - ScrEdge *se= screen_findedge(sc, sa->v4, sa->v1); - if (se && sa->v1!=sa->v2 ) { + ScrEdge *se = screen_findedge(sc, sa->v4, sa->v1); + if (se && sa->v1 != sa->v2) { int yval; select_connected_scredge(sc, se); /* all selected vertices get the right offset */ - yval= sa->v2->vec.y-headery; - sv= sc->vertbase.first; + yval = sa->v2->vec.y - headery; + sv = sc->vertbase.first; while (sv) { /* if is a collapsed area */ - if (sv!=sa->v2 && sv!=sa->v3) { - if (sv->flag) sv->vec.y= yval; + if (sv != sa->v2 && sv != sa->v3) { + if (sv->flag) sv->vec.y = yval; } - sv= sv->next; + sv = sv->next; } } } @@ -714,17 +718,17 @@ static void draw_horizontal_join_shape(ScrArea *sa, char dir) float width = sa->v3->vec.x - sa->v1->vec.x; float height = sa->v3->vec.y - sa->v1->vec.y; - if (height<width) { - h = height/8; - w = height/4; + if (height < width) { + h = height / 8; + w = height / 4; } else { - h = width/8; - w = width/4; + h = width / 8; + w = width / 4; } points[0].x = sa->v1->vec.x; - points[0].y = sa->v1->vec.y + height/2; + points[0].y = sa->v1->vec.y + height / 2; points[1].x = sa->v1->vec.x; points[1].y = sa->v1->vec.y; @@ -733,13 +737,13 @@ static void draw_horizontal_join_shape(ScrArea *sa, char dir) points[2].y = sa->v4->vec.y; points[3].x = sa->v4->vec.x - w; - points[3].y = sa->v4->vec.y + height/2 - 2*h; + points[3].y = sa->v4->vec.y + height / 2 - 2 * h; - points[4].x = sa->v4->vec.x - 2*w; - points[4].y = sa->v4->vec.y + height/2; + points[4].x = sa->v4->vec.x - 2 * w; + points[4].y = sa->v4->vec.y + height / 2; points[5].x = sa->v4->vec.x - w; - points[5].y = sa->v4->vec.y + height/2 + 2*h; + points[5].y = sa->v4->vec.y + height / 2 + 2 * h; points[6].x = sa->v3->vec.x - w; points[6].y = sa->v3->vec.y; @@ -748,15 +752,15 @@ static void draw_horizontal_join_shape(ScrArea *sa, char dir) points[7].y = sa->v2->vec.y; points[8].x = sa->v4->vec.x; - points[8].y = sa->v4->vec.y + height/2 - h; + points[8].y = sa->v4->vec.y + height / 2 - h; points[9].x = sa->v4->vec.x; - points[9].y = sa->v4->vec.y + height/2 + h; + points[9].y = sa->v4->vec.y + height / 2 + h; - if (dir=='l') { + if (dir == 'l') { /* when direction is left, then we flip direction of arrow */ float cx = sa->v1->vec.x + width; - for (i=0;i<10;i++) { + for (i = 0; i < 10; i++) { points[i].x -= cx; points[i].x = -points[i].x; points[i].x += sa->v1->vec.x; @@ -764,11 +768,11 @@ static void draw_horizontal_join_shape(ScrArea *sa, char dir) } glBegin(GL_POLYGON); - for (i=0;i<5;i++) + for (i = 0; i < 5; i++) glVertex2f(points[i].x, points[i].y); glEnd(); glBegin(GL_POLYGON); - for (i=4;i<8;i++) + for (i = 4; i < 8; i++) glVertex2f(points[i].x, points[i].y); glVertex2f(points[0].x, points[0].y); glEnd(); @@ -786,16 +790,16 @@ static void draw_vertical_join_shape(ScrArea *sa, char dir) float width = sa->v3->vec.x - sa->v1->vec.x; float height = sa->v3->vec.y - sa->v1->vec.y; - if (height<width) { - h = height/4; - w = height/8; + if (height < width) { + h = height / 4; + w = height / 8; } else { - h = width/4; - w = width/8; + h = width / 4; + w = width / 8; } - points[0].x = sa->v1->vec.x + width/2; + points[0].x = sa->v1->vec.x + width / 2; points[0].y = sa->v3->vec.y; points[1].x = sa->v2->vec.x; @@ -804,13 +808,13 @@ static void draw_vertical_join_shape(ScrArea *sa, char dir) points[2].x = sa->v1->vec.x; points[2].y = sa->v1->vec.y + h; - points[3].x = sa->v1->vec.x + width/2 - 2*w; + points[3].x = sa->v1->vec.x + width / 2 - 2 * w; points[3].y = sa->v1->vec.y + h; - points[4].x = sa->v1->vec.x + width/2; - points[4].y = sa->v1->vec.y + 2*h; + points[4].x = sa->v1->vec.x + width / 2; + points[4].y = sa->v1->vec.y + 2 * h; - points[5].x = sa->v1->vec.x + width/2 + 2*w; + points[5].x = sa->v1->vec.x + width / 2 + 2 * w; points[5].y = sa->v1->vec.y + h; points[6].x = sa->v4->vec.x; @@ -819,16 +823,16 @@ static void draw_vertical_join_shape(ScrArea *sa, char dir) points[7].x = sa->v3->vec.x; points[7].y = sa->v3->vec.y; - points[8].x = sa->v1->vec.x + width/2 - w; + points[8].x = sa->v1->vec.x + width / 2 - w; points[8].y = sa->v1->vec.y; - points[9].x = sa->v1->vec.x + width/2 + w; + points[9].x = sa->v1->vec.x + width / 2 + w; points[9].y = sa->v1->vec.y; - if (dir=='u') { + if (dir == 'u') { /* when direction is up, then we flip direction of arrow */ float cy = sa->v1->vec.y + height; - for (i=0;i<10;i++) { + for (i = 0; i < 10; i++) { points[i].y -= cy; points[i].y = -points[i].y; points[i].y += sa->v1->vec.y; @@ -836,11 +840,11 @@ static void draw_vertical_join_shape(ScrArea *sa, char dir) } glBegin(GL_POLYGON); - for (i=0;i<5;i++) + for (i = 0; i < 5; i++) glVertex2f(points[i].x, points[i].y); glEnd(); glBegin(GL_POLYGON); - for (i=4;i<8;i++) + for (i = 4; i < 8; i++) glVertex2f(points[i].x, points[i].y); glVertex2f(points[0].x, points[0].y); glEnd(); @@ -852,7 +856,7 @@ static void draw_vertical_join_shape(ScrArea *sa, char dir) /* draw join shape due to direction of joining */ static void draw_join_shape(ScrArea *sa, char dir) { - if (dir=='u' || dir=='d') + if (dir == 'u' || dir == 'd') draw_vertical_join_shape(sa, dir); else draw_horizontal_join_shape(sa, dir); @@ -883,38 +887,38 @@ static void scrarea_draw_shape_light(ScrArea *sa, char UNUSED(dir)) static void drawscredge_area_draw(int sizex, int sizey, short x1, short y1, short x2, short y2, short a) { /* right border area */ - if (x2<sizex-1) - sdrawline(x2+a, y1, x2+a, y2); + if (x2 < sizex - 1) + sdrawline(x2 + a, y1, x2 + a, y2); /* left border area */ - if (x1>0) /* otherwise it draws the emboss of window over */ - sdrawline(x1+a, y1, x1+a, y2); + if (x1 > 0) /* otherwise it draws the emboss of window over */ + sdrawline(x1 + a, y1, x1 + a, y2); /* top border area */ - if (y2<sizey-1) - sdrawline(x1, y2+a, x2, y2+a); + if (y2 < sizey - 1) + sdrawline(x1, y2 + a, x2, y2 + a); /* bottom border area */ - if (y1>0) - sdrawline(x1, y1+a, x2, y1+a); + if (y1 > 0) + sdrawline(x1, y1 + a, x2, y1 + a); } /** screen edges drawing **/ static void drawscredge_area(ScrArea *sa, int sizex, int sizey, int center) { - short x1= sa->v1->vec.x; - short y1= sa->v1->vec.y; - short x2= sa->v3->vec.x; - short y2= sa->v3->vec.y; + short x1 = sa->v1->vec.x; + short y1 = sa->v1->vec.y; + short x2 = sa->v3->vec.x; + short y2 = sa->v3->vec.y; short a, rt; - rt= 0; // CLAMPIS(G.rt, 0, 16); + rt = 0; // CLAMPIS(G.rt, 0, 16); - if (center==0) { + if (center == 0) { cpack(0x505050); - for (a=-rt; a<=rt; a++) - if (a!=0) + for (a = -rt; a <= rt; a++) + if (a != 0) drawscredge_area_draw(sizex, sizey, x1, y1, x2, y2, a); } else { @@ -929,10 +933,10 @@ bScreen *ED_screen_duplicate(wmWindow *win, bScreen *sc) { bScreen *newsc; - if (sc->full != SCREENNORMAL) return NULL; /* XXX handle this case! */ + if (sc->full != SCREENNORMAL) return NULL; /* XXX handle this case! */ /* make new empty screen: */ - newsc= ED_screen_add(win, sc->scene, sc->id.name+2); + newsc = ED_screen_add(win, sc->scene, sc->id.name + 2); /* copy all data */ screen_copy(newsc, sc); @@ -942,11 +946,11 @@ bScreen *ED_screen_duplicate(wmWindow *win, bScreen *sc) /* screen sets cursor based on swinid */ static void region_cursor_set(wmWindow *win, int swinid) { - ScrArea *sa= win->screen->areabase.first; + ScrArea *sa = win->screen->areabase.first; - for (;sa; sa= sa->next) { - ARegion *ar= sa->regionbase.first; - for (;ar; ar= ar->next) { + for (; sa; sa = sa->next) { + ARegion *ar = sa->regionbase.first; + for (; ar; ar = ar->next) { if (ar->swinid == swinid) { if (ar->type && ar->type->cursor) ar->type->cursor(win, sa, ar); @@ -960,25 +964,25 @@ static void region_cursor_set(wmWindow *win, int swinid) void ED_screen_do_listen(bContext *C, wmNotifier *note) { - wmWindow *win= CTX_wm_window(C); + wmWindow *win = CTX_wm_window(C); /* generic notes */ switch (note->category) { case NC_WM: - if (note->data==ND_FILEREAD) - win->screen->do_draw= 1; + if (note->data == ND_FILEREAD) + win->screen->do_draw = 1; break; case NC_WINDOW: - win->screen->do_draw= 1; + win->screen->do_draw = 1; break; case NC_SCREEN: - if (note->data==ND_SUBWINACTIVE) + if (note->data == ND_SUBWINACTIVE) uiFreeActiveButtons(C, win->screen); - if (note->action==NA_EDITED) - win->screen->do_draw= win->screen->do_refresh= 1; + if (note->action == NA_EDITED) + win->screen->do_draw = win->screen->do_refresh = 1; break; case NC_SCENE: - if (note->data==ND_MODE) + if (note->data == ND_MODE) region_cursor_set(win, note->swinid); break; } @@ -988,21 +992,21 @@ void ED_screen_do_listen(bContext *C, wmNotifier *note) void ED_screen_draw(wmWindow *win) { ScrArea *sa; - ScrArea *sa1= NULL; - ScrArea *sa2= NULL; - ScrArea *sa3= NULL; + ScrArea *sa1 = NULL; + ScrArea *sa2 = NULL; + ScrArea *sa3 = NULL; int dir = -1; int dira = -1; wmSubWindowSet(win, win->screen->mainwin); - for (sa= win->screen->areabase.first; sa; sa= sa->next) { + for (sa = win->screen->areabase.first; sa; sa = sa->next) { if (sa->flag & AREA_FLAG_DRAWJOINFROM) sa1 = sa; if (sa->flag & AREA_FLAG_DRAWJOINTO) sa2 = sa; - if (sa->flag & (AREA_FLAG_DRAWSPLIT_H|AREA_FLAG_DRAWSPLIT_V)) sa3 = sa; + if (sa->flag & (AREA_FLAG_DRAWSPLIT_H | AREA_FLAG_DRAWSPLIT_V)) sa3 = sa; drawscredge_area(sa, win->sizex, win->sizey, 0); } - for (sa= win->screen->areabase.first; sa; sa= sa->next) + for (sa = win->screen->areabase.first; sa; sa = sa->next) drawscredge_area(sa, win->sizex, win->sizey, 1); /* blended join arrow */ @@ -1040,29 +1044,29 @@ void ED_screen_draw(wmWindow *win) if (sa3->flag & AREA_FLAG_DRAWSPLIT_H) { sdrawline(sa3->totrct.xmin, win->eventstate->y, sa3->totrct.xmax, win->eventstate->y); glColor4ub(0, 0, 0, 100); - sdrawline(sa3->totrct.xmin, win->eventstate->y+1, sa3->totrct.xmax, win->eventstate->y+1); + sdrawline(sa3->totrct.xmin, win->eventstate->y + 1, sa3->totrct.xmax, win->eventstate->y + 1); } else { sdrawline(win->eventstate->x, sa3->totrct.ymin, win->eventstate->x, sa3->totrct.ymax); glColor4ub(0, 0, 0, 100); - sdrawline(win->eventstate->x+1, sa3->totrct.ymin, win->eventstate->x+1, sa3->totrct.ymax); + sdrawline(win->eventstate->x + 1, sa3->totrct.ymin, win->eventstate->x + 1, sa3->totrct.ymax); } glDisable(GL_BLEND); } - win->screen->do_draw= 0; + win->screen->do_draw = 0; } /* helper call for below, dpi changes headers */ static void screen_refresh_headersizes(void) { - const ListBase *lb= BKE_spacetypes_list(); + const ListBase *lb = BKE_spacetypes_list(); SpaceType *st; - for (st= lb->first; st; st= st->next) { - ARegionType *art= BKE_regiontype_from_id(st, RGN_TYPE_HEADER); - if (art) art->prefsizey= ED_area_headersize(); + for (st = lb->first; st; st = st->next) { + ARegionType *art = BKE_regiontype_from_id(st, RGN_TYPE_HEADER); + if (art) art->prefsizey = ED_area_headersize(); } } @@ -1076,21 +1080,21 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win) rcti winrct; winrct.xmin = 0; - winrct.xmax = win->sizex-1; + winrct.xmax = win->sizex - 1; winrct.ymin = 0; - winrct.ymax = win->sizey-1; + winrct.ymax = win->sizey - 1; screen_test_scale(win->screen, win->sizex, win->sizey); - if (win->screen->mainwin==0) - win->screen->mainwin= wm_subwindow_open(win, &winrct); + if (win->screen->mainwin == 0) + win->screen->mainwin = wm_subwindow_open(win, &winrct); else wm_subwindow_position(win, win->screen->mainwin, &winrct); /* header size depends on DPI, let's verify */ screen_refresh_headersizes(); - for (sa= win->screen->areabase.first; sa; sa= sa->next) { + for (sa = win->screen->areabase.first; sa; sa = sa->next) { /* set spacetype and region callbacks, calls init() */ /* sets subwindows for regions, adds handlers */ ED_area_initialize(wm, win, sa); @@ -1104,9 +1108,9 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win) if (G.debug & G_DEBUG_EVENTS) { printf("%s: set screen\n", __func__); } - win->screen->do_refresh= 0; + win->screen->do_refresh = 0; - win->screen->context= ed_screen_context; + win->screen->context = ed_screen_context; } /* file read, set all screens, ... */ @@ -1114,10 +1118,10 @@ void ED_screens_initialize(wmWindowManager *wm) { wmWindow *win; - for (win= wm->windows.first; win; win= win->next) { + for (win = wm->windows.first; win; win = win->next) { - if (win->screen==NULL) - win->screen= G.main->screen.first; + if (win->screen == NULL) + win->screen = G.main->screen.first; ED_screen_refresh(wm, win); } @@ -1128,28 +1132,28 @@ void ED_screens_initialize(wmWindowManager *wm) void ED_region_exit(bContext *C, ARegion *ar) { - ARegion *prevar= CTX_wm_region(C); + ARegion *prevar = CTX_wm_region(C); CTX_wm_region_set(C, ar); WM_event_remove_handlers(C, &ar->handlers); if (ar->swinid) wm_subwindow_close(CTX_wm_window(C), ar->swinid); - ar->swinid= 0; + ar->swinid = 0; if (ar->headerstr) MEM_freeN(ar->headerstr); - ar->headerstr= NULL; + ar->headerstr = NULL; CTX_wm_region_set(C, prevar); } void ED_area_exit(bContext *C, ScrArea *sa) { - ScrArea *prevsa= CTX_wm_area(C); + ScrArea *prevsa = CTX_wm_area(C); ARegion *ar; if (sa->spacetype == SPACE_FILE) { - SpaceLink *sl= sa->spacedata.first; + SpaceLink *sl = sa->spacedata.first; if (sl && sl->spacetype == SPACE_FILE) { ED_fileselect_exit(C, (SpaceFile *)sl); } @@ -1159,7 +1163,7 @@ void ED_area_exit(bContext *C, ScrArea *sa) } CTX_wm_area_set(C, sa); - for (ar= sa->regionbase.first; ar; ar= ar->next) + for (ar = sa->regionbase.first; ar; ar = ar->next) ED_region_exit(C, ar); WM_event_remove_handlers(C, &sa->handlers); @@ -1168,8 +1172,8 @@ void ED_area_exit(bContext *C, ScrArea *sa) void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen) { - wmWindowManager *wm= CTX_wm_manager(C); - wmWindow *prevwin= CTX_wm_window(C); + wmWindowManager *wm = CTX_wm_manager(C); + wmWindow *prevwin = CTX_wm_window(C); ScrArea *sa; ARegion *ar; @@ -1177,21 +1181,21 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen) if (screen->animtimer) WM_event_remove_timer(wm, window, screen->animtimer); - screen->animtimer= NULL; + screen->animtimer = NULL; if (screen->mainwin) wm_subwindow_close(window, screen->mainwin); - screen->mainwin= 0; - screen->subwinactive= 0; + screen->mainwin = 0; + screen->subwinactive = 0; - for (ar= screen->regionbase.first; ar; ar= ar->next) + for (ar = screen->regionbase.first; ar; ar = ar->next) ED_region_exit(C, ar); - for (sa= screen->areabase.first; sa; sa= sa->next) + for (sa = screen->areabase.first; sa; sa = sa->next) ED_area_exit(C, sa); /* mark it available for use for other windows */ - screen->winid= 0; + screen->winid = 0; if (prevwin->screen->temp == 0) { /* use previous window if possible */ @@ -1209,17 +1213,17 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen) /* case when on area-edge or in azones, or outside window */ static void screen_cursor_set(wmWindow *win, wmEvent *event) { - AZone *az= NULL; + AZone *az = NULL; ScrArea *sa; - for (sa= win->screen->areabase.first; sa; sa= sa->next) - if ((az=is_in_area_actionzone(sa, event->x, event->y))) + for (sa = win->screen->areabase.first; sa; sa = sa->next) + if ((az = is_in_area_actionzone(sa, event->x, event->y))) break; if (sa) { - if (az->type==AZONE_AREA) + if (az->type == AZONE_AREA) WM_cursor_set(win, CURSOR_EDIT); - else if (az->type==AZONE_REGION) { + else if (az->type == AZONE_REGION) { if (az->edge == AE_LEFT_TO_TOPRIGHT || az->edge == AE_RIGHT_TO_TOPLEFT) WM_cursor_set(win, CURSOR_X_MOVE); else @@ -1227,7 +1231,7 @@ static void screen_cursor_set(wmWindow *win, wmEvent *event) } } else { - ScrEdge *actedge= screen_find_active_scredge(win->screen, event->x, event->y); + ScrEdge *actedge = screen_find_active_scredge(win->screen, event->x, event->y); if (actedge) { if (scredge_is_horizontal(actedge)) @@ -1245,72 +1249,72 @@ static void screen_cursor_set(wmWindow *win, wmEvent *event) /* event type is mouse move */ void ED_screen_set_subwinactive(bContext *C, wmEvent *event) { - wmWindow *win= CTX_wm_window(C); + wmWindow *win = CTX_wm_window(C); if (win->screen) { - bScreen *scr= win->screen; + bScreen *scr = win->screen; ScrArea *sa; ARegion *ar; - int oldswin= scr->subwinactive; + int oldswin = scr->subwinactive; - for (sa= scr->areabase.first; sa; sa= sa->next) { + for (sa = scr->areabase.first; sa; sa = sa->next) { if (event->x > sa->totrct.xmin && event->x < sa->totrct.xmax) if (event->y > sa->totrct.ymin && event->y < sa->totrct.ymax) - if (NULL==is_in_area_actionzone(sa, event->x, event->y)) + if (NULL == is_in_area_actionzone(sa, event->x, event->y)) break; } if (sa) { - for (ar= sa->regionbase.first; ar; ar= ar->next) { + for (ar = sa->regionbase.first; ar; ar = ar->next) { if (BLI_in_rcti(&ar->winrct, event->x, event->y)) - scr->subwinactive= ar->swinid; + scr->subwinactive = ar->swinid; } } else - scr->subwinactive= scr->mainwin; + scr->subwinactive = scr->mainwin; /* check for redraw headers */ - if (oldswin!=scr->subwinactive) { + if (oldswin != scr->subwinactive) { - for (sa= scr->areabase.first; sa; sa= sa->next) { - int do_draw= 0; + for (sa = scr->areabase.first; sa; sa = sa->next) { + int do_draw = 0; - for (ar= sa->regionbase.first; ar; ar= ar->next) - if (ar->swinid==oldswin || ar->swinid==scr->subwinactive) - do_draw= 1; + for (ar = sa->regionbase.first; ar; ar = ar->next) + if (ar->swinid == oldswin || ar->swinid == scr->subwinactive) + do_draw = 1; if (do_draw) { - for (ar= sa->regionbase.first; ar; ar= ar->next) - if (ar->regiontype==RGN_TYPE_HEADER) + for (ar = sa->regionbase.first; ar; ar = ar->next) + if (ar->regiontype == RGN_TYPE_HEADER) ED_region_tag_redraw(ar); } } } /* cursors, for time being set always on edges, otherwise aregion doesnt switch */ - if (scr->subwinactive==scr->mainwin) { + if (scr->subwinactive == scr->mainwin) { screen_cursor_set(win, event); } - else if (oldswin!=scr->subwinactive) { + else if (oldswin != scr->subwinactive) { region_cursor_set(win, scr->subwinactive); - WM_event_add_notifier(C, NC_SCREEN|ND_SUBWINACTIVE, scr); + WM_event_add_notifier(C, NC_SCREEN | ND_SUBWINACTIVE, scr); } } } int ED_screen_area_active(const bContext *C) { - wmWindow *win= CTX_wm_window(C); - bScreen *sc= CTX_wm_screen(C); - ScrArea *sa= CTX_wm_area(C); + wmWindow *win = CTX_wm_window(C); + bScreen *sc = CTX_wm_screen(C); + ScrArea *sa = CTX_wm_area(C); if (win && sc && sa) { - AZone *az= is_in_area_actionzone(sa, win->eventstate->x, win->eventstate->y); + AZone *az = is_in_area_actionzone(sa, win->eventstate->x, win->eventstate->y); ARegion *ar; if (az && az->type == AZONE_REGION) return 1; - for (ar= sa->regionbase.first; ar; ar= ar->next) + for (ar = sa->regionbase.first; ar; ar = ar->next) if (ar->swinid == sc->subwinactive) return 1; } @@ -1321,35 +1325,35 @@ int ED_screen_area_active(const bContext *C) /* Do NOT call in area/region queues! */ void ED_screen_set(bContext *C, bScreen *sc) { - wmWindowManager *wm= CTX_wm_manager(C); - wmWindow *win= CTX_wm_window(C); - bScreen *oldscreen= CTX_wm_screen(C); + wmWindowManager *wm = CTX_wm_manager(C); + wmWindow *win = CTX_wm_window(C); + bScreen *oldscreen = CTX_wm_screen(C); ID *id; /* validate screen, it's called with notifier reference */ - for (id= CTX_data_main(C)->screen.first; id; id= id->next) + for (id = CTX_data_main(C)->screen.first; id; id = id->next) if (sc == (bScreen *)id) break; - if (id==NULL) + if (id == NULL) return; /* check for valid winid */ - if (sc->winid!=0 && sc->winid!=win->winid) + if (sc->winid != 0 && sc->winid != win->winid) return; - if (sc->full) { /* find associated full */ + if (sc->full) { /* find associated full */ bScreen *sc1; - for (sc1= CTX_data_main(C)->screen.first; sc1; sc1= sc1->id.next) { - ScrArea *sa= sc1->areabase.first; - if (sa->full==sc) { - sc= sc1; + for (sc1 = CTX_data_main(C)->screen.first; sc1; sc1 = sc1->id.next) { + ScrArea *sa = sc1->areabase.first; + if (sa->full == sc) { + sc = sc1; break; } } } if (oldscreen != sc) { - wmTimer *wt= oldscreen->animtimer; + wmTimer *wt = oldscreen->animtimer; ScrArea *sa; /* remove handlers referencing areas in old screen */ @@ -1358,22 +1362,22 @@ void ED_screen_set(bContext *C, bScreen *sc) } /* we put timer to sleep, so screen_exit has to think there's no timer */ - oldscreen->animtimer= NULL; + oldscreen->animtimer = NULL; if (wt) WM_event_timer_sleep(wm, win, wt, 1); ED_screen_exit(C, win, oldscreen); - oldscreen->animtimer= wt; + oldscreen->animtimer = wt; - win->screen= sc; - CTX_wm_window_set(C, win); // stores C->wm.screen... hrmf + win->screen = sc; + CTX_wm_window_set(C, win); // stores C->wm.screen... hrmf /* prevent multiwin errors */ - sc->winid= win->winid; + sc->winid = win->winid; ED_screen_refresh(CTX_wm_manager(C), CTX_wm_window(C)); WM_event_add_notifier(C, NC_WINDOW, NULL); - WM_event_add_notifier(C, NC_SCREEN|ND_SCREENSET, sc); + WM_event_add_notifier(C, NC_SCREEN | ND_SCREENSET, sc); /* makes button hilites work */ WM_event_add_mousemove(C); @@ -1384,7 +1388,7 @@ static int ed_screen_used(wmWindowManager *wm, bScreen *sc) { wmWindow *win; - for (win=wm->windows.first; win; win=win->next) + for (win = wm->windows.first; win; win = win->next) if (win->screen == sc) return 1; @@ -1394,11 +1398,11 @@ static int ed_screen_used(wmWindowManager *wm, bScreen *sc) /* only call outside of area/region loops */ void ED_screen_delete(bContext *C, bScreen *sc) { - Main *bmain= CTX_data_main(C); - wmWindowManager *wm= CTX_wm_manager(C); - wmWindow *win= CTX_wm_window(C); + Main *bmain = CTX_data_main(C); + wmWindowManager *wm = CTX_wm_manager(C); + wmWindow *win = CTX_wm_window(C); bScreen *newsc; - int delete= 1; + int delete = 1; /* don't allow deleting temp fullscreens for now */ if (sc->full == SCREENFULL) { @@ -1410,12 +1414,12 @@ void ED_screen_delete(bContext *C, bScreen *sc) * long as we are able to find a screen that is unused, we * can safely assume ours is not in use anywhere an delete it */ - for (newsc= sc->id.prev; newsc; newsc=newsc->id.prev) + for (newsc = sc->id.prev; newsc; newsc = newsc->id.prev) if (!ed_screen_used(wm, newsc)) break; if (!newsc) { - for (newsc= sc->id.next; newsc; newsc=newsc->id.next) + for (newsc = sc->id.next; newsc; newsc = newsc->id.next) if (!ed_screen_used(wm, newsc)) break; } @@ -1432,26 +1436,26 @@ void ED_screen_delete(bContext *C, bScreen *sc) /* only call outside of area/region loops */ void ED_screen_set_scene(bContext *C, bScreen *screen, Scene *scene) { - Main *bmain= CTX_data_main(C); + Main *bmain = CTX_data_main(C); bScreen *sc; if (screen == NULL) return; if (ed_screen_used(CTX_wm_manager(C), screen)) - ED_object_exit_editmode(C, EM_FREEDATA|EM_DO_UNDO); + ED_object_exit_editmode(C, EM_FREEDATA | EM_DO_UNDO); - for (sc= CTX_data_main(C)->screen.first; sc; sc= sc->id.next) { - if ((U.flag & USER_SCENEGLOBAL) || sc==screen) { + for (sc = CTX_data_main(C)->screen.first; sc; sc = sc->id.next) { + if ((U.flag & USER_SCENEGLOBAL) || sc == screen) { if (scene != sc->scene) { /* all areas endlocalview */ - // XXX ScrArea *sa= sc->areabase.first; - // while (sa) { - // endlocalview(sa); - // sa= sa->next; - // } - sc->scene= scene; + // XXX ScrArea *sa= sc->areabase.first; + // while (sa) { + // endlocalview(sa); + // sa= sa->next; + // } + sc->scene = scene; } } @@ -1460,36 +1464,36 @@ void ED_screen_set_scene(bContext *C, bScreen *screen, Scene *scene) // copy_view3d_lock(0); /* space.c */ /* are there cameras in the views that are not in the scene? */ - for (sc= CTX_data_main(C)->screen.first; sc; sc= sc->id.next) { - if ( (U.flag & USER_SCENEGLOBAL) || sc==screen) { - ScrArea *sa= sc->areabase.first; + for (sc = CTX_data_main(C)->screen.first; sc; sc = sc->id.next) { + if ( (U.flag & USER_SCENEGLOBAL) || sc == screen) { + ScrArea *sa = sc->areabase.first; while (sa) { - SpaceLink *sl= sa->spacedata.first; + SpaceLink *sl = sa->spacedata.first; while (sl) { - if (sl->spacetype==SPACE_VIEW3D) { - View3D *v3d= (View3D*) sl; + if (sl->spacetype == SPACE_VIEW3D) { + View3D *v3d = (View3D *) sl; BKE_screen_view3d_sync(v3d, scene); if (!v3d->camera || !BKE_scene_base_find(scene, v3d->camera)) { - v3d->camera= BKE_scene_camera_find(sc->scene); + v3d->camera = BKE_scene_camera_find(sc->scene); // XXX if (sc==curscreen) handle_view3d_lock(); if (!v3d->camera) { ARegion *ar; - for (ar=v3d->regionbase.first; ar; ar= ar->next) { + for (ar = v3d->regionbase.first; ar; ar = ar->next) { if (ar->regiontype == RGN_TYPE_WINDOW) { - RegionView3D *rv3d= ar->regiondata; + RegionView3D *rv3d = ar->regiondata; - if (rv3d->persp==RV3D_CAMOB) - rv3d->persp= RV3D_PERSP; + if (rv3d->persp == RV3D_CAMOB) + rv3d->persp = RV3D_PERSP; } } } } } - sl= sl->next; + sl = sl->next; } - sa= sa->next; + sa = sa->next; } } } @@ -1508,13 +1512,13 @@ void ED_screen_set_scene(bContext *C, bScreen *screen, Scene *scene) /* only call outside of area/region loops */ void ED_screen_delete_scene(bContext *C, Scene *scene) { - Main *bmain= CTX_data_main(C); + Main *bmain = CTX_data_main(C); Scene *newscene; if (scene->id.prev) - newscene= scene->id.prev; + newscene = scene->id.prev; else if (scene->id.next) - newscene= scene->id.next; + newscene = scene->id.next; else return; @@ -1525,12 +1529,12 @@ void ED_screen_delete_scene(bContext *C, Scene *scene) ScrArea *ED_screen_full_newspace(bContext *C, ScrArea *sa, int type) { - wmWindow *win= CTX_wm_window(C); - bScreen *screen= CTX_wm_screen(C); - ScrArea *newsa= NULL; + wmWindow *win = CTX_wm_window(C); + bScreen *screen = CTX_wm_screen(C); + ScrArea *newsa = NULL; - if (!sa || sa->full==NULL) { - newsa= ED_screen_full_toggle(C, win, sa); + if (!sa || sa->full == NULL) { + newsa = ED_screen_full_toggle(C, win, sa); } if (!newsa) { @@ -1538,7 +1542,7 @@ ScrArea *ED_screen_full_newspace(bContext *C, ScrArea *sa, int type) /* if this has been called from the temporary info header generated in * temp fullscreen layouts, find the correct fullscreen area to change * to create a new space inside */ - for (newsa = screen->areabase.first; newsa; newsa=newsa->next) { + for (newsa = screen->areabase.first; newsa; newsa = newsa->next) { if (!(sa->flag & AREA_TEMP_INFO)) break; } @@ -1555,7 +1559,7 @@ ScrArea *ED_screen_full_newspace(bContext *C, ScrArea *sa, int type) void ED_screen_full_prevspace(bContext *C, ScrArea *sa) { - wmWindow *win= CTX_wm_window(C); + wmWindow *win = CTX_wm_window(C); ED_area_prevspace(C, sa); @@ -1566,7 +1570,7 @@ void ED_screen_full_prevspace(bContext *C, ScrArea *sa) /* restore a screen / area back to default operation, after temp fullscreen modes */ void ED_screen_full_restore(bContext *C, ScrArea *sa) { - wmWindow *win= CTX_wm_window(C); + wmWindow *win = CTX_wm_window(C); SpaceLink *sl = sa->spacedata.first; /* if fullscreen area has a secondary space (such as a file browser or fullscreen render @@ -1579,13 +1583,13 @@ void ED_screen_full_restore(bContext *C, ScrArea *sa) /* Special check added for non-render image window (back from fullscreen through "Back to Previous" button) */ if (sl->spacetype == SPACE_IMAGE) { - SpaceImage *sima= sa->spacedata.first; + SpaceImage *sima = sa->spacedata.first; if (!(sima->flag & SI_PREVSPACE) && !(sima->flag & SI_FULLWINDOW)) sima_restore = 1; } if (sl->spacetype == SPACE_IMAGE && !sima_restore) { - SpaceImage *sima= sa->spacedata.first; + SpaceImage *sima = sa->spacedata.first; if (sima->flag & SI_PREVSPACE) sima->flag &= ~SI_PREVSPACE; if (sima->flag & SI_FULLWINDOW) { @@ -1616,7 +1620,7 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa) /* ensure we don't have a button active anymore, can crash when * switching screens with tooltip open because region and tooltip * are no longer in the same screen */ - for (ar=sa->regionbase.first; ar; ar=ar->next) + for (ar = sa->regionbase.first; ar; ar = ar->next) uiFreeBlocks(C, &ar->uiblocks); /* prevent hanging header prints */ @@ -1627,30 +1631,30 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa) ScrArea *old; /*short fulltype;*/ /*UNUSED*/ - sc= sa->full; /* the old screen to restore */ - oldscreen= win->screen; /* the one disappearing */ + sc = sa->full; /* the old screen to restore */ + oldscreen = win->screen; /* the one disappearing */ /*fulltype = sc->full;*/ - sc->full= 0; + sc->full = 0; /* removed: SCREENAUTOPLAY exception here */ /* find old area */ - for (old= sc->areabase.first; old; old= old->next) + for (old = sc->areabase.first; old; old = old->next) if (old->full) break; - if (old==NULL) { + if (old == NULL) { if (G.debug & G_DEBUG) printf("%s: something wrong in areafullscreen\n", __func__); return NULL; } - area_copy_data(old, sa, 1); /* 1 = swap spacelist */ + area_copy_data(old, sa, 1); /* 1 = swap spacelist */ if (sa->flag & AREA_TEMP_INFO) sa->flag &= ~AREA_TEMP_INFO; - old->full= NULL; + old->full = NULL; /* animtimer back */ - sc->animtimer= oldscreen->animtimer; - oldscreen->animtimer= NULL; + sc->animtimer = oldscreen->animtimer; + oldscreen->animtimer = NULL; ED_screen_set(C, sc); @@ -1660,43 +1664,43 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa) } else { ScrArea *newa; - char newname[MAX_ID_NAME-2]; + char newname[MAX_ID_NAME - 2]; - oldscreen= win->screen; + oldscreen = win->screen; /* nothing wrong with having only 1 area, as far as I can see... * is there only 1 area? */ #if 0 - if (oldscreen->areabase.first==oldscreen->areabase.last) + if (oldscreen->areabase.first == oldscreen->areabase.last) return NULL; #endif oldscreen->full = SCREENFULL; - BLI_snprintf(newname, sizeof(newname), "%s-%s", oldscreen->id.name+2, "full"); - sc= ED_screen_add(win, oldscreen->scene, newname); + BLI_snprintf(newname, sizeof(newname), "%s-%s", oldscreen->id.name + 2, "full"); + sc = ED_screen_add(win, oldscreen->scene, newname); sc->full = SCREENFULL; // XXX /* timer */ - sc->animtimer= oldscreen->animtimer; - oldscreen->animtimer= NULL; + sc->animtimer = oldscreen->animtimer; + oldscreen->animtimer = NULL; /* returns the top small area */ - newa= area_split(sc, (ScrArea *)sc->areabase.first, 'h', 0.99f, 1); + newa = area_split(sc, (ScrArea *)sc->areabase.first, 'h', 0.99f, 1); ED_area_newspace(C, newa, SPACE_INFO); /* use random area when we have no active one, e.g. when the * mouse is outside of the window and we open a file browser */ if (!sa) - sa= oldscreen->areabase.first; + sa = oldscreen->areabase.first; /* copy area */ - newa= newa->prev; - area_copy_data(newa, sa, 1); /* 1 = swap spacelist */ + newa = newa->prev; + area_copy_data(newa, sa, 1); /* 1 = swap spacelist */ sa->flag |= AREA_TEMP_INFO; - sa->full= oldscreen; - newa->full= oldscreen; - newa->next->full= oldscreen; // XXX + sa->full = oldscreen; + newa->full = oldscreen; + newa->next->full = oldscreen; // XXX ED_screen_set(C, sc); } @@ -1710,26 +1714,26 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa) /* update frame rate info for viewport drawing */ void ED_refresh_viewport_fps(bContext *C) { - wmTimer *animtimer= CTX_wm_screen(C)->animtimer; - Scene *scene= CTX_data_scene(C); + wmTimer *animtimer = CTX_wm_screen(C)->animtimer; + Scene *scene = CTX_data_scene(C); /* is anim playback running? */ if (animtimer && (U.uiflag & USER_SHOW_FPS)) { - ScreenFrameRateInfo *fpsi= scene->fps_info; + ScreenFrameRateInfo *fpsi = scene->fps_info; /* if there isn't any info, init it first */ if (fpsi == NULL) - fpsi= scene->fps_info= MEM_callocN(sizeof(ScreenFrameRateInfo), "refresh_viewport_fps fps_info"); + fpsi = scene->fps_info = MEM_callocN(sizeof(ScreenFrameRateInfo), "refresh_viewport_fps fps_info"); /* update the values */ - fpsi->redrawtime= fpsi->lredrawtime; - fpsi->lredrawtime= animtimer->ltime; + fpsi->redrawtime = fpsi->lredrawtime; + fpsi->lredrawtime = animtimer->ltime; } else { /* playback stopped or shouldn't be running */ if (scene->fps_info) MEM_freeN(scene->fps_info); - scene->fps_info= NULL; + scene->fps_info = NULL; } } @@ -1738,56 +1742,56 @@ void ED_refresh_viewport_fps(bContext *C) */ void ED_screen_animation_timer(bContext *C, int redraws, int refresh, int sync, int enable) { - bScreen *screen= CTX_wm_screen(C); - wmWindowManager *wm= CTX_wm_manager(C); - wmWindow *win= CTX_wm_window(C); - Scene *scene= CTX_data_scene(C); + bScreen *screen = CTX_wm_screen(C); + wmWindowManager *wm = CTX_wm_manager(C); + wmWindow *win = CTX_wm_window(C); + Scene *scene = CTX_data_scene(C); if (screen->animtimer) WM_event_remove_timer(wm, win, screen->animtimer); - screen->animtimer= NULL; + screen->animtimer = NULL; if (enable) { - ScreenAnimData *sad= MEM_callocN(sizeof(ScreenAnimData), "ScreenAnimData"); + ScreenAnimData *sad = MEM_callocN(sizeof(ScreenAnimData), "ScreenAnimData"); - screen->animtimer= WM_event_add_timer(wm, win, TIMER0, (1.0/FPS)); + screen->animtimer = WM_event_add_timer(wm, win, TIMER0, (1.0 / FPS)); - sad->ar= CTX_wm_region(C); + sad->ar = CTX_wm_region(C); /* if startframe is larger than current frame, we put currentframe on startframe. * note: first frame then is not drawn! (ton) */ if (scene->r.sfra > scene->r.cfra) { - sad->sfra= scene->r.cfra; - scene->r.cfra= scene->r.sfra; + sad->sfra = scene->r.cfra; + scene->r.cfra = scene->r.sfra; } else sad->sfra = scene->r.cfra; - sad->redraws= redraws; - sad->refresh= refresh; - sad->flag |= (enable < 0)? ANIMPLAY_FLAG_REVERSE: 0; - sad->flag |= (sync == 0)? ANIMPLAY_FLAG_NO_SYNC: (sync == 1)? ANIMPLAY_FLAG_SYNC: 0; + sad->redraws = redraws; + sad->refresh = refresh; + sad->flag |= (enable < 0) ? ANIMPLAY_FLAG_REVERSE : 0; + sad->flag |= (sync == 0) ? ANIMPLAY_FLAG_NO_SYNC : (sync == 1) ? ANIMPLAY_FLAG_SYNC : 0; - screen->animtimer->customdata= sad; + screen->animtimer->customdata = sad; } /* notifier catched by top header, for button */ - WM_event_add_notifier(C, NC_SCREEN|ND_ANIMPLAY, screen); + WM_event_add_notifier(C, NC_SCREEN | ND_ANIMPLAY, screen); } /* helper for screen_animation_play() - only to be used for TimeLine */ static ARegion *time_top_left_3dwindow(bScreen *screen) { - ARegion *aret= NULL; + ARegion *aret = NULL; ScrArea *sa; - int min= 10000; + int min = 10000; - for (sa= screen->areabase.first; sa; sa= sa->next) { - if (sa->spacetype==SPACE_VIEW3D) { + for (sa = screen->areabase.first; sa; sa = sa->next) { + if (sa->spacetype == SPACE_VIEW3D) { ARegion *ar; - for (ar= sa->regionbase.first; ar; ar= ar->next) { - if (ar->regiontype==RGN_TYPE_WINDOW) { + for (ar = sa->regionbase.first; ar; ar = ar->next) { + if (ar->regiontype == RGN_TYPE_WINDOW) { if (ar->winrct.xmin - ar->winrct.ymin < min) { - aret= ar; - min= ar->winrct.xmin - ar->winrct.ymin; + aret = ar; + min = ar->winrct.xmin - ar->winrct.ymin; } } } @@ -1800,14 +1804,14 @@ static ARegion *time_top_left_3dwindow(bScreen *screen) void ED_screen_animation_timer_update(bScreen *screen, int redraws, int refresh) { if (screen && screen->animtimer) { - wmTimer *wt= screen->animtimer; - ScreenAnimData *sad= wt->customdata; + wmTimer *wt = screen->animtimer; + ScreenAnimData *sad = wt->customdata; - sad->redraws= redraws; - sad->refresh= refresh; - sad->ar= NULL; + sad->redraws = redraws; + sad->refresh = refresh; + sad->ar = NULL; if (redraws & TIME_REGION) - sad->ar= time_top_left_3dwindow(screen); + sad->ar = time_top_left_3dwindow(screen); } } @@ -1816,12 +1820,12 @@ void ED_screen_animation_timer_update(bScreen *screen, int redraws, int refresh) void ED_update_for_newframe(Main *bmain, Scene *scene, bScreen *screen, int UNUSED(mute)) { #ifdef DURIAN_CAMERA_SWITCH - void *camera= BKE_scene_camera_switch_find(scene); + void *camera = BKE_scene_camera_switch_find(scene); if (camera && scene->camera != camera) { bScreen *sc; - scene->camera= camera; + scene->camera = camera; /* are there cameras in the views that are not in the scene? */ - for (sc= bmain->screen.first; sc; sc= sc->id.next) { + for (sc = bmain->screen.first; sc; sc = sc->id.next) { BKE_screen_view3d_scene_sync(sc); } } @@ -1855,7 +1859,7 @@ void ED_update_for_newframe(Main *bmain, Scene *scene, bScreen *screen, int UNUS /* update animated texture nodes */ { Tex *tex; - for (tex= bmain->tex.first; tex; tex= tex->id.next) + for (tex = bmain->tex.first; tex; tex = tex->id.next) if (tex->use_nodes && tex->nodetree) { ntreeTexTagAnimated(tex->nodetree); } |