Mercurial > hg > xemacs-beta
annotate 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 |
| rev | line source |
|---|---|
| 3094 | 1 /* Font handling code for X and Xft. |
| 2 | |
| 3 Copyright (C) 2003 Eric Knauel | |
| 4 Copyright (C) 2004 Free Software Foundation, Inc. | |
| 5 | |
| 6 Author: Stephen J. Turnbull <stephen@xemacs.org> | |
| 7 Created: 24 Jul 2004 by Stephen J. Turnbull | |
| 8 | |
| 9 This file is part of XEmacs. | |
| 10 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4916
diff
changeset
|
11 XEmacs is free software: you can redistribute it and/or modify it |
| 3094 | 12 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:
4916
diff
changeset
|
13 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:
4916
diff
changeset
|
14 option) any later version. |
| 3094 | 15 |
| 16 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 17 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 18 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 19 for more details. | |
| 20 | |
| 21 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:
4916
diff
changeset
|
22 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 3094 | 23 |
| 24 /* Synched up with: Not in GNU Emacs. */ | |
| 25 | |
| 26 #include <config.h> | |
| 27 #include <stdio.h> | |
| 28 #include <stdlib.h> | |
| 29 #include "lwlib-fonts.h" | |
| 30 | |
| 31 #if 0 | |
| 32 /* these are all from ../src; if we need them move the code */ | |
| 33 #include "lisp.h" | |
| 34 #include "device.h" | |
| 35 #include "device-impl.h" | |
| 36 #include "console-x-impl.h" | |
| 3360 | 37 #ifdef HAVE_FONTCONFIG |
| 3354 | 38 #include "font-mgr.h" |
| 3094 | 39 #endif |
| 3360 | 40 #endif |
| 3094 | 41 |
| 42 /* | |
| 43 * code for handling Xft | |
| 44 */ | |
| 45 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3360
diff
changeset
|
46 #ifdef HAVE_XFT |
| 3094 | 47 |
| 48 /* helper function to correctly open Xft/core fonts by name | |
| 49 #### Can't we use FcParseName here? | |
| 50 #### Is this done so often that the logic needs to be hard-coded in C? | |
| 51 | |
| 52 Daniel Pittman sez: Older code tried to enforce that an XLFD font was | |
| 53 not scaled, while this version just doesn't care. I think that is a | |
| 54 better behavior, since if someone really wants a scaled font we should | |
| 55 oblige them. | |
| 56 | |
| 57 Stephen sez: This whole function was ill-conceived, and I'm not sure it | |
| 58 succeeds at any of the things it attempts to do. First, we should be | |
| 59 using fontconfig directly. I'm not sure what Xft (or fontconfig) will | |
| 60 try to do if passed an XLFD. As for scaled fonts, both options are | |
| 61 equally bad. The problem is that the X server will often scale bitmap | |
| 62 fonts willy-nilly; it's worth trying to avoid that, but I can't say | |
| 63 whether that's worth overriding somebody who knows what they're doing. | |
| 64 In any case, I think we should find out what Xft (fontconfig?) is able | |
| 65 and willing to do with XLFDs, and probably move the logic to LISP. | |
| 66 */ | |
| 67 XftFont * | |
| 68 xft_open_font_by_name (Display *dpy, char *name) | |
| 69 { | |
| 70 XftFont *res = NULL; | |
| 71 | |
| 72 /* if (!NILP (Fxft_xlfd_font_name_p (make_string (name, strlen (name))))) */ | |
| 73 /* #### this is bogus but ... */ | |
| 74 int count = 0; | |
| 75 char *pos = name; | |
| 76 /* extra parens shut up gcc */ | |
|
5335
c9d31263ab7d
Replace POSIX index(3) with C89 strchr(3), lwlib-fonts.c
Aidan Kehoe <kehoea@parhasard.net>
parents:
4916
diff
changeset
|
77 while ((pos = strchr (pos, '-'))) |
| 3094 | 78 { |
| 79 count++; | |
| 80 pos++; | |
| 81 } | |
| 82 | |
| 83 /* #### hard-coding DefaultScreen is evil! */ | |
| 84 if (count == 14 /* fully-qualified XLFD */ | |
| 85 || (count < 14 /* heuristic for wildcarded XLFD */ | |
| 86 && count >= 5 | |
|
5335
c9d31263ab7d
Replace POSIX index(3) with C89 strchr(3), lwlib-fonts.c
Aidan Kehoe <kehoea@parhasard.net>
parents:
4916
diff
changeset
|
87 && strchr (name, '*'))) |
| 3094 | 88 res = XftFontOpenXlfd (dpy, DefaultScreen (dpy), name); |
| 89 else | |
| 90 res = XftFontOpenName (dpy, DefaultScreen (dpy), name); | |
| 91 | |
| 92 /* Try for a generic monospace font | |
| 93 #### Why? Menus don't need to line up in columns! */ | |
| 94 if (!res) | |
| 95 res = XftFontOpenName (dpy, DefaultScreen (dpy), "monospace"); | |
| 96 /* Try for anything we can get */ | |
| 97 if (!res) | |
| 98 res = XftFontOpenName (dpy, DefaultScreen (dpy), ""); | |
| 99 | |
| 100 if (!res) | |
| 101 { | |
| 102 /* #### This is Just So Wrong ... ! */ | |
| 103 /* sorry folks ... */ | |
| 104 fprintf (stderr, | |
| 105 "Unable to find any usable XFT font, even the defaults!\n"); | |
| 106 abort (); | |
| 107 return 0; | |
| 108 } | |
| 109 | |
| 110 return res; | |
| 111 } | |
| 112 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3360
diff
changeset
|
113 #endif /* HAVE_XFT */ |
| 3094 | 114 |
| 115 /* End of lwlib-fonts.c */ |