Mercurial > hg > xemacs-beta
annotate src/objects-tty.c @ 4407:4ee73bbe4f8e
Always use boyer_moore in ASCII or Latin-1 buffers with ASCII search strings.
2007-12-26 Aidan Kehoe <kehoea@parhasard.net>
* casetab.c:
Extend and correct some case table documentation.
* search.c (search_buffer):
Correct a bug where only the first entry for a character in the
case equivalence table was examined in determining if the
Boyer-Moore search algorithm is appropriate.
If there are case mappings outside of the charset and row of the
characters specified in the search string, those case mappings can
be safely ignored (and Boyer-Moore search can be used) if we know
from the buffer statistics that the corresponding characters cannot
occur.
* search.c (boyer_moore):
Assert that we haven't been passed a string with varying
characters sets or rows within character sets. That's what
simple_search is for.
In the very rare event that a character in the search string has a
canonical case mapping that is not in the same character set and
row, don't try to search for the canonical character, search for
some other character that is in the the desired character set and
row. Assert that the case table isn't corrupt.
Do not search for any character case mappings that cannot possibly
occur in the buffer, given the buffer metadata about its
contents.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 26 Dec 2007 17:30:16 +0100 |
| parents | 4143b78d0df0 |
| children | 3a87551bfeb5 |
| rev | line source |
|---|---|
| 428 | 1 /* TTY-specific Lisp objects. |
| 2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 793 | 3 Copyright (C) 1995, 1996, 2001, 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 #include <config.h> | |
| 25 #include "lisp.h" | |
| 26 | |
| 872 | 27 #include "console-tty-impl.h" |
| 428 | 28 #include "insdel.h" |
| 872 | 29 #include "objects-tty-impl.h" |
| 428 | 30 #include "device.h" |
| 771 | 31 #include "charset.h" |
| 428 | 32 |
| 33 /* An alist mapping from color names to a cons of (FG-STRING, BG-STRING). */ | |
| 34 Lisp_Object Vtty_color_alist; | |
| 35 #if 0 /* This stuff doesn't quite work yet */ | |
| 36 Lisp_Object Vtty_dynamic_color_fg; | |
| 37 Lisp_Object Vtty_dynamic_color_bg; | |
| 38 #endif | |
| 39 | |
| 1204 | 40 static const struct memory_description tty_color_instance_data_description_1 [] = { |
| 41 { XD_LISP_OBJECT, offsetof (struct tty_color_instance_data, symbol) }, | |
| 42 { XD_END } | |
| 43 }; | |
| 44 | |
| 3092 | 45 #ifdef NEW_GC |
| 46 DEFINE_LRECORD_IMPLEMENTATION ("tty-color-instance-data", | |
| 47 tty_color_instance_data, | |
| 48 0, /*dumpable-flag*/ | |
| 49 0, 0, 0, 0, 0, | |
| 50 tty_color_instance_data_description_1, | |
| 51 struct tty_color_instance_data); | |
| 52 #else /* not NEW_GC */ | |
| 1204 | 53 const struct sized_memory_description tty_color_instance_data_description = { |
| 54 sizeof (struct tty_color_instance_data), tty_color_instance_data_description_1 | |
| 55 }; | |
| 3092 | 56 #endif /* not NEW_GC */ |
| 1204 | 57 |
| 58 static const struct memory_description tty_font_instance_data_description_1 [] = { | |
| 59 { XD_LISP_OBJECT, offsetof (struct tty_font_instance_data, charset) }, | |
| 60 { XD_END } | |
| 61 }; | |
| 62 | |
| 3092 | 63 #ifdef NEW_GC |
| 64 DEFINE_LRECORD_IMPLEMENTATION ("tty-font-instance-data", | |
| 65 tty_font_instance_data, | |
| 66 0, /*dumpable-flag*/ | |
| 67 0, 0, 0, 0, 0, | |
| 68 tty_font_instance_data_description_1, | |
| 69 struct tty_font_instance_data); | |
| 70 #else /* not NEW_GC */ | |
| 1204 | 71 const struct sized_memory_description tty_font_instance_data_description = { |
| 72 sizeof (struct tty_font_instance_data), tty_font_instance_data_description_1 | |
| 73 }; | |
| 3092 | 74 #endif /* not NEW_GC */ |
| 1204 | 75 |
| 428 | 76 DEFUN ("register-tty-color", Fregister_tty_color, 3, 3, 0, /* |
| 77 Register COLOR as a recognized TTY color. | |
| 78 COLOR should be a string. | |
| 79 Strings FG-STRING and BG-STRING should specify the escape sequences to | |
| 80 set the foreground and background to the given color, respectively. | |
| 81 */ | |
| 82 (color, fg_string, bg_string)) | |
| 83 { | |
| 84 CHECK_STRING (color); | |
| 85 CHECK_STRING (fg_string); | |
| 86 CHECK_STRING (bg_string); | |
| 87 | |
| 88 color = Fintern (color, Qnil); | |
| 89 Vtty_color_alist = Fremassq (color, Vtty_color_alist); | |
| 90 Vtty_color_alist = Fcons (Fcons (color, Fcons (fg_string, bg_string)), | |
| 91 Vtty_color_alist); | |
| 92 | |
| 93 return Qnil; | |
| 94 } | |
| 95 | |
| 96 DEFUN ("unregister-tty-color", Funregister_tty_color, 1, 1, 0, /* | |
| 97 Unregister COLOR as a recognized TTY color. | |
| 98 */ | |
| 99 (color)) | |
| 100 { | |
| 101 CHECK_STRING (color); | |
| 102 | |
| 103 color = Fintern (color, Qnil); | |
| 104 Vtty_color_alist = Fremassq (color, Vtty_color_alist); | |
| 105 return Qnil; | |
| 106 } | |
| 107 | |
| 108 DEFUN ("find-tty-color", Ffind_tty_color, 1, 1, 0, /* | |
| 109 Look up COLOR in the list of registered TTY colors. | |
| 110 If it is found, return a list (FG-STRING BG-STRING) of the escape | |
| 111 sequences used to set the foreground and background to the color, respectively. | |
| 112 If it is not found, return nil. | |
| 113 */ | |
| 114 (color)) | |
| 115 { | |
| 116 Lisp_Object result; | |
| 117 | |
| 118 CHECK_STRING (color); | |
| 119 | |
| 120 result = Fassq (Fintern (color, Qnil), Vtty_color_alist); | |
| 121 if (!NILP (result)) | |
| 122 return list2 (Fcar (Fcdr (result)), Fcdr (Fcdr (result))); | |
| 123 else | |
| 124 return Qnil; | |
| 125 } | |
| 126 | |
| 2527 | 127 static Lisp_Object |
| 128 tty_color_list (void) | |
| 428 | 129 { |
| 130 Lisp_Object result = Qnil; | |
| 131 Lisp_Object rest; | |
| 132 | |
| 133 LIST_LOOP (rest, Vtty_color_alist) | |
| 134 { | |
| 135 result = Fcons (Fsymbol_name (XCAR (XCAR (rest))), result); | |
| 136 } | |
| 137 | |
| 138 return Fnreverse (result); | |
| 139 } | |
| 140 | |
| 141 #if 0 | |
| 142 | |
| 143 /* This approach is too simplistic. The problem is that the | |
| 144 dynamic color settings apply to *all* text in the default color, | |
| 145 not just the text output after the escape sequence has been given. */ | |
| 146 | |
| 147 DEFUN ("set-tty-dynamic-color-specs", Fset_tty_dynamic_color_specs, 2, 2, 0, /* | |
| 148 Set the dynamic color specifications for TTY's. | |
| 149 FG and BG should be either nil or vaguely printf-like strings, | |
| 150 where each occurrence of %s is replaced with the color name and each | |
| 151 occurrence of %% is replaced with a single % character. | |
| 152 */ | |
| 153 (fg, bg)) | |
| 154 { | |
| 155 if (!NILP (fg)) | |
| 156 CHECK_STRING (fg); | |
| 157 if (!NILP (bg)) | |
| 158 CHECK_STRING (bg); | |
| 159 | |
| 160 Vtty_dynamic_color_fg = fg; | |
| 161 Vtty_dynamic_color_bg = bg; | |
| 162 | |
| 163 return Qnil; | |
| 164 } | |
| 165 | |
| 166 DEFUN ("tty-dynamic-color-specs", Ftty_dynamic_color_specs, 0, 0, 0, /* | |
| 167 Return the dynamic color specifications for TTY's as a list of (FG BG). | |
| 168 See `set-tty-dynamic-color-specs'. | |
| 169 */ | |
| 170 ()) | |
| 171 { | |
| 172 return list2 (Vtty_dynamic_color_fg, Vtty_dynamic_color_bg); | |
| 173 } | |
| 174 | |
| 175 #endif /* 0 */ | |
| 176 | |
| 177 static int | |
| 440 | 178 tty_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name, |
| 2286 | 179 Lisp_Object UNUSED (device), |
| 180 Error_Behavior UNUSED (errb)) | |
| 428 | 181 { |
| 182 Lisp_Object result; | |
| 183 | |
| 184 name = Fintern (name, Qnil); | |
| 185 result = assq_no_quit (name, Vtty_color_alist); | |
| 186 | |
| 187 if (NILP (result)) | |
| 188 { | |
| 189 #if 0 | |
| 190 if (!STRINGP (Vtty_dynamic_color_fg) | |
| 191 && !STRINGP (Vtty_dynamic_color_bg)) | |
| 192 #endif | |
| 193 return 0; | |
| 194 } | |
| 195 | |
| 196 /* Don't allocate the data until we're sure that we will succeed. */ | |
| 3092 | 197 #ifdef NEW_GC |
| 198 c->data = alloc_lrecord_type (struct tty_color_instance_data, | |
| 199 &lrecord_tty_color_instance_data); | |
| 200 #else /* not NEW_GC */ | |
| 428 | 201 c->data = xnew (struct tty_color_instance_data); |
| 3092 | 202 #endif /* not NEW_GC */ |
| 428 | 203 COLOR_INSTANCE_TTY_SYMBOL (c) = name; |
| 204 | |
| 205 return 1; | |
| 206 } | |
| 207 | |
| 208 static void | |
| 440 | 209 tty_mark_color_instance (Lisp_Color_Instance *c) |
| 428 | 210 { |
| 211 mark_object (COLOR_INSTANCE_TTY_SYMBOL (c)); | |
| 212 } | |
| 213 | |
| 214 static void | |
| 2286 | 215 tty_print_color_instance (Lisp_Color_Instance *UNUSED (c), |
| 216 Lisp_Object UNUSED (printcharfun), | |
| 217 int UNUSED (escapeflag)) | |
| 428 | 218 { |
| 219 } | |
| 220 | |
| 221 static void | |
| 440 | 222 tty_finalize_color_instance (Lisp_Color_Instance *c) |
| 428 | 223 { |
| 4141 | 224 #ifndef NEW_GC |
| 428 | 225 if (c->data) |
| 1726 | 226 xfree (c->data, void *); |
| 4141 | 227 #endif /* not NEW_GC */ |
| 4117 | 228 } |
| 428 | 229 |
| 230 static int | |
| 440 | 231 tty_color_instance_equal (Lisp_Color_Instance *c1, |
| 232 Lisp_Color_Instance *c2, | |
| 2286 | 233 int UNUSED (depth)) |
| 428 | 234 { |
| 235 return (EQ (COLOR_INSTANCE_TTY_SYMBOL (c1), | |
| 236 COLOR_INSTANCE_TTY_SYMBOL (c2))); | |
| 237 } | |
| 238 | |
| 2515 | 239 static Hashcode |
| 2286 | 240 tty_color_instance_hash (Lisp_Color_Instance *c, int UNUSED (depth)) |
| 428 | 241 { |
| 242 return LISP_HASH (COLOR_INSTANCE_TTY_SYMBOL (c)); | |
| 243 } | |
| 244 | |
| 245 static int | |
| 2286 | 246 tty_valid_color_name_p (struct device *UNUSED (d), Lisp_Object color) |
| 428 | 247 { |
| 248 return (!NILP (assoc_no_quit (Fintern (color, Qnil), Vtty_color_alist))); | |
| 249 #if 0 | |
| 250 || STRINGP (Vtty_dynamic_color_fg) | |
| 251 || STRINGP (Vtty_dynamic_color_bg) | |
| 252 #endif | |
| 253 } | |
| 254 | |
| 255 | |
| 256 static int | |
| 440 | 257 tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, |
| 2286 | 258 Lisp_Object UNUSED (device), |
| 259 Error_Behavior UNUSED (errb)) | |
| 428 | 260 { |
| 867 | 261 Ibyte *str = XSTRING_DATA (name); |
| 428 | 262 Lisp_Object charset = Qnil; |
| 263 | |
| 2367 | 264 if (qxestrncmp_ascii (str, "normal", 6)) |
| 428 | 265 return 0; |
| 266 str += 6; | |
| 267 if (*str) | |
| 268 { | |
| 269 #ifdef MULE | |
| 270 if (*str != '/') | |
| 271 return 0; | |
| 272 str++; | |
| 771 | 273 charset = Ffind_charset (intern_int (str)); |
| 428 | 274 if (NILP (charset)) |
| 275 return 0; | |
| 276 #else | |
| 277 return 0; | |
| 278 #endif | |
| 279 } | |
| 280 | |
| 281 /* Don't allocate the data until we're sure that we will succeed. */ | |
| 3092 | 282 #ifdef NEW_GC |
| 283 f->data = alloc_lrecord_type (struct tty_font_instance_data, | |
| 284 &lrecord_tty_font_instance_data); | |
| 285 #else /* not NEW_GC */ | |
| 428 | 286 f->data = xnew (struct tty_font_instance_data); |
| 3092 | 287 #endif /* not NEW_GC */ |
| 428 | 288 FONT_INSTANCE_TTY_CHARSET (f) = charset; |
| 289 #ifdef MULE | |
| 290 if (CHARSETP (charset)) | |
| 291 f->width = XCHARSET_COLUMNS (charset); | |
| 292 else | |
| 293 #endif | |
| 294 f->width = 1; | |
| 295 | |
| 296 f->proportional_p = 0; | |
| 297 f->ascent = f->height = 1; | |
| 298 f->descent = 0; | |
| 299 | |
| 300 return 1; | |
| 301 } | |
| 302 | |
| 303 static void | |
| 440 | 304 tty_mark_font_instance (Lisp_Font_Instance *f) |
| 428 | 305 { |
| 306 mark_object (FONT_INSTANCE_TTY_CHARSET (f)); | |
| 307 } | |
| 308 | |
| 309 static void | |
| 2286 | 310 tty_print_font_instance (Lisp_Font_Instance *UNUSED (f), |
| 311 Lisp_Object UNUSED (printcharfun), | |
| 312 int UNUSED (escapeflag)) | |
| 428 | 313 { |
| 314 } | |
| 315 | |
| 316 static void | |
| 440 | 317 tty_finalize_font_instance (Lisp_Font_Instance *f) |
| 428 | 318 { |
| 4141 | 319 #ifndef NEW_GC |
| 428 | 320 if (f->data) |
| 1726 | 321 xfree (f->data, void *); |
| 4141 | 322 #endif /* not NEW_GC */ |
| 4117 | 323 } |
| 428 | 324 |
| 325 static Lisp_Object | |
| 2527 | 326 tty_font_list (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device), |
| 2286 | 327 Lisp_Object UNUSED (maxnumber)) |
| 428 | 328 { |
| 329 return list1 (build_string ("normal")); | |
| 330 } | |
| 331 | |
| 332 #ifdef MULE | |
| 333 | |
| 334 static int | |
| 2286 | 335 tty_font_spec_matches_charset (struct device *UNUSED (d), Lisp_Object charset, |
| 867 | 336 const Ibyte *nonreloc, Lisp_Object reloc, |
| 872 | 337 Bytecount offset, Bytecount length, |
| 3841 | 338 enum font_specifier_matchspec_stages stage) |
| 428 | 339 { |
| 867 | 340 const Ibyte *the_nonreloc = nonreloc; |
| 428 | 341 |
| 872 | 342 if (stage) |
| 343 return 0; | |
| 344 | |
| 428 | 345 if (!the_nonreloc) |
| 346 the_nonreloc = XSTRING_DATA (reloc); | |
| 347 fixup_internal_substring (nonreloc, reloc, offset, &length); | |
| 348 the_nonreloc += offset; | |
| 349 | |
|
4353
4143b78d0df0
Merge an old patch of Ben's, involving font instantiation and charsets.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4141
diff
changeset
|
350 if (NILP (charset)) |
| 428 | 351 return !memchr (the_nonreloc, '/', length); |
| 867 | 352 the_nonreloc = (const Ibyte *) memchr (the_nonreloc, '/', length); |
| 428 | 353 if (!the_nonreloc) |
| 354 return 0; | |
| 355 the_nonreloc++; | |
| 356 { | |
| 793 | 357 Lisp_Object s = symbol_name (XSYMBOL (XCHARSET_NAME (charset))); |
| 358 return !qxestrcmp (the_nonreloc, XSTRING_DATA (s)); | |
| 428 | 359 } |
| 360 } | |
| 361 | |
| 362 /* find a font spec that matches font spec FONT and also matches | |
| 363 (the registry of) CHARSET. */ | |
| 364 static Lisp_Object | |
| 365 tty_find_charset_font (Lisp_Object device, Lisp_Object font, | |
| 3659 | 366 Lisp_Object charset, |
| 367 enum font_specifier_matchspec_stages stage) | |
| 428 | 368 { |
| 867 | 369 Ibyte *fontname = XSTRING_DATA (font); |
| 428 | 370 |
| 872 | 371 if (stage) |
| 372 return Qnil; | |
| 373 | |
| 442 | 374 if (strchr ((const char *) fontname, '/')) |
| 428 | 375 { |
| 376 if (tty_font_spec_matches_charset (XDEVICE (device), charset, 0, | |
| 4124 | 377 font, 0, -1, initial)) |
| 428 | 378 return font; |
| 379 return Qnil; | |
| 380 } | |
| 381 | |
|
4353
4143b78d0df0
Merge an old patch of Ben's, involving font instantiation and charsets.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4141
diff
changeset
|
382 if (NILP (charset)) |
| 428 | 383 return font; |
| 384 | |
| 385 return concat3 (font, build_string ("/"), | |
| 386 Fsymbol_name (XCHARSET_NAME (charset))); | |
| 387 } | |
| 388 | |
| 389 #endif /* MULE */ | |
| 390 | |
| 391 | |
| 392 /************************************************************************/ | |
| 393 /* initialization */ | |
| 394 /************************************************************************/ | |
| 395 | |
| 396 void | |
| 397 syms_of_objects_tty (void) | |
| 398 { | |
| 3092 | 399 #ifdef NEW_GC |
| 400 INIT_LRECORD_IMPLEMENTATION (tty_color_instance_data); | |
| 401 INIT_LRECORD_IMPLEMENTATION (tty_font_instance_data); | |
| 402 #endif /* NEW_GC */ | |
| 403 | |
| 428 | 404 DEFSUBR (Fregister_tty_color); |
| 405 DEFSUBR (Funregister_tty_color); | |
| 406 DEFSUBR (Ffind_tty_color); | |
| 407 #if 0 | |
| 408 DEFSUBR (Fset_tty_dynamic_color_specs); | |
| 409 DEFSUBR (Ftty_dynamic_color_specs); | |
| 410 #endif | |
| 411 } | |
| 412 | |
| 413 void | |
| 414 console_type_create_objects_tty (void) | |
| 415 { | |
| 416 /* object methods */ | |
| 417 CONSOLE_HAS_METHOD (tty, initialize_color_instance); | |
| 418 CONSOLE_HAS_METHOD (tty, mark_color_instance); | |
| 419 CONSOLE_HAS_METHOD (tty, print_color_instance); | |
| 420 CONSOLE_HAS_METHOD (tty, finalize_color_instance); | |
| 421 CONSOLE_HAS_METHOD (tty, color_instance_equal); | |
| 422 CONSOLE_HAS_METHOD (tty, color_instance_hash); | |
| 423 CONSOLE_HAS_METHOD (tty, valid_color_name_p); | |
| 2527 | 424 CONSOLE_HAS_METHOD (tty, color_list); |
| 428 | 425 |
| 426 CONSOLE_HAS_METHOD (tty, initialize_font_instance); | |
| 427 CONSOLE_HAS_METHOD (tty, mark_font_instance); | |
| 428 CONSOLE_HAS_METHOD (tty, print_font_instance); | |
| 429 CONSOLE_HAS_METHOD (tty, finalize_font_instance); | |
| 2527 | 430 CONSOLE_HAS_METHOD (tty, font_list); |
| 428 | 431 #ifdef MULE |
| 432 CONSOLE_HAS_METHOD (tty, font_spec_matches_charset); | |
| 433 CONSOLE_HAS_METHOD (tty, find_charset_font); | |
| 434 #endif | |
| 435 } | |
| 436 | |
| 437 void | |
| 438 vars_of_objects_tty (void) | |
| 439 { | |
| 440 staticpro (&Vtty_color_alist); | |
| 441 Vtty_color_alist = Qnil; | |
| 442 | |
| 443 #if 0 | |
| 444 staticpro (&Vtty_dynamic_color_fg); | |
| 445 Vtty_dynamic_color_fg = Qnil; | |
| 446 | |
| 447 staticpro (&Vtty_dynamic_color_bg); | |
| 448 Vtty_dynamic_color_bg = Qnil; | |
| 449 #endif | |
| 450 } |