Mercurial > hg > xemacs-beta
annotate src/ExternalClientP.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 | 2aa9cd456ae7 |
| children |
| rev | line source |
|---|---|
| 0 | 1 /* External client widget internal header file. |
| 2 Copyright (C) 1993, 1994 Sun Microsystems, Inc. | |
| 3 | |
| 5405 | 4 This library is free software: you can redistribute it and/or modify it |
| 5 under the terms of the GNU General Public License as published by the | |
| 6 Free Software Foundation, either version 3 of the License, or (at your | |
| 7 option) any later version. | |
| 0 | 8 |
| 5405 | 9 This library is distributed in the hope that it will be useful, but WITHOUT |
| 10 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 for more details. | |
| 0 | 13 |
| 5405 | 14 You should have received a copy of the GNU General Public License |
| 15 along with this library. If not, see <http://www.gnu.org/licenses/>. */ | |
| 0 | 16 |
| 17 /* Synched up with: Not in FSF. */ | |
| 18 | |
| 19 /* Written by Ben Wing. */ | |
| 20 | |
| 398 | 21 #ifndef INCLUDED_ExternalClientP_h_ |
| 22 #define INCLUDED_ExternalClientP_h_ | |
| 0 | 23 |
| 24 #include "ExternalClient.h" | |
| 25 #ifdef EXTW_USES_MOTIF | |
| 26 #include <Xm/PrimitiveP.h> | |
| 27 #endif | |
| 28 | |
| 29 typedef struct { /* new fields for ExternalClient class */ | |
| 30 int dummy; | |
| 31 } ExternalClientClassPart; | |
| 32 | |
| 33 typedef struct _ExternalClientClassRec { /* full class record declaration */ | |
| 34 CoreClassPart core_class; | |
| 35 #ifdef EXTW_USES_MOTIF | |
| 36 XmPrimitiveClassPart primitive_class; | |
| 37 #endif | |
| 38 ExternalClientClassPart externalClient_class; | |
| 39 } ExternalClientClassRec; | |
| 40 | |
| 41 typedef struct { /* new fields for ExternalClient widget */ | |
| 42 Bool dead_shell; /* is the shell dead? */ | |
| 43 unsigned long shell_timeout;/* how long to wait for shell's response */ | |
| 44 int shell_ready; /* is the shell ready? */ | |
| 45 Window event_window; | |
| 46 long event_mask; | |
| 47 Bool has_focus; | |
| 48 char *emacs_procid; | |
| 49 XtCallbackList shell_ready_callback; | |
| 50 String shell_name; | |
| 51 Bool use_tooltalk; | |
| 52 } ExternalClientPart; | |
| 53 | |
| 54 typedef struct _ExternalClientRec { /* full instance record */ | |
| 55 CorePart core; | |
| 56 #ifdef EXTW_USES_MOTIF | |
| 57 XmPrimitivePart primitive; | |
| 58 #endif | |
| 59 ExternalClientPart externalClient; | |
| 60 } ExternalClientRec; | |
| 61 | |
| 62 extern ExternalClientClassRec externalClientClassRec; /* class pointer */ | |
| 63 | |
| 398 | 64 #endif /* INCLUDED_ExternalClientP_h_ */ |