Mercurial > hg > xemacs-beta
view lwlib/xlwmenu.h @ 5776:65d65b52d608
Pass character count from coding systems to buffer insertion code.
src/ChangeLog addition:
2014-01-16 Aidan Kehoe <kehoea@parhasard.net>
Pass character count information from the no-conversion and
unicode coding systems to the buffer insertion code, making
#'find-file on large buffers a little snappier (if
ERROR_CHECK_TEXT is not defined).
* file-coding.c:
* file-coding.c (coding_character_tell): New.
* file-coding.c (conversion_coding_stream_description): New.
* file-coding.c (no_conversion_convert):
Update characters_seen when decoding.
* file-coding.c (no_conversion_character_tell): New.
* file-coding.c (lstream_type_create_file_coding): Create the
no_conversion type with data.
* file-coding.c (coding_system_type_create):
Make the character_tell method available here.
* file-coding.h:
* file-coding.h (struct coding_system_methods):
Add a new character_tell() method, passing charcount information
from the coding systems to the buffer code, avoiding duplicate
bytecount-to-charcount work especially with large buffers.
* fileio.c (Finsert_file_contents_internal):
Update this to pass charcount information to
buffer_insert_string_1(), if that is available from the lstream code.
* insdel.c:
* insdel.c (buffer_insert_string_1):
Add a new CCLEN argument, giving the character count of the string
to insert. It can be -1 to indicate that te function should work
it out itself using bytecount_to_charcount(), as it used to.
* insdel.c (buffer_insert_raw_string_1):
* insdel.c (buffer_insert_lisp_string_1):
* insdel.c (buffer_insert_ascstring_1):
* insdel.c (buffer_insert_emacs_char_1):
* insdel.c (buffer_insert_from_buffer_1):
* insdel.c (buffer_replace_char):
Update these functions to use the new calling convention.
* insdel.h:
* insdel.h (buffer_insert_string):
Update this header to reflect the new buffer_insert_string_1()
argument.
* lstream.c (Lstream_character_tell): New.
Return the number of characters *read* and seen by the consumer so
far, taking into account the unget buffer, and buffered reading.
* lstream.c (Lstream_unread):
Update unget_character_count here as appropriate.
* lstream.c (Lstream_rewind):
Reset unget_character_count here too.
* lstream.h:
* lstream.h (struct lstream):
Provide the character_tell method, add a new field,
unget_character_count, giving the number of characters ever passed
to Lstream_unread().
Declare Lstream_character_tell().
Make Lstream_ungetc(), which happens to be unused, an inline
function rather than a macro, in the course of updating it to
modify unget_character_count.
* print.c (output_string):
Use the new argument to buffer_insert_string_1().
* tests.c:
* tests.c (Ftest_character_tell):
New test function.
* tests.c (syms_of_tests):
Make it available.
* unicode.c:
* unicode.c (struct unicode_coding_stream):
* unicode.c (unicode_character_tell):
New method.
* unicode.c (unicode_convert):
Update the character counter as appropriate.
* unicode.c (coding_system_type_create_unicode):
Make the character_tell method available.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 16 Jan 2014 16:27:52 +0000 |
parents | ade4c7e2c6cb |
children |
line wrap: on
line source
/* Implements a lightweight menubar widget. Copyright (C) 1992, 1993, 1994 Lucid, Inc. Copyright (C) 1995 Tinker Systems and INS Engineering Corp. This file is part of the Lucid Widget Library. The Lucid Widget 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. The Lucid Widget 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 the Lucid Widget Library. If not, see <http://www.gnu.org/licenses/>. */ #ifndef INCLUDED_xlwmenu_h_ #define INCLUDED_xlwmenu_h_ /*********************************************************************** * * XlwMenu Widget * ***********************************************************************/ #include "lwlib.h" /* Resource names used by the XlwMenu widget */ #define XtNbuttonForeground "buttonForeground" #define XtCButtonForeground "ButtonForeground" #define XtNhighlightForeground "highlightForeground" #define XtCHighlightForeground "HighlightForeground" #define XtNtitleForeground "titleForeground" #define XtCTitleForeground "TitleForeground" #define XtNmargin "margin" #define XtNhorizontalSpacing "horizontalSpacing" #define XtNverticalSpacing "verticalSpacing" #define XtNarrowSpacing "arrowSpacing" #define XtNmenu "menu" #define XtCMenu "Menu" #define XtNopen "open" #define XtNselect "select" #define XtNmenuBorderWidth "menuBorderWidth" #define XtNhorizontal "horizontal" #define XtCHorizontal "Horizontal" #ifndef XtNcursor #define XtNcursor "cursor" #endif #ifndef XtCCursor #define XtCCursor "Cursor" #endif #ifndef XtNuseBackingStore #define XtNuseBackingStore "useBackingStore" #endif #ifndef XtCUseBackingStore #define XtCUseBackingStore "UseBackingStore" #endif #define XtNbounceDown "bounceDown" #define XtCBounceDown "BounceDown" #define XtNresourceLabels "resourceLabels" #define XtCResourceLabels "ResourceLabels" /* Motif-compatible resource names */ #ifndef XmNshadowThickness # define XmNshadowThickness "shadowThickness" # define XmCShadowThickness "ShadowThickness" # define XmNtopShadowColor "topShadowColor" # define XmCTopShadowColor "TopShadowColor" # define XmNbottomShadowColor "bottomShadowColor" # define XmCBottomShadowColor "BottomShadowColor" # define XmNtopShadowPixmap "topShadowPixmap" # define XmCTopShadowPixmap "TopShadowPixmap" # define XmNbottomShadowPixmap "bottomShadowPixmap" # define XmCBottomShadowPixmap "BottomShadowPixmap" # define XmUNSPECIFIED_PIXMAP 2 # define XmRHorizontalDimension "HorizontalDimension" # define XmNspacing "spacing" # define XmCSpacing "Spacing" # define XmNindicatorSize "indicatorSize" # define XmCIndicatorSize "IndicatorSize" # define XmNselectColor "selectColor" # define XmCSelectColor "SelectColor" # define XmNmarginHeight "marginHeight" # define XmCMarginHeight "MarginHeight" # define XmNmarginWidth "marginWidth" # define XmCMarginWidth "MarginWidth" # define XmRVerticalDimension "VerticalDimension" #endif typedef struct _XlwMenuRec *XlwMenuWidget; typedef struct _XlwMenuClassRec *XlwMenuWidgetClass; extern WidgetClass xlwMenuWidgetClass; void xlw_pop_up_menu (XlwMenuWidget mw, XButtonPressedEvent* event); /* menu accelerator */ void xlw_set_menu (Widget w, widget_value *val); void xlw_push_menu (widget_value *val); int xlw_pop_menu (void); void xlw_set_item (widget_value *val); void xlw_map_menu (Time t); void xlw_display_menu (Time t); void xlw_kill_menus (widget_value *val); widget_value *xlw_get_entries (int allp); int xlw_menu_level (void); #endif /* INCLUDED_xlwmenu_h_ */