diff options
author | Eli Zaretskii <eliz@gnu.org> | 2020-10-16 10:02:50 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2020-10-16 10:02:50 +0300 |
commit | 72dd9119819eea5d8b1138e14a6010759f38366b (patch) | |
tree | 3f60f710275a6093828bb6868848dc3845d2cfb4 /src | |
parent | ace25f206640b94d876d7d0966fcd9e512f81fc9 (diff) | |
download | emacs-72dd9119819eea5d8b1138e14a6010759f38366b.tar.gz |
Fix posn-at-x-y in builds --without-x
* src/keyboard.c (make_lispy_position): Don't exclude the
window_or_frame = frame case from TTY-only builds. Reported by
Jared Finder <jared@finder.org>.
* doc/lispref/commands.texi (Click Events): Document the format of
POSITION in click events on the frame's internal border.
Diffstat (limited to 'src')
-rw-r--r-- | src/keyboard.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 5f136f03ecf..fca71985b92 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -5246,7 +5246,6 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y, extra_info))); } -#ifdef HAVE_WINDOW_SYSTEM else if (f) { /* Return mouse pixel coordinates here. */ @@ -5254,7 +5253,9 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y, xret = XFIXNUM (x); yret = XFIXNUM (y); - if (FRAME_LIVE_P (f) +#ifdef HAVE_WINDOW_SYSTEM + if (FRAME_WINDOW_P (f) + && FRAME_LIVE_P (f) && FRAME_INTERNAL_BORDER_WIDTH (f) > 0 && !NILP (get_frame_param (f, Qdrag_internal_border))) { @@ -5263,8 +5264,8 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y, posn = builtin_lisp_symbol (internal_border_parts[part]); } - } #endif + } else window_or_frame = Qnil; |