Mercurial > hg > xemacs-beta
view lib-src/winclient.c @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, 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-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | 6504113e7c2d |
children | 2b6fa2618f76 |
line wrap: on
line source
/* DDE client for XEmacs. Copyright (C) 2002 Alastair J. Houghton 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. */ /* -- Pre-Include Defines --------------------------------------------------- */ #define STRICT /* -- Includes -------------------------------------------------------------- */ #include <windows.h> #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <stdlib.h> #include <stdio.h> #include <ctype.h> #include <errno.h> static void error (const char* s1, const char* s2); static void fatal (const char *s1, const char *s2); static void * xmalloc (size_t size); static char * getNextArg (const char **ptr, unsigned *len); /* -- Post-Include Defines -------------------------------------------------- */ /* Timeouts & delays */ #define CONNECT_DELAY 500 /* ms */ #define TRANSACTION_TIMEOUT 5000 /* ms */ #define MAX_INPUT_IDLE_WAIT INFINITE /* ms */ /* DDE Strings */ #define SERVICE_NAME "XEmacs" #define TOPIC_NAME "System" #define COMMAND_FORMAT "[open(\"%s%s\")]" /* XEmacs program name */ #define PROGRAM_TO_RUN "xemacs.exe" /* -- Constants ------------------------------------------------------------- */ /* -- Global Variables ------------------------------------------------------ */ HINSTANCE hInstance; DWORD idInst = 0; /* -- Function Declarations ------------------------------------------------- */ HDDEDATA CALLBACK ddeCallback (UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, DWORD dwData1, DWORD dwData2); int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int nCmdShow); static HCONV openConversation (void); static void closeConversation (HCONV hConv); static int doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2); static int parseCommandLine (HCONV hConv, LPSTR lpszCommandLine); /* -- Function Definitions -------------------------------------------------- */ /* * Name : ddeCallback * Function: Gets called by DDEML. * */ HDDEDATA CALLBACK ddeCallback (UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, DWORD dwData1, DWORD dwData2) { return (HDDEDATA) NULL; } /* * Name : WinMain * Function: The program's entry point function. * */ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int nCmdShow) { HCONV hConv; int ret = 0; UINT uiRet; /* Initialise the DDEML library */ uiRet = DdeInitialize (&idInst, (PFNCALLBACK) ddeCallback, APPCMD_CLIENTONLY |CBF_FAIL_ALLSVRXACTIONS, 0); if (uiRet != DMLERR_NO_ERROR) { MessageBox (NULL, "Could not initialise DDE management library.", "winclient", MB_ICONEXCLAMATION | MB_OK); return 1; } /* Open a conversation */ hConv = openConversation (); if (hConv) { /* OK. Next, we need to parse the command line. */ ret = parseCommandLine (hConv, lpCmdLine); /* Close the conversation */ closeConversation (hConv); } DdeUninitialize (idInst); return ret; } /* * Name : openConversation * Function: Start a conversation. * */ static HCONV openConversation (void) { HSZ hszService = NULL, hszTopic = NULL; HCONV hConv = NULL; /* Get the application (service) name */ hszService = DdeCreateStringHandle (idInst, SERVICE_NAME, CP_WINANSI); if (!hszService) { MessageBox (NULL, "Could not create string handle for service.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Get the topic name */ hszTopic = DdeCreateStringHandle (idInst, TOPIC_NAME, CP_WINANSI); if (!hszTopic) { MessageBox (NULL, "Could not create string handle for topic.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Try to connect */ hConv = DdeConnect (idInst, hszService, hszTopic, NULL); if (!hConv) { STARTUPINFO sti; PROCESS_INFORMATION pi; int n; /* Try to start the program */ ZeroMemory (&sti, sizeof (sti)); sti.cb = sizeof (sti); if (!CreateProcess (NULL, PROGRAM_TO_RUN, NULL, NULL, FALSE, 0, NULL, NULL, &sti, &pi)) { MessageBox (NULL, "Could not start process.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Wait for the process to enter an idle state */ WaitForInputIdle (pi.hProcess, MAX_INPUT_IDLE_WAIT); /* Close the handles */ CloseHandle (pi.hThread); CloseHandle (pi.hProcess); /* Try to connect */ for (n = 0; n < 5; n++) { Sleep (CONNECT_DELAY); hConv = DdeConnect (idInst, hszService, hszTopic, NULL); if (hConv) break; } if (!hConv) { /* Still couldn't connect. */ MessageBox (NULL, "Could not connect to DDE server.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } } /* Release the string handles */ DdeFreeStringHandle (idInst, hszService); DdeFreeStringHandle (idInst, hszTopic); return hConv; error: if (hConv) DdeDisconnect (hConv); if (hszService) DdeFreeStringHandle (idInst, hszService); if (hszTopic) DdeFreeStringHandle (idInst, hszTopic); return NULL; } /* * Name : closeConversation * Function: Close a conversation. * */ static void closeConversation (HCONV hConv) { /* Shut down */ DdeDisconnect (hConv); } /* * Name : doFile * Function: Process a file. * */ int doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2) { char *buf = NULL; unsigned len; /* Calculate the buffer length */ len = strlen (lpszFileName1) + strlen (lpszFileName2) + strlen (COMMAND_FORMAT); /* Allocate a buffer */ buf = (char *) xmalloc (len); if (!buf) { MessageBox (NULL, "Not enough memory.", "winclient", MB_ICONEXCLAMATION | MB_OK); return 1; } /* Build the command */ len = wsprintf (buf, COMMAND_FORMAT, lpszFileName1, lpszFileName2); len++; /* OK. We're connected. Send the message. */ DdeClientTransaction (buf, len, hConv, NULL, 0, XTYP_EXECUTE, TRANSACTION_TIMEOUT, NULL); free (buf); return 0; } /* * Name : getNextArg * Function: Retrieve the next command line argument. * */ static char * getNextArg (const char **ptr, unsigned *len) { int in_quotes = 0, quit = 0, all_in_quotes = 0; const char *p = *ptr, *start; char *buf = NULL; unsigned length = 0; /* Skip whitespace */ while (*p && isspace (*p)) p++; /* If this is the end, return NULL */ if (!*p) return NULL; /* Remember where we are */ start = p; /* Find the next whitespace character outside quotes */ if (*p == '"') all_in_quotes = 1; while (*p && !quit) { switch (*p) { case '"': in_quotes = 1 - in_quotes; p++; break; case '\\': if (!in_quotes) all_in_quotes = 0; p++; if (!*p) break; p++; break; default: if (isspace (*p) && !in_quotes) quit = 1; else if (!in_quotes) all_in_quotes = 0; if (!quit) p++; } } /* Work out the length */ length = p - start; /* Strip quotes if the argument is completely quoted */ if (all_in_quotes) { start++; length -= 2; } /* Copy */ buf = (char *) xmalloc (length + 1); if (!buf) return NULL; strncpy (buf, start, length); buf[length] = '\0'; /* Return the pointer and length */ *ptr = p; *len = length; return buf; } /* * Name : parseCommandLine * Function: Process the command line. This program accepts a list of strings * : (which may contain wildcards) representing filenames. * */ int parseCommandLine (HCONV hConv, LPSTR lpszCommandLine) { char *fullpath, *filepart; char *arg; unsigned len, pathlen; int ret = 0; HANDLE hFindFile = NULL; WIN32_FIND_DATA wfd; /* Retrieve arguments */ while ((arg = getNextArg ((const char**)&lpszCommandLine, &len)) != NULL) { /* First find the canonical path name */ fullpath = filepart = NULL; pathlen = GetFullPathName (arg, 0, fullpath, &filepart); fullpath = (char *) xmalloc (pathlen); if (!fullpath) { MessageBox (NULL, "Not enough memory.", "winclient", MB_ICONEXCLAMATION | MB_OK); ret = 1; free (arg); break; } GetFullPathName (arg, pathlen, fullpath, &filepart); /* Find the first matching file */ hFindFile = FindFirstFile (arg, &wfd); if (hFindFile == INVALID_HANDLE_VALUE) ret = doFile (hConv, fullpath, ""); else { /* Chop off the file part from the full path name */ if (filepart) *filepart = '\0'; /* For each matching file */ do { /* Process it */ ret = doFile (hConv, fullpath, wfd.cFileName); if (ret) break; } while (FindNextFile (hFindFile, &wfd)); FindClose (hFindFile); } /* Release the path name buffers */ free (fullpath); free (arg); if (ret) break; } return ret; } static void fatal (const char *s1, const char *s2) { error (s1, s2); exit (1); } /* Print error message. `s1' is printf control string, `s2' is arg for it. */ static void error (const char* s1, const char* s2) { fprintf (stderr, "winclient: "); fprintf (stderr, s1, s2); fprintf (stderr, "\n"); } /* Like malloc but get fatal error if memory is exhausted. */ static void * xmalloc (size_t size) { void *result = malloc (size); if (result == NULL) fatal ("virtual memory exhausted", (char *) 0); return result; }