Re: master ad76020 1/2: Support mouse clicks on tab bar on TTY frames

Re: master ad76020 1/2: Support mouse clicks on tab bar on TTY frames

[Andreas Schwab]

On Okt 06 2019, eliz@gnu.org (Eli Zaretskii) wrote:

> +/* Handle a mouse click at X/Y on the tab bar of TTY frame F.  If the
> +   click was on the tab bar and was handled, populate the EVENT
> +   structure, store it in keyboard queue, and return true; otherwise
> +   return false.  MODIFIERS are event modifiers for generating the tab
> +   release event.  */
> +bool
> +tty_handle_tab_bar_click (struct frame *f, int x, int y, bool down_p,
> +			  struct input_event *event)
> +{
> +  /* Did they click on the tab bar?  */
> +  if (y < FRAME_MENU_BAR_LINES (f)
> +      || y >= FRAME_MENU_BAR_LINES (f) + FRAME_TAB_BAR_LINES (f))
> +    return false;
> +
> +  /* Find the tab-bar item where the X,Y coordinates belong.  */
> +  int prop_idx;
> +  ptrdiff_t clen;
> +  Lisp_Object caption = tty_get_tab_bar_item (f, x, &prop_idx, &clen);
> +
> +  if (NILP (caption))
> +    return false;
> +
> +  if (NILP (AREF (f->tab_bar_items,
> +		  prop_idx * TAB_BAR_ITEM_NSLOTS + TAB_BAR_ITEM_ENABLED_P)))
> +    return false;
> +
> +  if (down_p)
> +    f->last_tab_bar_item = prop_idx;

That breaks no-x build:

xdisp.c:13477:8: error: ‘struct frame’ has no member named ‘last_tab_bar_item’; did you mean ‘n_tab_bar_items’?

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."

Re: master ad76020 1/2: Support mouse clicks on tab bar on TTY frames

[Juri Linkov]

>> +/* Handle a mouse click at X/Y on the tab bar of TTY frame F.  If the
>> +   click was on the tab bar and was handled, populate the EVENT
>> +   structure, store it in keyboard queue, and return true; otherwise
>> +   return false.  MODIFIERS are event modifiers for generating the tab
>> +   release event.  */
>> +bool
>> +tty_handle_tab_bar_click (struct frame *f, int x, int y, bool down_p,
>> +			  struct input_event *event)
>> +{
>> +  /* Did they click on the tab bar?  */
>> +  if (y < FRAME_MENU_BAR_LINES (f)
>> +      || y >= FRAME_MENU_BAR_LINES (f) + FRAME_TAB_BAR_LINES (f))
>> +    return false;
>> +
>> +  /* Find the tab-bar item where the X,Y coordinates belong.  */
>> +  int prop_idx;
>> +  ptrdiff_t clen;
>> +  Lisp_Object caption = tty_get_tab_bar_item (f, x, &prop_idx, &clen);
>> +
>> +  if (NILP (caption))
>> +    return false;
>> +
>> +  if (NILP (AREF (f->tab_bar_items,
>> +		  prop_idx * TAB_BAR_ITEM_NSLOTS + TAB_BAR_ITEM_ENABLED_P)))
>> +    return false;
>> +
>> +  if (down_p)
>> +    f->last_tab_bar_item = prop_idx;
>
> That breaks no-x build:
>
> xdisp.c:13477:8: error: ‘struct frame’ has no member named ‘last_tab_bar_item’; did you mean ‘n_tab_bar_items’?

Maybe Eli has a better fix, but at least now I fixed compilation to not fail.

Re: master ad76020 1/2: Support mouse clicks on tab bar on TTY frames

[Eli Zaretskii]

> From: Andreas Schwab <schwab@linux-m68k.org>
> Cc: Eli Zaretskii <eliz@gnu.org>
> Date: Mon, 07 Oct 2019 00:20:32 +0200
> 
> That breaks no-x build:
> 
> xdisp.c:13477:8: error: ‘struct frame’ has no member named ‘last_tab_bar_item’; did you mean ‘n_tab_bar_items’?

Sorry about that.  This is exactly why I hate terminal-specific struct
members in the display engine.

Re: master ad76020 1/2: Support mouse clicks on tab bar on TTY frames

[Eli Zaretskii]

> From: Juri Linkov <juri@linkov.net>
> Cc: emacs-devel@gnu.org,  Eli Zaretskii <eliz@gnu.org>
> Date: Mon, 07 Oct 2019 02:02:20 +0300
> 
> Maybe Eli has a better fix, but at least now I fixed compilation to not fail.

Thanks, your fix was exactly the right one.