Mercurial > hg > xemacs-beta
view src/scrollbar.h @ 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
/* Define scrollbar instance. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 2010 Ben Wing. 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. */ #ifndef INCLUDED_scrollbar_h_ #define INCLUDED_scrollbar_h_ #ifdef HAVE_SCROLLBARS struct scrollbar_instance { NORMAL_LISP_OBJECT_HEADER header; /* Used by the frame caches. */ struct scrollbar_instance *next; /* Pointer back to the mirror structure attached to. */ struct window_mirror *mirror; /* This flag indicates if the scrollbar is currently in use. */ char scrollbar_is_active; /* This flag indicates if a data parameter has changed. */ char scrollbar_instance_changed; /* A structure of auxiliary data specific to the device type. struct x_scrollbar_data is used for X window frames; defined in scrollbar-x.h */ void *scrollbar_data; }; DECLARE_LISP_OBJECT (scrollbar_instance, struct scrollbar_instance); #define XSCROLLBAR_INSTANCE(x) XRECORD (x, scrollbar_instance, struct scrollbar_instance) #define wrap_scrollbar_instance(p) wrap_record (p, scrollbar_instance) #define SCROLLBAR_INSTANCEP(x) RECORDP (x, scrollbar_instance) #define CHECK_SCROLLBAR_INSTANCE(x) CHECK_RECORD (x, scrollbar_instance) #define CONCHECK_SCROLLBAR_INSTANCE(x) CONCHECK_RECORD (x, scrollbar_instance) #define SCROLLBAR_INSTANCE_FRAME(inst) (inst->mirror->frame) void init_frame_scrollbars (struct frame *f); void init_device_scrollbars (struct device *d); void init_global_scrollbars (struct device *d); void free_frame_scrollbars (struct frame *f); void release_window_mirror_scrollbars (struct window_mirror *mir); void update_window_scrollbars (struct window *w, struct window_mirror *mirror, int active, int horiz_only); #ifdef MEMORY_USAGE_STATS Bytecount compute_all_scrollbar_instance_usage (struct scrollbar_instance * inst); #endif extern Lisp_Object Vscrollbar_width, Vscrollbar_height; extern Lisp_Object Qscrollbar_line_up; extern Lisp_Object Qscrollbar_line_down; extern Lisp_Object Qscrollbar_page_up; extern Lisp_Object Qscrollbar_page_down; extern Lisp_Object Qscrollbar_to_top; extern Lisp_Object Qscrollbar_to_bottom; extern Lisp_Object Qscrollbar_vertical_drag; extern Lisp_Object Qscrollbar_char_left; extern Lisp_Object Qscrollbar_char_right; extern Lisp_Object Qscrollbar_page_left; extern Lisp_Object Qscrollbar_page_right; extern Lisp_Object Qscrollbar_to_left; extern Lisp_Object Qscrollbar_to_right; extern Lisp_Object Qscrollbar_horizontal_drag; #endif /* HAVE_SCROLLBARS */ #endif /* INCLUDED_scrollbar_h_ */