Mercurial > hg > xemacs-beta
view src/balloon-x.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 |
line wrap: on
line source
/* Copyright (c) 1997 Douglas Keller 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: Not in FSF. */ #include <config.h> #include "lisp.h" #include "device-impl.h" #include "console-x-impl.h" #include "balloon_help.h" /* #### start of hack */ static unsigned long alloc_color (Display* dpy, const char* colorname, int light) { Colormap cmap = DEVICE_X_COLORMAP (XDEVICE (get_default_device (Qx))); unsigned long pixel = 0; XColor color; if (XParseColor(dpy, cmap, colorname, &color) && XAllocColor(dpy, cmap, &color)) { pixel = color.pixel; } else { if (light) { printf ("Warning: could not allocate color \"%s\", using \"white\"\n", colorname); pixel = alloc_color (dpy, "white", True); } else { printf ("Warning: could not allocate color \"%s\", using \"black\"\n", colorname); pixel = alloc_color (dpy, "black", True); } } return pixel; } static XFontStruct * open_font (Display* dpy, const char* font_name) { XFontStruct* fontStruct = NULL; fontStruct = XLoadQueryFont (dpy, font_name ? font_name : "fixed"); if (fontStruct == NULL) { printf ("Warning: could not load font \"%s\", using \"fixed\".\n", font_name); fontStruct = XLoadQueryFont (dpy, "fixed"); assert (fontStruct != NULL); } return fontStruct; } static void init (void) { static int init_p = 0; if (!init_p) { Pixel fg, bg, shine, shadow; XFontStruct* font; Display *dpy = DEVICE_X_DISPLAY (XDEVICE (get_default_device (Qx))); fg = alloc_color (dpy, "grey60", 1); bg = alloc_color (dpy, "black", 0); shine = alloc_color (dpy, "grey80", 1); shadow = alloc_color (dpy, "grey40", 0); font = open_font (dpy, "-adobe-helvetica-medium-r-normal--12-*"); balloon_help_create (dpy, bg, fg, shine, shadow, font); init_p = 1; } } /* #### end of hack */ DEFUN ("show-balloon-help", Fshow_balloon_help, 1, 1, 0, /* Show balloon help. */ (string)) { char *p; CHECK_STRING (string); p = (char *) XSTRING_DATA (string); init (); balloon_help_show (p); return Qnil; } DEFUN ("hide-balloon-help", Fhide_balloon_help, 0, 0, 0, /* Hide balloon help. */ ()) { init (); balloon_help_hide (); return Qnil; } DEFUN ("balloon-help-move-to-pointer", Fballoon_help_move_to_pointer, 0, 0, 0, /* Move the balloon help to the place where the pointer currently resides. */ ()) { init (); balloon_help_move_to_pointer (); return Qnil; } /************************************************************************/ /* initialization */ /************************************************************************/ void syms_of_balloon_x (void) { DEFSUBR (Fshow_balloon_help); DEFSUBR (Fhide_balloon_help); DEFSUBR (Fballoon_help_move_to_pointer); } void vars_of_balloon_x (void) { Fprovide (intern ("c-balloon-help")); }