Mercurial > hg > xemacs-beta
annotate src/console-x.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 | 99f8ebc082d9 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Console functions for X windows. |
| 793 | 2 Copyright (C) 1996, 2002 Ben Wing. |
| 428 | 3 |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 442 | 23 /* This file Mule-ized by Ben Wing, 7-10-00. */ |
| 24 | |
| 428 | 25 /* Authorship: |
| 26 | |
| 27 Ben Wing: January 1996, for 19.14. | |
| 28 */ | |
| 29 | |
| 30 #include <config.h> | |
| 31 #include "lisp.h" | |
| 32 | |
| 442 | 33 #include "buffer.h" |
| 2828 | 34 #include "device.h" |
| 35 #include "elhash.h" | |
| 428 | 36 #include "process.h" /* canonicalize_host_name */ |
| 37 #include "redisplay.h" /* for display_arg */ | |
| 38 | |
| 2828 | 39 #include "device-impl.h" |
| 872 | 40 #include "console-x-impl.h" |
| 41 | |
| 428 | 42 DEFINE_CONSOLE_TYPE (x); |
| 43 | |
| 3381 | 44 int wedge_metacity; /* nonzero means update WM_HINTS always */ |
| 45 | |
| 428 | 46 static int |
| 2286 | 47 x_initially_selected_for_input (struct console *UNUSED (con)) |
| 428 | 48 { |
| 49 return 1; | |
| 50 } | |
| 51 | |
| 444 | 52 /* Parse a DISPLAY specification like "host:10.0" or ":0" */ |
| 428 | 53 static void |
| 54 split_up_display_spec (Lisp_Object display, int *hostname_length, | |
| 55 int *display_length, int *screen_length) | |
| 56 { | |
| 867 | 57 Ibyte *beg = XSTRING_DATA (display); |
| 58 Ibyte *end = beg + XSTRING_LENGTH (display); | |
| 59 Ibyte *p = end; | |
| 428 | 60 |
| 444 | 61 while (p > beg) |
| 428 | 62 { |
| 867 | 63 DEC_IBYTEPTR (p); |
| 64 if (itext_ichar (p) == ':') | |
| 444 | 65 { |
| 66 *hostname_length = p - beg; | |
| 428 | 67 |
| 444 | 68 while (p < end - 1) |
| 69 { | |
| 867 | 70 INC_IBYTEPTR (p); |
| 71 if (itext_ichar (p) == '.') | |
| 444 | 72 { |
| 73 *display_length = p - beg - *hostname_length; | |
| 74 *screen_length = end - p; | |
| 75 return; | |
| 76 } | |
| 77 } | |
| 78 /* No '.' found. */ | |
| 79 *display_length = XSTRING_LENGTH (display) - *hostname_length; | |
| 80 *screen_length = 0; | |
| 81 return; | |
| 82 } | |
| 428 | 83 } |
| 84 | |
| 444 | 85 /* No ':' found. */ |
| 86 *hostname_length = XSTRING_LENGTH (display); | |
| 87 *display_length = 0; | |
| 88 *screen_length = 0; | |
| 428 | 89 } |
| 90 | |
| 91 /* Remember, in all of the following functions, we have to verify | |
| 92 the integrity of our input, because the generic functions don't. */ | |
| 93 | |
| 94 static Lisp_Object | |
| 578 | 95 x_device_to_console_connection (Lisp_Object connection, Error_Behavior errb) |
| 428 | 96 { |
| 97 /* Strip the trailing .# off of the connection, if it's there. */ | |
| 98 | |
| 99 if (NILP (connection)) | |
| 100 return Qnil; | |
| 101 else | |
| 102 { | |
| 103 int hostname_length, display_length, screen_length; | |
| 104 | |
| 105 if (!ERRB_EQ (errb, ERROR_ME)) | |
| 106 { | |
| 107 if (!STRINGP (connection)) | |
| 108 return Qunbound; | |
| 109 } | |
| 110 else | |
| 111 CHECK_STRING (connection); | |
| 112 | |
| 113 split_up_display_spec (connection, &hostname_length, &display_length, | |
| 114 &screen_length); | |
| 115 connection = make_string (XSTRING_DATA (connection), | |
| 116 hostname_length + display_length); | |
| 117 } | |
| 118 | |
| 119 return connection; | |
| 120 } | |
| 121 | |
| 122 static Lisp_Object | |
| 123 get_display_arg_connection (void) | |
| 124 { | |
| 442 | 125 const Extbyte *disp_name; |
| 428 | 126 |
| 127 /* If the user didn't explicitly specify a display to use when | |
| 128 they called make-x-device, then we first check to see if a | |
| 129 display was specified on the command line with -display. If | |
| 130 so, we set disp_name to it. Otherwise we use XDisplayName to | |
| 131 see what DISPLAY is set to. XtOpenDisplay knows how to do | |
| 132 both of these things, but we need to know the name to use. */ | |
| 133 if (display_arg) | |
| 134 { | |
| 135 int elt; | |
| 136 int argc; | |
| 442 | 137 Extbyte **argv; |
| 428 | 138 Lisp_Object conn; |
| 139 | |
| 140 make_argc_argv (Vx_initial_argv_list, &argc, &argv); | |
| 141 | |
| 142 disp_name = NULL; | |
| 143 for (elt = 0; elt < argc; elt++) | |
| 144 { | |
| 145 if (!strcmp (argv[elt], "-d") || !strcmp (argv[elt], "-display")) | |
| 146 { | |
| 147 if (elt + 1 == argc) | |
| 148 { | |
| 149 suppress_early_error_handler_backtrace = 1; | |
| 563 | 150 invalid_argument ("-display specified with no arg", Qunbound); |
| 428 | 151 } |
| 152 else | |
| 153 { | |
| 154 disp_name = argv[elt + 1]; | |
| 155 break; | |
| 156 } | |
| 157 } | |
| 158 } | |
| 159 | |
| 160 /* assert: display_arg is only set if we found the display | |
| 161 arg earlier so we can't fail to find it now. */ | |
| 162 assert (disp_name != NULL); | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
163 conn = build_extstring (disp_name, Qcommand_argument_encoding); |
| 428 | 164 free_argc_argv (argv); |
| 165 return conn; | |
| 166 } | |
| 167 else | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
168 return build_extstring (XDisplayName (0), Qx_display_name_encoding); |
| 428 | 169 } |
| 170 | |
| 171 /* "semi-canonicalize" means convert to a nicer form for printing, but | |
| 172 don't completely canonicalize (into some likely ugly form) */ | |
| 173 | |
| 174 static Lisp_Object | |
| 175 x_semi_canonicalize_console_connection (Lisp_Object connection, | |
| 578 | 176 Error_Behavior errb) |
| 428 | 177 { |
| 178 struct gcpro gcpro1; | |
| 179 | |
| 180 GCPRO1 (connection); | |
| 181 | |
| 182 if (NILP (connection)) | |
| 183 connection = get_display_arg_connection (); | |
| 184 else | |
| 185 { | |
| 186 if (!ERRB_EQ (errb, ERROR_ME)) | |
| 187 { | |
| 188 if (!STRINGP (connection)) | |
| 189 RETURN_UNGCPRO (Qunbound); | |
| 190 } | |
| 191 else | |
| 192 CHECK_STRING (connection); | |
| 193 } | |
| 194 | |
| 195 | |
| 196 /* Be lenient, allow people to specify a device connection instead of | |
| 197 a console connection -- e.g. "foo:0.0" instead of "foo:0". This | |
| 198 only happens in `find-console' and `get-console'. */ | |
| 199 connection = x_device_to_console_connection (connection, errb); | |
| 200 | |
| 201 /* Check for a couple of standard special cases */ | |
| 867 | 202 if (string_ichar (connection, 0) == ':') |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
3381
diff
changeset
|
203 connection = concat2 (build_ascstring ("localhost"), connection); |
| 444 | 204 else |
| 205 { | |
| 206 /* connection =~ s/^unix:/localhost:/; */ | |
| 867 | 207 const Ibyte *p = XSTRING_DATA (connection); |
| 208 const Ibyte *end = XSTRING_DATA (connection) + XSTRING_LENGTH (connection); | |
| 647 | 209 int i; |
| 444 | 210 |
| 647 | 211 for (i = 0; i < (int) sizeof ("unix:") - 1; i++) |
| 444 | 212 { |
| 867 | 213 if (p == end || itext_ichar (p) != "unix:"[i]) |
| 444 | 214 goto ok; |
| 867 | 215 INC_IBYTEPTR (p); |
| 444 | 216 } |
| 217 | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
3381
diff
changeset
|
218 connection = concat2 (build_ascstring ("localhost:"), |
| 444 | 219 make_string (p, end - p)); |
| 220 } | |
| 221 ok: | |
| 428 | 222 |
| 223 RETURN_UNGCPRO (connection); | |
| 224 } | |
| 225 | |
| 226 static Lisp_Object | |
| 578 | 227 x_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb) |
| 428 | 228 { |
| 229 Lisp_Object hostname = Qnil; | |
| 230 struct gcpro gcpro1, gcpro2; | |
| 231 | |
| 232 GCPRO2 (connection, hostname); | |
| 233 | |
| 234 connection = x_semi_canonicalize_console_connection (connection, errb); | |
| 235 if (UNBOUNDP (connection)) | |
| 236 RETURN_UNGCPRO (Qunbound); | |
| 237 | |
| 238 { | |
| 239 int hostname_length, display_length, screen_length; | |
| 240 | |
| 241 split_up_display_spec (connection, &hostname_length, &display_length, | |
| 242 &screen_length); | |
|
5089
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5016
diff
changeset
|
243 hostname = Fsubseq (connection, Qzero, make_int (hostname_length)); |
| 428 | 244 hostname = canonicalize_host_name (hostname); |
| 245 connection = concat2 (hostname, | |
| 246 make_string (XSTRING_DATA (connection) | |
| 247 + hostname_length, display_length)); | |
| 248 } | |
| 249 | |
| 250 RETURN_UNGCPRO (connection); | |
| 251 } | |
| 252 | |
| 253 static Lisp_Object | |
| 254 x_semi_canonicalize_device_connection (Lisp_Object connection, | |
| 578 | 255 Error_Behavior errb) |
| 428 | 256 { |
| 257 int hostname_length, display_length, screen_length; | |
| 258 struct gcpro gcpro1; | |
| 259 | |
| 260 GCPRO1 (connection); | |
| 261 if (NILP (connection)) | |
| 262 connection = get_display_arg_connection (); | |
| 263 else | |
| 264 { | |
| 265 if (!ERRB_EQ (errb, ERROR_ME)) | |
| 266 { | |
| 267 if (!STRINGP (connection)) | |
| 268 RETURN_UNGCPRO (Qunbound); | |
| 269 } | |
| 270 else | |
| 271 CHECK_STRING (connection); | |
| 272 } | |
| 273 | |
| 274 split_up_display_spec (connection, &hostname_length, &display_length, | |
| 275 &screen_length); | |
| 276 | |
| 277 if (!screen_length) | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
3381
diff
changeset
|
278 connection = concat2 (connection, build_ascstring (".0")); |
| 428 | 279 RETURN_UNGCPRO (connection); |
| 280 } | |
| 281 | |
| 282 static Lisp_Object | |
| 578 | 283 x_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb) |
| 428 | 284 { |
| 285 int hostname_length, display_length, screen_length; | |
| 286 Lisp_Object screen_str = Qnil; | |
| 287 struct gcpro gcpro1, gcpro2; | |
| 288 | |
| 289 GCPRO2 (screen_str, connection); | |
| 290 connection = x_semi_canonicalize_device_connection (connection, errb); | |
| 291 if (UNBOUNDP (connection)) | |
| 292 RETURN_UNGCPRO (Qunbound); | |
| 293 | |
| 294 split_up_display_spec (connection, &hostname_length, &display_length, | |
| 295 &screen_length); | |
| 296 | |
| 444 | 297 screen_str = make_string (XSTRING_DATA (connection) |
| 298 + hostname_length + display_length, screen_length); | |
| 428 | 299 connection = x_canonicalize_console_connection (connection, errb); |
| 300 | |
| 301 RETURN_UNGCPRO (concat2 (connection, screen_str)); | |
| 302 } | |
| 303 | |
| 2828 | 304 /* Given a key, if it maps to a character and we weren't previously aware |
| 305 that it could be generated on console CON, and if it's unbound in the | |
| 306 global map, bind it to self-insert-command. Return Qt if the binding was | |
| 307 done; Qnil if not. */ | |
| 308 | |
| 309 static Lisp_Object | |
| 310 x_perhaps_init_unseen_key_defaults (struct console *con, Lisp_Object key) | |
| 311 { | |
| 312 KeySym xkeysym; | |
| 313 const Extbyte *keysym_ext; | |
| 314 Lisp_Object key_name, previous_binding = Qnil; | |
| 315 extern Lisp_Object Qcharacter_of_keysym, Vcurrent_global_map; | |
| 316 | |
| 317 /* Getting the device exactly right is not horrendously important; as long | |
| 318 as it's an X11 device it should be okay, because the global keymap (and | |
| 319 whether the key is bound) _is_ global, and any previously seen keysym | |
| 320 will already be bound, or not, in it. However, there is a corner case | |
| 321 where a symbol has been typed, and then explicitly unbound; if the next | |
| 322 event using that symbol comes in on some other frame, it'll get bound | |
| 323 again. This is not realistically an issue. */ | |
| 324 struct device *d = XDEVICE(con->selected_device); | |
| 325 | |
| 326 if (SYMBOLP (key)) | |
| 327 { | |
| 328 key_name = symbol_name(XSYMBOL(key)); | |
| 329 } | |
| 330 else | |
| 331 { | |
| 332 Ibyte buf[MAX_ICHAR_LEN + 1]; | |
| 333 CHECK_CHAR(key); | |
| 334 | |
| 335 buf[set_itext_ichar(buf, XCHAR(key))] = '\0'; | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
336 key_name = build_istring (buf); |
| 2828 | 337 |
| 338 /* We need to do the lookup and compare later, because we can't check | |
| 339 the Qcharacter_of_keysym property belonging to an actual character. */ | |
| 340 previous_binding = Flookup_key (Vcurrent_global_map, key, Qnil); | |
| 341 } | |
| 342 | |
| 343 if (!NILP(Fgethash(key, DEVICE_X_KEYSYM_MAP_HASH_TABLE (d), Qnil))) | |
| 344 { | |
| 345 return Qnil; | |
| 346 } | |
| 347 | |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
348 keysym_ext = LISP_STRING_TO_EXTERNAL (key_name, Qctext); |
| 2828 | 349 xkeysym = XStringToKeysym(keysym_ext); |
| 350 if (NoSymbol == xkeysym) | |
| 351 { | |
| 3142 | 352 /* Keysym is NoSymbol; this may mean the key event passed to us came |
| 353 from an input method, which stored the actual character intended to | |
| 354 be inserted in the key name, and didn't trouble itself to set the | |
| 355 keycode to anything useful. Thus, if the key name is a single | |
| 356 character, and the keysym is NoSymbol, give it a default binding, | |
| 357 if that is possible. */ | |
| 358 Lisp_Object keychar; | |
| 359 | |
| 360 if (1 != string_char_length(key_name)) | |
| 361 { | |
| 362 /* Don't let them pass us more than one character. */ | |
| 363 return Qnil; | |
| 364 } | |
| 365 keychar = make_char(itext_ichar(XSTRING_DATA(key_name))); | |
| 366 if (NILP (Flookup_key (Vcurrent_global_map, keychar, Qnil))) | |
| 367 { | |
| 368 Fdefine_key (Vcurrent_global_map, keychar, Qself_insert_command); | |
| 369 Fputhash (keychar, Qt, DEVICE_X_KEYSYM_MAP_HASH_TABLE (d)); | |
| 370 return Qt; | |
| 371 } | |
| 2828 | 372 return Qnil; |
| 373 } | |
| 374 | |
| 375 x_has_keysym(xkeysym, DEVICE_X_KEYSYM_MAP_HASH_TABLE (d), 0); | |
| 376 | |
| 377 if (SYMBOLP(key)) | |
| 378 { | |
| 379 return NILP(Fget (key, Qcharacter_of_keysym, Qnil)) ? Qnil : Qt; | |
| 380 } | |
| 381 else | |
| 382 { | |
| 383 return EQ(previous_binding, Flookup_key(Vcurrent_global_map, key, Qnil)) | |
| 384 ? Qnil : Qt; | |
| 385 } | |
| 386 } | |
| 387 | |
| 428 | 388 void |
| 389 console_type_create_x (void) | |
| 390 { | |
| 391 INITIALIZE_CONSOLE_TYPE (x, "x", "console-x-p"); | |
| 392 | |
| 393 CONSOLE_HAS_METHOD (x, semi_canonicalize_console_connection); | |
| 394 CONSOLE_HAS_METHOD (x, canonicalize_console_connection); | |
| 395 CONSOLE_HAS_METHOD (x, semi_canonicalize_device_connection); | |
| 396 CONSOLE_HAS_METHOD (x, canonicalize_device_connection); | |
| 397 CONSOLE_HAS_METHOD (x, device_to_console_connection); | |
| 398 CONSOLE_HAS_METHOD (x, initially_selected_for_input); | |
| 2828 | 399 CONSOLE_HAS_METHOD (x, perhaps_init_unseen_key_defaults); |
| 428 | 400 } |
| 401 | |
| 402 | |
| 403 void | |
| 3381 | 404 vars_of_console_x (void) |
| 405 { | |
| 406 DEFVAR_BOOL ("wedge-metacity", &wedge_metacity /* | |
| 407 When non-nil, frame geometry management is backward-compatible. | |
| 408 This is known to create inflooping window jitter in metacity, et al. | |
| 409 It also does not conform to Xt conventions for geometry management. | |
| 410 Specifically, all frame resizes, XEmacs-initiated or not, update WM_HINTS. | |
| 411 Furthermore, geometry changes occur in the widget resize method. | |
| 412 | |
| 413 The default is nil. This probably gives correct behavior regardless of the | |
| 414 window manager used. | |
| 415 This variable is deprecated and will be removed. | |
| 416 */ ); | |
| 417 } | |
| 418 | |
| 419 void | |
| 428 | 420 reinit_console_type_create_x (void) |
| 421 { | |
| 422 REINITIALIZE_CONSOLE_TYPE (x); | |
| 423 } |