Mercurial > hg > xemacs-beta
view lwlib/xlwtabs.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
/* Tabs Widget for XEmacs. Copyright (C) 1999 Edward A. Falk 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/>. */ /* * This widget manages one or more child widgets, exactly one of which is * visible. Above the child widgets is a graphic that looks like index * tabs from file folders. Each tab corresponds to one of the child widgets. * By clicking on a tab, the user can bring the corresponding widget to * the top of the stack. */ #ifndef _Tabs_h #define _Tabs_h #include <X11/Constraint.h> /*********************************************************************** * * Tabs Widget (subclass of CompositeClass) * ***********************************************************************/ /* Parameters: Name Class RepType Default Value ---- ----- ------- ------------- font Font XFontStruct* XtDefaultFont fcFontName FcFontName String NULL *0 xftFont XftFont String Helvetica-12 *8 internalWidth Width Dimension 4 *1 internalHeight Height Dimension 2 *1 topWidget TopWidget Widget *2 callback Callback XtCallbackList NULL *3 popdownCallback Callback XtCallbackList NULL *4 selectInsensitive SelectInsensitive Boolean True *5 beNiceToColormap BeNiceToColormap Boolean False *6 topShadowContrast TopShadowContrast int 20 bottomShadowContrast BottomShadowContrast int 40 insensitiveContrast InsensitiveContrast int 33 *7 background Background Pixel XtDefaultBackground border BorderColor Pixel XtDefaultForeground borderWidth BorderWidth Dimension 1 destroyCallback Callback Pointer NULL hSpace HSpace Dimension 4 height Height Dimension 0 mappedWhenManaged MappedWhenManaged Boolean True orientation Orientation XtOrientation vertical vSpace VSpace Dimension 4 width Width Dimension 0 x Position Position 0 y Position Position 0 Notes: 0 this is a joke, it will be changed. 1 internalWidth, internalHeight specify the margins around the text in the tabs. 2 topWidget identifies the widget which is currently visible. 3 callbacks are called whenever the user selects a tab. Call_data is the new top widget. 4 popdownCallbacks are called whenever the user selects a tab. Call_data is the old (no longer visible) top widget. Note that popdownCallbacks are called before callbacks. 5 SelectInsensitive determines whether or not insensitive children may be selected anyway. 6 BeNiceToColormap causes the Tabs widget to use fewer colors. 7 InsensitiveContrast sets the contrast used for labels of insensitive widgets. 8 fcFontName and xftFont are separate resources because there is not yet registered representation and converter for XftFonts. */ /* Constraint parameters: Name Class RepType Default Value ---- ----- ------- ------------- tabLabel Label String widget name tabLeftBitmap LeftBitmap Pixmap None tabForeground Foreground Pixel XtDefaultForeground resizable Resizable Boolean False */ /* New fields */ #ifndef XtNtabLabel #define XtNtabLabel "tabLabel" #define XtNtabForeground "tabForeground" #endif #ifndef XtNtabLeftBitmap #define XtNtabLeftBitmap "tabLeftBitmap" #endif #ifndef XtCLeftBitmap #define XtCLeftBitmap "LeftBitmap" #endif #ifndef XtCResizable #define XtCResizable "Resizable" #endif #ifndef XtNselectInsensitive #define XtNselectInsensitive "selectInsensitive" #define XtCSelectInsensitive "SelectInsensitive" #endif #ifndef XtNnlabels #define XtNnlabels "nlabels" #define XtCNLabels "NLabels" #endif #ifndef XtNlabels #define XtNlabels "labels" #define XtCLabels "Labels" #endif #ifndef XtNtopWidget #define XtNtopWidget "topWidget" #define XtCTopWidget "TopWidget" #endif #ifndef XtNhSpace #define XtNhSpace "hSpace" #define XtCHSpace "HSpace" #define XtNvSpace "vSpace" #define XtCVSpace "VSpace" #endif #ifndef XtNresizable #define XtNresizable "resizable" #endif #ifndef XtNinsensitiveContrast #define XtNinsensitiveContrast "insensitiveContrast" #define XtCInsensitiveContrast "InsensitiveContrast" #endif #ifndef XtNshadowWidth #define XtNshadowWidth "shadowWidth" #define XtCShadowWidth "ShadowWidth" #define XtNtopShadowPixel "topShadowPixel" #define XtCTopShadowPixel "TopShadowPixel" #define XtNbottomShadowPixel "bottomShadowPixel" #define XtCBottomShadowPixel "BottomShadowPixel" #define XtNtopShadowContrast "topShadowContrast" #define XtCTopShadowContrast "TopShadowContrast" #define XtNbottomShadowContrast "bottomShadowContrast" #define XtCBottomShadowContrast "BottomShadowContrast" #endif #ifndef XtNtopShadowPixmap #define XtNtopShadowPixmap "topShadowPixmap" #define XtCTopShadowPixmap "TopShadowPixmap" #define XtNbottomShadowPixmap "bottomShadowPixmap" #define XtCBottomShadowPixmap "BottomShadowPixmap" #endif #ifndef XtNbeNiceToColormap #define XtNbeNiceToColormap "beNiceToColormap" #define XtCBeNiceToColormap "BeNiceToColormap" #define XtNbeNiceToColourmap "beNiceToColormap" #define XtCBeNiceToColourmap "BeNiceToColormap" #endif /* Class record constants */ extern WidgetClass tabsWidgetClass; typedef struct _TabsClassRec *TabsWidgetClass; typedef struct _TabsRec *TabsWidget; _XFUNCPROTOBEGIN extern void XawTabsSetTop( #if NeedFunctionPrototypes Widget w, Bool callCallbacks #endif ) ; extern void XawTabsSetHighlight( #if NeedFunctionPrototypes Widget tabs, Widget w #endif ) ; _XFUNCPROTOEND #endif /* _Tabs_h */