Mercurial > hg > xemacs-beta
view src/ExternalClient-Xlib.c @ 5803:b79e1e02bf01
Preserve extent information in the command builder code.
src/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* event-stream.c:
* event-stream.c (mark_command_builder):
* event-stream.c (finalize_command_builder): Removed.
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder): Removed. Use
free_normal_lisp_object() instead.
* event-stream.c (echo_key_event):
* event-stream.c (regenerate_echo_keys_from_this_command_keys):
Detach all extents here.
* event-stream.c (maybe_echo_keys):
* event-stream.c (reset_key_echo):
* event-stream.c (execute_help_form):
* event-stream.c (Fnext_event):
* event-stream.c (command_builder_find_leaf_no_jit_binding):
* event-stream.c (command_builder_find_leaf):
* event-stream.c (lookup_command_event):
* events.h (struct command_builder):
Move the command builder's echo_buf to being a Lisp string rather
than a malloced Ibyte array. This allows passing through extent
information, which was previously dropped. It also simplifies the
allocation and release code for the command builder.
Rename echo_buf_index to echo_buf_fill_pointer, better reflecting
its function.
Don't rely on zero-termination (something not particularly
compatible with Lisp-level code) when showing a substring of
echo_buf that differs from that designated by
echo_buf_fill_pointer, keep a separate counter instead and use
that.
* minibuf.c:
* minibuf.c (echo_area_append):
Use the new START and END keyword arguments to #'append-message,
rather than consing a new string for basically every #'next-event
prompt displayed.
test/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* automated/extent-tests.el:
Check that extent information is passed through to the echo area
correctly with #'next-event's PROMPT argument.
lisp/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (raw-append-message):
Use #'write-sequence in this, take its START and END keyword
arguments, so our callers don't have to cons as much.
* simple.el (append-message):
Pass through START and END here.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 14 Jul 2014 13:42:42 +0100 |
| parents | 2aa9cd456ae7 |
| children | 5d5aeb79edb4 |
line wrap: on
line source
/* External client, raw Xlib version. Copyright (C) 1993, 1994 Sun Microsystems, Inc. This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this library. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ /* Written by Ben Wing, February 1994. */ #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> #include "extw-Xlib.h" /* this is not a perfect solution, but otherwise we have to include all of the Xt junk */ #define XtGeometryNo 1 #if (XlibSpecificationRelease < 5) # define XPointer char * #endif static int context_inited; static XContext focus_context; /* does the specified window have the focus, given that the pointer just entered (or left) the window (according to enter_p)? This question does not have an obvious answer in X. (Basically, X sucks.) */ static int window_has_focus_p (Display *display, Window win, int enter_p) { Window focuswin; int dummy; XGetInputFocus(display, &focuswin, &dummy); if (focuswin == PointerRoot) return enter_p; if (focuswin == win) return True; if (!enter_p) return False; do { Status st; Window root_win, parent_win; Window *child_win; unsigned int nchild; st = XQueryTree (display, win, &root_win, &parent_win, &child_win, &nchild); if (!st) return False; XFree((XPointer)child_win); if (parent_win == focuswin) return True; if (parent_win == root_win) return False; win = parent_win; } while (1); } /* External entry points when using XLib directly */ void ExternalClientInitialize (Display *display, Window win); void ExternalClientInitialize (Display *display, Window win) { extw_initialize_atoms(display); extw_which_side = extw_client_send; if (!context_inited) { focus_context = XUniqueContext(); context_inited = 1; } XSaveContext(display, win, focus_context, 0); XSelectInput(display, win, EnterWindowMask | LeaveWindowMask | FocusChangeMask); } void ExternalClientEventHandler (Display *display, Window win, XEvent *event); void ExternalClientEventHandler (Display *display, Window win, XEvent *event) { if (win != event->xany.window) return; if (event->type == ClientMessage && event->xclient.message_type == a_EXTW_NOTIFY && event->xclient.data.l[0] == extw_shell_send) switch (event->xclient.data.l[1]) { case extw_notify_gm: /* for the moment, just refuse geometry requests. */ extw_send_notify_3(display, win, extw_notify_gm, XtGeometryNo, 0, 0); break; case extw_notify_init: extw_send_notify_3(display, win, extw_notify_init, EXTW_TYPE_XLIB, 0, 0); break; case extw_notify_end: XClearArea(display, win, 0, 0, 0, 0, True); break; } else { int focus_status; XPointer current_focus; if (event->type == FocusIn) focus_status = 1; else if (event->type == FocusOut) focus_status = 0; else if (event->type == EnterNotify && event->xcrossing.detail != NotifyInferior) focus_status = window_has_focus_p(display, win, 1); else if (event->type == LeaveNotify && event->xcrossing.detail != NotifyInferior) focus_status = window_has_focus_p(display, win, 0); else return; XFindContext(display, win, focus_context, ¤t_focus); if (focus_status != (int) current_focus) { XSaveContext(display, win, focus_context, (XPointer) focus_status); extw_send_notify_3(display, win, focus_status ? extw_notify_focus_in : extw_notify_focus_out, 0, 0, 0); } } }
