procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure bar cursors are always visible on Haiku

Browse source 
* src/haikuterm.c (haiku_draw_window_cursor): Adjust bar cursor
colors like X.
This commit is contained in:
Po Lu 2022-02-06 13:08:06 +00:00
parent dc5930ba97
commit b0fd3ec2c0
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/haikuterm.c
View file

@ -1687,7 +1687,7 @@ haiku_draw_window_cursor (struct window *w,
int cursor_width, bool on_p, bool active_p)
{
struct frame *f = XFRAME (WINDOW_FRAME (w));
struct face *face;
struct glyph *phys_cursor_glyph;
struct glyph *cursor_glyph;
@ -1741,7 +1741,26 @@ haiku_draw_window_cursor (struct window *w,
BView_draw_lock (view);
BView_StartClip (view);
BView_SetHighColor (view, FRAME_CURSOR_COLOR (f).pixel);
if (cursor_type == BAR_CURSOR)
{
cursor_glyph = get_phys_cursor_glyph (w);
face = FACE_FROM_ID (f, cursor_glyph->face_id);
}
/* If the glyph's background equals the color we normally draw the
bar cursor in, our cursor in its normal color is invisible. Use
the glyph's foreground color instead in this case, on the
assumption that the glyph's colors are chosen so that the glyph
is legible. */
/* xterm.c only does this for bar cursors, and nobody has
complained, so it would be best to do that here as well. */
if (cursor_type == BAR_CURSOR
&& face->background == FRAME_CURSOR_COLOR (f).pixel)
BView_SetHighColor (view, face->foreground);
else
BView_SetHighColor (view, FRAME_CURSOR_COLOR (f).pixel);
haiku_clip_to_row (w, glyph_row, TEXT_AREA);
switch (cursor_type)
@ -1754,7 +1773,6 @@ haiku_draw_window_cursor (struct window *w,
BView_FillRectangle (view, fx, fy, w->phys_cursor_width, h);
break;
case BAR_CURSOR:
cursor_glyph = get_phys_cursor_glyph (w);
if (cursor_glyph->resolved_level & 1)
BView_FillRectangle (view, fx + cursor_glyph->pixel_width - w->phys_cursor_width,
fy, w->phys_cursor_width, h);