Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-25 06:17:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move text line right when in box (bug#23755)

Browse source 
* src/nsterm.m (ns_draw_glyph_string_foreground): Create to take
CHAR_GLYPH specific code and move glyphs right if within a box.
(ns_draw_glyph_string): Move CHAR_GLYPH specific code into above
function.
This commit is contained in:
Alan Third 2016-06-18 00:02:32 +01:00
parent fdcf46d33e
commit f7df85a8d1
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/nsterm.m
View file

@ -3639,6 +3639,32 @@ overwriting cursor (usually when cursor on a tab) */
}
static void
ns_draw_glyph_string_foreground (struct glyph_string *s)
{
int x, flags;
struct font *font = s->font;
/* If first glyph of S has a left box line, start drawing the text
of S to the right of that box line. */
if (s->face && s->face->box != FACE_NO_BOX
&& s->first_glyph->left_box_line_p)
x = s->x + eabs (s->face->box_line_width);
else
x = s->x;
flags = s->hl == DRAW_CURSOR ? NS_DUMPGLYPH_CURSOR :
(s->hl == DRAW_MOUSE_FACE ? NS_DUMPGLYPH_MOUSEFACE :
(s->for_overlaps ? NS_DUMPGLYPH_FOREGROUND :
NS_DUMPGLYPH_NORMAL));
font->driver->draw
(s, s->cmp_from, s->nchars, x, s->ybase,
(flags == NS_DUMPGLYPH_NORMAL && !s->background_filled_p)
|| flags == NS_DUMPGLYPH_MOUSEFACE);
}
static void
ns_draw_composite_glyph_string_foreground (struct glyph_string *s)
{
@ -3737,7 +3763,7 @@ overwriting cursor (usually when cursor on a tab) */
{
/* TODO (optimize): focus for box and contents draw */
NSRect r[2];
int n, flags;
int n;
char box_drawn_p = 0;
struct font *font = s->face->font;
if (! font) font = FRAME_FONT (s->f);
@ -3807,11 +3833,6 @@ overwriting cursor (usually when cursor on a tab) */
ns_maybe_dumpglyphs_background
(s, s->first_glyph->type == COMPOSITE_GLYPH);
flags = s->hl == DRAW_CURSOR ? NS_DUMPGLYPH_CURSOR :
(s->hl == DRAW_MOUSE_FACE ? NS_DUMPGLYPH_MOUSEFACE :
(s->for_overlaps ? NS_DUMPGLYPH_FOREGROUND :
NS_DUMPGLYPH_NORMAL));
if (s->hl == DRAW_CURSOR && s->w->phys_cursor_type == FILLED_BOX_CURSOR)
{
unsigned long tmp = NS_FACE_BACKGROUND (s->face);
@ -3825,10 +3846,7 @@ overwriting cursor (usually when cursor on a tab) */
if (isComposite)
ns_draw_composite_glyph_string_foreground (s);
else
font->driver->draw
(s, s->cmp_from, s->nchars, s->x, s->ybase,
(flags == NS_DUMPGLYPH_NORMAL && !s->background_filled_p)
|| flags == NS_DUMPGLYPH_MOUSEFACE);
ns_draw_glyph_string_foreground (s);
}
{