Mercurial > emacs

comparison src/xftfont.c @ 90499:32b8f672da38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(xftfont_prepare_face): Cancel previous change. (xftfont_done_face): Likewise.
author Kenichi Handa <handa@m17n.org>
date Wed, 28 Jun 2006 05:39:02 +0000
parents 78a820ef12db
children 2cd8e24f656a
comparison
equal deleted inserted replaced
90498:fa27e8839f68 90499:32b8f672da38
362 FRAME_PTR f; 362 FRAME_PTR f;
363 struct face *face; 363 struct face *face;
364 { 364 {
365 struct xftface_info *xftface_info; 365 struct xftface_info *xftface_info;
366 366
367 #if 0
368 /* This doesn't work if face->ascii_face doesn't use an Xft font. */
367 if (face != face->ascii_face) 369 if (face != face->ascii_face)
368 { 370 {
369 face->extra = face->ascii_face->extra; 371 face->extra = face->ascii_face->extra;
370 return 0; 372 return 0;
371 } 373 }
374 #endif
372 375
373 xftface_info = malloc (sizeof (struct xftface_info)); 376 xftface_info = malloc (sizeof (struct xftface_info));
374 if (! xftface_info) 377 if (! xftface_info)
375 return -1; 378 return -1;
376 379
392 FRAME_PTR f; 395 FRAME_PTR f;
393 struct face *face; 396 struct face *face;
394 { 397 {
395 struct xftface_info *xftface_info; 398 struct xftface_info *xftface_info;
396 399
400 #if 0
401 /* This doesn't work if face->ascii_face doesn't use an Xft font. */
397 if (face != face->ascii_face 402 if (face != face->ascii_face
398 || ! face->extra) 403 || ! face->extra)
399 return; 404 return;
405 #endif
400 406
401 xftface_info = (struct xftface_info *) face->extra; 407 xftface_info = (struct xftface_info *) face->extra;
402 BLOCK_INPUT; 408 BLOCK_INPUT;
403 XftDrawDestroy (xftface_info->xft_draw); 409 XftDrawDestroy (xftface_info->xft_draw);
404 UNBLOCK_INPUT; 410 UNBLOCK_INPUT;