Mercurial > hg > xemacs-beta
annotate src/frame-tty.c @ 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 | e34711681f30 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* TTY frame functions. |
| 771 | 2 Copyright (C) 1995, 1997 Free Software Foundation, Inc. |
| 3 Copyright (C) 1995, 1996, 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 /* Written by Ben Wing. | |
| 25 Multi-frame support added by Hrvoje Niksic. */ | |
| 26 | |
| 27 #include <config.h> | |
| 28 #include "lisp.h" | |
| 29 | |
| 872 | 30 #include "device-impl.h" |
| 800 | 31 #include "events.h" |
| 872 | 32 #include "frame-impl.h" |
| 428 | 33 |
| 872 | 34 #include "console-tty-impl.h" |
| 428 | 35 |
| 36 | |
| 37 /* Default properties to use when creating frames. */ | |
| 38 Lisp_Object Vdefault_tty_frame_plist; | |
| 39 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3025
diff
changeset
|
40 Lisp_Object Qframe_number, Qmake_frame_after_init_entry_point; |
| 771 | 41 |
| 428 | 42 static void tty_raise_frame (struct frame *); |
| 43 | |
| 44 | |
| 45 static void | |
| 2286 | 46 tty_init_frame_1 (struct frame *f, Lisp_Object UNUSED (props), |
| 771 | 47 int frame_name_is_defaulted) |
| 428 | 48 { |
| 49 struct device *d = XDEVICE (FRAME_DEVICE (f)); | |
| 50 struct console *c = XCONSOLE (DEVICE_CONSOLE (d)); | |
| 51 | |
| 52 ++CONSOLE_TTY_DATA (c)->frame_count; | |
| 53 f->order_count = CONSOLE_TTY_DATA (c)->frame_count; | |
| 54 f->height = CONSOLE_TTY_DATA (c)->height; | |
| 55 f->width = CONSOLE_TTY_DATA (c)->width; | |
| 771 | 56 if (frame_name_is_defaulted) |
| 57 f->name = emacs_sprintf_string ("F%d", f->order_count); | |
| 428 | 58 } |
| 59 | |
| 60 static void | |
| 61 tty_init_frame_3 (struct frame *f) | |
| 62 { | |
| 63 tty_raise_frame (f); | |
| 64 } | |
| 65 | |
| 66 static void | |
| 67 tty_select_frame_if_unhidden (Lisp_Object frame) | |
| 68 { | |
| 69 if (FRAME_REPAINT_P (XFRAME (frame))) | |
| 70 select_frame_1 (frame); | |
| 71 } | |
| 72 | |
| 73 static void | |
| 74 tty_schedule_frame_select (struct frame *f) | |
| 75 { | |
| 793 | 76 Lisp_Object frame = wrap_frame (f); |
| 428 | 77 |
| 78 enqueue_magic_eval_event (tty_select_frame_if_unhidden, frame); | |
| 79 } | |
| 80 | |
| 81 static void | |
| 2286 | 82 tty_after_init_frame (struct frame *f, int UNUSED (first_on_device), |
| 428 | 83 int first_on_console) |
| 84 { | |
| 85 if (first_on_console) | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3025
diff
changeset
|
86 call1 (Qmake_frame_after_init_entry_point, FRAME_CONSOLE (f)); |
| 428 | 87 } |
| 88 | |
| 89 /* Change from withdrawn state to mapped state. */ | |
| 90 static void | |
| 91 tty_make_frame_visible (struct frame *f) | |
| 92 { | |
| 771 | 93 if (!FRAME_VISIBLE_P (f)) |
| 428 | 94 { |
| 95 f->visible = -1; | |
| 96 } | |
| 97 } | |
| 98 | |
| 99 /* Change from mapped state to withdrawn state. */ | |
| 100 static void | |
| 101 tty_make_frame_invisible (struct frame *f) | |
| 102 { | |
| 103 f->visible = 0; | |
| 104 } | |
| 105 | |
| 106 static void | |
| 107 tty_make_frame_hidden (struct frame *f) | |
| 108 { | |
| 109 f->visible = -1; | |
| 110 } | |
| 111 | |
| 112 static void | |
| 113 tty_make_frame_unhidden (struct frame *f) | |
| 114 { | |
| 771 | 115 if (!FRAME_REPAINT_P (f)) |
| 428 | 116 { |
| 771 | 117 SET_FRAME_CLEAR (f); |
| 428 | 118 f->visible = 1; |
| 119 } | |
| 120 } | |
| 121 | |
| 122 static int | |
| 123 tty_frame_visible_p (struct frame *f) | |
| 124 { | |
| 125 return FRAME_VISIBLE_P (f); | |
| 126 } | |
| 127 | |
| 128 static void | |
| 129 tty_raise_frame_no_select (struct frame *f) | |
| 130 { | |
| 131 LIST_LOOP_2 (frame, DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f)))) | |
| 132 { | |
| 133 struct frame *o = XFRAME (frame); | |
| 134 if (o != f && FRAME_REPAINT_P (o)) | |
| 135 { | |
| 136 tty_make_frame_hidden (o); | |
| 137 break; | |
| 138 } | |
| 139 } | |
| 140 tty_make_frame_unhidden (f); | |
| 141 } | |
| 142 | |
| 143 static void | |
| 144 tty_raise_frame (struct frame *f) | |
| 145 { | |
| 146 tty_raise_frame_no_select (f); | |
| 147 tty_schedule_frame_select (f); | |
| 148 } | |
| 149 | |
| 150 static void | |
| 151 tty_lower_frame (struct frame *f) | |
| 152 { | |
| 153 Lisp_Object frame_list = DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f))); | |
| 3025 | 154 Lisp_Object tail, new_; |
| 428 | 155 |
| 156 if (!FRAME_REPAINT_P (f)) | |
| 157 return; | |
| 158 | |
| 159 LIST_LOOP (tail, frame_list) | |
| 160 { | |
| 161 if (f == XFRAME (XCAR (tail))) | |
| 162 break; | |
| 163 } | |
| 164 | |
| 165 /* To lower this frame, another frame has to be raised. Return if | |
| 166 there is no other frame. */ | |
| 771 | 167 if (NILP (tail) && EQ (frame_list, tail)) |
| 428 | 168 return; |
| 169 | |
| 170 tty_make_frame_hidden (f); | |
| 171 if (CONSP (XCDR (tail))) | |
| 3025 | 172 new_ = XCAR (XCDR (tail)); |
| 428 | 173 else |
| 3025 | 174 new_ = XCAR (frame_list); |
| 175 tty_make_frame_unhidden (XFRAME (new_)); | |
| 176 tty_schedule_frame_select (XFRAME (new_)); | |
| 428 | 177 } |
| 178 | |
| 179 static void | |
| 180 tty_delete_frame (struct frame *f) | |
| 181 { | |
| 182 struct device *d = XDEVICE (FRAME_DEVICE (f)); | |
| 183 | |
| 184 if (!NILP (DEVICE_SELECTED_FRAME (d))) | |
| 185 tty_raise_frame (XFRAME (DEVICE_SELECTED_FRAME (d))); | |
| 186 } | |
| 771 | 187 |
| 188 static Lisp_Object | |
| 189 tty_frame_property (struct frame *f, Lisp_Object property) | |
| 190 { | |
| 191 if (EQ (Qframe_number, property)) | |
| 192 return make_int (f->order_count); | |
| 193 | |
| 194 return Qunbound; | |
| 195 } | |
| 196 | |
| 197 static int | |
| 2286 | 198 tty_internal_frame_property_p (struct frame *UNUSED (f), Lisp_Object property) |
| 771 | 199 { |
| 200 return EQ (property, Qframe_number); | |
| 201 } | |
| 202 | |
| 203 static Lisp_Object | |
| 204 tty_frame_properties (struct frame *f) | |
| 205 { | |
| 206 Lisp_Object props = Qnil; | |
| 207 | |
| 208 props = cons3 (Qframe_number, make_int (f->order_count), props); | |
| 209 | |
| 210 return props; | |
| 211 } | |
| 428 | 212 |
| 213 /************************************************************************/ | |
| 214 /* initialization */ | |
| 215 /************************************************************************/ | |
| 216 | |
| 217 void | |
| 218 console_type_create_frame_tty (void) | |
| 219 { | |
| 220 CONSOLE_HAS_METHOD (tty, init_frame_1); | |
| 221 CONSOLE_HAS_METHOD (tty, init_frame_3); | |
| 222 CONSOLE_HAS_METHOD (tty, after_init_frame); | |
| 223 CONSOLE_HAS_METHOD (tty, make_frame_visible); | |
| 224 CONSOLE_HAS_METHOD (tty, make_frame_invisible); | |
| 225 CONSOLE_HAS_METHOD (tty, frame_visible_p); | |
| 226 CONSOLE_HAS_METHOD (tty, raise_frame); | |
| 227 CONSOLE_HAS_METHOD (tty, lower_frame); | |
| 228 CONSOLE_HAS_METHOD (tty, delete_frame); | |
| 771 | 229 CONSOLE_HAS_METHOD (tty, frame_property); |
| 230 CONSOLE_HAS_METHOD (tty, internal_frame_property_p); | |
| 231 CONSOLE_HAS_METHOD (tty, frame_properties); | |
| 232 } | |
| 233 | |
| 234 void | |
| 235 syms_of_frame_tty (void) | |
| 236 { | |
| 237 DEFSYMBOL (Qframe_number); | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3025
diff
changeset
|
238 DEFSYMBOL (Qmake_frame_after_init_entry_point); |
| 428 | 239 } |
| 240 | |
| 241 void | |
| 242 vars_of_frame_tty (void) | |
| 243 { | |
| 244 DEFVAR_LISP ("default-tty-frame-plist", &Vdefault_tty_frame_plist /* | |
| 245 Plist of default frame-creation properties for tty frames. | |
| 246 These are in addition to and override what is specified in | |
| 247 `default-frame-plist', but are overridden by the arguments to the | |
| 248 particular call to `make-frame'. | |
| 249 */ ); | |
| 250 Vdefault_tty_frame_plist = Qnil; | |
| 251 | |
| 252 tty_console_methods->device_specific_frame_props = | |
| 253 &Vdefault_tty_frame_plist; | |
| 254 | |
| 255 /* Tty frames are now supported. Advertise a feature to indicate this. */ | |
| 256 Fprovide (intern ("tty-frames")); | |
| 257 } |