#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
+#include <limits.h>
#include "MEM_guardedalloc.h"
#include "BIF_glutil.h"
#include "ED_datafiles.h"
+#include "ED_types.h"
+
#include "UI_interface.h"
#include "UI_resources.h"
}
}
-static void console_report_color(unsigned char *fg, int type)
+static void console_report_color(unsigned char *fg, unsigned char *bg, Report *report, int bool)
{
/*
if (type & RPT_ERROR_ALL) { fg[0]=220; fg[1]=0; fg[2]=0; }
else if (type & RPT_DEBUG_ALL) { fg[0]=196; fg[1]=196; fg[2]=196; }
else { fg[0]=196; fg[1]=196; fg[2]=196; }
*/
+ if(report->flag & SELECT) {
+ fg[0]=255; fg[1]=255; fg[2]=255;
+ if(bool) {
+ bg[0]=96; bg[1]=128; bg[2]=255;
+ }
+ else {
+ bg[0]=90; bg[1]=122; bg[2]=249;
+ }
+ }
+
+ else {
+ fg[0]=0; fg[1]=0; fg[2]=0;
+
+ if(bool) {
+ bg[0]=120; bg[1]=120; bg[2]=120;
+ }
+ else {
+ bg[0]=114; bg[1]=114; bg[2]=114;
+ }
+
+ }
+
+
- fg[0]=0; fg[1]=0; fg[2]=0;
}
static int console_draw_string( char *str, int str_len,
int console_width, int lheight,
unsigned char *fg, unsigned char *bg,
- int winx, int winy,
+ int winx,
+ int ymin, int ymax,
int *x, int *y, int draw)
{
int rct_ofs= lheight/4;
- int tot_lines = (str_len/console_width)+1; /* total number of lines for wrapping */
+ int tot_lines = (str_len/console_width)+1; /* total number of lines for wrapping */
+ int y_next = (str_len > console_width) ? (*y)+lheight*tot_lines : (*y)+lheight;
/* just advance the height */
if(draw==0) {
- if(str_len > console_width) (*y) += tot_lines * lheight;
- else (*y) += lheight;
-
+ *y= y_next;
+ return 1;
+ }
+ else if (y_next-lheight < ymin) {
+ /* have not reached the drawable area so don't break */
+ *y= y_next;
return 1;
}
if(str_len > console_width) { /* wrap? */
char *line_stride= str + ((tot_lines-1) * console_width); /* advance to the last line and draw it first */
- char eol; /* baclup the end of wrapping */
+ char eol; /* baclup the end of wrapping */
if(bg) {
glColor3ub(bg[0], bg[1], bg[2]);
line_stride[console_width] = eol; /* restore */
/* check if were out of view bounds */
- if(*y > winy)
+ if(*y > ymax)
return 0;
}
}
BLF_position(*x, *y, 0); (*y) += lheight;
BLF_draw(str);
- if(*y > winy)
+ if(*y > ymax)
return 0;
}
#define CONSOLE_DRAW_MARGIN 4
#define CONSOLE_DRAW_SCROLL 16
-static int console_text_main__internal(struct SpaceConsole *sc, struct ARegion *ar, ReportList *reports, int draw)
+static int console_text_main__internal(struct SpaceConsole *sc, struct ARegion *ar, ReportList *reports, int draw, int mouse_y, void **mouse_pick)
{
View2D *v2d= &ar->v2d;
ConsoleLine *cl= sc->history.last;
int x_orig=CONSOLE_DRAW_MARGIN, y_orig=CONSOLE_DRAW_MARGIN;
- int x,y;
+ int x,y, y_prev;
int cwidth;
int console_width; /* number of characters that fit into the width of the console (fixed width) */
unsigned char fg[3];
x= x_orig; y= y_orig;
+ if(mouse_y != INT_MAX)
+ mouse_y += (v2d->cur.ymin+CONSOLE_DRAW_MARGIN);
+
+
if(sc->type==CONSOLE_TYPE_PYTHON) {
int prompt_len;
y += sc->lheight;
for(cl= sc->scrollback.last; cl; cl= cl->prev) {
+ y_prev= y;
if(draw)
console_line_color(fg, cl->type);
if(!console_draw_string( cl->line, cl->len,
console_width, sc->lheight,
fg, NULL,
- ar->winx-CONSOLE_DRAW_MARGIN, v2d->cur.ymax,
+ ar->winx-(CONSOLE_DRAW_MARGIN+CONSOLE_DRAW_SCROLL),
+ v2d->cur.ymin, v2d->cur.ymax,
&x, &y, draw))
{
/* when drawing, if we pass v2d->cur.ymax, then quit */
break; /* past the y limits */
}
}
+
+ if((mouse_y != INT_MAX) && (mouse_y >= y_prev && mouse_y <= y)) {
+ *mouse_pick= (void *)cl;
+ break;
+ }
}
}
else {
Report *report;
int report_mask= 0;
int bool= 0;
- unsigned char bg[3] = {114, 114, 114};
-
+ unsigned char bg[3];
+
if(draw) {
glClearColor(120.0/255.0, 120.0/255.0, 120.0/255.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);
}
/* convert our display toggles into a flag compatible with BKE_report flags */
- if(sc->rpt_mask & CONSOLE_RPT_DEBUG) report_mask |= RPT_DEBUG_ALL;
- if(sc->rpt_mask & CONSOLE_RPT_INFO) report_mask |= RPT_INFO_ALL;
- if(sc->rpt_mask & CONSOLE_RPT_OP) report_mask |= RPT_OPERATOR_ALL;
- if(sc->rpt_mask & CONSOLE_RPT_WARN) report_mask |= RPT_WARNING_ALL;
- if(sc->rpt_mask & CONSOLE_RPT_ERR) report_mask |= RPT_ERROR_ALL;
+ report_mask= console_report_mask(sc);
for(report=reports->list.last; report; report=report->prev) {
if(report->type & report_mask) {
+ y_prev= y;
if(draw)
- console_report_color(fg, report->type);
+ console_report_color(fg, bg, report, bool);
if(!console_draw_string( report->message, report->len,
console_width, sc->lheight,
- fg, bool?bg:NULL,
- ar->winx-CONSOLE_DRAW_MARGIN, v2d->cur.ymax,
+ fg, bg,
+ ar->winx-(CONSOLE_DRAW_MARGIN+CONSOLE_DRAW_SCROLL),
+ v2d->cur.ymin, v2d->cur.ymax,
&x, &y, draw))
{
/* when drawing, if we pass v2d->cur.ymax, then quit */
break; /* past the y limits */
}
}
+ if((mouse_y != INT_MAX) && (mouse_y >= y_prev && mouse_y <= y)) {
+ *mouse_pick= (void *)report;
+ break;
+ }
bool = !(bool);
}
-
}
}
y += sc->lheight*2;
void console_text_main(struct SpaceConsole *sc, struct ARegion *ar, ReportList *reports)
{
- console_text_main__internal(sc, ar, reports, 1);
+ console_text_main__internal(sc, ar, reports, 1, INT_MAX, NULL);
}
int console_text_height(struct SpaceConsole *sc, struct ARegion *ar, ReportList *reports)
{
- return console_text_main__internal(sc, ar, reports, 0);
+ return console_text_main__internal(sc, ar, reports, 0, INT_MAX, NULL);
+}
+
+void *console_text_pick(struct SpaceConsole *sc, struct ARegion *ar, ReportList *reports, int mouse_y)
+{
+ void *mouse_pick= NULL;
+ console_text_main__internal(sc, ar, reports, 0, mouse_y, &mouse_pick);
+ return (void *)mouse_pick;
}
projects / blender-staging.git / blobdiff