Mercurial > hg > xemacs-beta
view lwlib/lwlib-fonts.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 | 7ebbe334061e |
children |
line wrap: on
line source
/* Font handling code for X and Xft. Copyright (C) 2003 Eric Knauel Copyright (C) 2004 Free Software Foundation, Inc. Author: Stephen J. Turnbull <stephen@xemacs.org> Created: 24 Jul 2004 by Stephen J. Turnbull 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 GNU Emacs. */ #include <config.h> #include <stdio.h> #include <stdlib.h> #include "lwlib-fonts.h" #if 0 /* these are all from ../src; if we need them move the code */ #include "lisp.h" #include "device.h" #include "device-impl.h" #include "console-x-impl.h" #ifdef HAVE_FONTCONFIG #include "font-mgr.h" #endif #endif /* * code for handling Xft */ #ifdef HAVE_XFT /* helper function to correctly open Xft/core fonts by name #### Can't we use FcParseName here? #### Is this done so often that the logic needs to be hard-coded in C? Daniel Pittman sez: Older code tried to enforce that an XLFD font was not scaled, while this version just doesn't care. I think that is a better behavior, since if someone really wants a scaled font we should oblige them. Stephen sez: This whole function was ill-conceived, and I'm not sure it succeeds at any of the things it attempts to do. First, we should be using fontconfig directly. I'm not sure what Xft (or fontconfig) will try to do if passed an XLFD. As for scaled fonts, both options are equally bad. The problem is that the X server will often scale bitmap fonts willy-nilly; it's worth trying to avoid that, but I can't say whether that's worth overriding somebody who knows what they're doing. In any case, I think we should find out what Xft (fontconfig?) is able and willing to do with XLFDs, and probably move the logic to LISP. */ XftFont * xft_open_font_by_name (Display *dpy, char *name) { XftFont *res = NULL; /* if (!NILP (Fxft_xlfd_font_name_p (make_string (name, strlen (name))))) */ /* #### this is bogus but ... */ int count = 0; char *pos = name; /* extra parens shut up gcc */ while ((pos = strchr (pos, '-'))) { count++; pos++; } /* #### hard-coding DefaultScreen is evil! */ if (count == 14 /* fully-qualified XLFD */ || (count < 14 /* heuristic for wildcarded XLFD */ && count >= 5 && strchr (name, '*'))) res = XftFontOpenXlfd (dpy, DefaultScreen (dpy), name); else res = XftFontOpenName (dpy, DefaultScreen (dpy), name); /* Try for a generic monospace font #### Why? Menus don't need to line up in columns! */ if (!res) res = XftFontOpenName (dpy, DefaultScreen (dpy), "monospace"); /* Try for anything we can get */ if (!res) res = XftFontOpenName (dpy, DefaultScreen (dpy), ""); if (!res) { /* #### This is Just So Wrong ... ! */ /* sorry folks ... */ fprintf (stderr, "Unable to find any usable XFT font, even the defaults!\n"); abort (); return 0; } return res; } #endif /* HAVE_XFT */ /* End of lwlib-fonts.c */