comparison src/w32fns.c @ 41322:482c520b29ba

(Vw32_system_coding_system): Remove. (w32_to_x_font, x_to_w32_font): Use Vlocale_coding_system.
author Jason Rumney <jasonr@gnu.org>
date Tue, 20 Nov 2001 22:00:54 +0000
parents 4423b32c875c
children aff1b15f295b
comparison
equal deleted inserted replaced
41321:8e388f1d8196 41322:482c520b29ba
174 174
175 Lisp_Object Vx_pixel_size_width_font_regexp; 175 Lisp_Object Vx_pixel_size_width_font_regexp;
176 176
177 /* Alist of bdf fonts and the files that define them. */ 177 /* Alist of bdf fonts and the files that define them. */
178 Lisp_Object Vw32_bdf_filename_alist; 178 Lisp_Object Vw32_bdf_filename_alist;
179
180 Lisp_Object Vw32_system_coding_system;
181 179
182 /* A flag to control whether fonts are matched strictly or not. */ 180 /* A flag to control whether fonts are matched strictly or not. */
183 int w32_strict_fontnames; 181 int w32_strict_fontnames;
184 182
185 /* A flag to control whether we should only repaint if GetUpdateRect 183 /* A flag to control whether we should only repaint if GetUpdateRect
6240 else if (lplogfont->lfOutPrecision == OUT_STROKE_PRECIS) 6238 else if (lplogfont->lfOutPrecision == OUT_STROKE_PRECIS)
6241 fonttype = "outline"; 6239 fonttype = "outline";
6242 else 6240 else
6243 fonttype = "unknown"; 6241 fonttype = "unknown";
6244 6242
6245 setup_coding_system (Fcheck_coding_system (Vw32_system_coding_system), 6243 setup_coding_system (Fcheck_coding_system (Vlocale_coding_system),
6246 &coding); 6244 &coding);
6247 coding.src_multibyte = 0; 6245 coding.src_multibyte = 0;
6248 coding.dst_multibyte = 1; 6246 coding.dst_multibyte = 1;
6249 coding.mode |= CODING_MODE_LAST_BLOCK; 6247 coding.mode |= CODING_MODE_LAST_BLOCK;
6250 bufsz = decoding_buffer_size (&coding, LF_FACESIZE); 6248 bufsz = decoding_buffer_size (&coding, LF_FACESIZE);
6372 { 6370 {
6373 int bufsize; 6371 int bufsize;
6374 unsigned char *buf; 6372 unsigned char *buf;
6375 6373
6376 setup_coding_system 6374 setup_coding_system
6377 (Fcheck_coding_system (Vw32_system_coding_system), &coding); 6375 (Fcheck_coding_system (Vlocale_coding_system), &coding);
6378 coding.src_multibyte = 1; 6376 coding.src_multibyte = 1;
6379 coding.dst_multibyte = 1; 6377 coding.dst_multibyte = 1;
6380 bufsize = encoding_buffer_size (&coding, strlen (name)); 6378 bufsize = encoding_buffer_size (&coding, strlen (name));
6381 buf = (unsigned char *) alloca (bufsize); 6379 buf = (unsigned char *) alloca (bufsize);
6382 coding.mode |= CODING_MODE_LAST_BLOCK; 6380 coding.mode |= CODING_MODE_LAST_BLOCK;
14491 doc: /* Non-nil means use strict rules for repainting frames. 14489 doc: /* Non-nil means use strict rules for repainting frames.
14492 Set this to nil to get the old behaviour for repainting; this should 14490 Set this to nil to get the old behaviour for repainting; this should
14493 only be necessary if the default setting causes problems. */); 14491 only be necessary if the default setting causes problems. */);
14494 w32_strict_painting = 1; 14492 w32_strict_painting = 1;
14495 14493
14496 DEFVAR_LISP ("w32-system-coding-system",
14497 &Vw32_system_coding_system,
14498 doc: /* Coding system used by Windows system functions, such as for font names. */);
14499 Vw32_system_coding_system = Qnil;
14500
14501 DEFVAR_LISP ("w32-charset-info-alist", 14494 DEFVAR_LISP ("w32-charset-info-alist",
14502 &Vw32_charset_info_alist, 14495 &Vw32_charset_info_alist,
14503 doc: /* Alist linking Emacs character sets to Windows fonts and codepages. 14496 doc: /* Alist linking Emacs character sets to Windows fonts and codepages.
14504 Each entry should be of the form: 14497 Each entry should be of the form:
14505 14498