From ed61bfc9a6580360805a3daae1003df43a7f2c11 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 28 Mar 2012 11:53:18 +0000 Subject: style cleanup --- .../blender/editors/space_console/console_draw.c | 126 ++++++++++----------- 1 file changed, 63 insertions(+), 63 deletions(-) (limited to 'source/blender/editors/space_console/console_draw.c') diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c index 1bfdcee1aae..2897c5d7d67 100644 --- a/source/blender/editors/space_console/console_draw.c +++ b/source/blender/editors/space_console/console_draw.c @@ -59,19 +59,19 @@ static void console_line_color(unsigned char fg[3], int type) { - switch(type) { - case CONSOLE_LINE_OUTPUT: - UI_GetThemeColor3ubv(TH_CONSOLE_OUTPUT, fg); - break; - case CONSOLE_LINE_INPUT: - UI_GetThemeColor3ubv(TH_CONSOLE_INPUT, fg); - break; - case CONSOLE_LINE_INFO: - UI_GetThemeColor3ubv(TH_CONSOLE_INFO, fg); - break; - case CONSOLE_LINE_ERROR: - UI_GetThemeColor3ubv(TH_CONSOLE_ERROR, fg); - break; + switch (type) { + case CONSOLE_LINE_OUTPUT: + UI_GetThemeColor3ubv(TH_CONSOLE_OUTPUT, fg); + break; + case CONSOLE_LINE_INPUT: + UI_GetThemeColor3ubv(TH_CONSOLE_INPUT, fg); + break; + case CONSOLE_LINE_INFO: + UI_GetThemeColor3ubv(TH_CONSOLE_INFO, fg); + break; + case CONSOLE_LINE_ERROR: + UI_GetThemeColor3ubv(TH_CONSOLE_ERROR, fg); + break; } } @@ -93,11 +93,11 @@ typedef struct ConsoleDrawContext { void console_scrollback_prompt_begin(struct SpaceConsole *sc, ConsoleLine *cl_dummy) { /* fake the edit line being in the scroll buffer */ - ConsoleLine *cl= sc->history.last; - cl_dummy->type= CONSOLE_LINE_INPUT; - cl_dummy->len= cl_dummy->len_alloc= strlen(sc->prompt) + cl->len; - cl_dummy->len_alloc= cl_dummy->len + 1; - cl_dummy->line= MEM_mallocN(cl_dummy->len_alloc, "cl_dummy"); + ConsoleLine *cl = sc->history.last; + cl_dummy->type = CONSOLE_LINE_INPUT; + cl_dummy->len = cl_dummy->len_alloc = strlen(sc->prompt) + cl->len; + cl_dummy->len_alloc = cl_dummy->len + 1; + cl_dummy->line = MEM_mallocN(cl_dummy->len_alloc, "cl_dummy"); memcpy(cl_dummy->line, sc->prompt, (cl_dummy->len_alloc - cl->len)); memcpy(cl_dummy->line + ((cl_dummy->len_alloc - cl->len)) - 1, cl->line, cl->len + 1); BLI_addtail(&sc->scrollback, cl_dummy); @@ -116,73 +116,73 @@ void console_scrollback_prompt_end(struct SpaceConsole *sc, ConsoleLine *cl_dumm /* console textview callbacks */ static int console_textview_begin(TextViewContext *tvc) { - SpaceConsole *sc= (SpaceConsole *)tvc->arg1; - tvc->lheight= sc->lheight; - tvc->sel_start= sc->sel_start; - tvc->sel_end= sc->sel_end; + SpaceConsole *sc = (SpaceConsole *)tvc->arg1; + tvc->lheight = sc->lheight; + tvc->sel_start = sc->sel_start; + tvc->sel_end = sc->sel_end; /* iterator */ - tvc->iter= sc->scrollback.last; + tvc->iter = sc->scrollback.last; return (tvc->iter != NULL); } static void console_textview_end(TextViewContext *tvc) { - SpaceConsole *sc= (SpaceConsole *)tvc->arg1; + SpaceConsole *sc = (SpaceConsole *)tvc->arg1; (void)sc; } static int console_textview_step(TextViewContext *tvc) { - return ((tvc->iter= (void *)((Link *)tvc->iter)->prev) != NULL); + return ((tvc->iter = (void *)((Link *)tvc->iter)->prev) != NULL); } static int console_textview_line_get(struct TextViewContext *tvc, const char **line, int *len) { - ConsoleLine *cl= (ConsoleLine *)tvc->iter; - *line= cl->line; - *len= cl->len; + ConsoleLine *cl = (ConsoleLine *)tvc->iter; + *line = cl->line; + *len = cl->len; return 1; } static int console_textview_line_color(struct TextViewContext *tvc, unsigned char fg[3], unsigned char UNUSED(bg[3])) { - ConsoleLine *cl_iter= (ConsoleLine *)tvc->iter; + ConsoleLine *cl_iter = (ConsoleLine *)tvc->iter; /* annoying hack, to draw the prompt */ if (tvc->iter_index == 0) { - const SpaceConsole *sc= (SpaceConsole *)tvc->arg1; - const ConsoleLine *cl= (ConsoleLine *)sc->history.last; - const int prompt_len= strlen(sc->prompt); - const int cursor_loc= cl->cursor + prompt_len; + const SpaceConsole *sc = (SpaceConsole *)tvc->arg1; + const ConsoleLine *cl = (ConsoleLine *)sc->history.last; + const int prompt_len = strlen(sc->prompt); + const int cursor_loc = cl->cursor + prompt_len; int xy[2] = {CONSOLE_DRAW_MARGIN, CONSOLE_DRAW_MARGIN}; int pen[2]; - xy[1] += tvc->lheight/6; + xy[1] += tvc->lheight / 6; /* account for wrapping */ if (cl->len < tvc->console_width) { /* simple case, no wrapping */ - pen[0]= tvc->cwidth * cursor_loc; - pen[1]= -2; + pen[0] = tvc->cwidth * cursor_loc; + pen[1] = -2; } else { /* wrap */ - pen[0]= tvc->cwidth * (cursor_loc % tvc->console_width); - pen[1]= -2 + (((cl->len / tvc->console_width) - (cursor_loc / tvc->console_width)) * tvc->lheight); + pen[0] = tvc->cwidth * (cursor_loc % tvc->console_width); + pen[1] = -2 + (((cl->len / tvc->console_width) - (cursor_loc / tvc->console_width)) * tvc->lheight); } /* cursor */ UI_GetThemeColor3ubv(TH_CONSOLE_CURSOR, fg); glColor3ubv(fg); - glRecti( (xy[0] + pen[0]) - 1, - (xy[1] + pen[1]), - (xy[0] + pen[0]) + 1, - (xy[1] + pen[1] + tvc->lheight) - ); + glRecti((xy[0] + pen[0]) - 1, + (xy[1] + pen[1]), + (xy[0] + pen[0]) + 1, + (xy[1] + pen[1] + tvc->lheight) + ); } console_line_color(fg, cl_iter->type); @@ -193,33 +193,33 @@ static int console_textview_line_color(struct TextViewContext *tvc, unsigned cha static int console_textview_main__internal(struct SpaceConsole *sc, struct ARegion *ar, int draw, int mval[2], void **mouse_pick, int *pos_pick) { - ConsoleLine cl_dummy= {NULL}; - int ret= 0; + ConsoleLine cl_dummy = {NULL}; + int ret = 0; - View2D *v2d= &ar->v2d; + View2D *v2d = &ar->v2d; - TextViewContext tvc= {0}; + TextViewContext tvc = {0}; - tvc.begin= console_textview_begin; - tvc.end= console_textview_end; + tvc.begin = console_textview_begin; + tvc.end = console_textview_end; - tvc.step= console_textview_step; - tvc.line_get= console_textview_line_get; - tvc.line_color= console_textview_line_color; + tvc.step = console_textview_step; + tvc.line_get = console_textview_line_get; + tvc.line_color = console_textview_line_color; - tvc.arg1= sc; - tvc.arg2= NULL; + tvc.arg1 = sc; + tvc.arg2 = NULL; /* view */ - tvc.sel_start= sc->sel_start; - tvc.sel_end= sc->sel_end; - tvc.lheight= sc->lheight; + tvc.sel_start = sc->sel_start; + tvc.sel_end = sc->sel_end; + tvc.lheight = sc->lheight; tvc.ymin = v2d->cur.ymin; tvc.ymax = v2d->cur.ymax; - tvc.winx= ar->winx; + tvc.winx = ar->winx; console_scrollback_prompt_begin(sc, &cl_dummy); - ret= textview_draw(&tvc, draw, mval, mouse_pick, pos_pick); + ret = textview_draw(&tvc, draw, mval, mouse_pick, pos_pick); console_scrollback_prompt_end(sc, &cl_dummy); return ret; @@ -240,12 +240,12 @@ int console_textview_height(struct SpaceConsole *sc, struct ARegion *ar) int console_char_pick(struct SpaceConsole *sc, struct ARegion *ar, int mval[2]) { - int pos_pick= 0; - void *mouse_pick= NULL; + int pos_pick = 0; + void *mouse_pick = NULL; int mval_clamp[2]; - mval_clamp[0]= CLAMPIS(mval[0], CONSOLE_DRAW_MARGIN, ar->winx-(CONSOLE_DRAW_SCROLL + CONSOLE_DRAW_MARGIN)); - mval_clamp[1]= CLAMPIS(mval[1], CONSOLE_DRAW_MARGIN, ar->winy-CONSOLE_DRAW_MARGIN); + mval_clamp[0] = CLAMPIS(mval[0], CONSOLE_DRAW_MARGIN, ar->winx - (CONSOLE_DRAW_SCROLL + CONSOLE_DRAW_MARGIN)); + mval_clamp[1] = CLAMPIS(mval[1], CONSOLE_DRAW_MARGIN, ar->winy - CONSOLE_DRAW_MARGIN); console_textview_main__internal(sc, ar, 0, mval_clamp, &mouse_pick, &pos_pick); return pos_pick; -- cgit v1.2.3