Mercurial > hg > xemacs-beta
view src/objects-tty.c @ 502:7039e6323819
[xemacs-hg @ 2001-05-04 22:41:46 by ben]
----------------------- byte-comp warning fixes -----------------
New functions for cleanly eliminating byte-compiler warnings.
Their definitions require no changes at all in bytecomp.el,
meaning that any package that wants to use them and be compatible
with older versions of XEmacs need only copy the code and rename
the functions (i.e. prefix them with the package name).
Eliminate byte-compiler warnings using the new functions in
bytecomp-runtime.el.
Move coding-system-put,get,category, since they're not
Mule-specific and are used in prefer-coding-system.
font.el was incredibly ugly. Clean it up. Avoid using defsubst
for any exported functions, to avoid possible compatibility
problems if we later change the internal interface. (It happened
before, with face accessors, between 19.8 and 19.9). Fix tons
of warnings.
Clean up (new function gpm-is-supported-p eliminates duplicate
code in gpm-create/delete-device-hook) and eliminate warnings.
---------- make byte-recompile-directory work in the ---------
core `lisp' dir, even in the absence of
a Mule XEmacs (i.e. make it skip the Mule
files rather than trying to compile them).
now you should be able to do `touch *.el'
in the `lisp' dir, then
M-x byte-recompile-directory, and get no
warnings.
Avoid trying to compile Mule files in byte-recompile-directory
when we're not in a Mule XEmacs, since we're highly likely to get
syntax errors.
Add a coding-system cookie to all Mule files so that
byte-recompile-directory ignores them.
Magic cookie function moved to files.el from code-files.el (for
use by bytecomp even in a non-coding-system XEmacs), and changed
names and semantics for use by bytecomp. NOTE: IMO this is an
internal function that we can change as we like (and there is
absolutely no code anywhere else using the function).
---------------- GUI improvements: menus, help -------------------
Rearrange order of keymap declarations to be alphabetical.
Improve help on help to include all bindings, and group by
category. Add bindings for new Info commands. Remove
warnings. Use command-hyper-apropos in place of command-apropos.
Add a function to do the equivalent of command-apropos.
Evals its help-text argument so you can put expressions there.
Used now by help-for-help.
Add binding to continue text searches. Expand index searches to
work over multiple info documents. Add commands to search
text/index in User and Lispref.
Add new entry, "Uncomment Region" (parallels "Comment Out Region").
Redo Help menu; add bindings for new Info commands to search the
index or text of the User and Lispref manuals. Add command for
mark-paragraph, activate-region. Make Edit->R accelerator be
rectangle, not register (more commonly used), and put rectangle
first. Fix the Edit Init File entry to never load the .elc file.
Simplify the default-popup-menu. Add Cmds->Tabs menu.
Use kp-left not kp_left, etc.
---------------- Miscellaneous bug fixes/cleanup -------------------
byte-compiler-options: Correct doc string.
easy-menu-do-define: fix extra quote.
fill-paragraph-or-region:Rewrite to be more correct -- use
call-interactively so that we always get exactly the same
behavior as if the functions were called directly.
No need to fiddle with zmacs-region-stays, now that bogus
clearing of it (2001-04-28 src/ChangeLog) is removed.
Put dialog titles back in -- this time correctly. Fix various
other problems with leaks and such.
key-sequence-list-description:
Clean up fun to always correctly canonicalize.
Clean up Kinsoku comments, synch comment-region with FSF 20.7.
* simple.el (region-exists-p):
* simple.el (region-active-p):
Add comment about which one is correct to use in menu specs.
* sound.el (load-sound-file):
Minor code clean up.
* startup.el:
* startup.el (command-line-early):
* startup.el (initial-scratch-message):
Comment changes. Add info about sample.init.el to splash screen.
Improve initial-scratch-message and clarify purpose of Scratch
buffer. Fix byte-compile warning.
------------------------ Added features -------------------------
Add new variable to control whether etags checks all parent
directories for tag files. (On by default.)
* hash-table.el: New file, useful utility functions.
* dumped-lisp.el (preloaded-file-list): Dump hash-table.el.
------------ notable bug fix: Windows event code --------------
Get critical quit working.
------------ notable bug fix and new feature: regex code --------------
Shy groups were implemented in a horrible, half-assed way that
would cause them to screw up regex searching in most cases.
Fixed to work correctly.
Also extended back-reference syntax past 9. Only is recognized
as such if there are at least that many non-shy groups; and
optionally will warn about such uses, to catch old code that
might be using them differently. (Added variable to control
this in search.c -- `warn-about-possibly-incompatible-back-
references', on by default for the moment. Declared in lisp.h.
---------------- process/SIGIO improvements -------------------
define USE_GETADDRINFO to replace more complex conditional,
and use it. the code conditionalized on this in
unix_open_network_stream had *serious* problems handling errors.
it's now fixed, and major amounts of duplicate code between
the two versions were combined.
don't disable SIGIO and other interrupts unless
CONNECT_NEEDS_SLOWED_INTERRUPTS is defined -- don't penalize OS's
without bugs. similarly for a freebsd bug that was affecting all
OS's.
* s\ultrix.h:
define CONNECT_NEEDS_SLOWED_INTERRUPTS, since that's the OS
mentioned as having a kernel bug.
* sysdep.c (request_sigio_on_device):
* sysdep.c (unrequest_sigio_on_device):
fix SIGIO problems on Linux. add check for O_ASYNC in case it's
defined and FASYNC isn't. add comment about other ways to do
SIGIO on Linux.
* callproc.c (Fold_call_process_internal):
* process.c (Fstart_process_internal):
Deal with the possibility that `default-directory' doesn't
have terminating slash. Correct comments about vfork.
---------------- Miscellaneous bug fixes/cleanup -------------------
* callint.c (Finteractive):
Add lots of documentation -- exactly what the Lisp equivalents of
all the interactive specs are.
* console.h (struct console): change type of quit_char to Emchar.
* event-msw.c (lstream_type_create_mswindows_selectable): spacing
change.
Eliminate events-mod.h and combine into events.h.
* emacs.c:
* emacs.c (make_arg_list_1):
* emacs.c (main_1):
A couple of char->Extbyte changes, add a comment.
* glyphs-msw.c:
Correct indentation of function defns to not exceed 80 cols.
Try (sort of) to fix some code that sets the colors of the
progress gauge. (Commented out)
* keymap.c (syms_of_keymap):
use DEFSYMBOL.
* process.c (read_process_output):
No need to fiddle with zmacs_region_stays, now that bogus
clearing of it (see below) is removed.
* search.c (Freplace_match): warning fix.
author | ben |
---|---|
date | Fri, 04 May 2001 22:42:35 +0000 |
parents | abe6d1db359e |
children | 190b164ddcac |
line wrap: on
line source
/* TTY-specific Lisp objects. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995, 1996 Ben Wing. 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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #include <config.h> #include "lisp.h" #include "console-tty.h" #include "insdel.h" #include "objects-tty.h" #ifdef MULE #include "device.h" #include "mule-charset.h" #endif /* An alist mapping from color names to a cons of (FG-STRING, BG-STRING). */ Lisp_Object Vtty_color_alist; #if 0 /* This stuff doesn't quite work yet */ Lisp_Object Vtty_dynamic_color_fg; Lisp_Object Vtty_dynamic_color_bg; #endif DEFUN ("register-tty-color", Fregister_tty_color, 3, 3, 0, /* Register COLOR as a recognized TTY color. COLOR should be a string. Strings FG-STRING and BG-STRING should specify the escape sequences to set the foreground and background to the given color, respectively. */ (color, fg_string, bg_string)) { CHECK_STRING (color); CHECK_STRING (fg_string); CHECK_STRING (bg_string); color = Fintern (color, Qnil); Vtty_color_alist = Fremassq (color, Vtty_color_alist); Vtty_color_alist = Fcons (Fcons (color, Fcons (fg_string, bg_string)), Vtty_color_alist); return Qnil; } DEFUN ("unregister-tty-color", Funregister_tty_color, 1, 1, 0, /* Unregister COLOR as a recognized TTY color. */ (color)) { CHECK_STRING (color); color = Fintern (color, Qnil); Vtty_color_alist = Fremassq (color, Vtty_color_alist); return Qnil; } DEFUN ("find-tty-color", Ffind_tty_color, 1, 1, 0, /* Look up COLOR in the list of registered TTY colors. If it is found, return a list (FG-STRING BG-STRING) of the escape sequences used to set the foreground and background to the color, respectively. If it is not found, return nil. */ (color)) { Lisp_Object result; CHECK_STRING (color); result = Fassq (Fintern (color, Qnil), Vtty_color_alist); if (!NILP (result)) return list2 (Fcar (Fcdr (result)), Fcdr (Fcdr (result))); else return Qnil; } DEFUN ("tty-color-list", Ftty_color_list, 0, 0, 0, /* Return a list of the registered TTY colors. */ ()) { Lisp_Object result = Qnil; Lisp_Object rest; LIST_LOOP (rest, Vtty_color_alist) { result = Fcons (Fsymbol_name (XCAR (XCAR (rest))), result); } return Fnreverse (result); } #if 0 /* This approach is too simplistic. The problem is that the dynamic color settings apply to *all* text in the default color, not just the text output after the escape sequence has been given. */ DEFUN ("set-tty-dynamic-color-specs", Fset_tty_dynamic_color_specs, 2, 2, 0, /* Set the dynamic color specifications for TTY's. FG and BG should be either nil or vaguely printf-like strings, where each occurrence of %s is replaced with the color name and each occurrence of %% is replaced with a single % character. */ (fg, bg)) { if (!NILP (fg)) CHECK_STRING (fg); if (!NILP (bg)) CHECK_STRING (bg); Vtty_dynamic_color_fg = fg; Vtty_dynamic_color_bg = bg; return Qnil; } DEFUN ("tty-dynamic-color-specs", Ftty_dynamic_color_specs, 0, 0, 0, /* Return the dynamic color specifications for TTY's as a list of (FG BG). See `set-tty-dynamic-color-specs'. */ ()) { return list2 (Vtty_dynamic_color_fg, Vtty_dynamic_color_bg); } #endif /* 0 */ static int tty_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name, Lisp_Object device, Error_behavior errb) { Lisp_Object result; name = Fintern (name, Qnil); result = assq_no_quit (name, Vtty_color_alist); if (NILP (result)) { #if 0 if (!STRINGP (Vtty_dynamic_color_fg) && !STRINGP (Vtty_dynamic_color_bg)) #endif return 0; } /* Don't allocate the data until we're sure that we will succeed. */ c->data = xnew (struct tty_color_instance_data); COLOR_INSTANCE_TTY_SYMBOL (c) = name; return 1; } static void tty_mark_color_instance (Lisp_Color_Instance *c) { mark_object (COLOR_INSTANCE_TTY_SYMBOL (c)); } static void tty_print_color_instance (Lisp_Color_Instance *c, Lisp_Object printcharfun, int escapeflag) { } static void tty_finalize_color_instance (Lisp_Color_Instance *c) { if (c->data) xfree (c->data); } static int tty_color_instance_equal (Lisp_Color_Instance *c1, Lisp_Color_Instance *c2, int depth) { return (EQ (COLOR_INSTANCE_TTY_SYMBOL (c1), COLOR_INSTANCE_TTY_SYMBOL (c2))); } static unsigned long tty_color_instance_hash (Lisp_Color_Instance *c, int depth) { return LISP_HASH (COLOR_INSTANCE_TTY_SYMBOL (c)); } static int tty_valid_color_name_p (struct device *d, Lisp_Object color) { return (!NILP (assoc_no_quit (Fintern (color, Qnil), Vtty_color_alist))); #if 0 || STRINGP (Vtty_dynamic_color_fg) || STRINGP (Vtty_dynamic_color_bg) #endif } static int tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, Lisp_Object device, Error_behavior errb) { Bufbyte *str = XSTRING_DATA (name); Lisp_Object charset = Qnil; if (strncmp ((const char *) str, "normal", 6)) return 0; str += 6; if (*str) { #ifdef MULE if (*str != '/') return 0; str++; charset = Ffind_charset (intern ((const char *) str)); if (NILP (charset)) return 0; #else return 0; #endif } /* Don't allocate the data until we're sure that we will succeed. */ f->data = xnew (struct tty_font_instance_data); FONT_INSTANCE_TTY_CHARSET (f) = charset; #ifdef MULE if (CHARSETP (charset)) f->width = XCHARSET_COLUMNS (charset); else #endif f->width = 1; f->proportional_p = 0; f->ascent = f->height = 1; f->descent = 0; return 1; } static void tty_mark_font_instance (Lisp_Font_Instance *f) { mark_object (FONT_INSTANCE_TTY_CHARSET (f)); } static void tty_print_font_instance (Lisp_Font_Instance *f, Lisp_Object printcharfun, int escapeflag) { } static void tty_finalize_font_instance (Lisp_Font_Instance *f) { if (f->data) xfree (f->data); } static Lisp_Object tty_list_fonts (Lisp_Object pattern, Lisp_Object device) { return list1 (build_string ("normal")); } #ifdef MULE static int tty_font_spec_matches_charset (struct device *d, Lisp_Object charset, const Bufbyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length) { const Bufbyte *the_nonreloc = nonreloc; if (!the_nonreloc) the_nonreloc = XSTRING_DATA (reloc); fixup_internal_substring (nonreloc, reloc, offset, &length); the_nonreloc += offset; if (UNBOUNDP (charset)) return !memchr (the_nonreloc, '/', length); the_nonreloc = (const Bufbyte *) memchr (the_nonreloc, '/', length); if (!the_nonreloc) return 0; the_nonreloc++; { Lisp_String *s = symbol_name (XSYMBOL (XCHARSET_NAME (charset))); return !strcmp ((const char *) the_nonreloc, (const char *) string_data (s)); } } /* find a font spec that matches font spec FONT and also matches (the registry of) CHARSET. */ static Lisp_Object tty_find_charset_font (Lisp_Object device, Lisp_Object font, Lisp_Object charset) { Bufbyte *fontname = XSTRING_DATA (font); if (strchr ((const char *) fontname, '/')) { if (tty_font_spec_matches_charset (XDEVICE (device), charset, 0, font, 0, -1)) return font; return Qnil; } if (UNBOUNDP (charset)) return font; return concat3 (font, build_string ("/"), Fsymbol_name (XCHARSET_NAME (charset))); } #endif /* MULE */ /************************************************************************/ /* initialization */ /************************************************************************/ void syms_of_objects_tty (void) { DEFSUBR (Fregister_tty_color); DEFSUBR (Funregister_tty_color); DEFSUBR (Ffind_tty_color); DEFSUBR (Ftty_color_list); #if 0 DEFSUBR (Fset_tty_dynamic_color_specs); DEFSUBR (Ftty_dynamic_color_specs); #endif } void console_type_create_objects_tty (void) { /* object methods */ CONSOLE_HAS_METHOD (tty, initialize_color_instance); CONSOLE_HAS_METHOD (tty, mark_color_instance); CONSOLE_HAS_METHOD (tty, print_color_instance); CONSOLE_HAS_METHOD (tty, finalize_color_instance); CONSOLE_HAS_METHOD (tty, color_instance_equal); CONSOLE_HAS_METHOD (tty, color_instance_hash); CONSOLE_HAS_METHOD (tty, valid_color_name_p); CONSOLE_HAS_METHOD (tty, initialize_font_instance); CONSOLE_HAS_METHOD (tty, mark_font_instance); CONSOLE_HAS_METHOD (tty, print_font_instance); CONSOLE_HAS_METHOD (tty, finalize_font_instance); CONSOLE_HAS_METHOD (tty, list_fonts); #ifdef MULE CONSOLE_HAS_METHOD (tty, font_spec_matches_charset); CONSOLE_HAS_METHOD (tty, find_charset_font); #endif } void vars_of_objects_tty (void) { staticpro (&Vtty_color_alist); Vtty_color_alist = Qnil; #if 0 staticpro (&Vtty_dynamic_color_fg); Vtty_dynamic_color_fg = Qnil; staticpro (&Vtty_dynamic_color_bg); Vtty_dynamic_color_bg = Qnil; #endif }