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

* src/xdisp.c (note_tab_bar_highlight): Simplify HAVE_NS ifdefs.

Browse source
This commit is contained in:
Paul Eggert 2019-10-13 12:55:12 -07:00
parent b02f0ae995
commit 5c4195fd36
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/xdisp.c
View file

@ -13334,9 +13334,6 @@ note_tab_bar_highlight (struct frame *f, int x, int y)
{
Lisp_Object window = f->tab_bar_window;
struct window *w = XWINDOW (window);
#ifndef HAVE_NS
Display_Info *dpyinfo = FRAME_DISPLAY_INFO (f);
#endif
Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
int hpos, vpos;
struct glyph *glyph;
@ -13346,9 +13343,6 @@ note_tab_bar_highlight (struct frame *f, int x, int y)
int prop_idx;
bool close_p;
enum draw_glyphs_face draw = DRAW_IMAGE_RAISED;
#ifndef HAVE_NS
bool mouse_down_p;
#endif
int rc;
/* Function note_mouse_highlight is called with negative X/Y
@ -13372,18 +13366,17 @@ note_tab_bar_highlight (struct frame *f, int x, int y)
clear_mouse_face (hlinfo);
bool mouse_down_p = false;
#ifndef HAVE_NS
/* Mouse is down, but on different tab-bar item? */
Display_Info *dpyinfo = FRAME_DISPLAY_INFO (f);
mouse_down_p = (gui_mouse_grabbed (dpyinfo)
&& f == dpyinfo->last_mouse_frame);
if (mouse_down_p && f->last_tab_bar_item != prop_idx)
return;
#endif
draw = mouse_down_p ? DRAW_IMAGE_SUNKEN : DRAW_IMAGE_RAISED;
#else
draw = DRAW_IMAGE_RAISED;
#endif /* HAVE_NS */
/* If tab-bar item is not enabled, don't highlight it. */
enabled_p = AREF (f->tab_bar_items, prop_idx + TAB_BAR_ITEM_ENABLED_P);