Mercurial > hg > xemacs-beta
view src/balloon-x.c @ 5552:85210c453a97
Fix performance regression in refactored syntax cache setup.
More doc improvements.
* syntax.h (enum syntax_source):
New. Specify whether syntax is from property or buffer.
(struct syntax_cache):
Use enum syntax_source source, instead of no_syntax_table_prop
and use_code.
Improve comments.
(SOURCE_IS_TABLE):
New predicate.
(SYNTAX_CODE_FROM_CACHE):
Use it instead of use_code, and adjust logic.
* syntax.c (syntax_cache_table_was_changed):
Check cache->source (cache->no_syntax_table_prop is gone).
(reset_syntax_cache_range):
All information about OBJECT and BUFFER is in CACHE already.
Also reset markers in OBJECT if it is a buffer.
Rename INFINITE to VALID_EVERYWHERE.
(init_syntax_cache):
Initialize source (cache->no_syntax_table_prop is gone).
Maybe initialize start and end to null markers.
Initialize cache range with reset_syntax_cache_range.
(update_syntax_cache):
Use source instead of no_syntax_table_prop and use_code.
(setup_syntax_cache):
Add header comment. Improve other comments.
Make calls to reset_syntax_cache_range and init_syntax_cache match
their prototypes.
(init_buffer_syntax_cache):
Use init_syntax_cache to do the work.
(signal_syntax_cache_extent_changed):
Make call to reset_syntax_cache_range match its prototype.
Improve local variable naming.
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Tue, 23 Aug 2011 04:41:45 +0900 |
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")); }