Mercurial > hg > xemacs-beta
view lwlib/xlwgauge.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 | 308d34e9f07d |
children |
line wrap: on
line source
/* Gauge 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/>. */ /* Synched up with: Gauge.h 1.1 */ /* * Gauge.h - Gauge widget * * Author: Edward A. Falk * falk@falconer.vip.best.com * * Date: July 8, 1997 */ #ifndef _XawGauge_h #define _XawGauge_h /*********************************************************************** * * Gauge Widget * * The Gauge widget looks something like a thermometer. Application * defines the values at the ends of the range and the current value * and Gauge draws accordingly. Gauge does not accept input. * ***********************************************************************/ #include ATHENA_Label_h_ /* Resources: Name Class RepType Default Value ---- ----- ------- ------------- value Value Int 0 minValue Int Cardinal 0 maxValue Int Cardinal 100 ntics NTics Cardinal 0 + nlabels NLabels Cardinal 0 ++ labels Labels String * NULL +++ orientation Orientation XtOrientation horizontal autoScaleUp AutoScaleUp Boolean FALSE ++++ autoScaleDown AutoScaleDown Boolean FALSE ++++ getValue Callback XtCallbackList NULL +++++ update Interval int 0 (seconds) = disabled encoding Encoding unsigned char XawTextEncoding8bit font Font XFontStruct* XtDefaultFont foreground Foreground Pixel XtDefaultForeground internalHeight Height Dimension 2 internalWidth Width Dimension 4 resize Resize Boolean True background Background Pixel XtDefaultBackground bitmap Pixmap Pixmap None border BorderColor Pixel XtDefaultForeground borderWidth BorderWidth Dimension 1 cursor Cursor Cursor None cursorName Cursor String NULL destroyCallback Callback XtCallbackList NULL height Height Dimension varies insensitiveBorder Insensitive Pixmap Gray mappedWhenManaged MappedWhenManaged Boolean True pointerColor Foreground Pixel XtDefaultForeground pointerColorBackground Background Pixel XtDefaultBackground sensitive Sensitive Boolean True width Width Dimension text width x Position Position 0 y Position Position 0 + Ntics sets the number of tic marks next to the gauge. If 0, no tic marks will be drawn. ++ Nlabels sets the number of labels next to the gauge. +++ Labels is an array of nul-terminated strings to be used as labels. If this field is NULL but nlabels is > 0, then numeric labels will be provided. NOTE: the labels are not copied to any internal memory; they must be stored in static memory provided by the application. ++++ AutoScale allows the gauge to set its own value limits. Default is False unless upper & lower limits are both 0. +++++ The GetValue() callback proc is called with these arguments: static void myGetValue(gauge, client, rval) Widget gauge ; XtPointer client ; XtPointer rval ; { *(int *)rval = value ; } */ /* * Resource names not provided in StringDefs.h */ #ifndef XtNvalue #define XtNvalue "value" #define XtCValue "Value" #endif #ifndef XtNorientation #define XtNorientation "orientation" #define XtCOrientation "Orientation" #endif #define XtNntics "ntics" #define XtCNTics "NTics" #ifndef XtNnlabels #define XtNnlabels "nlabels" #define XtCNLabels "NLabels" #endif #ifndef XtNlabels #define XtNlabels "labels" #define XtCLabels "Labels" #endif #ifndef XtNminValue #define XtNminValue "minValue" #define XtCMinValue "MinValue" #endif #ifndef XtNmaxValue #define XtNmaxValue "maxValue" #define XtCMaxValue "MaxValue" #endif #ifndef XtNautoScaleUp #define XtNautoScaleUp "autoScaleUp" #define XtCAutoScaleUp "AutoScaleUp" #define XtNautoScaleDown "autoScaleDown" #define XtCAutoScaleDown "AutoScaleDown" #endif #ifndef XtNupdate #define XtNupdate "update" #endif #ifndef XtNgetValue #define XtNgetValue "getValue" #endif /* Class record constants */ extern WidgetClass gaugeWidgetClass; typedef struct _GaugeClassRec *GaugeWidgetClass; typedef struct _GaugeRec *GaugeWidget; _XFUNCPROTOBEGIN extern void XawGaugeSetValue( #if NeedFunctionPrototypes Widget gauge, int value #endif ); extern int XawGaugeGetValue( #if NeedFunctionPrototypes Widget gauge #endif ); _XFUNCPROTOEND #endif /* _XawGauge_h */