diff src/console-msw.c @ 800:a5954632b187

[xemacs-hg @ 2002-03-31 08:27:14 by ben] more fixes, first crack at finishing behavior implementation TODO.ben-mule-21-5: Update. configure.in: Fix for new error-checking types. make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code to force errors when nonintercepted Windows calls issued. behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs. Correct :title to :short-doc in accordance with behavior-defs.el. Add a submenu under Options for turning on/off behaviors. cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and add support for bit-vector iteration. lisp-mode.el: Rearrange and add items for macro expanding. menubar-items.el: Document connection between these two functions. window.el: Port stuff from GNU 21.1. config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking. s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK -> ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in config.h.in. Fix code to follow docs. Fix *_checking_assert() in accordance with new names. Attempt to fix periodic redisplay crash freeing display line structures. Add first implementation of sledgehammer redisplay check. Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). Fix bug in md5 handling. Rename character-to-unicode to char-to-unicode; same for unicode-to-char{acter}. Move chartab documentation to `make-char-table'. Some header cleanup. Clean up remaining places where nonintercepted Windows calls are being used. automated/mule-tests.el: Fix for new Unicode support.
author ben
date Sun, 31 Mar 2002 08:30:17 +0000
parents e38acbeb1cae
children 804517e16990
line wrap: on
line diff
--- a/src/console-msw.c	Sat Mar 30 04:46:48 2002 +0000
+++ b/src/console-msw.c	Sun Mar 31 08:30:17 2002 +0000
@@ -87,29 +87,39 @@
 
 static HWND mswindows_console_hwnd = 0;
 
-#define KLUDGE_BUFSIZE 1024 /* buffer size for console window titles */
-
-/* Direct from the horse's mouth: Microsoft KB article Q124103 */
+/* Based on Microsoft KB article Q124103 */
 static HWND
 GetConsoleHwnd (void)
 { 
-  HWND hwndFound;         /* this is what is returned to the caller */
-  char pszNewWindowTitle[KLUDGE_BUFSIZE]; /* contains fabricated WindowTitle */
-  char pszOldWindowTitle[KLUDGE_BUFSIZE]; /* contains original WindowTitle */
+  HWND hwndFound;
+  Intbyte newtitleint[200];
+  Extbyte *newtitle;
+  Extbyte *oldtitle;
+  int numchars;
 
   /* fetch current window title */
 
-  GetConsoleTitle (pszOldWindowTitle, KLUDGE_BUFSIZE);
-
-  /* format a "unique" NewWindowTitle */
+  {
+    int size = 64;
+    do
+      {
+	size *= 2;
+	oldtitle = alloca_extbytes (size * XETCHAR_SIZE);
+	numchars = qxeGetConsoleTitle (oldtitle, size);
+      }
+    while (numchars >= size - 1);
+  }
 
-  sprintf (pszNewWindowTitle, "%ld/%ld",
-	   GetTickCount (),
-	   GetCurrentProcessId ());
+  /* format a "unique" new title */
+
+  qxesprintf (newtitleint, "%ld/%ld", GetTickCount (),
+	      GetCurrentProcessId ());
+
+  C_STRING_TO_TSTR (newtitleint, newtitle);
 
   /* change current window title */
 
-  SetConsoleTitle (pszNewWindowTitle);
+  qxeSetConsoleTitle (newtitle);
 
   /* ensure window title has been updated */
 
@@ -117,13 +127,13 @@
 
   /* look for NewWindowTitle */
 
-  hwndFound=FindWindow (NULL, pszNewWindowTitle);
+  hwndFound = qxeFindWindow (NULL, newtitle);
 
   /* restore original window title */
 
-  SetConsoleTitle (pszOldWindowTitle);
+  qxeSetConsoleTitle (oldtitle);
 
-  return (hwndFound);
+  return hwndFound;
 } 
 
 static HWND