Re: master e465ea816d: Don't unnecessarily call monitor change functions

[Jashank Jeremy]

> diff --git a/src/xterm.c b/src/xterm.c
> index add0c848db9..05ede2e5803 100644
> --- a/src/xterm.c
> +++ b/src/xterm.c
> @@ -20144,6 +20145,18 @@ handle_one_xevent (struct x_display_info *dpyinfo,
>           inev.ie.kind = MONITORS_CHANGED_EVENT;
>           inev.ie.timestamp = timestamp;
>           XSETTERMINAL (inev.ie.arg, dpyinfo->terminal);
> +
> +         /* Also don't do anything if the monitor configuration
> +            didn't really change.  */
> +
> +         current_monitors
> +           = Fx_display_monitor_attributes_list (inev.ie.arg);
> +
> +         if (Fequal (current_monitors,
> +                     dpyinfo->last_monitor_attributes_list))
> +           inev.ie.kind = NO_EVENT;
> +
> +         dpyinfo->last_monitor_attributes_list = current_monitors;
>         }
>  #endif
>      OTHER:

On my machine, this introduces a build failure:

.../emacs/src/src/xterm.c:20162:4: error: statement requires expression of 
scalar type ('Lisp_Object' (aka 'struct Lisp_Object') invalid)
          if (Fequal (current_monitors,
          ^   ~~~~~~~~~~~~~~~~~~~~~~~~~

This seems fixable by making this an explicit nil check:

        if (!NILP (Fequal (current_monitors,
                           dpyinfo->last_monitor_attributes_list)))

A patch to that effect is attached.

    ~jashank

20220522-xterm-xrandr-fix.patch
Description: Text document

pgpVwwEMTzsaU.pgp
Description: OpenPGP Digital Signature