comparison src/xfont.c @ 90461:2457d1153a8b

(xfont_parse_name): Delete this function.
author Kenichi Handa <handa@m17n.org>
date Fri, 16 Jun 2006 12:13:36 +0000
parents a8b745412821
children 2ef165ebcc7d
comparison
equal deleted inserted replaced
90460:86449661f321 90461:2457d1153a8b
236 = nconc2 (x_font_charset_alist, Fcons (Fcons (registry, Qnil), Qnil)); 236 = nconc2 (x_font_charset_alist, Fcons (Fcons (registry, Qnil), Qnil));
237 return -1; 237 return -1;
238 } 238 }
239 239
240 static Lisp_Object xfont_get_cache P_ ((Lisp_Object)); 240 static Lisp_Object xfont_get_cache P_ ((Lisp_Object));
241 static int xfont_parse_name P_ ((FRAME_PTR, char *, Lisp_Object));
242 static Lisp_Object xfont_list P_ ((Lisp_Object, Lisp_Object)); 241 static Lisp_Object xfont_list P_ ((Lisp_Object, Lisp_Object));
243 static Lisp_Object xfont_list_family P_ ((Lisp_Object)); 242 static Lisp_Object xfont_list_family P_ ((Lisp_Object));
244 static struct font *xfont_open P_ ((FRAME_PTR, Lisp_Object, int)); 243 static struct font *xfont_open P_ ((FRAME_PTR, Lisp_Object, int));
245 static void xfont_close P_ ((FRAME_PTR, struct font *)); 244 static void xfont_close P_ ((FRAME_PTR, struct font *));
246 static int xfont_prepare_face P_ ((FRAME_PTR, struct face *)); 245 static int xfont_prepare_face P_ ((FRAME_PTR, struct face *));
255 254
256 struct font_driver xfont_driver = 255 struct font_driver xfont_driver =
257 { 256 {
258 (Lisp_Object) NULL, /* Qx */ 257 (Lisp_Object) NULL, /* Qx */
259 xfont_get_cache, 258 xfont_get_cache,
260 xfont_parse_name,
261 xfont_list, 259 xfont_list,
262 xfont_list_family, 260 xfont_list_family,
263 NULL, 261 NULL,
264 xfont_open, 262 xfont_open,
265 xfont_close, 263 xfont_close,
278 Lisp_Object frame; 276 Lisp_Object frame;
279 { 277 {
280 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (XFRAME (frame)); 278 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (XFRAME (frame));
281 279
282 return (dpyinfo->name_list_element); 280 return (dpyinfo->name_list_element);
283 }
284
285 static int
286 xfont_parse_name (f, name, spec)
287 FRAME_PTR f;
288 char *name;
289 Lisp_Object spec;
290 {
291 if (font_parse_xlfd (name, spec, 0) >= 0)
292 return 0;
293 name = xfont_query_font (FRAME_X_DISPLAY (f), name, spec);
294 if (name)
295 {
296 XFree (name);
297 return 0;
298 }
299 return -1;
300 } 281 }
301 282
302 extern Lisp_Object Vface_alternative_font_registry_alist; 283 extern Lisp_Object Vface_alternative_font_registry_alist;
303 284
304 static Lisp_Object 285 static Lisp_Object