Mercurial > hg > xemacs-beta
view src/console-x.c @ 1111:184461bc8de4
[xemacs-hg @ 2002-11-18 06:52:23 by ben]
warning fixes, etc.
* s/cygwin32.h:
-fvtable-thunks is obsolete in GCC 3 and generates warnings.
* s/mingw32.h:
* s/windowsnt.h:
Comment fixes.
* emodules.h:
Fix warnings from redefining symbols.
* eval.c:
Fix C++ errors -- no automatic casting between function pointers
and void *, function declarations inside of functions not allowed.
* event-Xt.c (emacs_Xt_enqueue_focus_event):
Warning fixes.
* fileio.c (Ffile_truename):
Warning fixes.
Use LOCAL_TO_WIN32_FILE_FORMAT rather than duplicating it.
* glyphs-x.c:
Fix style.
* intl-auto-encap-win32.c:
* intl-auto-encap-win32.h:
* intl-encap-win32.c:
* intl-encap-win32.c (qxeRegConnectRegistry):
* syswindows.h (RegConnectRegistry):
DdeCreateStringHandle needs to be manual due to new Cygwin bug.
* intl-win32.c:
wcslen/wcscmp don't seem to exist under G++ 3, Cygwin.
* lisp.h:
* lisp-union.h:
* lisp-disunion.h:
* process-unix.c (unix_send_process):
Ugh, C needs volatile and C++ must not have volatile. Remove
previous volatile hacks, which don't seem to be working any more.
* sheap.c (STATIC_HEAP_SLOP):
Try to get a working Cygwin build with old unexec.
* sheap.c (more_static_core):
No NL's in literals allowed.
* symbols.c (Fset):
Fix C++ errors.
* syswindows.h:
Fix Cygwin complaints now that some missing structs have been added.
aclocal.m4: Disable shared library modules under Cygwin for the moment,
since we need some more tricky coding done and I don't have the
time right now.
configure.in, configure.usage:
code-files.el, loadhist.el: Fix warnings.
package-get.el: Fix warnings.
NOTE: This was already fixed awhile ago, but reverted by Steve Y.
Please be careful.
postgresql/Makefile.in.in: Removed.
Move common stuff into modues/common/Makefile.common. (Also
add extraclean target and a couple of other fixes in that file.)
postgresql/configure.ac: Extract out common configure stuff into
modules/common/configure-{pre,post}.ac.
postgresql/postgresql.c: Fix warning.
ldap/Makefile.in.in: Removed.
Move common stuff into modues/common/Makefile.common. (Also
add extraclean target and a couple of other fixes in that file.)
ldap/configure.ac: Extract out common configure stuff into
modules/common/configure-{pre,post}.ac.
common/Makefile.common: Common stuff is here.
author | ben |
---|---|
date | Mon, 18 Nov 2002 06:53:08 +0000 |
parents | 79c6ff3eef26 |
children | 04bc9d2f42c7 |
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 "buffer.h" #include "process.h" /* canonicalize_host_name */ #include "redisplay.h" /* for display_arg */ #include "console-x-impl.h" 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) { Ibyte *beg = XSTRING_DATA (display); Ibyte *end = beg + XSTRING_LENGTH (display); Ibyte *p = end; while (p > beg) { DEC_IBYTEPTR (p); if (itext_ichar (p) == ':') { *hostname_length = p - beg; while (p < end - 1) { INC_IBYTEPTR (p); if (itext_ichar (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 (string_ichar (connection, 0) == ':') connection = concat2 (build_string ("localhost"), connection); else { /* connection =~ s/^unix:/localhost:/; */ const Ibyte *p = XSTRING_DATA (connection); const Ibyte *end = XSTRING_DATA (connection) + XSTRING_LENGTH (connection); int i; for (i = 0; i < (int) sizeof ("unix:") - 1; i++) { if (p == end || itext_ichar (p) != "unix:"[i]) goto ok; INC_IBYTEPTR (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); }