(JC3-70A4): New character.

[chise/xemacs-chise.git-] / src / redisplay-x.c

diff --git a/src/redisplay-x.c b/src/redisplay-x.c
index 3df981c..e218fe5 100644 (file)
--- a/src/redisplay-x.c
+++ b/src/redisplay-x.c
@@ -174,9 +174,9 @@ separate_textual_runs (unsigned char *text_storage,
 #ifdef MULE
          {
            Lisp_Object ccl_prog = XCHARSET_CCL_PROGRAM (charset);
-           need_ccl_conversion = !NILP (ccl_prog);
-           if (need_ccl_conversion)
-             setup_ccl_program (&char_converter, ccl_prog);
+           if ((!NILP (ccl_prog))
+                 && (setup_ccl_program (&char_converter, ccl_prog) >= 0))
+             need_ccl_conversion = 1;
          }
 #endif
        }
@@ -449,11 +449,12 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
              Lisp_Object instance;
              struct display_box dbox;
              struct display_glyph_area dga;
+
              redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset,
-                                                start_pixpos, rb->width,
-                                                &dbox, &dga);
+                                                rb->object.dglyph.yoffset, start_pixpos,
+                                                 rb->width, &dbox, &dga);
 
-             XSETWINDOW (window, w);
+              XSETWINDOW (window, w);
              instance = glyph_image_instance (rb->object.dglyph.glyph,
                                               window, ERROR_ME_NOT, 1);
              findex = rb->findex;
@@ -468,12 +469,12 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
                                               cursor_start, cursor_width,
                                               cursor_height, 0);
                      break;
-                     
+
                    case IMAGE_WIDGET:
                      if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance),
                              Qlayout))
                        {
-                         redisplay_output_layout (w, instance, &dbox, &dga, findex,
+                         redisplay_output_layout (window, instance, &dbox, &dga, findex,
                                                   cursor_start, cursor_width,
                                                   cursor_height);
                          break;
@@ -483,17 +484,17 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
                                                  cursor_start, cursor_width,
                                                  cursor_height);
                      break;
-                     
+
                    case IMAGE_NOTHING:
                      /* nothing is as nothing does */
                      break;
-                     
+
                    case IMAGE_TEXT:
                    case IMAGE_POINTER:
                    default:
                      abort ();
                    }
-                 IMAGE_INSTANCE_OPTIMIZE_OUTPUT 
+                 IMAGE_INSTANCE_OPTIMIZE_OUTPUT
                    (XIMAGE_INSTANCE (instance)) = 0;
                }
 
@@ -524,7 +525,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 /*****************************************************************************
  x_bevel_area
 
- Draw a shadows for the given area in the given face.
+ Draw shadows for the given area in the given face.
  ****************************************************************************/
 static void
 x_bevel_area (struct window *w, face_index findex,
@@ -981,7 +982,8 @@ x_output_string (struct window *w, struct display_line *dl,
       /* We draw underlines in the same color as the text. */
       if (cachel->underline)
        {
-         unsigned long upos, uthick;
+         long upos;
+         long uthick;
          XFontStruct *xfont;
 
          xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));
@@ -1716,6 +1718,7 @@ x_redraw_exposed_window (struct window *w, int x, int y, int width, int height)
       f->windows_structure_changed = 1;
     }
 
+  redisplay_clear_top_of_window (w);
   if (window_needs_vertical_divider (w))
     {
       x_output_vertical_divider (w, 0);
@@ -2010,7 +2013,7 @@ x_flash (struct device *d)
                      w->pixel_width, flash_height);
     }
   else
-    /* If it is short, flash it all.  */ 
+    /* If it is short, flash it all.  */
     XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
                    w->pixel_width, w->pixel_height);
 
@@ -2043,7 +2046,7 @@ x_flash (struct device *d)
                      w->pixel_width, flash_height);
     }
   else
-    /* If it is short, flash it all.  */ 
+    /* If it is short, flash it all.  */
     XFillRectangle (dpy, win, gc, w->pixel_left, w->pixel_top,
                    w->pixel_width, w->pixel_height);
 
@@ -2074,8 +2077,8 @@ x_ring_bell (struct device *d, int volume, int pitch, int duration)
       /* #### grab server? */
       XGetKeyboardControl (display, &state);
 
-      ctl.bell_pitch    = (pitch    >= 0 ? pitch    : state.bell_pitch);
-      ctl.bell_duration = (duration >= 0 ? duration : state.bell_duration);
+      ctl.bell_pitch    = (pitch    >= 0 ? pitch    : (int) state.bell_pitch);
+      ctl.bell_duration = (duration >= 0 ? duration : (int) state.bell_duration);
       XChangeKeyboardControl (display, KBBellPitch|KBBellDuration, &ctl);
 
       XBell (display, (volume * 2) - 100);