Mercurial > hg > xemacs-beta

diff src/event-msw.c @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-05 09:54:39 by ben] Textual renaming: text/char names abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization. [a] distinguish between "charptr" when it refers to operations on the pointer itself and when it refers to operations on text; and [b] use consistent naming for everything referring to internal format, i.e. Itext == text in internal format Ibyte == a byte in such text Ichar == a char as represented in internal character format thus e.g. set_charptr_emchar -> set_itext_ichar The pre and post tags on either side of this change are: pre-internal-format-textual-renaming post-internal-format-textual-renaming See the Internals Manual for details of exactly how this was done, how to handle the change in your workspace, etc.
author ben
date Wed, 05 Jun 2002 09:58:45 +0000
parents b27b70c1252a
children 79c6ff3eef26
line wrap: on
line diff
--- a/src/event-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/event-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -1769,8 +1769,8 @@
 	{
 	  DWORD len = DdeGetData (hdata, NULL, 0, 0);
 	  LPBYTE extcmd = (LPBYTE) ALLOCA (len + 1);
-	  Intbyte *cmd;
-	  Intbyte *end;
+	  Ibyte *cmd;
+	  Ibyte *end;
 	  struct gcpro gcpro1, gcpro2;
 	  Lisp_Object l_dndlist = Qnil;
 	  Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
@@ -2361,7 +2361,7 @@
 	  }
 	else	/* Normal keys & modifiers */
 	  {
-	    Emchar quit_ch =
+	    Ichar quit_ch =
 	      CONSOLE_QUIT_CHAR (XCONSOLE (mswindows_find_console (hwnd)));
 	    POINT pnt = { LOWORD (GetMessagePos()), HIWORD (GetMessagePos()) };
 	    MSG msg, tranmsg;
@@ -2426,8 +2426,8 @@
 		int mods_with_quit = mods;
 		int length;
 		Extbyte extchar[4];
-		Intbyte *intchar;
-		Emchar ch;
+		Ibyte *intchar;
+		Ichar ch;
 
 		if (XEUNICODE_P)
 		  {
@@ -2435,7 +2435,7 @@
 		    TO_INTERNAL_FORMAT (DATA, (extchar, length),
 					C_STRING_ALLOCA, (intchar),
 					Qmswindows_unicode);
-		    ch = charptr_emchar (intchar);
+		    ch = itext_ichar (intchar);
 		  }
 		else
 		  {
@@ -2447,7 +2447,7 @@
 				   the following */
 				((LCID) GetKeyboardLayout (0) & 0xFFFF),
 				NULL));
-		    ch = charptr_emchar (intchar);
+		    ch = itext_ichar (intchar);
 		    xfree (intchar);
 		  }
 
@@ -2565,7 +2565,7 @@
 				 (HKL) lcid);
 			    if (tounret > 0)
 			      {
-				Intbyte *intchar;
+				Ibyte *intchar;
 
 				TO_INTERNAL_FORMAT
 				  (DATA,
@@ -2573,7 +2573,7 @@
 				   C_STRING_ALLOCA, intchar,
 				   Qmswindows_unicode);
 				XEVENT (lastev)->event.key.alt_keychars[i] =
-				  charptr_emchar (intchar);
+				  itext_ichar (intchar);
 			      }
 			  }
 			else
@@ -2594,7 +2594,7 @@
 				   it's like WM_IME_CHAR: DBCS chars
 				   have the lead byte in bits 8-15 of
 				   the short. */
-				Intbyte *intchar;
+				Ibyte *intchar;
 				Extbyte mbstuff[2];
 				Bytecount mblength = 0;
 				WORD thechar = received_keys[tounret - 1];
@@ -2611,14 +2611,14 @@
 				   NULL);
 
 				XEVENT (lastev)->event.key.alt_keychars[i] =
-				  charptr_emchar (intchar);
+				  itext_ichar (intchar);
 				xfree (intchar);
 			      }
 			  }
 		      }
 		    else
 		      {
-			Emchar altch;
+			Ichar altch;
 
 			if (virtual_key >= 'A' && virtual_key <= 'Z')
 			  altch =
@@ -3354,7 +3354,7 @@
 	filecount = qxeDragQueryFile ((HDROP) wParam, 0xffffffff, NULL, 0);
 	for (i = 0; i < filecount; i++)
 	  {
-	    Intbyte *fname;
+	    Ibyte *fname;
 	    Extbyte *fname_ext;
 	    Bytecount fnamelen;
 	    Charcount len = qxeDragQueryFile ((HDROP) wParam, i, NULL, 0);
@@ -3545,7 +3545,7 @@
          HIMC imc = ImmGetContext (hwnd);
 	 Extbyte *result;
          Bytecount len;
-	 Intbyte *resultint, *endptr;
+	 Ibyte *resultint, *endptr;
 	 Bytecount lenint;
 	 int speccount;
 
@@ -3571,12 +3571,12 @@
 
 	 while (resultint < endptr)
 	   {
-	     Emchar ch = charptr_emchar (resultint);
+	     Ichar ch = itext_ichar (resultint);
 	      if (ch == ' ')
 		mswindows_enqueue_keypress_event (hwnd, QKspace, 0);
 	      else
 		mswindows_enqueue_keypress_event (hwnd, make_char (ch), 0);
-	     INC_CHARPTR (resultint);
+	     INC_IBYTEPTR (resultint);
 	   }
 
 	 unbind_to (speccount);