Mercurial > hg > xemacs-beta
annotate src/objects-tty.c @ 5492:e82f5b7010fe
Merge some stuff in man, fix up Makefile
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-02-19 Ben Wing <ben@xemacs.org>
* widget.texi:
* widget.texi (Top):
* widget.texi (Introduction):
* widget.texi (User Interface):
* widget.texi (Programming Example):
* widget.texi (Setting Up the Buffer):
* widget.texi (Basic Types):
* widget.texi (link):
* widget.texi (url-link):
* widget.texi (info-link):
* widget.texi (push-button):
* widget.texi (editable-field):
* widget.texi (text):
* widget.texi (menu-choice):
* widget.texi (radio-button-choice):
* widget.texi (item):
* widget.texi (choice-item):
* widget.texi (toggle):
* widget.texi (checkbox):
* widget.texi (checklist):
* widget.texi (editable-list):
* widget.texi (group):
* widget.texi (Sexp Types):
* widget.texi (constants):
* widget.texi (generic):
* widget.texi (atoms):
* widget.texi (composite):
* widget.texi (Widget Properties):
* widget.texi (Defining New Widgets):
* widget.texi (Widget Browser):
* widget.texi (Widget Minor Mode):
* widget.texi (Utilities):
* widget.texi (Widget Wishlist):
* widget.texi (Widget Internals):
* widget.texi (GNU Free Documentation License):
* widget.texi (Index):
Sync with FSF 23.1.92.
2010-02-19 Ben Wing <ben@xemacs.org>
* texinfo/fdl.texi: New file.
* texinfo/texinfo.texi:
* texinfo/texinfo.texi (Top):
* texinfo/texinfo.texi (Copying Conditions):
* texinfo/texinfo.texi (Overview):
* texinfo/texinfo.texi (Reporting Bugs):
* texinfo/texinfo.texi (Using Texinfo):
* texinfo/texinfo.texi (Output Formats):
* texinfo/texinfo.texi (Info Files):
* texinfo/texinfo.texi (Printed Books):
* texinfo/texinfo.texi (Formatting Commands):
* texinfo/texinfo.texi (Conventions):
* texinfo/texinfo.texi (Comments):
* texinfo/texinfo.texi (Minimum):
* texinfo/texinfo.texi (Six Parts):
* texinfo/texinfo.texi (Short Sample):
* texinfo/texinfo.texi (History):
* texinfo/texinfo.texi (Texinfo Mode):
* texinfo/texinfo.texi (Texinfo Mode Overview):
* texinfo/texinfo.texi (XEmacs Editing):
* texinfo/texinfo.texi (Inserting):
* texinfo/texinfo.texi (Showing the Structure):
* texinfo/texinfo.texi (Updating Nodes and Menus):
* texinfo/texinfo.texi (Updating Commands):
* texinfo/texinfo.texi (Updating Requirements):
* texinfo/texinfo.texi (Other Updating Commands):
* texinfo/texinfo.texi (Info Formatting):
* texinfo/texinfo.texi (Printing):
* texinfo/texinfo.texi (Texinfo Mode Summary):
* texinfo/texinfo.texi (Beginning a File):
* texinfo/texinfo.texi (Sample Beginning):
* texinfo/texinfo.texi (Texinfo File Header):
* texinfo/texinfo.texi (First Line):
* texinfo/texinfo.texi (Start of Header):
* texinfo/texinfo.texi (setfilename):
* texinfo/texinfo.texi (settitle):
* texinfo/texinfo.texi (End of Header):
* texinfo/texinfo.texi (Document Permissions):
* texinfo/texinfo.texi (copying):
* texinfo/texinfo.texi (insertcopying):
* texinfo/texinfo.texi (Titlepage & Copyright Page):
* texinfo/texinfo.texi (titlepage):
* texinfo/texinfo.texi (titlefont center sp):
* texinfo/texinfo.texi (title subtitle author):
* texinfo/texinfo.texi (Copyright):
* texinfo/texinfo.texi (end titlepage):
* texinfo/texinfo.texi (headings on off):
* texinfo/texinfo.texi (Contents):
* texinfo/texinfo.texi (The Top Node):
* texinfo/texinfo.texi (Top Node Example):
* texinfo/texinfo.texi (Master Menu Parts):
* texinfo/texinfo.texi (Global Document Commands):
* texinfo/texinfo.texi (documentdescription):
* texinfo/texinfo.texi (setchapternewpage):
* texinfo/texinfo.texi (paragraphindent):
* texinfo/texinfo.texi (firstparagraphindent):
* texinfo/texinfo.texi (exampleindent):
* texinfo/texinfo.texi (Software Copying Permissions):
* texinfo/texinfo.texi (Ending a File):
* texinfo/texinfo.texi (Printing Indices & Menus):
* texinfo/texinfo.texi (File End):
* texinfo/texinfo.texi (Structuring):
* texinfo/texinfo.texi (Tree Structuring):
* texinfo/texinfo.texi (Structuring Command Types):
* texinfo/texinfo.texi (makeinfo top):
* texinfo/texinfo.texi (chapter):
* texinfo/texinfo.texi (unnumbered & appendix):
* texinfo/texinfo.texi (majorheading & chapheading):
* texinfo/texinfo.texi (section):
* texinfo/texinfo.texi (unnumberedsec appendixsec heading):
* texinfo/texinfo.texi (subsection):
* texinfo/texinfo.texi (unnumberedsubsec appendixsubsec subheading):
* texinfo/texinfo.texi (subsubsection):
* texinfo/texinfo.texi (Raise/lower sections):
* texinfo/texinfo.texi (Nodes):
* texinfo/texinfo.texi (Two Paths):
* texinfo/texinfo.texi (Node Menu Illustration):
* texinfo/texinfo.texi (node):
* texinfo/texinfo.texi (Node Names):
* texinfo/texinfo.texi (Writing a Node):
* texinfo/texinfo.texi (Node Line Tips):
* texinfo/texinfo.texi (Node Line Requirements):
* texinfo/texinfo.texi (First Node):
* texinfo/texinfo.texi (makeinfo top command):
* texinfo/texinfo.texi (makeinfo Pointer Creation):
* texinfo/texinfo.texi (anchor):
* texinfo/texinfo.texi (Menus):
* texinfo/texinfo.texi (Menu Location):
* texinfo/texinfo.texi (Writing a Menu):
* texinfo/texinfo.texi (Menu Parts):
* texinfo/texinfo.texi (Less Cluttered Menu Entry):
* texinfo/texinfo.texi (Menu Example):
* texinfo/texinfo.texi (Other Info Files):
* texinfo/texinfo.texi (Cross References):
* texinfo/texinfo.texi (References):
* texinfo/texinfo.texi (Cross Reference Commands):
* texinfo/texinfo.texi (Cross Reference Parts):
* texinfo/texinfo.texi (xref):
* texinfo/texinfo.texi (Reference Syntax):
* texinfo/texinfo.texi (One Argument):
* texinfo/texinfo.texi (Two Arguments):
* texinfo/texinfo.texi (Three Arguments):
* texinfo/texinfo.texi (Four and Five Arguments):
* texinfo/texinfo.texi (Top Node Naming):
* texinfo/texinfo.texi (ref):
* texinfo/texinfo.texi (pxref):
* texinfo/texinfo.texi (inforef):
* texinfo/texinfo.texi (uref):
* texinfo/texinfo.texi (cite):
* texinfo/texinfo.texi (Marking Text):
* texinfo/texinfo.texi (Indicating):
* texinfo/texinfo.texi (Useful Highlighting):
* texinfo/texinfo.texi (code):
* texinfo/texinfo.texi (kbd):
* texinfo/texinfo.texi (key):
* texinfo/texinfo.texi (samp):
* texinfo/texinfo.texi (verb):
* texinfo/texinfo.texi (var):
* texinfo/texinfo.texi (env):
* texinfo/texinfo.texi (file):
* texinfo/texinfo.texi (command):
* texinfo/texinfo.texi (option):
* texinfo/texinfo.texi (dfn):
* texinfo/texinfo.texi (abbr):
* texinfo/texinfo.texi (acronym):
* texinfo/texinfo.texi (indicateurl):
* texinfo/texinfo.texi (email):
* texinfo/texinfo.texi (Emphasis):
* texinfo/texinfo.texi (emph & strong):
* texinfo/texinfo.texi (Smallcaps):
* texinfo/texinfo.texi (Fonts):
* texinfo/texinfo.texi (Quotations and Examples):
* texinfo/texinfo.texi (Block Enclosing Commands):
* texinfo/texinfo.texi (quotation):
* texinfo/texinfo.texi (example):
* texinfo/texinfo.texi (verbatim):
* texinfo/texinfo.texi (verbatiminclude):
* texinfo/texinfo.texi (lisp):
* texinfo/texinfo.texi (small):
* texinfo/texinfo.texi (display):
* texinfo/texinfo.texi (format):
* texinfo/texinfo.texi (exdent):
* texinfo/texinfo.texi (flushleft & flushright):
* texinfo/texinfo.texi (noindent):
* texinfo/texinfo.texi (indent):
* texinfo/texinfo.texi (cartouche):
* texinfo/texinfo.texi (Lists and Tables):
* texinfo/texinfo.texi (Introducing Lists):
* texinfo/texinfo.texi (itemize):
* texinfo/texinfo.texi (enumerate):
* texinfo/texinfo.texi (Two-column Tables):
* texinfo/texinfo.texi (table):
* texinfo/texinfo.texi (ftable vtable):
* texinfo/texinfo.texi (itemx):
* texinfo/texinfo.texi (Multi-column Tables):
* texinfo/texinfo.texi (Multitable Column Widths):
* texinfo/texinfo.texi (Multitable Rows):
* texinfo/texinfo.texi (Special Displays):
* texinfo/texinfo.texi (Floats):
* texinfo/texinfo.texi (float):
* texinfo/texinfo.texi (caption shortcaption):
* texinfo/texinfo.texi (listoffloats):
* texinfo/texinfo.texi (Images):
* texinfo/texinfo.texi (Image Syntax):
* texinfo/texinfo.texi (Image Scaling):
* texinfo/texinfo.texi (Footnotes):
* texinfo/texinfo.texi (Footnote Commands):
* texinfo/texinfo.texi (Footnote Styles):
* texinfo/texinfo.texi (Indices):
* texinfo/texinfo.texi (Index Entries):
* texinfo/texinfo.texi (Predefined Indices):
* texinfo/texinfo.texi (Indexing Commands):
* texinfo/texinfo.texi (Combining Indices):
* texinfo/texinfo.texi (syncodeindex):
* texinfo/texinfo.texi (synindex):
* texinfo/texinfo.texi (New Indices):
* texinfo/texinfo.texi (Insertions):
* texinfo/texinfo.texi (Atsign Braces Comma):
* texinfo/texinfo.texi (Inserting an Atsign):
* texinfo/texinfo.texi (Inserting Braces):
* texinfo/texinfo.texi (Inserting a Comma):
* texinfo/texinfo.texi (Inserting Quote Characters):
* texinfo/texinfo.texi (Inserting Space):
* texinfo/texinfo.texi (Not Ending a Sentence):
* texinfo/texinfo.texi (Ending a Sentence):
* texinfo/texinfo.texi (Multiple Spaces):
* texinfo/texinfo.texi (frenchspacing):
* texinfo/texinfo.texi (dmn):
* texinfo/texinfo.texi (Inserting Accents):
* texinfo/texinfo.texi (Inserting Quotation Marks):
* texinfo/texinfo.texi (Dots Bullets):
* texinfo/texinfo.texi (dots):
* texinfo/texinfo.texi (bullet):
* texinfo/texinfo.texi (TeX and copyright):
* texinfo/texinfo.texi (tex):
* texinfo/texinfo.texi (copyright symbol):
* texinfo/texinfo.texi (registered symbol):
* texinfo/texinfo.texi (euro):
* texinfo/texinfo.texi (pounds):
* texinfo/texinfo.texi (textdegree):
* texinfo/texinfo.texi (minus):
* texinfo/texinfo.texi (geq leq):
* texinfo/texinfo.texi (math):
* texinfo/texinfo.texi (Click Sequences):
* texinfo/texinfo.texi (Glyphs):
* texinfo/texinfo.texi (Glyphs Summary):
* texinfo/texinfo.texi (result):
* texinfo/texinfo.texi (expansion):
* texinfo/texinfo.texi (Print Glyph):
* texinfo/texinfo.texi (Error Glyph):
* texinfo/texinfo.texi (Equivalence):
* texinfo/texinfo.texi (Point Glyph):
* texinfo/texinfo.texi (Breaks):
* texinfo/texinfo.texi (Break Commands):
* texinfo/texinfo.texi (Line Breaks):
* texinfo/texinfo.texi (- and hyphenation):
* texinfo/texinfo.texi (allowcodebreaks):
* texinfo/texinfo.texi (w):
* texinfo/texinfo.texi (tie):
* texinfo/texinfo.texi (sp):
* texinfo/texinfo.texi (page):
* texinfo/texinfo.texi (group):
* texinfo/texinfo.texi (need):
* texinfo/texinfo.texi (Definition Commands):
* texinfo/texinfo.texi (Def Cmd Template):
* texinfo/texinfo.texi (Def Cmd Continuation Lines):
* texinfo/texinfo.texi (Optional Arguments):
* texinfo/texinfo.texi (deffnx):
* texinfo/texinfo.texi (Def Cmds in Detail):
* texinfo/texinfo.texi (Functions Commands):
* texinfo/texinfo.texi (Variables Commands):
* texinfo/texinfo.texi (Typed Functions):
* texinfo/texinfo.texi (Typed Variables):
* texinfo/texinfo.texi (Data Types):
* texinfo/texinfo.texi (Abstract Objects):
* texinfo/texinfo.texi (Object-Oriented Variables):
* texinfo/texinfo.texi (Object-Oriented Methods):
* texinfo/texinfo.texi (Defining Macros):
* texinfo/texinfo.texi (Invoking Macros):
* texinfo/texinfo.texi (Macro Details):
* texinfo/texinfo.texi (alias):
* texinfo/texinfo.texi (definfoenclose):
* texinfo/texinfo.texi (Hardcopy):
* texinfo/texinfo.texi (Use TeX):
* texinfo/texinfo.texi (Format with tex/texindex):
* texinfo/texinfo.texi (Format with texi2dvi):
* texinfo/texinfo.texi (Print with lpr):
* texinfo/texinfo.texi (Within XEmacs):
* texinfo/texinfo.texi (Texinfo Mode Printing):
* texinfo/texinfo.texi (Compile-Command):
* texinfo/texinfo.texi (Requirements Summary):
* texinfo/texinfo.texi (Preparing for TeX):
* texinfo/texinfo.texi (Overfull hboxes):
* texinfo/texinfo.texi (smallbook):
* texinfo/texinfo.texi (A4 Paper):
* texinfo/texinfo.texi (pagesizes):
* texinfo/texinfo.texi (Cropmarks and Magnification):
* texinfo/texinfo.texi (PDF Output):
* texinfo/texinfo.texi (Obtaining TeX):
* texinfo/texinfo.texi (Creating and Installing Info Files):
* texinfo/texinfo.texi (Creating an Info File):
* texinfo/texinfo.texi (makeinfo advantages):
* texinfo/texinfo.texi (Invoking makeinfo):
* texinfo/texinfo.texi (makeinfo options):
* texinfo/texinfo.texi (Pointer Validation):
* texinfo/texinfo.texi (makeinfo in XEmacs):
* texinfo/texinfo.texi (texinfo-format commands):
* texinfo/texinfo.texi (Batch Formatting):
* texinfo/texinfo.texi (Tag and Split Files):
* texinfo/texinfo.texi (Installing an Info File):
* texinfo/texinfo.texi (Directory File):
* texinfo/texinfo.texi (New Info File):
* texinfo/texinfo.texi (Other Info Directories):
* texinfo/texinfo.texi (Installing Dir Entries):
* texinfo/texinfo.texi (Invoking install-info):
* texinfo/texinfo.texi (Generating HTML):
* texinfo/texinfo.texi (HTML Translation):
* texinfo/texinfo.texi (HTML Splitting):
* texinfo/texinfo.texi (HTML CSS):
* texinfo/texinfo.texi (HTML Xref):
* texinfo/texinfo.texi (HTML Xref Link Basics):
* texinfo/texinfo.texi (HTML Xref Node Name Expansion):
* texinfo/texinfo.texi (HTML Xref Command Expansion):
* texinfo/texinfo.texi (HTML Xref 8-bit Character Expansion):
* texinfo/texinfo.texi (HTML Xref Mismatch):
* texinfo/texinfo.texi (Command List):
* texinfo/texinfo.texi (Command Syntax):
* texinfo/texinfo.texi (Tips):
* texinfo/texinfo.texi (Sample Texinfo Files):
* texinfo/texinfo.texi (Short Sample Texinfo File):
* texinfo/texinfo.texi (GNU Sample Texts):
* texinfo/texinfo.texi (Invoking sample):
* texinfo/texinfo.texi (GNU Free Documentation License):
* texinfo/texinfo.texi (Index):
* texinfo/texinfo.texi (Verbatim Copying License):
* texinfo/texinfo.texi (All-permissive Copying License):
* texinfo/texinfo.texi (Include Files):
* texinfo/texinfo.texi (Using Include Files):
* texinfo/texinfo.texi (texinfo-multiple-files-update):
* texinfo/texinfo.texi (Include Files Requirements):
* texinfo/texinfo.texi (Sample Include File):
* texinfo/texinfo.texi (Include Files Evolution):
* texinfo/texinfo.texi (Headings):
* texinfo/texinfo.texi (Headings Introduced):
* texinfo/texinfo.texi (Heading Format):
* texinfo/texinfo.texi (Heading Choice):
* texinfo/texinfo.texi (Custom Headings):
* texinfo/texinfo.texi (Catching Mistakes):
* texinfo/texinfo.texi (makeinfo Preferred):
* texinfo/texinfo.texi (Debugging with Info):
* texinfo/texinfo.texi (Debugging with TeX):
* texinfo/texinfo.texi (Using texinfo-show-structure):
* texinfo/texinfo.texi (Using occur):
* texinfo/texinfo.texi (Running Info-Validate):
* texinfo/texinfo.texi (Using Info-validate):
* texinfo/texinfo.texi (Unsplit):
* texinfo/texinfo.texi (Tagifying):
* texinfo/texinfo.texi (Splitting):
* texinfo/texinfo.texi (Refilling Paragraphs):
* texinfo/texinfo.texi (Command and Variable Index):
* texinfo/texinfo.texi (General Index):
* texinfo/version.texi: New file.
Sync with FSF 23.1.92. Make new directory to hold the files needed
to generate texinfo.info, since there are three such files now.
2010-02-19 Ben Wing <ben@xemacs.org>
* Makefile:
* Makefile (src_files1):
* Makefile (DIR):
* Makefile (texinfo-srcs):
* Makefile ($(INFODIR)/widget.info):
* Makefile ($(INFODIR)/texinfo.info):
* Makefile (.PHONY):
* Makefile (texinfo.dvi):
* Makefile (texinfo.pdf):
* Makefile ($(HTMLDIR)/widget.html):
* Makefile ($(HTMLDIR)/texinfo.html):
Incorporate texinfo.texi moving to a subdirectory texinfo/.
Do some tricks to reduce the amount of duplication while still
maintaining compatible with non-GNU make (at least, with
Solaris make).
* doclicense.texi: New file.
* info.texi:
* info.texi (Top):
* info.texi (Getting Started):
* info.texi (Help-Small-Screen):
* info.texi (Help):
* info.texi (Help-P):
* info.texi (Help-^L):
* info.texi (Help-Inv):
* info.texi (Help-]):
* info.texi (Help-M):
* info.texi (Help-FOO):
* info.texi (Help-Xref):
* info.texi (Help-Int):
* info.texi (Help-Q):
* info.texi (Advanced):
* info.texi (Search Text):
* info.texi (Search Index):
* info.texi (Go to node):
* info.texi (Choose menu subtopic):
* info.texi (Create Info buffer):
* info.texi (XEmacs Info Variables):
* info.texi (Expert Info):
* info.texi (Add):
* info.texi (Menus):
* info.texi (Cross-refs):
* info.texi (Help-Cross):
* info.texi (Tags):
* info.texi (Checking):
* info.texi (Index):
* texinfo.tex:
* texinfo.tex (paragraphindent{%):
* texinfo.tex (sectionheading will have):
* texinfo.tex (chapterzzz{#3}%):
* texinfo.tex (subsubsection = \numberedsubsubsec):
* texinfo.tex (subsubsection = \appendixsubsubsec):
* texinfo.tex (subsubsection = \unnumberedsubsubsec):
* texinfo.tex (sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%):
* texinfo.tex (sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%):
* texinfo.tex (sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%):
* texinfo.tex (sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%):
* texinfo.tex (sectionheading{#1}{subsec}{Yappendix}%):
* texinfo.tex (sectionheading{#1}{subsec}{Ynothing}%):
* texinfo.tex (sectionheading{#1}{subsubsec}{Ynumbered}%):
* texinfo.tex (sectionheading{#1}{subsubsec}{Yappendix}%):
* texinfo.tex (sectionheading{#1}{subsubsec}{Ynothing}%):
* texinfo.tex (sectionheading{#1}{subsubsec}{Yomitfromtoc}{}):
* texinfo.tex (sectionheading to do the printing.):
* texinfo.tex (sectionlevel}{#1}{#4}%):
* texinfo.tex (sectionheading, q.v.):
Sync with FSF 23.1.92.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 19 Feb 2010 22:39:19 -0600 |
| parents | d95c102a96d3 |
| children | d4f666cda5e6 b5df3737028a |
| rev | line source |
|---|---|
| 428 | 1 /* TTY-specific Lisp objects. |
| 2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
|
5015
d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
Ben Wing <ben@xemacs.org>
parents:
4976
diff
changeset
|
3 Copyright (C) 1995, 1996, 2001, 2002, 2010 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 |
|
4710
3a87551bfeb5
Fixes for a number of minor warnings issued by gcc. See xemacs-patches message
Jerry James <james@xemacs.org>
parents:
4353
diff
changeset
|
33 #ifdef NEW_GC |
|
3a87551bfeb5
Fixes for a number of minor warnings issued by gcc. See xemacs-patches message
Jerry James <james@xemacs.org>
parents:
4353
diff
changeset
|
34 # define UNUSED_IF_NEW_GC(decl) UNUSED (decl) |
|
3a87551bfeb5
Fixes for a number of minor warnings issued by gcc. See xemacs-patches message
Jerry James <james@xemacs.org>
parents:
4353
diff
changeset
|
35 #else |
|
3a87551bfeb5
Fixes for a number of minor warnings issued by gcc. See xemacs-patches message
Jerry James <james@xemacs.org>
parents:
4353
diff
changeset
|
36 # define UNUSED_IF_NEW_GC(decl) decl |
|
3a87551bfeb5
Fixes for a number of minor warnings issued by gcc. See xemacs-patches message
Jerry James <james@xemacs.org>
parents:
4353
diff
changeset
|
37 #endif |
|
3a87551bfeb5
Fixes for a number of minor warnings issued by gcc. See xemacs-patches message
Jerry James <james@xemacs.org>
parents:
4353
diff
changeset
|
38 |
| 428 | 39 /* An alist mapping from color names to a cons of (FG-STRING, BG-STRING). */ |
| 40 Lisp_Object Vtty_color_alist; | |
| 41 #if 0 /* This stuff doesn't quite work yet */ | |
| 42 Lisp_Object Vtty_dynamic_color_fg; | |
| 43 Lisp_Object Vtty_dynamic_color_bg; | |
| 44 #endif | |
| 45 | |
| 1204 | 46 static const struct memory_description tty_color_instance_data_description_1 [] = { |
| 47 { XD_LISP_OBJECT, offsetof (struct tty_color_instance_data, symbol) }, | |
| 48 { XD_END } | |
| 49 }; | |
| 50 | |
| 3092 | 51 #ifdef NEW_GC |
| 52 DEFINE_LRECORD_IMPLEMENTATION ("tty-color-instance-data", | |
| 53 tty_color_instance_data, | |
| 54 0, /*dumpable-flag*/ | |
| 55 0, 0, 0, 0, 0, | |
| 56 tty_color_instance_data_description_1, | |
| 57 struct tty_color_instance_data); | |
| 58 #else /* not NEW_GC */ | |
| 1204 | 59 const struct sized_memory_description tty_color_instance_data_description = { |
| 60 sizeof (struct tty_color_instance_data), tty_color_instance_data_description_1 | |
| 61 }; | |
| 3092 | 62 #endif /* not NEW_GC */ |
| 1204 | 63 |
| 64 static const struct memory_description tty_font_instance_data_description_1 [] = { | |
| 65 { XD_LISP_OBJECT, offsetof (struct tty_font_instance_data, charset) }, | |
| 66 { XD_END } | |
| 67 }; | |
| 68 | |
| 3092 | 69 #ifdef NEW_GC |
| 70 DEFINE_LRECORD_IMPLEMENTATION ("tty-font-instance-data", | |
| 71 tty_font_instance_data, | |
| 72 0, /*dumpable-flag*/ | |
| 73 0, 0, 0, 0, 0, | |
| 74 tty_font_instance_data_description_1, | |
| 75 struct tty_font_instance_data); | |
| 76 #else /* not NEW_GC */ | |
| 1204 | 77 const struct sized_memory_description tty_font_instance_data_description = { |
| 78 sizeof (struct tty_font_instance_data), tty_font_instance_data_description_1 | |
| 79 }; | |
| 3092 | 80 #endif /* not NEW_GC */ |
| 1204 | 81 |
| 428 | 82 DEFUN ("register-tty-color", Fregister_tty_color, 3, 3, 0, /* |
| 83 Register COLOR as a recognized TTY color. | |
| 84 COLOR should be a string. | |
| 85 Strings FG-STRING and BG-STRING should specify the escape sequences to | |
| 86 set the foreground and background to the given color, respectively. | |
| 87 */ | |
| 88 (color, fg_string, bg_string)) | |
| 89 { | |
| 90 CHECK_STRING (color); | |
| 91 CHECK_STRING (fg_string); | |
| 92 CHECK_STRING (bg_string); | |
| 93 | |
| 94 color = Fintern (color, Qnil); | |
| 95 Vtty_color_alist = Fremassq (color, Vtty_color_alist); | |
| 96 Vtty_color_alist = Fcons (Fcons (color, Fcons (fg_string, bg_string)), | |
| 97 Vtty_color_alist); | |
| 98 | |
| 99 return Qnil; | |
| 100 } | |
| 101 | |
| 102 DEFUN ("unregister-tty-color", Funregister_tty_color, 1, 1, 0, /* | |
| 103 Unregister COLOR as a recognized TTY color. | |
| 104 */ | |
| 105 (color)) | |
| 106 { | |
| 107 CHECK_STRING (color); | |
| 108 | |
| 109 color = Fintern (color, Qnil); | |
| 110 Vtty_color_alist = Fremassq (color, Vtty_color_alist); | |
| 111 return Qnil; | |
| 112 } | |
| 113 | |
| 114 DEFUN ("find-tty-color", Ffind_tty_color, 1, 1, 0, /* | |
| 115 Look up COLOR in the list of registered TTY colors. | |
| 116 If it is found, return a list (FG-STRING BG-STRING) of the escape | |
| 117 sequences used to set the foreground and background to the color, respectively. | |
| 118 If it is not found, return nil. | |
| 119 */ | |
| 120 (color)) | |
| 121 { | |
| 122 Lisp_Object result; | |
| 123 | |
| 124 CHECK_STRING (color); | |
| 125 | |
| 126 result = Fassq (Fintern (color, Qnil), Vtty_color_alist); | |
| 127 if (!NILP (result)) | |
| 128 return list2 (Fcar (Fcdr (result)), Fcdr (Fcdr (result))); | |
| 129 else | |
| 130 return Qnil; | |
| 131 } | |
| 132 | |
| 2527 | 133 static Lisp_Object |
| 134 tty_color_list (void) | |
| 428 | 135 { |
| 136 Lisp_Object result = Qnil; | |
| 137 Lisp_Object rest; | |
| 138 | |
| 139 LIST_LOOP (rest, Vtty_color_alist) | |
| 140 { | |
| 141 result = Fcons (Fsymbol_name (XCAR (XCAR (rest))), result); | |
| 142 } | |
| 143 | |
| 144 return Fnreverse (result); | |
| 145 } | |
| 146 | |
| 147 #if 0 | |
| 148 | |
| 149 /* This approach is too simplistic. The problem is that the | |
| 150 dynamic color settings apply to *all* text in the default color, | |
| 151 not just the text output after the escape sequence has been given. */ | |
| 152 | |
| 153 DEFUN ("set-tty-dynamic-color-specs", Fset_tty_dynamic_color_specs, 2, 2, 0, /* | |
| 154 Set the dynamic color specifications for TTY's. | |
| 155 FG and BG should be either nil or vaguely printf-like strings, | |
| 156 where each occurrence of %s is replaced with the color name and each | |
| 157 occurrence of %% is replaced with a single % character. | |
| 158 */ | |
| 159 (fg, bg)) | |
| 160 { | |
| 161 if (!NILP (fg)) | |
| 162 CHECK_STRING (fg); | |
| 163 if (!NILP (bg)) | |
| 164 CHECK_STRING (bg); | |
| 165 | |
| 166 Vtty_dynamic_color_fg = fg; | |
| 167 Vtty_dynamic_color_bg = bg; | |
| 168 | |
| 169 return Qnil; | |
| 170 } | |
| 171 | |
| 172 DEFUN ("tty-dynamic-color-specs", Ftty_dynamic_color_specs, 0, 0, 0, /* | |
| 173 Return the dynamic color specifications for TTY's as a list of (FG BG). | |
| 174 See `set-tty-dynamic-color-specs'. | |
| 175 */ | |
| 176 ()) | |
| 177 { | |
| 178 return list2 (Vtty_dynamic_color_fg, Vtty_dynamic_color_bg); | |
| 179 } | |
| 180 | |
| 181 #endif /* 0 */ | |
| 182 | |
| 183 static int | |
| 440 | 184 tty_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name, |
| 2286 | 185 Lisp_Object UNUSED (device), |
| 186 Error_Behavior UNUSED (errb)) | |
| 428 | 187 { |
| 188 Lisp_Object result; | |
| 189 | |
| 190 name = Fintern (name, Qnil); | |
| 191 result = assq_no_quit (name, Vtty_color_alist); | |
| 192 | |
| 193 if (NILP (result)) | |
| 194 { | |
| 195 #if 0 | |
| 196 if (!STRINGP (Vtty_dynamic_color_fg) | |
| 197 && !STRINGP (Vtty_dynamic_color_bg)) | |
| 198 #endif | |
| 199 return 0; | |
| 200 } | |
| 201 | |
| 202 /* Don't allocate the data until we're sure that we will succeed. */ | |
| 3092 | 203 #ifdef NEW_GC |
| 204 c->data = alloc_lrecord_type (struct tty_color_instance_data, | |
| 205 &lrecord_tty_color_instance_data); | |
| 206 #else /* not NEW_GC */ | |
| 428 | 207 c->data = xnew (struct tty_color_instance_data); |
| 3092 | 208 #endif /* not NEW_GC */ |
| 428 | 209 COLOR_INSTANCE_TTY_SYMBOL (c) = name; |
| 210 | |
| 211 return 1; | |
| 212 } | |
| 213 | |
| 214 static void | |
| 440 | 215 tty_mark_color_instance (Lisp_Color_Instance *c) |
| 428 | 216 { |
| 217 mark_object (COLOR_INSTANCE_TTY_SYMBOL (c)); | |
| 218 } | |
| 219 | |
| 220 static void | |
| 2286 | 221 tty_print_color_instance (Lisp_Color_Instance *UNUSED (c), |
| 222 Lisp_Object UNUSED (printcharfun), | |
| 223 int UNUSED (escapeflag)) | |
| 428 | 224 { |
| 225 } | |
| 226 | |
| 227 static void | |
|
4710
3a87551bfeb5
Fixes for a number of minor warnings issued by gcc. See xemacs-patches message
Jerry James <james@xemacs.org>
parents:
4353
diff
changeset
|
228 tty_finalize_color_instance (Lisp_Color_Instance *UNUSED_IF_NEW_GC (c)) |
| 428 | 229 { |
| 4141 | 230 #ifndef NEW_GC |
| 428 | 231 if (c->data) |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
232 xfree (c->data); |
| 4141 | 233 #endif /* not NEW_GC */ |
| 4117 | 234 } |
| 428 | 235 |
| 236 static int | |
| 440 | 237 tty_color_instance_equal (Lisp_Color_Instance *c1, |
| 238 Lisp_Color_Instance *c2, | |
| 2286 | 239 int UNUSED (depth)) |
| 428 | 240 { |
| 241 return (EQ (COLOR_INSTANCE_TTY_SYMBOL (c1), | |
| 242 COLOR_INSTANCE_TTY_SYMBOL (c2))); | |
| 243 } | |
| 244 | |
| 2515 | 245 static Hashcode |
| 2286 | 246 tty_color_instance_hash (Lisp_Color_Instance *c, int UNUSED (depth)) |
| 428 | 247 { |
| 248 return LISP_HASH (COLOR_INSTANCE_TTY_SYMBOL (c)); | |
| 249 } | |
| 250 | |
| 251 static int | |
| 2286 | 252 tty_valid_color_name_p (struct device *UNUSED (d), Lisp_Object color) |
| 428 | 253 { |
| 254 return (!NILP (assoc_no_quit (Fintern (color, Qnil), Vtty_color_alist))); | |
| 255 #if 0 | |
| 256 || STRINGP (Vtty_dynamic_color_fg) | |
| 257 || STRINGP (Vtty_dynamic_color_bg) | |
| 258 #endif | |
| 259 } | |
| 260 | |
| 261 | |
| 262 static int | |
| 440 | 263 tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, |
| 2286 | 264 Lisp_Object UNUSED (device), |
| 265 Error_Behavior UNUSED (errb)) | |
| 428 | 266 { |
| 867 | 267 Ibyte *str = XSTRING_DATA (name); |
| 428 | 268 Lisp_Object charset = Qnil; |
| 269 | |
| 2367 | 270 if (qxestrncmp_ascii (str, "normal", 6)) |
| 428 | 271 return 0; |
| 272 str += 6; | |
| 273 if (*str) | |
| 274 { | |
| 275 #ifdef MULE | |
| 276 if (*str != '/') | |
| 277 return 0; | |
| 278 str++; | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
279 charset = Ffind_charset (intern_istring (str)); |
| 428 | 280 if (NILP (charset)) |
| 281 return 0; | |
| 282 #else | |
| 283 return 0; | |
| 284 #endif | |
| 285 } | |
| 286 | |
| 287 /* Don't allocate the data until we're sure that we will succeed. */ | |
| 3092 | 288 #ifdef NEW_GC |
| 289 f->data = alloc_lrecord_type (struct tty_font_instance_data, | |
| 290 &lrecord_tty_font_instance_data); | |
| 291 #else /* not NEW_GC */ | |
| 428 | 292 f->data = xnew (struct tty_font_instance_data); |
| 3092 | 293 #endif /* not NEW_GC */ |
| 428 | 294 FONT_INSTANCE_TTY_CHARSET (f) = charset; |
| 295 #ifdef MULE | |
| 296 if (CHARSETP (charset)) | |
| 297 f->width = XCHARSET_COLUMNS (charset); | |
| 298 else | |
| 299 #endif | |
| 300 f->width = 1; | |
| 301 | |
| 302 f->proportional_p = 0; | |
| 303 f->ascent = f->height = 1; | |
| 304 f->descent = 0; | |
| 305 | |
| 306 return 1; | |
| 307 } | |
| 308 | |
| 309 static void | |
| 440 | 310 tty_mark_font_instance (Lisp_Font_Instance *f) |
| 428 | 311 { |
| 312 mark_object (FONT_INSTANCE_TTY_CHARSET (f)); | |
| 313 } | |
| 314 | |
| 315 static void | |
| 2286 | 316 tty_print_font_instance (Lisp_Font_Instance *UNUSED (f), |
| 317 Lisp_Object UNUSED (printcharfun), | |
| 318 int UNUSED (escapeflag)) | |
| 428 | 319 { |
| 320 } | |
| 321 | |
| 322 static void | |
|
4710
3a87551bfeb5
Fixes for a number of minor warnings issued by gcc. See xemacs-patches message
Jerry James <james@xemacs.org>
parents:
4353
diff
changeset
|
323 tty_finalize_font_instance (Lisp_Font_Instance *UNUSED_IF_NEW_GC (f)) |
| 428 | 324 { |
| 4141 | 325 #ifndef NEW_GC |
| 428 | 326 if (f->data) |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
327 xfree (f->data); |
| 4141 | 328 #endif /* not NEW_GC */ |
| 4117 | 329 } |
| 428 | 330 |
| 331 static Lisp_Object | |
| 2527 | 332 tty_font_list (Lisp_Object UNUSED (pattern), Lisp_Object UNUSED (device), |
| 2286 | 333 Lisp_Object UNUSED (maxnumber)) |
| 428 | 334 { |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4710
diff
changeset
|
335 return list1 (build_ascstring ("normal")); |
| 428 | 336 } |
| 337 | |
| 338 #ifdef MULE | |
| 339 | |
| 340 static int | |
| 2286 | 341 tty_font_spec_matches_charset (struct device *UNUSED (d), Lisp_Object charset, |
| 867 | 342 const Ibyte *nonreloc, Lisp_Object reloc, |
| 872 | 343 Bytecount offset, Bytecount length, |
| 3841 | 344 enum font_specifier_matchspec_stages stage) |
| 428 | 345 { |
| 867 | 346 const Ibyte *the_nonreloc = nonreloc; |
| 428 | 347 |
|
5015
d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
Ben Wing <ben@xemacs.org>
parents:
4976
diff
changeset
|
348 if (stage == STAGE_FINAL) |
| 872 | 349 return 0; |
| 350 | |
| 428 | 351 if (!the_nonreloc) |
| 352 the_nonreloc = XSTRING_DATA (reloc); | |
| 353 fixup_internal_substring (nonreloc, reloc, offset, &length); | |
| 354 the_nonreloc += offset; | |
| 355 | |
|
4353
4143b78d0df0
Merge an old patch of Ben's, involving font instantiation and charsets.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4141
diff
changeset
|
356 if (NILP (charset)) |
| 428 | 357 return !memchr (the_nonreloc, '/', length); |
| 867 | 358 the_nonreloc = (const Ibyte *) memchr (the_nonreloc, '/', length); |
| 428 | 359 if (!the_nonreloc) |
| 360 return 0; | |
| 361 the_nonreloc++; | |
| 362 { | |
| 793 | 363 Lisp_Object s = symbol_name (XSYMBOL (XCHARSET_NAME (charset))); |
| 364 return !qxestrcmp (the_nonreloc, XSTRING_DATA (s)); | |
| 428 | 365 } |
| 366 } | |
| 367 | |
| 368 /* find a font spec that matches font spec FONT and also matches | |
| 369 (the registry of) CHARSET. */ | |
| 370 static Lisp_Object | |
| 371 tty_find_charset_font (Lisp_Object device, Lisp_Object font, | |
| 3659 | 372 Lisp_Object charset, |
| 373 enum font_specifier_matchspec_stages stage) | |
| 428 | 374 { |
| 867 | 375 Ibyte *fontname = XSTRING_DATA (font); |
| 428 | 376 |
|
5015
d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
Ben Wing <ben@xemacs.org>
parents:
4976
diff
changeset
|
377 if (stage == STAGE_FINAL) |
| 872 | 378 return Qnil; |
| 379 | |
| 442 | 380 if (strchr ((const char *) fontname, '/')) |
| 428 | 381 { |
| 382 if (tty_font_spec_matches_charset (XDEVICE (device), charset, 0, | |
|
5015
d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
Ben Wing <ben@xemacs.org>
parents:
4976
diff
changeset
|
383 font, 0, -1, STAGE_INITIAL)) |
| 428 | 384 return font; |
| 385 return Qnil; | |
| 386 } | |
| 387 | |
|
4353
4143b78d0df0
Merge an old patch of Ben's, involving font instantiation and charsets.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4141
diff
changeset
|
388 if (NILP (charset)) |
| 428 | 389 return font; |
| 390 | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4710
diff
changeset
|
391 return concat3 (font, build_ascstring ("/"), |
| 428 | 392 Fsymbol_name (XCHARSET_NAME (charset))); |
| 393 } | |
| 394 | |
| 395 #endif /* MULE */ | |
| 396 | |
| 397 | |
| 398 /************************************************************************/ | |
| 399 /* initialization */ | |
| 400 /************************************************************************/ | |
| 401 | |
| 402 void | |
| 403 syms_of_objects_tty (void) | |
| 404 { | |
| 3092 | 405 #ifdef NEW_GC |
| 406 INIT_LRECORD_IMPLEMENTATION (tty_color_instance_data); | |
| 407 INIT_LRECORD_IMPLEMENTATION (tty_font_instance_data); | |
| 408 #endif /* NEW_GC */ | |
| 409 | |
| 428 | 410 DEFSUBR (Fregister_tty_color); |
| 411 DEFSUBR (Funregister_tty_color); | |
| 412 DEFSUBR (Ffind_tty_color); | |
| 413 #if 0 | |
| 414 DEFSUBR (Fset_tty_dynamic_color_specs); | |
| 415 DEFSUBR (Ftty_dynamic_color_specs); | |
| 416 #endif | |
| 417 } | |
| 418 | |
| 419 void | |
| 420 console_type_create_objects_tty (void) | |
| 421 { | |
| 422 /* object methods */ | |
| 423 CONSOLE_HAS_METHOD (tty, initialize_color_instance); | |
| 424 CONSOLE_HAS_METHOD (tty, mark_color_instance); | |
| 425 CONSOLE_HAS_METHOD (tty, print_color_instance); | |
| 426 CONSOLE_HAS_METHOD (tty, finalize_color_instance); | |
| 427 CONSOLE_HAS_METHOD (tty, color_instance_equal); | |
| 428 CONSOLE_HAS_METHOD (tty, color_instance_hash); | |
| 429 CONSOLE_HAS_METHOD (tty, valid_color_name_p); | |
| 2527 | 430 CONSOLE_HAS_METHOD (tty, color_list); |
| 428 | 431 |
| 432 CONSOLE_HAS_METHOD (tty, initialize_font_instance); | |
| 433 CONSOLE_HAS_METHOD (tty, mark_font_instance); | |
| 434 CONSOLE_HAS_METHOD (tty, print_font_instance); | |
| 435 CONSOLE_HAS_METHOD (tty, finalize_font_instance); | |
| 2527 | 436 CONSOLE_HAS_METHOD (tty, font_list); |
| 428 | 437 #ifdef MULE |
| 438 CONSOLE_HAS_METHOD (tty, font_spec_matches_charset); | |
| 439 CONSOLE_HAS_METHOD (tty, find_charset_font); | |
| 440 #endif | |
| 441 } | |
| 442 | |
| 443 void | |
| 444 vars_of_objects_tty (void) | |
| 445 { | |
| 446 staticpro (&Vtty_color_alist); | |
| 447 Vtty_color_alist = Qnil; | |
| 448 | |
| 449 #if 0 | |
| 450 staticpro (&Vtty_dynamic_color_fg); | |
| 451 Vtty_dynamic_color_fg = Qnil; | |
| 452 | |
| 453 staticpro (&Vtty_dynamic_color_bg); | |
| 454 Vtty_dynamic_color_bg = Qnil; | |
| 455 #endif | |
| 456 } |