Mercurial > hg > xemacs-beta
annotate src/widget.c @ 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 |
|---|---|
| 428 | 1 /* Primitives for work of the "widget" library. |
| 2 Copyright (C) 1997 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4693
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 7 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4693
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:
4693
diff
changeset
|
9 option) any later version. |
| 428 | 10 |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4693
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 18 |
| 19 /* Synched up with: Not in FSF. */ | |
| 20 | |
| 21 /* In an ideal world, this file would not have been necessary. | |
| 22 However, elisp function calls being as slow as they are, it turns | |
| 23 out that some functions in the widget library (wid-edit.el) are the | |
| 24 bottleneck of Widget operation. Here is their translation to C, | |
| 25 for the sole reason of efficiency. */ | |
| 26 | |
| 27 #include <config.h> | |
| 28 #include "lisp.h" | |
| 29 #include "buffer.h" | |
| 30 | |
| 31 | |
| 32 Lisp_Object Qwidget_type; | |
| 33 | |
| 34 | |
| 35 DEFUN ("widget-plist-member", Fwidget_plist_member, 2, 2, 0, /* | |
| 36 Like `plist-get', but returns the tail of PLIST whose car is PROP. | |
| 37 */ | |
| 38 (plist, prop)) | |
| 39 { | |
| 40 while (!NILP (plist) && !EQ (Fcar (plist), prop)) | |
| 41 { | |
| 42 /* Check for QUIT, so a circular plist doesn't lock up the | |
| 43 editor. */ | |
| 44 QUIT; | |
| 45 plist = Fcdr (Fcdr (plist)); | |
| 46 } | |
| 47 return plist; | |
| 48 } | |
| 49 | |
| 50 DEFUN ("widget-put", Fwidget_put, 3, 3, 0, /* | |
| 51 In WIDGET set PROPERTY to VALUE. | |
| 52 The value can later be retrieved with `widget-get'. | |
| 53 */ | |
| 54 (widget, property, value)) | |
| 55 { | |
| 56 CHECK_CONS (widget); | |
| 57 XCDR (widget) = Fplist_put (XCDR (widget), property, value); | |
| 58 return widget; | |
| 59 } | |
| 60 | |
| 61 DEFUN ("widget-get", Fwidget_get, 2, 2, 0, /* | |
| 62 In WIDGET, get the value of PROPERTY. | |
| 63 The value could either be specified when the widget was created, or | |
| 64 later with `widget-put'. | |
| 65 */ | |
| 66 (widget, property)) | |
| 67 { | |
| 68 Lisp_Object value = Qnil; | |
| 69 | |
| 70 while (1) | |
| 71 { | |
| 72 Lisp_Object tmp = Fwidget_plist_member (Fcdr (widget), property); | |
| 73 if (!NILP (tmp)) | |
| 74 { | |
| 75 value = Fcar (Fcdr (tmp)); | |
| 76 break; | |
| 77 } | |
| 78 tmp = Fcar (widget); | |
| 79 if (!NILP (tmp)) | |
| 80 { | |
| 81 widget = Fget (tmp, Qwidget_type, Qnil); | |
| 82 continue; | |
| 83 } | |
| 84 break; | |
| 85 } | |
| 86 return value; | |
| 87 } | |
| 88 | |
| 89 DEFUN ("widget-apply", Fwidget_apply, 2, MANY, 0, /* | |
| 90 Apply the value of WIDGET's PROPERTY to the widget itself. | |
| 91 ARGS are passed as extra arguments to the function. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
563
diff
changeset
|
92 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
563
diff
changeset
|
93 arguments: (WIDGET PROPERTY &rest ARGS) |
| 428 | 94 */ |
| 95 (int nargs, Lisp_Object *args)) | |
| 96 { | |
| 97 /* This function can GC */ | |
| 98 Lisp_Object newargs[3]; | |
| 99 struct gcpro gcpro1; | |
| 100 | |
| 101 newargs[0] = Fwidget_get (args[0], args[1]); | |
| 102 newargs[1] = args[0]; | |
| 103 newargs[2] = Flist (nargs - 2, args + 2); | |
| 434 | 104 GCPRO1 (newargs[2]); |
| 428 | 105 RETURN_UNGCPRO (Fapply (3, newargs)); |
| 106 } | |
| 107 | |
| 108 void | |
| 109 syms_of_widget (void) | |
| 110 { | |
| 563 | 111 DEFSYMBOL (Qwidget_type); |
| 428 | 112 |
| 113 DEFSUBR (Fwidget_plist_member); | |
| 114 DEFSUBR (Fwidget_put); | |
| 115 DEFSUBR (Fwidget_get); | |
| 116 DEFSUBR (Fwidget_apply); | |
| 117 } |