comparison src/redisplay-x.c @ 213:78f53ef88e17 r20-4b5

Import from CVS: tag r20-4b5
author cvs
date Mon, 13 Aug 2007 10:06:47 +0200
parents 41ff10fd062f
children 1f0dabaa0855
comparison
equal deleted inserted replaced
212:d8688acf4c5b 213:78f53ef88e17
46 #include <X11/bitmaps/gray> 46 #include <X11/bitmaps/gray>
47 47
48 #include "sysproc.h" /* for select() */ 48 #include "sysproc.h" /* for select() */
49 49
50 #ifdef MULE 50 #ifdef MULE
51 #include "mule-ccl.h"
51 #include "mule-coding.h" /* for CCL conversion */ 52 #include "mule-coding.h" /* for CCL conversion */
52 #endif 53 #endif
53 54
54 /* X_DIVIDER_LINE_WIDTH is the width of the line drawn in the gutter. 55 /* X_DIVIDER_LINE_WIDTH is the width of the line drawn in the gutter.
55 X_DIVIDER_SPACING is the amount of blank space on each side of the line. 56 X_DIVIDER_SPACING is the amount of blank space on each side of the line.
182 #ifdef MULE 183 #ifdef MULE
183 { 184 {
184 Lisp_Object ccl_prog = XCHARSET_CCL_PROGRAM (charset); 185 Lisp_Object ccl_prog = XCHARSET_CCL_PROGRAM (charset);
185 need_ccl_conversion = !NILP (ccl_prog); 186 need_ccl_conversion = !NILP (ccl_prog);
186 if (need_ccl_conversion) 187 if (need_ccl_conversion)
187 set_ccl_program (&char_converter, ccl_prog, 0, 0, 0); 188 setup_ccl_program (&char_converter, ccl_prog);
188 } 189 }
189 #endif 190 #endif
190 } 191 }
191 192
192 if (graphic == 0) 193 if (graphic == 0)
200 byte2 |= 0x80; 201 byte2 |= 0x80;
201 } 202 }
202 #ifdef MULE 203 #ifdef MULE
203 if (need_ccl_conversion) 204 if (need_ccl_conversion)
204 { 205 {
205 char_converter.reg[0] = byte1; 206 char_converter.reg[0] = XCHARSET_ID (charset);
206 char_converter.reg[1] = byte2; 207 char_converter.reg[1] = byte1;
207 char_converter.ic = 0; /* start at beginning each time */ 208 char_converter.reg[2] = byte2;
208 ccl_driver (&char_converter, 0, 0, 0, 0); 209 ccl_driver (&char_converter, 0, 0, 0, 0);
209 byte1 = char_converter.reg[0]; 210 byte1 = char_converter.reg[1];
210 byte2 = char_converter.reg[1]; 211 byte2 = char_converter.reg[2];
211 } 212 }
212 #endif 213 #endif
213 *text_storage++ = (unsigned char) byte1; 214 *text_storage++ = (unsigned char) byte1;
214 if (dimension == 2) 215 if (dimension == 2)
215 *text_storage++ = (unsigned char) byte2; 216 *text_storage++ = (unsigned char) byte2;