Mercurial > hg > xemacs-beta

diff src/redisplay-gtk.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 e7ee5f8bde58
children 79c6ff3eef26
line wrap: on
line diff
--- a/src/redisplay-gtk.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/redisplay-gtk.c	Wed Jun 05 09:58:45 2002 +0000
@@ -114,7 +114,7 @@
 static int
 separate_textual_runs (unsigned char *text_storage,
 		       struct textual_run *run_storage,
-		       CONST Emchar *str, Charcount len)
+		       CONST Ichar *str, Charcount len)
 {
   Lisp_Object prev_charset = Qunbound; /* not Qnil because that is a
 					  possible valid charset when
@@ -128,13 +128,13 @@
 
   for (i = 0; i < len; i++)
     {
-      Emchar ch = str[i];
+      Ichar ch = str[i];
       Lisp_Object charset;
       int byte1, byte2;
       int dimension;
       int graphic;
 
-      BREAKUP_EMCHAR (ch, charset, byte1, byte2);
+      BREAKUP_ICHAR (ch, charset, byte1, byte2);
       dimension = XCHARSET_DIMENSION (charset);
       graphic   = XCHARSET_GRAPHIC   (charset);
 
@@ -240,7 +240,7 @@
    */
 
 static int
-gtk_text_width (struct frame *f, struct face_cachel *cachel, CONST Emchar *str,
+gtk_text_width (struct frame *f, struct face_cachel *cachel, CONST Ichar *str,
 		Charcount len)
 {
   int width_so_far = 0;
@@ -296,7 +296,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);
@@ -323,7 +323,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)
@@ -336,7 +336,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;
@@ -359,7 +359,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)
 		{
@@ -440,7 +440,7 @@
 			 add_glyph_rune(). */
 		      Lisp_Object string =
 			XIMAGE_INSTANCE_TEXT_STRING (instance);
-		      convert_intbyte_string_into_emchar_dynarr
+		      convert_ibyte_string_into_ichar_dynarr
 			(XSTRING_DATA (string), XSTRING_LENGTH (string), buf);
 
 		      gtk_output_string (w, dl, buf, xpos,
@@ -628,7 +628,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
@@ -659,7 +659,7 @@
 
 void
 gtk_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)
 {