Mercurial > hg > xemacs-beta
annotate 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 |
| rev | line source |
|---|---|
| 398 | 1 /* Tabs Widget for XEmacs. |
| 2 Copyright (C) 1999 Edward A. Falk | |
| 442 | 3 |
| 398 | 4 This file is part of XEmacs. |
| 442 | 5 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4769
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4769
diff
changeset
|
7 under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4769
diff
changeset
|
8 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4769
diff
changeset
|
9 option) any later version. |
| 442 | 10 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4769
diff
changeset
|
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4769
diff
changeset
|
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4769
diff
changeset
|
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4769
diff
changeset
|
14 for more details. |
| 442 | 15 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4769
diff
changeset
|
16 You should have received a copy of the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4769
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 442 | 18 |
| 398 | 19 /* Synched up with: Gcs 1.7 */ |
| 442 | 20 |
| 398 | 21 |
| 22 #ifndef GCS_H | |
| 23 #define GCS_H | |
| 24 | |
| 25 /* Overview of functions provided here: | |
| 26 * | |
| 27 * AllocFgGC() | |
| 28 * Given a foreground pixel & a font, return an appropriate GC | |
| 29 * | |
| 30 * AllocBackgroundGC() | |
| 31 * Given a widget, return a GC for painting the background color | |
| 32 * | |
| 33 * AllocShadeGC() | |
| 34 * Given foreground, background, a contrast value & be_nice_to_colormap | |
| 35 * flag, return a GC suitable for rendering in an intermediate color, | |
| 442 | 36 * as determined by contrast. May return a dither pattern or a |
| 398 | 37 * solid color, as appropriate. |
| 38 * | |
| 39 * Contrast 0 = background color, 100 = foreground color. It is legal | |
| 40 * for contrast to be more than 100 or less than 0. | |
| 41 * | |
| 42 * AllocGreyGC() | |
| 43 * Given widget, foreground, font, contrast & be_nice_to_colormap, | |
| 44 * return a shade GC (see above) based on foreground and widget | |
| 45 * background. | |
| 46 * | |
| 47 * AllocTopShadowGC() | |
| 48 * Given widget, contrast & be_nice_to_colormap, return a GC suitable | |
| 49 * for rendering the top shadow. | |
| 50 * | |
| 51 * Contrast 0 = use background pixel. Contrast > 0 = use brighter | |
| 52 * colors. | |
| 53 * | |
| 54 * AllocBotShadowGC() | |
| 55 * Given widget, contrast & be_nice_to_colormap, return a GC suitable | |
| 56 * for rendering the bottom shadow. | |
| 57 * | |
| 58 * Contrast 0 = use background pixel. Contrast > 0 = use darker | |
| 59 * colors. | |
| 60 * | |
| 61 * AllocArmShadowGC() | |
| 62 * Given widget, contrast & be_nice_to_colormap, return a GC suitable | |
| 63 * for rendering the "armed" shadow. | |
| 64 * | |
| 65 * Contrast 0 = use background pixel. Contrast > 0 = use darker | |
| 66 * colors. | |
| 67 * | |
| 68 * AllocShadowPixel() | |
| 69 * Given a widget & scale factor, allocate & return a color darker | |
| 70 * or lighter than the background pixel, as determined by scale. | |
| 71 * | |
| 72 * Scale 100 = use background pixel. Scale > 100 = brighter color, | |
| 73 * Scale < 100 = darker color. | |
| 74 * | |
| 75 * AllocGreyPixel() | |
| 76 * Given two pixel values and scale factor, allocate & return a | |
| 77 * pixel value between them, according to scale. | |
| 78 * | |
| 79 * Scale == 0: background color | |
| 80 * Scale == 100: foreground color | |
| 81 * 0<Scale<100: intermediate color | |
| 82 * Scale > 100: more foreground | |
| 83 * Scale < 0: more background | |
| 84 * | |
| 85 * | |
| 86 * AllocGreyPixelC() | |
| 87 * Given two color values and scale factor, allocate & return a | |
| 88 * pixel value between them, according to scale. | |
| 89 * | |
| 90 * Scale == 0: background color | |
| 91 * Scale == 100: foreground color | |
| 92 * 0<Scale<100: intermediate color | |
| 93 * Scale > 100: more foreground | |
| 94 * Scale < 0: more background | |
| 95 * | |
| 96 * Draw3dBox() | |
| 97 * Given box dimensions, shadow width, top shadow GC & bottom shadow GC, | |
| 98 * draw a 3-d box. | |
| 99 */ | |
| 100 | |
| 101 #if NeedFunctionPrototypes | |
| 102 | |
| 103 extern GC AllocFgGC( Widget w, Pixel fg, Font font) ; | |
| 104 extern GC AllocBackgroundGC( Widget w, Font font) ; | |
| 105 extern GC AllocShadeGC( Widget w, Pixel fg, Pixel bg, Font, | |
| 106 int contrast, Bool ) ; | |
| 107 extern GC AllocGreyGC( Widget w, Pixel fg, Font, int, Bool ) ; | |
| 108 extern GC AllocTopShadowGC( Widget w, int contrast, int ) ; | |
| 109 extern GC AllocBotShadowGC( Widget w, int contrast, int ) ; | |
| 110 extern GC AllocArmGC( Widget w, int contrast, int) ; | |
| 111 extern Pixel AllocShadowPixel(Widget, int scale) ; | |
| 112 extern Pixel AllocGreyPixel(Widget, Pixel fg, Pixel bg, int scale) ; | |
| 113 extern Pixel AllocGreyPixelC(Widget, XColor *fg, XColor *bg, int scale) ; | |
| 114 extern void Draw3dBox(Widget w, int x, int y, int wid, int hgt, int s, | |
| 115 GC topgc, GC botgc) ; | |
| 116 | |
| 117 #else | |
| 118 | |
| 119 extern GC AllocFgGC() ; | |
| 120 extern GC AllocBackgroundGC() ; | |
| 121 extern GC AllocShadeGC() ; | |
| 122 extern GC AllocGreyGC() ; | |
| 123 extern GC AllocTopShadowGC() ; | |
| 124 extern GC AllocBotShadowGC() ; | |
| 125 extern GC AllocArmGC() ; | |
| 126 extern Pixel AllocShadowPixel() ; | |
| 127 extern Pixel AllocGreyPixel() ; | |
| 128 extern Pixel AllocGreyPixelC() ; | |
| 129 extern void Draw3dBox() ; | |
| 130 | |
| 131 #endif | |
| 132 | |
| 133 #endif /* GCS_H */ |