comparison src/xfont.c @ 112434:9de5a68b57e1

Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
author Paul Eggert <eggert@cs.ucla.edu>
date Sat, 22 Jan 2011 18:56:06 -0800
parents ef719132ddfa
children
comparison
equal deleted inserted replaced
112433:7b649f6eac4f 112434:9de5a68b57e1
360 if (! xfont_chars_supported (chars, NULL, encoding, repertory)) 360 if (! xfont_chars_supported (chars, NULL, encoding, repertory))
361 return Qnil; 361 return Qnil;
362 script = Qnil; 362 script = Qnil;
363 } 363 }
364 } 364 }
365 365
366 BLOCK_INPUT; 366 BLOCK_INPUT;
367 x_catch_errors (display); 367 x_catch_errors (display);
368 368
369 for (limit = 512; ; limit *= 2) 369 for (limit = 512; ; limit *= 2)
370 { 370 {
538 538
539 for (alter = XCDR (alter); CONSP (alter); alter = XCDR (alter)) 539 for (alter = XCDR (alter); CONSP (alter); alter = XCDR (alter))
540 if (STRINGP (XCAR (alter)) 540 if (STRINGP (XCAR (alter))
541 && ((r - name) + SBYTES (XCAR (alter))) < 256) 541 && ((r - name) + SBYTES (XCAR (alter))) < 256)
542 { 542 {
543 strcpy (r, (char *) SDATA (XCAR (alter))); 543 strcpy (r, SSDATA (XCAR (alter)));
544 list = xfont_list_pattern (display, name, registry, script); 544 list = xfont_list_pattern (display, name, registry, script);
545 if (! NILP (list)) 545 if (! NILP (list))
546 break; 546 break;
547 } 547 }
548 } 548 }
795 font_object = font_make_object (VECSIZE (struct xfont_info), 795 font_object = font_make_object (VECSIZE (struct xfont_info),
796 entity, pixel_size); 796 entity, pixel_size);
797 ASET (font_object, FONT_TYPE_INDEX, Qx); 797 ASET (font_object, FONT_TYPE_INDEX, Qx);
798 if (STRINGP (fullname)) 798 if (STRINGP (fullname))
799 { 799 {
800 font_parse_xlfd ((char *) SDATA (fullname), font_object); 800 font_parse_xlfd (SSDATA (fullname), font_object);
801 ASET (font_object, FONT_NAME_INDEX, fullname); 801 ASET (font_object, FONT_NAME_INDEX, fullname);
802 } 802 }
803 else 803 else
804 { 804 {
805 char buf[512]; 805 char buf[512];
1111 staticpro (&xfont_scratch_props); 1111 staticpro (&xfont_scratch_props);
1112 xfont_scratch_props = Fmake_vector (make_number (8), Qnil); 1112 xfont_scratch_props = Fmake_vector (make_number (8), Qnil);
1113 xfont_driver.type = Qx; 1113 xfont_driver.type = Qx;
1114 register_font_driver (&xfont_driver, NULL); 1114 register_font_driver (&xfont_driver, NULL);
1115 } 1115 }
1116