projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename `chinese-cns11643-6' to `=cns11643-6'.
[chise/xemacs-chise.git.1]
/
src
/
redisplay-msw.c
diff --git
a/src/redisplay-msw.c
b/src/redisplay-msw.c
index
ea34721
..
62ddceb
100644
(file)
--- 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"
#ifdef MULE
#include "mule-ccl.h"
-#include "mule-charset.h"
+#include "character.h"
#endif
#define MSWINDOWS_EOL_CURSOR_WIDTH 5
#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);
#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
}
}
#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,
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 */
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;
{
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,
clip_start, width, &db, &dga);
/* blank the background in the appropriate color */
mswindows_update_dc (hdc,
@@
-1165,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,
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,
XSETWINDOW (window, w);
instance = glyph_image_instance (rb->object.dglyph.glyph,