From: handa <handa>
Date: Mon, 26 Jul 2004 11:37:09 +0000 (+0000)
Subject: (redraw_cursor): Fix checking of redrawing area.
X-Git-Tag: REL-1-1-0~62
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ab49f54d6478d0175d06956918bb513b7880c1e5;p=m17n%2Fm17n-lib.git

(redraw_cursor): Fix checking of redrawing area.
(set_input_method_spot): Don't check face if the buffer is empty.
(show_cursor): Likewise.
(delete_char): Fix adjustment of nchars.
---

diff --git a/example/medit.c b/example/medit.c
index a7067c0..07f34c7 100644
--- a/example/medit.c
+++ b/example/medit.c
@@ -425,16 +425,19 @@ set_input_method_spot ()
   int x = cursor.x + (control.orientation_reversed ? win_width : 0);
   int pos = cursor.from > 0 ? cursor.from - 1 : 0;
   MFace *faces[256];
-  int n = mtext_get_prop_values (mt, pos, Mface, (void **) faces, 256);
+  int n = 0;
   int size = 0, ratio = 0, i;
 
-  for (i = n - 1; i >= 0; i--)
-    {
-      if (! size)
-	size = (int) mface_get_prop (faces[i], Msize);
-      if (! ratio)
-	ratio = (int) mface_get_prop (faces[i], Mratio);
-    }
+  if (nchars > 0)
+    n = mtext_get_prop_values (mt, pos, Mface, (void **) faces, 256);
+  if (n > 0)
+    for (i = n - 1; i >= 0; i--)
+      {
+	if (! size)
+	  size = (int) mface_get_prop (faces[i], Msize);
+	if (! ratio)
+	  ratio = (int) mface_get_prop (faces[i], Mratio);
+      }
   if (! size)
     size = default_font_size;
   if (ratio)
@@ -741,59 +744,60 @@ show_cursor (XtPointer client_data)
   if (current_input_context)
     set_input_method_spot ();
 
-  {
-    int pos = (SELECTEDP () ? mtext_property_start (selection)
-	       : cursor.from > 0 ? cursor.from - 1
-	       : cursor.from);
-    MFace *face = mface ();
-    MTextProperty *props[256];
-    int n = mtext_get_properties (mt, pos, Mface, props, 256);
-    int i;
-    char buf[256], *p = buf;
-    MSymbol sym;
-
-    buf[0] = '\0';
-    if (cursor.font)
-      {
-	int size = (int) mfont_get_prop (cursor.font, Msize);
-	MSymbol family = mfont_get_prop (cursor.font, Mfamily);
-	MSymbol weight = mfont_get_prop (cursor.font, Mweight);
-	MSymbol style = mfont_get_prop (cursor.font, Mstyle);
-	MSymbol registry = mfont_get_prop (cursor.font, Mregistry);
-
-	sprintf (p, "%dpt", size / 10), p += strlen (p);
-	if (family)
-	  strcat (p, ","), strcat (p, msymbol_name (family)), p += strlen (p);
-	if (weight)
-	  strcat (p, ","), strcat (p, msymbol_name (weight)), p += strlen (p);
-	if (style)
-	  strcat (p, ","), strcat (p, msymbol_name (style)), p += strlen (p);
-	if (registry)
-	  strcat (p, ","), strcat (p, msymbol_name (registry)), p += strlen (p);
-	p += strlen (p);
-      }
+  if (nchars > 0)
+    {
+      int pos = (SELECTEDP () ? mtext_property_start (selection)
+		 : cursor.from > 0 ? cursor.from - 1
+		 : cursor.from);
+      MFace *face = mface ();
+      MTextProperty *props[256];
+      int n = mtext_get_properties (mt, pos, Mface, props, 256);
+      int i;
+      char buf[256], *p = buf;
+      MSymbol sym;
 
-    mface_merge (face, face_default);
-    for (i = 0; i < n; i++)
-      if (props[i] != selection)
-	mface_merge (face, (MFace *) mtext_property_value (props[i]));
-    sym = (MSymbol) mface_get_prop (face, Mforeground);
-    if (sym != Mnil)
-      strcat (p, ","), strcat (p, msymbol_name (sym)), p += strlen (p);
-    if ((MSymbol) mface_get_prop (face, Mvideomode) == Mreverse)
-      strcat (p, ",rev"), p += strlen (p);
-    hline = mface_get_prop (face, Mhline);
-    if (hline && hline->width > 0)
-      strcat (p, ",ul"), p += strlen (p);
-    box = mface_get_prop (face, Mbox);
-    if (box && box->width > 0)
-      strcat (p, ",box"), p += strlen (p);
-    m17n_object_unref (face);
+      buf[0] = '\0';
+      if (cursor.font)
+	{
+	  int size = (int) mfont_get_prop (cursor.font, Msize);
+	  MSymbol family = mfont_get_prop (cursor.font, Mfamily);
+	  MSymbol weight = mfont_get_prop (cursor.font, Mweight);
+	  MSymbol style = mfont_get_prop (cursor.font, Mstyle);
+	  MSymbol registry = mfont_get_prop (cursor.font, Mregistry);
+
+	  sprintf (p, "%dpt", size / 10), p += strlen (p);
+	  if (family)
+	    strcat (p, ","), strcat (p, msymbol_name (family)), p += strlen (p);
+	  if (weight)
+	    strcat (p, ","), strcat (p, msymbol_name (weight)), p += strlen (p);
+	  if (style)
+	    strcat (p, ","), strcat (p, msymbol_name (style)), p += strlen (p);
+	  if (registry)
+	    strcat (p, ","), strcat (p, msymbol_name (registry)), p += strlen (p);
+	  p += strlen (p);
+	}
 
-    XtSetArg (arg[0], XtNborderWidth, 1);
-    XtSetArg (arg[1], XtNlabel, buf);
-    XtSetValues (CurFaceWidget, arg, 2);
-  }
+      mface_merge (face, face_default);
+      for (i = 0; i < n; i++)
+	if (props[i] != selection)
+	  mface_merge (face, (MFace *) mtext_property_value (props[i]));
+      sym = (MSymbol) mface_get_prop (face, Mforeground);
+      if (sym != Mnil)
+	strcat (p, ","), strcat (p, msymbol_name (sym)), p += strlen (p);
+      if ((MSymbol) mface_get_prop (face, Mvideomode) == Mreverse)
+	strcat (p, ",rev"), p += strlen (p);
+      hline = mface_get_prop (face, Mhline);
+      if (hline && hline->width > 0)
+	strcat (p, ",ul"), p += strlen (p);
+      box = mface_get_prop (face, Mbox);
+      if (box && box->width > 0)
+	strcat (p, ",box"), p += strlen (p);
+      m17n_object_unref (face);
+
+      XtSetArg (arg[0], XtNborderWidth, 1);
+      XtSetArg (arg[1], XtNlabel, buf);
+      XtSetValues (CurFaceWidget, arg, 2);
+    }
 
   if (control.cursor_pos < nchars)
     {
@@ -939,7 +943,7 @@ delete_char (int n)
 
   /* Now delete a character.  */
   mtext_del (mt, from, to);
-  nchars--;
+  nchars -= to - from;
   if (from >= top.from && from < top.to)
     update_top (top.from);
   update_cursor (from, 1);