diff options
Diffstat (limited to 'source/blender/editors/space_console/console_ops.c')
| -rw-r--r-- | source/blender/editors/space_console/console_ops.c | 61 |
1 files changed, 46 insertions, 15 deletions
diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index 6aef967b851..e8c7cc6c926 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -40,6 +40,7 @@ #include "WM_api.h" #include "WM_types.h" +#include "UI_view2d.h" #include "ED_screen.h" #include "RNA_access.h" @@ -47,6 +48,13 @@ #include "console_intern.h" +static void console_textview_update_rect(SpaceConsole *sc, ARegion *ar) +{ + View2D *v2d= &ar->v2d; + + UI_view2d_totRect_set(v2d, ar->winx-1, console_textview_height(sc, ar)); +} + static void console_select_offset(SpaceConsole *sc, const int offset) { sc->sel_start += offset; @@ -349,6 +357,8 @@ void CONSOLE_OT_move(wmOperatorType *ot) #define TAB_LENGTH 4 static int insert_exec(bContext *C, wmOperator *op) { + SpaceConsole *sc= CTX_wm_space_console(C); + ARegion *ar= CTX_wm_region(C); ConsoleLine *ci= console_history_verify(C); char *str= RNA_string_get_alloc(op->ptr, "text", NULL, 0); int len; @@ -373,7 +383,8 @@ static int insert_exec(bContext *C, wmOperator *op) SpaceConsole *sc= CTX_wm_space_console(C); console_select_offset(sc, len); } - + + console_textview_update_rect(sc, ar); ED_area_tag_redraw(CTX_wm_area(C)); return OPERATOR_FINISHED; @@ -424,13 +435,12 @@ static EnumPropertyItem delete_type_items[]= { static int delete_exec(bContext *C, wmOperator *op) { - + SpaceConsole *sc= CTX_wm_space_console(C); + ARegion *ar= CTX_wm_region(C); ConsoleLine *ci= console_history_verify(C); - - - int done = 0; - int type= RNA_enum_get(op->ptr, "type"); + const short type= RNA_enum_get(op->ptr, "type"); + int done = 0; if(ci->len==0) { return OPERATOR_CANCELLED; @@ -461,7 +471,8 @@ static int delete_exec(bContext *C, wmOperator *op) SpaceConsole *sc= CTX_wm_space_console(C); console_select_offset(sc, -1); } - + + console_textview_update_rect(sc, ar); ED_area_tag_redraw(CTX_wm_area(C)); return OPERATOR_FINISHED; @@ -488,6 +499,7 @@ void CONSOLE_OT_delete(wmOperatorType *ot) static int clear_exec(bContext *C, wmOperator *op) { SpaceConsole *sc= CTX_wm_space_console(C); + ARegion *ar= CTX_wm_region(C); short scrollback= RNA_boolean_get(op->ptr, "scrollback"); short history= RNA_boolean_get(op->ptr, "history"); @@ -503,9 +515,10 @@ static int clear_exec(bContext *C, wmOperator *op) while(sc->history.first) console_history_free(sc, sc->history.first); } - + + console_textview_update_rect(sc, ar); ED_area_tag_redraw(CTX_wm_area(C)); - + return OPERATOR_FINISHED; } @@ -531,6 +544,8 @@ void CONSOLE_OT_clear(wmOperatorType *ot) static int history_cycle_exec(bContext *C, wmOperator *op) { SpaceConsole *sc= CTX_wm_space_console(C); + ARegion *ar= CTX_wm_region(C); + ConsoleLine *ci= console_history_verify(C); /* TODO - stupid, just prevernts crashes when no command line */ short reverse= RNA_boolean_get(op->ptr, "reverse"); /* assumes down, reverse is up */ int prev_len= ci->len; @@ -566,6 +581,8 @@ static int history_cycle_exec(bContext *C, wmOperator *op) ci= sc->history.last; console_select_offset(sc, ci->len - prev_len); + /* could be wrapped so update scroll rect */ + console_textview_update_rect(sc, ar); ED_area_tag_redraw(CTX_wm_area(C)); return OPERATOR_FINISHED; @@ -591,6 +608,7 @@ void CONSOLE_OT_history_cycle(wmOperatorType *ot) static int history_append_exec(bContext *C, wmOperator *op) { SpaceConsole *sc= CTX_wm_space_console(C); + ScrArea *sa= CTX_wm_area(C); ConsoleLine *ci= console_history_verify(C); char *str= RNA_string_get_alloc(op->ptr, "text", NULL, 0); /* own this text in the new line, dont free */ int cursor= RNA_int_get(op->ptr, "current_character"); @@ -613,9 +631,9 @@ static int history_append_exec(bContext *C, wmOperator *op) ci= console_history_add_str(sc, str, 1); /* own the string */ console_select_offset(sc, ci->len - prev_len); console_line_cursor_set(ci, cursor); - - ED_area_tag_redraw(CTX_wm_area(C)); - + + ED_area_tag_redraw(sa); + return OPERATOR_FINISHED; } @@ -641,6 +659,8 @@ void CONSOLE_OT_history_append(wmOperatorType *ot) static int scrollback_append_exec(bContext *C, wmOperator *op) { SpaceConsole *sc= CTX_wm_space_console(C); + ARegion *ar= CTX_wm_region(C); + ConsoleLine *ci= console_history_verify(C); char *str= RNA_string_get_alloc(op->ptr, "text", NULL, 0); /* own this text in the new line, dont free */ @@ -650,7 +670,8 @@ static int scrollback_append_exec(bContext *C, wmOperator *op) ci->type= type; console_scrollback_limit(sc); - + + console_textview_update_rect(sc, ar); ED_area_tag_redraw(CTX_wm_area(C)); return OPERATOR_FINISHED; @@ -765,6 +786,7 @@ void CONSOLE_OT_copy(wmOperatorType *ot) static int paste_exec(bContext *C, wmOperator *UNUSED(op)) { SpaceConsole *sc= CTX_wm_space_console(C); + ARegion *ar= CTX_wm_region(C); ConsoleLine *ci= console_history_verify(C); char *buf_str= WM_clipboard_text_get(0); @@ -793,6 +815,7 @@ static int paste_exec(bContext *C, wmOperator *UNUSED(op)) MEM_freeN(buf_str); + console_textview_update_rect(sc, ar); ED_area_tag_redraw(CTX_wm_area(C)); return OPERATOR_FINISHED; @@ -821,7 +844,7 @@ typedef struct SetConsoleCursor { static void set_cursor_to_pos(SpaceConsole *sc, ARegion *ar, SetConsoleCursor *scu, int mval[2], int UNUSED(sel)) { int pos; - pos= console_char_pick(sc, ar, NULL, mval); + pos= console_char_pick(sc, ar, mval); if(scu->sel_init == INT_MAX) { scu->sel_init= pos; @@ -848,12 +871,20 @@ static void console_modal_select_apply(bContext *C, wmOperator *op, wmEvent *eve ARegion *ar= CTX_wm_region(C); SetConsoleCursor *scu= op->customdata; int mval[2]; + int sel_prev[2]; mval[0]= event->mval[0]; mval[1]= event->mval[1]; + sel_prev[0]= sc->sel_start; + sel_prev[1]= sc->sel_end; + set_cursor_to_pos(sc, ar, scu, mval, TRUE); - ED_area_tag_redraw(CTX_wm_area(C)); + + /* only redraw if the selection changed */ + if(sel_prev[0] != sc->sel_start || sel_prev[1] != sc->sel_end) { + ED_area_tag_redraw(CTX_wm_area(C)); + } } static void set_cursor_exit(bContext *UNUSED(C), wmOperator *op) |