Mercurial > hg > xemacs-beta
view src/console-x.c @ 793:e38acbeb1cae
[xemacs-hg @ 2002-03-29 04:46:17 by ben]
lots o' fixes
etc/ChangeLog: New file.
Separated out all entries for etc/ into their own ChangeLog.
Includes entries for the following files:
etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad,
etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL,
etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS,
etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL,
etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se,
etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh,
etc/custom/example-themes/europe-theme.el,
etc/custom/example-themes/ex-custom-file,
etc/custom/example-themes/example-theme.el, etc/e/eterm.ti,
etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1,
etc/gnuserv.README, etc/package-index.LATEST.gpg,
etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm,
etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs,
etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E,
etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm,
etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm,
etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar,
etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1,
etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL,
etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el,
etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\*
unicode/unicode-consortium/8859-16.TXT: New file.
mule/english.el: Define this charset now, since a bug was fixed that formerly
prevented it.
mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be
integers.
Makefile.in.in: Always include gui.c, to fix compile error when TTY-only.
EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo().
Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate
nearly all uses of Lisp_String * in favor of Lisp_Object, and
correct macros so most of them favor Lisp_Object.
Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings,
but at level `debug' (usually ignored). Use it when instantiating
specifiers, so problems can be debugged. Move
log-warning-minimum-level into C so that we can optimize
ERROR_ME_DEBUG_WARN.
Fix warning levels consistent with new definitions.
Add default_ and parent fields to char table; not yet implemented.
New fun Dynarr_verify(); use for further error checking on Dynarrs.
Rearrange code at top of lisp.h in conjunction with dynarr changes.
Fix eifree(). Use Eistrings in various places
(format_event_object(), where_is_to_char(), and callers thereof)
to avoid fixed-size strings buffers. New fun write_eistring().
Reindent and fix GPM code to follow standards.
Set default MS Windows font to Lucida Console (same size as
Courier New but less interline spacing, so more lines fit).
Increase default frame size on Windows to 50 lines. (If that's too
big for the workspace, the frame will be shrunk as necessary.)
Fix problem with text files with no newlines (). (Change
`convert-eol' coding system to use `nil' for autodetect,
consistent with make-coding-system.)
Correct compile warnings in vm-limit.c.
Fix handling of reverse-direction charsets to avoid errors when
opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el.
Recode some object printing methods to use write_fmt_string()
instead of a fixed buffer and sprintf.
Turn on display of png comments as warnings (level `info'), now
that they're unobtrusive.
Revamped the sound documentation.
Fixed bug in redisplay w.r.t. hscroll/truncation/continuation
glyphs causing jumping up and down of the lines, since they're
bigger than the line size. (It was seen most obviously when
there's a horizontal scroll bar, e.g. do C-h a glyph or something
like that.) The problem was that the glyph-contrib-p setting on
glyphs was ignored even if it was set properly, which it wasn't
until now.
author | ben |
---|---|
date | Fri, 29 Mar 2002 04:49:13 +0000 |
parents | fdefd0186b75 |
children | 6728e641994e |
line wrap: on
line source
/* Console functions for X windows. Copyright (C) 1996, 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* This file Mule-ized by Ben Wing, 7-10-00. */ /* Authorship: Ben Wing: January 1996, for 19.14. */ #include <config.h> #include "lisp.h" #include "console-x.h" #include "buffer.h" #include "process.h" /* canonicalize_host_name */ #include "redisplay.h" /* for display_arg */ DEFINE_CONSOLE_TYPE (x); static int x_initially_selected_for_input (struct console *con) { return 1; } /* Parse a DISPLAY specification like "host:10.0" or ":0" */ static void split_up_display_spec (Lisp_Object display, int *hostname_length, int *display_length, int *screen_length) { Intbyte *beg = XSTRING_DATA (display); Intbyte *end = beg + XSTRING_LENGTH (display); Intbyte *p = end; while (p > beg) { DEC_CHARPTR (p); if (charptr_emchar (p) == ':') { *hostname_length = p - beg; while (p < end - 1) { INC_CHARPTR (p); if (charptr_emchar (p) == '.') { *display_length = p - beg - *hostname_length; *screen_length = end - p; return; } } /* No '.' found. */ *display_length = XSTRING_LENGTH (display) - *hostname_length; *screen_length = 0; return; } } /* No ':' found. */ *hostname_length = XSTRING_LENGTH (display); *display_length = 0; *screen_length = 0; } /* Remember, in all of the following functions, we have to verify the integrity of our input, because the generic functions don't. */ static Lisp_Object x_device_to_console_connection (Lisp_Object connection, Error_Behavior errb) { /* Strip the trailing .# off of the connection, if it's there. */ if (NILP (connection)) return Qnil; else { int hostname_length, display_length, screen_length; if (!ERRB_EQ (errb, ERROR_ME)) { if (!STRINGP (connection)) return Qunbound; } else CHECK_STRING (connection); split_up_display_spec (connection, &hostname_length, &display_length, &screen_length); connection = make_string (XSTRING_DATA (connection), hostname_length + display_length); } return connection; } static Lisp_Object get_display_arg_connection (void) { const Extbyte *disp_name; /* If the user didn't explicitly specify a display to use when they called make-x-device, then we first check to see if a display was specified on the command line with -display. If so, we set disp_name to it. Otherwise we use XDisplayName to see what DISPLAY is set to. XtOpenDisplay knows how to do both of these things, but we need to know the name to use. */ if (display_arg) { int elt; int argc; Extbyte **argv; Lisp_Object conn; make_argc_argv (Vx_initial_argv_list, &argc, &argv); disp_name = NULL; for (elt = 0; elt < argc; elt++) { if (!strcmp (argv[elt], "-d") || !strcmp (argv[elt], "-display")) { if (elt + 1 == argc) { suppress_early_error_handler_backtrace = 1; invalid_argument ("-display specified with no arg", Qunbound); } else { disp_name = argv[elt + 1]; break; } } } /* assert: display_arg is only set if we found the display arg earlier so we can't fail to find it now. */ assert (disp_name != NULL); conn = build_ext_string (disp_name, Qcommand_argument_encoding); free_argc_argv (argv); return conn; } else return build_ext_string (XDisplayName (0), Qx_display_name_encoding); } /* "semi-canonicalize" means convert to a nicer form for printing, but don't completely canonicalize (into some likely ugly form) */ static Lisp_Object x_semi_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb) { struct gcpro gcpro1; GCPRO1 (connection); if (NILP (connection)) connection = get_display_arg_connection (); else { if (!ERRB_EQ (errb, ERROR_ME)) { if (!STRINGP (connection)) RETURN_UNGCPRO (Qunbound); } else CHECK_STRING (connection); } /* Be lenient, allow people to specify a device connection instead of a console connection -- e.g. "foo:0.0" instead of "foo:0". This only happens in `find-console' and `get-console'. */ connection = x_device_to_console_connection (connection, errb); /* Check for a couple of standard special cases */ if (XSTRING_CHAR (connection, 0) == ':') connection = concat2 (build_string ("localhost"), connection); else { /* connection =~ s/^unix:/localhost:/; */ const Intbyte *p = XSTRING_DATA (connection); const Intbyte *end = XSTRING_DATA (connection) + XSTRING_LENGTH (connection); int i; for (i = 0; i < (int) sizeof ("unix:") - 1; i++) { if (p == end || charptr_emchar (p) != "unix:"[i]) goto ok; INC_CHARPTR (p); } connection = concat2 (build_string ("localhost:"), make_string (p, end - p)); } ok: RETURN_UNGCPRO (connection); } static Lisp_Object x_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb) { Lisp_Object hostname = Qnil; struct gcpro gcpro1, gcpro2; GCPRO2 (connection, hostname); connection = x_semi_canonicalize_console_connection (connection, errb); if (UNBOUNDP (connection)) RETURN_UNGCPRO (Qunbound); { int hostname_length, display_length, screen_length; split_up_display_spec (connection, &hostname_length, &display_length, &screen_length); hostname = Fsubstring (connection, Qzero, make_int (hostname_length)); hostname = canonicalize_host_name (hostname); connection = concat2 (hostname, make_string (XSTRING_DATA (connection) + hostname_length, display_length)); } RETURN_UNGCPRO (connection); } static Lisp_Object x_semi_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb) { int hostname_length, display_length, screen_length; struct gcpro gcpro1; GCPRO1 (connection); if (NILP (connection)) connection = get_display_arg_connection (); else { if (!ERRB_EQ (errb, ERROR_ME)) { if (!STRINGP (connection)) RETURN_UNGCPRO (Qunbound); } else CHECK_STRING (connection); } split_up_display_spec (connection, &hostname_length, &display_length, &screen_length); if (!screen_length) connection = concat2 (connection, build_string (".0")); RETURN_UNGCPRO (connection); } static Lisp_Object x_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb) { int hostname_length, display_length, screen_length; Lisp_Object screen_str = Qnil; struct gcpro gcpro1, gcpro2; GCPRO2 (screen_str, connection); connection = x_semi_canonicalize_device_connection (connection, errb); if (UNBOUNDP (connection)) RETURN_UNGCPRO (Qunbound); split_up_display_spec (connection, &hostname_length, &display_length, &screen_length); screen_str = make_string (XSTRING_DATA (connection) + hostname_length + display_length, screen_length); connection = x_canonicalize_console_connection (connection, errb); RETURN_UNGCPRO (concat2 (connection, screen_str)); } void console_type_create_x (void) { INITIALIZE_CONSOLE_TYPE (x, "x", "console-x-p"); CONSOLE_HAS_METHOD (x, semi_canonicalize_console_connection); CONSOLE_HAS_METHOD (x, canonicalize_console_connection); CONSOLE_HAS_METHOD (x, semi_canonicalize_device_connection); CONSOLE_HAS_METHOD (x, canonicalize_device_connection); CONSOLE_HAS_METHOD (x, device_to_console_connection); CONSOLE_HAS_METHOD (x, initially_selected_for_input); } void reinit_console_type_create_x (void) { REINITIALIZE_CONSOLE_TYPE (x); }