Mercurial > hg > xemacs-beta

diff src/redisplay-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 6728e641994e
children 79c6ff3eef26
line wrap: on
line diff
--- a/src/redisplay-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/redisplay-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -84,7 +84,7 @@
 
 static int
 separate_textual_runs (textual_run **run_storage_ptr,
-		       const Emchar *str, Charcount len)
+		       const Ichar *str, Charcount len)
 {
   static WCHAR *ext_storage;
   static int ext_storage_size; /* in WCHARS! */
@@ -99,15 +99,15 @@
   if (len == 0)
     return 0;
 
-  prev_charset = emchar_charset (str[0]);
+  prev_charset = ichar_charset (str[0]);
 
   for (i = 1; i <= len; i++)
     {
-      if (i == len || !EQ (emchar_charset (str[i]), prev_charset))
+      if (i == len || !EQ (ichar_charset (str[i]), prev_charset))
 	{
 	  int j;
-	  Intbyte *int_storage =
-	    alloca_intbytes (MAX_EMCHAR_LEN * (i - runbegin));
+	  Ibyte *int_storage =
+	    alloca_ibytes (MAX_ICHAR_LEN * (i - runbegin));
 	  int int_storage_ptr = 0;
 	  Extbyte *alloca_ext_storage;
 	  int nchars;
@@ -115,7 +115,7 @@
 	  int_storage_ptr = 0;
 	  for (j = runbegin; j < i; j++)
 	    int_storage_ptr +=
-	      set_charptr_emchar (int_storage + int_storage_ptr, str[j]);
+	      set_itext_ichar (int_storage + int_storage_ptr, str[j]);
 	  TO_EXTERNAL_FORMAT (DATA, (int_storage, int_storage_ptr),
 			      ALLOCA, (alloca_ext_storage, nchars),
 			      Qmswindows_unicode);
@@ -134,7 +134,7 @@
 	  runs_so_far++;
 	  runbegin = i;
 	  if (i < len)
-	    prev_charset = emchar_charset (str[i]);
+	    prev_charset = ichar_charset (str[i]);
 	}
     }
 
@@ -307,7 +307,7 @@
  ****************************************************************************/
 static void
 mswindows_output_cursor (struct window *w, struct display_line *dl, int xpos,
-			 int width, face_index findex, Emchar ch, int image_p)
+			 int width, face_index findex, Ichar ch, int image_p)
 {
   struct frame *f = XFRAME (w->frame);
   struct device *d = XDEVICE (f->device);
@@ -425,7 +425,7 @@
  DL		Display line that this text is on.  The values in the
  		structure are used to determine the vertical position and
 		clipping range of the text.
- BUF		Dynamic array of Emchars specifying what is actually to be
+ BUF		Dynamic array of Ichars specifying what is actually to be
 		drawn.
  XPOS		X position in pixels where the text should start being drawn.
  XOFFSET	Number of pixels to be chopped off the left side of the
@@ -438,7 +438,7 @@
  ****************************************************************************/
 static void
 mswindows_output_string (struct window *w, struct display_line *dl,
-			 Emchar_dynarr *buf, int xpos, int xoffset, int clip_start,
+			 Ichar_dynarr *buf, int xpos, int xoffset, int clip_start,
 			 int width, face_index findex,
 			 int cursor, int cursor_start, int cursor_width,
 			 int cursor_height)
@@ -1024,7 +1024,7 @@
 				int cursor_width, int cursor_height)
 {
   struct frame *f = XFRAME (w->frame);
-  Emchar_dynarr *buf = Dynarr_new (Emchar);
+  Ichar_dynarr *buf = Dynarr_new (Ichar);
   Lisp_Object window;
 
   struct display_block *db = Dynarr_atp (dl->display_blocks, block);
@@ -1047,7 +1047,7 @@
   xpos = rb->xpos;
   width = 0;
   if (rb->type == RUNE_CHAR)
-    charset = emchar_charset (rb->object.chr.ch);
+    charset = ichar_charset (rb->object.chr.ch);
 
   if (end < 0)
     end = Dynarr_length (rba);
@@ -1059,7 +1059,7 @@
 
       if (rb->findex == findex && rb->type == RUNE_CHAR
 	  && rb->object.chr.ch != '\n' && rb->cursor_type != CURSOR_ON
-	  && EQ (charset, emchar_charset (rb->object.chr.ch)))
+	  && EQ (charset, ichar_charset (rb->object.chr.ch)))
 	{
 	  Dynarr_add (buf, rb->object.chr.ch);
 	  width += rb->width;
@@ -1081,7 +1081,7 @@
 	    {
 	      findex = rb->findex;
 	      xpos = rb->xpos;
-	      charset = emchar_charset (rb->object.chr.ch);
+	      charset = ichar_charset (rb->object.chr.ch);
 
 	      if (rb->cursor_type == CURSOR_ON)
 		{
@@ -1290,7 +1290,7 @@
  ****************************************************************************/
 static int
 mswindows_text_width (struct frame *f, struct face_cachel *cachel,
-		      const Emchar *str, Charcount len)
+		      const Ichar *str, Charcount len)
 {
   HDC hdc = get_frame_dc (f, 0);
   int width_so_far = 0;