Mercurial > hg > xemacs-beta
view src/widget.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 | 308d34e9f07d |
| children |
line wrap: on
line source
/* Primitives for work of the "widget" library. Copyright (C) 1997 Free Software Foundation, Inc. This file is part of XEmacs. XEmacs 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. XEmacs 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 XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ /* In an ideal world, this file would not have been necessary. However, elisp function calls being as slow as they are, it turns out that some functions in the widget library (wid-edit.el) are the bottleneck of Widget operation. Here is their translation to C, for the sole reason of efficiency. */ #include <config.h> #include "lisp.h" #include "buffer.h" Lisp_Object Qwidget_type; DEFUN ("widget-plist-member", Fwidget_plist_member, 2, 2, 0, /* Like `plist-get', but returns the tail of PLIST whose car is PROP. */ (plist, prop)) { while (!NILP (plist) && !EQ (Fcar (plist), prop)) { /* Check for QUIT, so a circular plist doesn't lock up the editor. */ QUIT; plist = Fcdr (Fcdr (plist)); } return plist; } DEFUN ("widget-put", Fwidget_put, 3, 3, 0, /* In WIDGET set PROPERTY to VALUE. The value can later be retrieved with `widget-get'. */ (widget, property, value)) { CHECK_CONS (widget); XCDR (widget) = Fplist_put (XCDR (widget), property, value); return widget; } DEFUN ("widget-get", Fwidget_get, 2, 2, 0, /* In WIDGET, get the value of PROPERTY. The value could either be specified when the widget was created, or later with `widget-put'. */ (widget, property)) { Lisp_Object value = Qnil; while (1) { Lisp_Object tmp = Fwidget_plist_member (Fcdr (widget), property); if (!NILP (tmp)) { value = Fcar (Fcdr (tmp)); break; } tmp = Fcar (widget); if (!NILP (tmp)) { widget = Fget (tmp, Qwidget_type, Qnil); continue; } break; } return value; } DEFUN ("widget-apply", Fwidget_apply, 2, MANY, 0, /* Apply the value of WIDGET's PROPERTY to the widget itself. ARGS are passed as extra arguments to the function. arguments: (WIDGET PROPERTY &rest ARGS) */ (int nargs, Lisp_Object *args)) { /* This function can GC */ Lisp_Object newargs[3]; struct gcpro gcpro1; newargs[0] = Fwidget_get (args[0], args[1]); newargs[1] = args[0]; newargs[2] = Flist (nargs - 2, args + 2); GCPRO1 (newargs[2]); RETURN_UNGCPRO (Fapply (3, newargs)); } void syms_of_widget (void) { DEFSYMBOL (Qwidget_type); DEFSUBR (Fwidget_plist_member); DEFSUBR (Fwidget_put); DEFSUBR (Fwidget_get); DEFSUBR (Fwidget_apply); }
