Mercurial > hg > xemacs-beta
annotate src/console-tty-impl.h @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | a9c41067dd88 |
| children | 5256fedd50e6 308d34e9f07d |
| rev | line source |
|---|---|
| 872 | 1 /* Define TTY specific console, device, and frame object for XEmacs. |
| 2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 3 Copyright (C) 1996 Ben Wing. | |
| 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 /* Written by Chuck Thompson and Ben Wing. */ | |
| 25 | |
| 26 /* NOTE: Currently each TTY console can have only one device. | |
| 27 Therefore, all stuff for both input and output is lumped into | |
| 28 the console structure. If it ever becomes meaningful to | |
| 29 have more than one device on a TTY console, the output stuff | |
| 30 will have to get separated out. */ | |
| 31 | |
| 32 #ifndef INCLUDED_console_tty_impl_h_ | |
| 33 #define INCLUDED_console_tty_impl_h_ | |
| 34 | |
| 35 #include "console-impl.h" | |
| 36 #include "console-tty.h" | |
| 37 | |
| 38 DECLARE_CONSOLE_TYPE (tty); | |
| 39 | |
| 40 struct tty_console | |
| 41 { | |
| 3092 | 42 #ifdef NEW_GC |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
43 NORMAL_LISP_OBJECT_HEADER header; |
| 3092 | 44 #endif /* NEW_GC */ |
| 872 | 45 int infd, outfd; |
| 46 Lisp_Object instream, outstream; | |
| 47 Lisp_Object terminal_type; | |
| 48 Lisp_Object controlling_process; | |
| 49 char *term_entry_buffer; | |
| 50 | |
| 51 /* Physical location of cursor on this console. */ | |
| 52 int cursor_x; | |
| 53 int cursor_y; | |
| 54 | |
| 55 /* The real location of the cursor. The above physical location may | |
| 56 be ahead of where we really are. */ | |
| 57 int real_cursor_x; | |
| 58 int real_cursor_y; | |
| 59 | |
| 60 int final_cursor_x; | |
| 61 int final_cursor_y; | |
| 62 | |
| 63 int height; | |
| 64 int width; | |
| 65 | |
| 66 /* The count of frame number. */ | |
| 67 int frame_count; | |
| 68 | |
| 69 /* flags indicating presence, absence or value of various features */ | |
| 70 struct | |
| 71 { | |
| 72 unsigned int must_write_spaces :1; /* terminal inserts nulls, not | |
| 73 spaces to fill whitespace on | |
| 74 screen */ | |
| 75 unsigned int insert_mode_motion :1; /* cursor movement commands | |
| 76 work while in insert mode */ | |
| 77 unsigned int standout_motion :1; /* cursor movement is graceful | |
| 78 in standout or underline mode */ | |
| 79 unsigned int memory_above_frame :1; /* display retained above screen */ | |
| 80 unsigned int memory_below_frame :1; /* display retained below screen */ | |
| 81 unsigned int meta_key :2; /* 0 == mask off top bit; | |
| 82 1 == top bit is meta; | |
| 83 2 == top bit is useful as | |
| 84 character info */ | |
| 85 unsigned int flow_control :1; /* Nonzero means use ^S/^Q as | |
| 86 cretinous flow control. */ | |
| 87 int standout_width; /* # of spaces printed when | |
| 88 change to standout mode */ | |
| 89 int underline_width; /* # of spaces printed when | |
| 90 change to underline mode */ | |
| 91 } flags; | |
| 92 | |
| 93 /* cursor motion entries - each entry is commented with the terminfo | |
| 94 and the termcap entry */ | |
| 95 struct | |
| 96 { | |
| 97 /* local cursor movement */ | |
| 98 const char *up; /* cuu1, up */ | |
| 99 const char *down; /* cud1, do */ | |
| 100 const char *left; /* cub1, le */ | |
| 101 const char *right; /* cuf1, nd */ | |
| 102 const char *home; /* home, ho */ | |
| 103 const char *low_left; /* ll, ll */ | |
| 104 const char *car_return; /* cr, cr */ | |
| 105 | |
| 106 /* parameterized local cursor movement */ | |
| 107 const char *multi_up; /* cuu, UP */ | |
| 108 const char *multi_down; /* cud, DO */ | |
| 109 const char *multi_left; /* cub, LE */ | |
| 110 const char *multi_right; /* cuf, RI */ | |
| 111 | |
| 112 /* absolute cursor motion */ | |
| 113 const char *abs; /* cup, cm */ | |
| 114 const char *hor_abs; /* hpa, ch */ | |
| 115 const char *ver_abs; /* vpa, cv */ | |
| 116 | |
| 117 /* scrolling */ | |
| 118 const char *scroll_forw; /* ind, sf */ | |
| 119 const char *scroll_back; /* ri, sr */ | |
| 120 const char *multi_scroll_forw; /* indn, SF */ | |
| 121 const char *multi_scroll_back; /* rin, SR */ | |
| 122 const char *set_scroll_region; /* csr, cs */ | |
| 123 } cm; | |
| 124 | |
| 125 /* screen editing entries - each entry is commented with the | |
| 126 terminfo and the termcap entry */ | |
| 127 struct | |
| 128 { | |
| 129 /* adding to the screen */ | |
| 130 const char *ins_line; /* il1, al */ | |
| 131 const char *multi_ins_line; /* il, AL */ | |
| 132 const char *repeat; /* rep, rp */ | |
| 133 const char *begin_ins_mode; /* smir, im */ | |
| 134 const char *end_ins_mode; /* rmir, ei */ | |
| 135 const char *ins_char; /* ich1, ic */ | |
| 136 const char *multi_ins_char; /* ich, IC */ | |
| 137 const char *insert_pad; /* ip, ip */ | |
| 138 | |
| 139 /* deleting from the screen */ | |
| 140 const char *clr_frame; /* clear, cl */ | |
| 141 const char *clr_from_cursor; /* ed, cd */ | |
| 142 const char *clr_to_eol; /* el, ce */ | |
| 143 const char *del_line; /* dl1, dl */ | |
| 144 const char *multi_del_line; /* dl, DL */ | |
| 145 const char *del_char; /* dch1, dc */ | |
| 146 const char *multi_del_char; /* dch, DC */ | |
| 147 const char *begin_del_mode; /* smdc, dm */ | |
| 148 const char *end_del_mode; /* rmdc, ed */ | |
| 149 const char *erase_at_cursor; /* ech, ec */ | |
| 150 } se; | |
| 151 | |
| 152 /* screen display entries - each entry is commented with the | |
| 153 terminfo and termcap entry */ | |
| 154 struct | |
| 155 { | |
| 156 const char *begin_standout; /* smso, so */ | |
| 157 const char *end_standout; /* rmso, se */ | |
| 158 const char *begin_underline; /* smul, us */ | |
| 159 const char *end_underline; /* rmul, ue */ | |
| 160 const char *begin_alternate; /* smacs, as */ | |
| 161 const char *end_alternate; /* rmacs, ae */ | |
| 162 | |
| 163 const char *turn_on_reverse; /* rev, mr */ | |
| 164 const char *turn_on_blinking; /* blink, mb */ | |
| 165 const char *turn_on_bold; /* bold, md */ | |
| 166 const char *turn_on_dim; /* dim, mh */ | |
| 167 const char *turn_off_attributes; /* sgr0, me */ | |
| 168 | |
| 169 const char *visual_bell; /* flash, vb */ | |
| 170 const char *audio_bell; /* bel, bl */ | |
| 171 | |
| 172 const char *cursor_visible; /* cvvis, vs */ | |
| 173 const char *cursor_normal; /* cnorm, ve */ | |
| 174 const char *init_motion; /* smcup, ti */ | |
| 175 const char *end_motion; /* rmcup, te */ | |
| 176 const char *keypad_on; /* smkx, ks */ | |
| 177 const char *keypad_off; /* rmkx, ke */ | |
| 178 | |
| 179 const char *orig_pair; /* op, op */ | |
| 180 } sd; | |
| 181 | |
| 182 /* costs of various operations */ | |
| 183 struct | |
| 184 { | |
| 185 int cm_up; | |
| 186 int cm_down; | |
| 187 int cm_left; | |
| 188 int cm_right; | |
| 189 int cm_home; | |
| 190 int cm_low_left; | |
| 191 int cm_car_return; | |
| 192 int cm_abs; | |
| 193 int cm_hor_abs; | |
| 194 int cm_ver_abs; | |
| 195 } cost; | |
| 196 | |
| 197 /* The initial tty mode bits */ | |
| 198 struct emacs_tty old_tty; | |
| 199 | |
| 200 /* Is this TTY our controlling terminal? */ | |
| 201 unsigned int controlling_terminal :1; | |
| 202 unsigned int is_stdio :1; | |
| 3571 | 203 /* Do East Asian chars take up two columns? */ |
| 204 unsigned int multiple_width :1; | |
| 872 | 205 }; |
| 206 | |
| 3092 | 207 #ifdef NEW_GC |
| 208 typedef struct tty_console Lisp_Tty_Console; | |
| 209 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3571
diff
changeset
|
210 DECLARE_LISP_OBJECT (tty_console, Lisp_Tty_Console); |
| 3092 | 211 |
| 212 #define XTTY_CONSOLE(x) \ | |
| 213 XRECORD (x, tty_console, Lisp_Tty_Console) | |
| 214 #define wrap_tty_console(p) wrap_record (p, tty_console) | |
| 215 #define TTY_CONSOLE_P(x) RECORDP (x, tty_console) | |
| 216 #endif /* NEW_GC */ | |
| 217 | |
| 872 | 218 #define CONSOLE_TTY_DATA(c) CONSOLE_TYPE_DATA (c, tty) |
| 219 #define CONSOLE_TTY_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->cursor_x) | |
| 220 #define CONSOLE_TTY_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->cursor_y) | |
| 221 #define CONSOLE_TTY_REAL_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->real_cursor_x) | |
| 222 #define CONSOLE_TTY_REAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->real_cursor_y) | |
| 223 #define CONSOLE_TTY_FINAL_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->final_cursor_x) | |
| 224 #define CONSOLE_TTY_FINAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->final_cursor_y) | |
| 225 | |
| 3571 | 226 /* In a more ideal world where available terminfo files actually included |
| 227 information on whether a given TTY supports double-width characters or | |
| 228 not, oh, and where Mule was not conditional, SUPPORTS_MULTIPLE_WIDTH | |
| 229 would be as console-specific as its syntax implies. | |
| 230 | |
| 231 In this world, this is overengineering more than it is anything. */ | |
| 232 #define CONSOLE_TTY_SUPPORTS_MULTIPLE_WIDTH(c) (1 != MAX_ICHAR_LEN) | |
| 233 #define CONSOLE_TTY_MULTIPLE_WIDTH(c) \ | |
| 234 (CONSOLE_TTY_SUPPORTS_MULTIPLE_WIDTH(c) ? \ | |
| 235 CONSOLE_TTY_DATA (c)->multiple_width : (0)) | |
| 236 | |
| 872 | 237 #define TTY_CM(c) (CONSOLE_TTY_DATA (c)->cm) |
| 238 #define TTY_SE(c) (CONSOLE_TTY_DATA (c)->se) | |
| 239 #define TTY_SD(c) (CONSOLE_TTY_DATA (c)->sd) | |
| 240 #define TTY_FLAGS(c) (CONSOLE_TTY_DATA (c)->flags) | |
| 241 #define TTY_COST(c) (CONSOLE_TTY_DATA (c)->cost) | |
| 242 | |
| 243 #define TTY_INC_CURSOR_X(c, n) do { \ | |
| 244 int TICX_n = (n); \ | |
| 245 assert (CONSOLE_TTY_CURSOR_X (c) == CONSOLE_TTY_REAL_CURSOR_X (c)); \ | |
| 246 CONSOLE_TTY_CURSOR_X (c) += TICX_n; \ | |
| 247 CONSOLE_TTY_REAL_CURSOR_X (c) += TICX_n; \ | |
| 248 } while (0) | |
| 249 | |
| 250 #define TTY_INC_CURSOR_Y(c, n) do { \ | |
| 251 int TICY_n = (n); \ | |
| 252 CONSOLE_TTY_CURSOR_Y (c) += TICY_n; \ | |
| 253 CONSOLE_TTY_REAL_CURSOR_Y (c) += TICY_n; \ | |
| 254 } while (0) | |
| 255 | |
| 256 struct tty_device | |
| 257 { | |
| 3092 | 258 #ifdef NEW_GC |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
259 NORMAL_LISP_OBJECT_HEADER header; |
| 3092 | 260 #endif /* NEW_GC */ |
| 872 | 261 #ifdef HAVE_TERMIOS |
| 262 speed_t ospeed; /* Output speed (from sg_ospeed) */ | |
| 263 #else | |
| 264 short ospeed; /* Output speed (from sg_ospeed) */ | |
| 265 #endif | |
| 266 }; | |
| 267 | |
| 3092 | 268 #ifdef NEW_GC |
| 269 typedef struct tty_device Lisp_Tty_Device; | |
| 270 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3571
diff
changeset
|
271 DECLARE_LISP_OBJECT (tty_device, Lisp_Tty_Device); |
| 3092 | 272 |
| 273 #define XTTY_DEVICE(x) \ | |
| 274 XRECORD (x, tty_device, Lisp_Tty_Device) | |
| 275 #define wrap_tty_device(p) wrap_record (p, tty_device) | |
| 276 #define TTY_DEVICE_P(x) RECORDP (x, tty_device) | |
| 277 #endif /* NEW_GC */ | |
| 278 | |
| 872 | 279 #define DEVICE_TTY_DATA(d) DEVICE_TYPE_DATA (d, tty) |
| 280 | |
| 281 /* termcap requires this to be global */ | |
| 282 #ifndef HAVE_TERMIOS | |
| 283 extern short ospeed; /* Output speed (from sg_ospeed) */ | |
| 284 #endif | |
| 285 | |
| 286 #endif /* INCLUDED_console_tty_impl_h_ */ |