X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fredisplay-msw.c;h=5e7e9e5c986a276a730961ae4d57fb5f0f6c2842;hb=d1772ff384b161fa884517d201956e477afad354;hp=9af4b5e0c950f1ab3d6f75d13bd20f65e3335c4a;hpb=a1655b870904de973c366d85ebdc8adde4ef5e1e;p=chise%2Fxemacs-chise.git.1 diff --git a/src/redisplay-msw.c b/src/redisplay-msw.c index 9af4b5e..5e7e9e5 100644 --- a/src/redisplay-msw.c +++ b/src/redisplay-msw.c @@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA. */ #ifdef MULE #include "mule-ccl.h" -#include "mule-charset.h" +#include "character.h" #endif #define MSWINDOWS_EOL_CURSOR_WIDTH 5 @@ -134,9 +134,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 } @@ -309,6 +309,7 @@ mswindows_output_blank (struct window *w, struct display_line *dl, struct display_glyph_area dga; redisplay_calculate_display_boxes (dl, rb->xpos, /*rb->object.dglyph.xoffset*/ 0, + /*rb->object.dglyph.yoffset*/ 0, start_pixpos, rb->width, &db, &dga); /* blank the background in the appropriate color */ @@ -512,7 +513,7 @@ mswindows_output_string (struct window *w, struct display_line *dl, { struct display_box db; struct display_glyph_area dga; - redisplay_calculate_display_boxes (dl, xpos + xoffset, 0, + redisplay_calculate_display_boxes (dl, xpos + xoffset, 0, 0, clip_start, width, &db, &dga); /* blank the background in the appropriate color */ mswindows_update_dc (hdc, @@ -576,7 +577,6 @@ mswindows_output_dibitmap (struct frame *f, Lisp_Image_Instance *p, HDC hdc = get_frame_dc (f, 1); HDC hcompdc = get_frame_compdc (f); HGDIOBJ old=NULL; - COLORREF bgcolor = GetBkColor (hdc); const int real_x = IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_WIDTH (p); const int real_y = IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_HEIGHT (p); const int surface_x = IMAGE_INSTANCE_PIXMAP_WIDTH (p); @@ -585,15 +585,30 @@ mswindows_output_dibitmap (struct frame *f, Lisp_Image_Instance *p, /* first blit the mask */ if (IMAGE_INSTANCE_MSWINDOWS_MASK (p)) { - RGBQUAD col; - col.rgbBlue = GetBValue (bgcolor); - col.rgbRed = GetRValue (bgcolor); - col.rgbGreen = GetGValue (bgcolor); - col.rgbReserved = 0; + RGBQUAD bg; + COLORREF bgcolor; old = SelectObject (hcompdc, IMAGE_INSTANCE_MSWINDOWS_MASK (p)); - SetDIBColorTable (hcompdc, 1, 1, &col); + if (IMAGE_INSTANCE_TYPE (p) == IMAGE_MONO_PIXMAP) + { + COLORREF fgcolor; + RGBQUAD fg; + + fgcolor = GetTextColor (hdc); + fg.rgbBlue = GetBValue (fgcolor); + fg.rgbRed = GetRValue (fgcolor); + fg.rgbGreen = GetGValue (fgcolor); + fg.rgbReserved = 0; + SetDIBColorTable (hcompdc, 0, 1, &fg); + } + + bgcolor = GetBkColor (hdc); + bg.rgbBlue = GetBValue (bgcolor); + bg.rgbRed = GetRValue (bgcolor); + bg.rgbGreen = GetGValue (bgcolor); + bg.rgbReserved = 0; + SetDIBColorTable (hcompdc, 1, 1, &bg); StretchBlt (hdc, db->xpos, db->ypos, @@ -957,22 +972,38 @@ mswindows_eol_cursor_width (void) } /***************************************************************************** - mswindows_output_begin + mswindows_frame_output_begin Perform any necessary initialization prior to an update. ****************************************************************************/ static void -mswindows_output_begin (struct device *d) +mswindows_frame_output_begin (struct frame *f) { } /***************************************************************************** - mswindows_output_end + mswindows_frame_output_end Perform any necessary flushing of queues when an update has completed. ****************************************************************************/ static void -mswindows_output_end (struct device *d) +mswindows_frame_output_end (struct frame *f) +{ +#ifdef DEFER_WINDOW_POS + HDWP hdwp = FRAME_MSWINDOWS_DATA (f)->hdwp; + + if (hdwp != 0) + { + EndDeferWindowPos (hdwp); + FRAME_MSWINDOWS_DATA (f)->hdwp = 0; + } +#endif + GdiFlush(); +} + +/* Printer version is more lightweight. */ +static void +msprinter_frame_output_end (struct frame *f) { GdiFlush(); } @@ -1013,7 +1044,7 @@ mswindows_output_display_block (struct window *w, struct display_line *dl, int b int cursor_width, int cursor_height) { struct frame *f = XFRAME (w->frame); - Emchar_dynarr *buf = Dynarr_new (Emchar); + Emchar_dynarr *buf; Lisp_Object window; struct display_block *db = Dynarr_atp (dl->display_blocks, block); @@ -1040,7 +1071,7 @@ mswindows_output_display_block (struct window *w, struct display_line *dl, int b if (end < 0) end = Dynarr_length (rba); - Dynarr_reset (buf); + buf = Dynarr_new (Emchar); while (elt < end) { @@ -1135,8 +1166,8 @@ mswindows_output_display_block (struct window *w, struct display_line *dl, int b 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); instance = glyph_image_instance (rb->object.dglyph.glyph, @@ -1157,8 +1188,19 @@ mswindows_output_display_block (struct window *w, struct display_line *dl, int b findex, 0, 1); break; - case IMAGE_SUBWINDOW: case IMAGE_WIDGET: + if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance), + Qlayout)) + { + redisplay_output_layout (window, instance, &dbox, &dga, findex, + cursor_start, cursor_width, + cursor_height); + if (rb->cursor_type == CURSOR_ON) + mswindows_output_cursor (w, dl, xpos, cursor_width, + findex, 0, 1); + break; + } + case IMAGE_SUBWINDOW: redisplay_output_subwindow (w, instance, &dbox, &dga, findex, cursor_start, cursor_width, cursor_height); @@ -1167,15 +1209,6 @@ mswindows_output_display_block (struct window *w, struct display_line *dl, int b findex, 0, 1); break; - case IMAGE_LAYOUT: - redisplay_output_layout (w, instance, &dbox, &dga, findex, - cursor_start, cursor_width, - cursor_height); - if (rb->cursor_type == CURSOR_ON) - mswindows_output_cursor (w, dl, xpos, cursor_width, - findex, 0, 1); - break; - case IMAGE_NOTHING: /* nothing is as nothing does */ break; @@ -1183,7 +1216,7 @@ mswindows_output_display_block (struct window *w, struct display_line *dl, int b case IMAGE_TEXT: case IMAGE_POINTER: default: - abort (); + ABORT (); } IMAGE_INSTANCE_OPTIMIZE_OUTPUT (XIMAGE_INSTANCE (instance)) = 0; @@ -1192,7 +1225,7 @@ mswindows_output_display_block (struct window *w, struct display_line *dl, int b elt++; } else - abort (); + ABORT (); } } @@ -1358,8 +1391,8 @@ console_type_create_redisplay_mswindows (void) CONSOLE_HAS_METHOD (mswindows, output_vertical_divider); CONSOLE_HAS_METHOD (mswindows, clear_region); CONSOLE_HAS_METHOD (mswindows, clear_frame); - CONSOLE_HAS_METHOD (mswindows, output_begin); - CONSOLE_HAS_METHOD (mswindows, output_end); + CONSOLE_HAS_METHOD (mswindows, frame_output_begin); + CONSOLE_HAS_METHOD (mswindows, frame_output_end); CONSOLE_HAS_METHOD (mswindows, flash); CONSOLE_HAS_METHOD (mswindows, ring_bell); CONSOLE_HAS_METHOD (mswindows, bevel_area); @@ -1367,6 +1400,7 @@ console_type_create_redisplay_mswindows (void) CONSOLE_HAS_METHOD (mswindows, output_pixmap); /* redisplay methods - printer */ + CONSOLE_HAS_METHOD (msprinter, frame_output_end); CONSOLE_INHERITS_METHOD (msprinter, mswindows, text_width); CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_display_block); CONSOLE_INHERITS_METHOD (msprinter, mswindows, divider_height); @@ -1374,8 +1408,7 @@ console_type_create_redisplay_mswindows (void) CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_vertical_divider); CONSOLE_INHERITS_METHOD (msprinter, mswindows, clear_region); CONSOLE_INHERITS_METHOD (msprinter, mswindows, clear_frame); - CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_begin); - CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_end); + CONSOLE_INHERITS_METHOD (msprinter, mswindows, frame_output_begin); CONSOLE_INHERITS_METHOD (msprinter, mswindows, bevel_area); CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_string); CONSOLE_INHERITS_METHOD (msprinter, mswindows, output_pixmap);