diff options
-rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_info/textview.c | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 3173736c2a5..25c74a0a6cb 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -182,7 +182,6 @@ GHOST_WindowX11( * X can find us a visual matching those requirements. */ int attributes[40], i, samples; - Atom atoms[2]; int natom; int glxVersionMajor, glxVersionMinor; /* As in GLX major.minor */ @@ -405,6 +404,7 @@ GHOST_WindowX11( /* The basic for a good ICCCM "work" */ if (m_system->m_atom.WM_PROTOCOLS) { + Atom atoms[2]; natom = 0; if (m_system->m_atom.WM_DELETE_WINDOW) { diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f2566980d9b..7059cedc2dc 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7066,7 +7066,9 @@ static const char *dataname(short id_code) case ID_BR: return "Data from BR"; case ID_PA: return "Data from PA"; case ID_GD: return "Data from GD"; + case ID_WM: return "Data from WM"; case ID_MC: return "Data from MC"; + case ID_MSK: return "Data from MSK"; case ID_LS: return "Data from LS"; } return "Data from Lib Block"; diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index e53cbdd04af..e23f792d0b5 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -57,6 +57,7 @@ static void console_font_begin(TextViewContext *sc) typedef struct ConsoleDrawContext { int cwidth; int lheight; + int lofs; /* text vertical offset */ int console_width; /* number of characters that fit into the width of the console (fixed width) */ int winx; int ymin, ymax; @@ -192,7 +193,7 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str glColor3ubv(fg); /* last part needs no clipping */ - BLF_position(mono, cdc->xy[0], cdc->xy[1], 0); + BLF_position(mono, cdc->xy[0], cdc->lofs + cdc->xy[1], 0); BLF_draw_mono(mono, s, len, cdc->cwidth); if (cdc->sel[0] != cdc->sel[1]) { @@ -208,7 +209,7 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str len = offsets[i] - offsets[i - 1]; s = str + offsets[i - 1]; - BLF_position(mono, cdc->xy[0], cdc->xy[1], 0); + BLF_position(mono, cdc->xy[0], cdc->lofs + cdc->xy[1], 0); BLF_draw_mono(mono, s, len, cdc->cwidth); if (cdc->sel[0] != cdc->sel[1]) { @@ -239,7 +240,7 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str glColor3ubv(fg); - BLF_position(mono, cdc->xy[0], cdc->xy[1], 0); + BLF_position(mono, cdc->xy[0], cdc->lofs + cdc->xy[1], 0); BLF_draw_mono(mono, str, str_len, cdc->cwidth); if (cdc->sel[0] != cdc->sel[1]) { @@ -291,6 +292,7 @@ int textview_draw(TextViewContext *tvc, const int draw, int mval[2], void **mous cdc.cwidth = (int)BLF_fixed_width(mono); assert(cdc.cwidth > 0); cdc.lheight = tvc->lheight; + cdc.lofs = -BLF_descender(mono); /* note, scroll bar must be already subtracted () */ cdc.console_width = (tvc->winx - (CONSOLE_DRAW_MARGIN * 2) ) / cdc.cwidth; CLAMP(cdc.console_width, 1, INT_MAX); /* avoid divide by zero on small windows */ |