Mercurial > hg > xemacs-beta
view lwlib/xlwgcs.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
/* 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/>. */ /* Synched up with: Gcs 1.7 */ #ifndef GCS_H #define GCS_H /* Overview of functions provided here: * * AllocFgGC() * Given a foreground pixel & a font, return an appropriate GC * * AllocBackgroundGC() * Given a widget, return a GC for painting the background color * * AllocShadeGC() * Given foreground, background, a contrast value & be_nice_to_colormap * flag, return a GC suitable for rendering in an intermediate color, * as determined by contrast. May return a dither pattern or a * solid color, as appropriate. * * Contrast 0 = background color, 100 = foreground color. It is legal * for contrast to be more than 100 or less than 0. * * AllocGreyGC() * Given widget, foreground, font, contrast & be_nice_to_colormap, * return a shade GC (see above) based on foreground and widget * background. * * AllocTopShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the top shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use brighter * colors. * * AllocBotShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the bottom shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use darker * colors. * * AllocArmShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the "armed" shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use darker * colors. * * AllocShadowPixel() * Given a widget & scale factor, allocate & return a color darker * or lighter than the background pixel, as determined by scale. * * Scale 100 = use background pixel. Scale > 100 = brighter color, * Scale < 100 = darker color. * * AllocGreyPixel() * Given two pixel values and scale factor, allocate & return a * pixel value between them, according to scale. * * Scale == 0: background color * Scale == 100: foreground color * 0<Scale<100: intermediate color * Scale > 100: more foreground * Scale < 0: more background * * * AllocGreyPixelC() * Given two color values and scale factor, allocate & return a * pixel value between them, according to scale. * * Scale == 0: background color * Scale == 100: foreground color * 0<Scale<100: intermediate color * Scale > 100: more foreground * Scale < 0: more background * * Draw3dBox() * Given box dimensions, shadow width, top shadow GC & bottom shadow GC, * draw a 3-d box. */ #if NeedFunctionPrototypes extern GC AllocFgGC( Widget w, Pixel fg, Font font) ; extern GC AllocBackgroundGC( Widget w, Font font) ; extern GC AllocShadeGC( Widget w, Pixel fg, Pixel bg, Font, int contrast, Bool ) ; extern GC AllocGreyGC( Widget w, Pixel fg, Font, int, Bool ) ; extern GC AllocTopShadowGC( Widget w, int contrast, int ) ; extern GC AllocBotShadowGC( Widget w, int contrast, int ) ; extern GC AllocArmGC( Widget w, int contrast, int) ; extern Pixel AllocShadowPixel(Widget, int scale) ; extern Pixel AllocGreyPixel(Widget, Pixel fg, Pixel bg, int scale) ; extern Pixel AllocGreyPixelC(Widget, XColor *fg, XColor *bg, int scale) ; extern void Draw3dBox(Widget w, int x, int y, int wid, int hgt, int s, GC topgc, GC botgc) ; #else extern GC AllocFgGC() ; extern GC AllocBackgroundGC() ; extern GC AllocShadeGC() ; extern GC AllocGreyGC() ; extern GC AllocTopShadowGC() ; extern GC AllocBotShadowGC() ; extern GC AllocArmGC() ; extern Pixel AllocShadowPixel() ; extern Pixel AllocGreyPixel() ; extern Pixel AllocGreyPixelC() ; extern void Draw3dBox() ; #endif #endif /* GCS_H */