comparison src/xftfont.c @ 109100:2bc9a0c04c87

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 bcae1f83a33e
children aec1143e8d85
comparison
equal deleted inserted replaced
109099:e16f43875a48 109100:2bc9a0c04c87
68 { 68 {
69 XftColor xft_fg; /* color for face->foreground */ 69 XftColor xft_fg; /* color for face->foreground */
70 XftColor xft_bg; /* color for face->background */ 70 XftColor xft_bg; /* color for face->background */
71 }; 71 };
72 72
73 static void xftfont_get_colors P_ ((FRAME_PTR, struct face *, GC gc, 73 static void xftfont_get_colors (FRAME_PTR, struct face *, GC gc,
74 struct xftface_info *, 74 struct xftface_info *,
75 XftColor *fg, XftColor *bg)); 75 XftColor *fg, XftColor *bg);
76 76
77 77
78 /* Setup foreground and background colors of GC into FG and BG. If 78 /* Setup foreground and background colors of GC into FG and BG. If
79 XFTFACE_INFO is not NULL, reuse the colors in it if possible. BG 79 XFTFACE_INFO is not NULL, reuse the colors in it if possible. BG
80 may be NULL. */ 80 may be NULL. */
139 UNBLOCK_INPUT; 139 UNBLOCK_INPUT;
140 } 140 }
141 } 141 }
142 142
143 143
144 static Lisp_Object xftfont_list P_ ((Lisp_Object, Lisp_Object)); 144 static Lisp_Object xftfont_list (Lisp_Object, Lisp_Object);
145 static Lisp_Object xftfont_match P_ ((Lisp_Object, Lisp_Object)); 145 static Lisp_Object xftfont_match (Lisp_Object, Lisp_Object);
146 static Lisp_Object xftfont_open P_ ((FRAME_PTR, Lisp_Object, int)); 146 static Lisp_Object xftfont_open (FRAME_PTR, Lisp_Object, int);
147 static void xftfont_close P_ ((FRAME_PTR, struct font *)); 147 static void xftfont_close (FRAME_PTR, struct font *);
148 static int xftfont_prepare_face P_ ((FRAME_PTR, struct face *)); 148 static int xftfont_prepare_face (FRAME_PTR, struct face *);
149 static void xftfont_done_face P_ ((FRAME_PTR, struct face *)); 149 static void xftfont_done_face (FRAME_PTR, struct face *);
150 static int xftfont_has_char P_ ((Lisp_Object, int)); 150 static int xftfont_has_char (Lisp_Object, int);
151 static unsigned xftfont_encode_char P_ ((struct font *, int)); 151 static unsigned xftfont_encode_char (struct font *, int);
152 static int xftfont_text_extents P_ ((struct font *, unsigned *, int, 152 static int xftfont_text_extents (struct font *, unsigned *, int,
153 struct font_metrics *)); 153 struct font_metrics *);
154 static int xftfont_draw P_ ((struct glyph_string *, int, int, int, int, int)); 154 static int xftfont_draw (struct glyph_string *, int, int, int, int, int);
155 static int xftfont_end_for_frame P_ ((FRAME_PTR f)); 155 static int xftfont_end_for_frame (FRAME_PTR f);
156 156
157 struct font_driver xftfont_driver; 157 struct font_driver xftfont_driver;
158 158
159 static Lisp_Object 159 static Lisp_Object
160 xftfont_list (frame, spec) 160 xftfont_list (frame, spec)
178 if (! NILP (entity)) 178 if (! NILP (entity))
179 ASET (entity, FONT_TYPE_INDEX, Qxft); 179 ASET (entity, FONT_TYPE_INDEX, Qxft);
180 return entity; 180 return entity;
181 } 181 }
182 182
183 extern Lisp_Object ftfont_font_format P_ ((FcPattern *, Lisp_Object)); 183 extern Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object);
184 extern FcCharSet *ftfont_get_fc_charset P_ ((Lisp_Object)); 184 extern FcCharSet *ftfont_get_fc_charset (Lisp_Object);
185 extern Lisp_Object QCantialias; 185 extern Lisp_Object QCantialias;
186 186
187 static FcChar8 ascii_printable[95]; 187 static FcChar8 ascii_printable[95];
188 188
189 static void 189 static void