Mercurial > emacs

comparison src/font.c @ 109100:2bc9a0c04c87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove __P and P_ from .c and .m files and definition of P_ * lisp.h: * atimer.h: Remove define for P_. * alloc.c: Remove __P and P_ from .c and .m files. * atimer.c: * buffer.c: * callint.c: * category.c: * charset.c: * chartab.c: * cm.c: * coding.c: * composite.c: * data.c: * dired.c: * dispnew.c: * doc.c: * editfns.c: * emacs.c: * eval.c: * fileio.c: * filelock.c: * fns.c: * font.c: * fontset.c: * frame.c: * ftfont.c: * ftxfont.c: * gmalloc.c: * gtkutil.c: * image.c: * indent.c: * intervals.c: * keyboard.c: * keymap.c: * lread.c: * marker.c: * menu.c: * minibuf.c: * print.c: * process.c: * scroll.c: * search.c: * sound.c: * strftime.c: * syntax.c: * sysdep.c: * term.c: * terminal.c: * textprop.c: * unexalpha.c: * w32console.c: * w32fns.c: * w32font.c: * w32menu.c: * w32term.c: * w32uniscribe.c: * window.c: * xdisp.c: * xfaces.c: * xfns.c: * xfont.c: * xftfont.c: * xmenu.c: * xselect.c: * xterm.c: Likewise. * ebrowse.c: Remove P_ and __P. * etags.c: * movemail.c: * pop.c: * update-game-score.c: Likewise.
author Jan D <jan.h.d@swipnet.se>
date Fri, 02 Jul 2010 14:19:53 +0200
parents d8720405694a
children aec1143e8d85
comparison
equal deleted inserted replaced
109099:e16f43875a48 109100:2bc9a0c04c87
227 return font_object; 227 return font_object;
228 } 228 }
229 229
230 230
231 231
232 static int font_pixel_size P_ ((FRAME_PTR f, Lisp_Object)); 232 static int font_pixel_size (FRAME_PTR f, Lisp_Object);
233 static Lisp_Object font_open_entity P_ ((FRAME_PTR, Lisp_Object, int)); 233 static Lisp_Object font_open_entity (FRAME_PTR, Lisp_Object, int);
234 static Lisp_Object font_matching_entity P_ ((FRAME_PTR, Lisp_Object *, 234 static Lisp_Object font_matching_entity (FRAME_PTR, Lisp_Object *,
235 Lisp_Object)); 235 Lisp_Object);
236 236
237 /* Number of registered font drivers. */ 237 /* Number of registered font drivers. */
238 static int num_font_drivers; 238 static int num_font_drivers;
239 239
240 240
414 return (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1)); 414 return (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1));
415 } 415 }
416 416
417 extern Lisp_Object Vface_alternative_font_family_alist; 417 extern Lisp_Object Vface_alternative_font_family_alist;
418 418
419 extern Lisp_Object find_font_encoding P_ ((Lisp_Object)); 419 extern Lisp_Object find_font_encoding (Lisp_Object);
420 420
421 421
422 /* Return ENCODING or a cons of ENCODING and REPERTORY of the font 422 /* Return ENCODING or a cons of ENCODING and REPERTORY of the font
423 FONTNAME. ENCODING is a charset symbol that specifies the encoding 423 FONTNAME. ENCODING is a charset symbol that specifies the encoding
424 of the font. REPERTORY is a charset symbol or nil. */ 424 of the font. REPERTORY is a charset symbol or nil. */
506 506
507 507
508 /* Font property value validaters. See the comment of 508 /* Font property value validaters. See the comment of
509 font_property_table for the meaning of the arguments. */ 509 font_property_table for the meaning of the arguments. */
510 510
511 static Lisp_Object font_prop_validate P_ ((int, Lisp_Object, Lisp_Object)); 511 static Lisp_Object font_prop_validate (int, Lisp_Object, Lisp_Object);
512 static Lisp_Object font_prop_validate_symbol P_ ((Lisp_Object, Lisp_Object)); 512 static Lisp_Object font_prop_validate_symbol (Lisp_Object, Lisp_Object);
513 static Lisp_Object font_prop_validate_style P_ ((Lisp_Object, Lisp_Object)); 513 static Lisp_Object font_prop_validate_style (Lisp_Object, Lisp_Object);
514 static Lisp_Object font_prop_validate_non_neg P_ ((Lisp_Object, Lisp_Object)); 514 static Lisp_Object font_prop_validate_non_neg (Lisp_Object, Lisp_Object);
515 static Lisp_Object font_prop_validate_spacing P_ ((Lisp_Object, Lisp_Object)); 515 static Lisp_Object font_prop_validate_spacing (Lisp_Object, Lisp_Object);
516 static int get_font_prop_index P_ ((Lisp_Object)); 516 static int get_font_prop_index (Lisp_Object);
517 517
518 static Lisp_Object 518 static Lisp_Object
519 font_prop_validate_symbol (prop, val) 519 font_prop_validate_symbol (prop, val)
520 Lisp_Object prop, val; 520 Lisp_Object prop, val;
521 { 521 {
636 /* Pointer to the key symbol. */ 636 /* Pointer to the key symbol. */
637 Lisp_Object *key; 637 Lisp_Object *key;
638 /* Function to validate PROP's value VAL, or NULL if any value is 638 /* Function to validate PROP's value VAL, or NULL if any value is
639 ok. The value is VAL or its regularized value if VAL is valid, 639 ok. The value is VAL or its regularized value if VAL is valid,
640 and Qerror if not. */ 640 and Qerror if not. */
641 Lisp_Object (*validater) P_ ((Lisp_Object prop, Lisp_Object val)); 641 Lisp_Object (*validater) (Lisp_Object prop, Lisp_Object val);
642 } font_property_table[] = 642 } font_property_table[] =
643 { { &QCtype, font_prop_validate_symbol }, 643 { { &QCtype, font_prop_validate_symbol },
644 { &QCfoundry, font_prop_validate_symbol }, 644 { &QCfoundry, font_prop_validate_symbol },
645 { &QCfamily, font_prop_validate_symbol }, 645 { &QCfamily, font_prop_validate_symbol },
646 { &QCadstyle, font_prop_validate_symbol }, 646 { &QCadstyle, font_prop_validate_symbol },
738 } 738 }
739 739
740 740
741 /* Font name parser and unparser */ 741 /* Font name parser and unparser */
742 742
743 static int parse_matrix P_ ((char *)); 743 static int parse_matrix (char *);
744 static int font_expand_wildcards P_ ((Lisp_Object *, int)); 744 static int font_expand_wildcards (Lisp_Object *, int);
745 static int font_parse_name P_ ((char *, Lisp_Object)); 745 static int font_parse_name (char *, Lisp_Object);
746 746
747 /* An enumerator for each field of an XLFD font name. */ 747 /* An enumerator for each field of an XLFD font name. */
748 enum xlfd_field_index 748 enum xlfd_field_index
749 { 749 {
750 XLFD_FOUNDRY_INDEX, 750 XLFD_FOUNDRY_INDEX,
2218 #endif /* 0 */ 2218 #endif /* 0 */
2219 2219
2220 2220
2221 /* Font sorting */ 2221 /* Font sorting */
2222 2222
2223 static unsigned font_score P_ ((Lisp_Object, Lisp_Object *)); 2223 static unsigned font_score (Lisp_Object, Lisp_Object *);
2224 static int font_compare P_ ((const void *, const void *)); 2224 static int font_compare (const void *, const void *);
2225 static Lisp_Object font_sort_entities P_ ((Lisp_Object, Lisp_Object, 2225 static Lisp_Object font_sort_entities (Lisp_Object, Lisp_Object,
2226 Lisp_Object, int)); 2226 Lisp_Object, int);
2227 2227
2228 /* Return a rescaling ratio of FONT_ENTITY. */ 2228 /* Return a rescaling ratio of FONT_ENTITY. */
2229 extern Lisp_Object Vface_font_rescale_alist; 2229 extern Lisp_Object Vface_font_rescale_alist;
2230 2230
2231 static double 2231 static double
2699 2699
2700 where DRIVER-TYPE is a symbol such as `x', `xft', etc., NUM-FRAMES 2700 where DRIVER-TYPE is a symbol such as `x', `xft', etc., NUM-FRAMES
2701 is a number frames sharing this cache, and FONT-CACHE-DATA is a 2701 is a number frames sharing this cache, and FONT-CACHE-DATA is a
2702 cons (FONT-SPEC FONT-ENTITY ...). */ 2702 cons (FONT-SPEC FONT-ENTITY ...). */
2703 2703
2704 static void font_prepare_cache P_ ((FRAME_PTR, struct font_driver *)); 2704 static void font_prepare_cache (FRAME_PTR, struct font_driver *);
2705 static void font_finish_cache P_ ((FRAME_PTR, struct font_driver *)); 2705 static void font_finish_cache (FRAME_PTR, struct font_driver *);
2706 static Lisp_Object font_get_cache P_ ((FRAME_PTR, struct font_driver *)); 2706 static Lisp_Object font_get_cache (FRAME_PTR, struct font_driver *);
2707 static void font_clear_cache P_ ((FRAME_PTR, Lisp_Object, 2707 static void font_clear_cache (FRAME_PTR, Lisp_Object,
2708 struct font_driver *)); 2708 struct font_driver *);
2709 2709
2710 static void 2710 static void
2711 font_prepare_cache (f, driver) 2711 font_prepare_cache (f, driver)
2712 FRAME_PTR f; 2712 FRAME_PTR f;
2713 struct font_driver *driver; 2713 struct font_driver *driver;
5247 ASET (Vfont_log_deferred, 0, build_string (action)); 5247 ASET (Vfont_log_deferred, 0, build_string (action));
5248 ASET (Vfont_log_deferred, 1, arg); 5248 ASET (Vfont_log_deferred, 1, arg);
5249 ASET (Vfont_log_deferred, 2, result); 5249 ASET (Vfont_log_deferred, 2, result);
5250 } 5250 }
5251 5251
5252 extern void syms_of_ftfont P_ (()); 5252 extern void syms_of_ftfont ();
5253 extern void syms_of_xfont P_ (()); 5253 extern void syms_of_xfont ();
5254 extern void syms_of_xftfont P_ (()); 5254 extern void syms_of_xftfont ();
5255 extern void syms_of_ftxfont P_ (()); 5255 extern void syms_of_ftxfont ();
5256 extern void syms_of_bdffont P_ (()); 5256 extern void syms_of_bdffont ();
5257 extern void syms_of_w32font P_ (()); 5257 extern void syms_of_w32font ();
5258 extern void syms_of_atmfont P_ (()); 5258 extern void syms_of_atmfont ();
5259 extern void syms_of_nsfont P_ (()); 5259 extern void syms_of_nsfont ();
5260 5260
5261 void 5261 void
5262 syms_of_font () 5262 syms_of_font ()
5263 { 5263 {
5264 sort_shift_bits[FONT_TYPE_INDEX] = 0; 5264 sort_shift_bits[FONT_TYPE_INDEX] = 0;