diff options
| author | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
| commit | 971de7fb158335fbda39525feb2d7776a26bc030 (patch) | |
| tree | 605333d85f16e35bb06baffcb66ac49f4ec0dce9 /src/ftxfont.c | |
| parent | b8463cbfbe2c5183cf40772df2746e58b787ddeb (diff) | |
| download | emacs-971de7fb158335fbda39525feb2d7776a26bc030.tar.gz emacs-971de7fb158335fbda39525feb2d7776a26bc030.zip | |
Convert (most) functions in src to standard C.
* src/alloc.c: Convert function definitions to standard C.
* src/atimer.c:
* src/bidi.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/ccl.c:
* src/character.c:
* src/charset.c:
* src/chartab.c:
* src/cmds.c:
* src/coding.c:
* src/composite.c:
* src/data.c:
* src/dbusbind.c:
* src/dired.c:
* src/dispnew.c:
* src/doc.c:
* src/doprnt.c:
* src/ecrt0.c:
* src/editfns.c:
* src/fileio.c:
* src/filelock.c:
* src/filemode.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/ftfont.c:
* src/ftxfont.c:
* src/gtkutil.c:
* src/indent.c:
* src/insdel.c:
* src/intervals.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/md5.c:
* src/menu.c:
* src/minibuf.c:
* src/prefix-args.c:
* src/print.c:
* src/ralloc.c:
* src/regex.c:
* src/region-cache.c:
* src/scroll.c:
* src/search.c:
* src/sound.c:
* src/strftime.c:
* src/syntax.c:
* src/sysdep.c:
* src/termcap.c:
* src/terminal.c:
* src/terminfo.c:
* src/textprop.c:
* src/tparam.c:
* src/undo.c:
* src/unexelf.c:
* src/window.c:
* src/xfaces.c:
* src/xfns.c:
* src/xfont.c:
* src/xftfont.c:
* src/xgselect.c:
* src/xmenu.c:
* src/xrdb.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c:
* src/xterm.c: Likewise.
Diffstat (limited to 'src/ftxfont.c')
| -rw-r--r-- | src/ftxfont.c | 46 |
1 files changed, 10 insertions, 36 deletions
diff --git a/src/ftxfont.c b/src/ftxfont.c index e81a5380045..0a9137617b8 100644 --- a/src/ftxfont.c +++ b/src/ftxfont.c | |||
| @@ -61,9 +61,7 @@ struct ftxfont_frame_data | |||
| 61 | /* Return an array of 6 GCs for antialiasing. */ | 61 | /* Return an array of 6 GCs for antialiasing. */ |
| 62 | 62 | ||
| 63 | static GC * | 63 | static GC * |
| 64 | ftxfont_get_gcs (f, foreground, background) | 64 | ftxfont_get_gcs (FRAME_PTR f, long unsigned int foreground, long unsigned int background) |
| 65 | FRAME_PTR f; | ||
| 66 | unsigned long foreground, background; | ||
| 67 | { | 65 | { |
| 68 | XColor color; | 66 | XColor color; |
| 69 | XGCValues xgcv; | 67 | XGCValues xgcv; |
| @@ -140,15 +138,7 @@ ftxfont_get_gcs (f, foreground, background) | |||
| 140 | } | 138 | } |
| 141 | 139 | ||
| 142 | static int | 140 | static int |
| 143 | ftxfont_draw_bitmap (f, gc_fore, gcs, font, code, x, y, p, size, n, flush) | 141 | ftxfont_draw_bitmap (FRAME_PTR f, GC gc_fore, GC *gcs, struct font *font, unsigned int code, int x, int y, XPoint *p, int size, int *n, int flush) |
| 144 | FRAME_PTR f; | ||
| 145 | GC gc_fore, *gcs; | ||
| 146 | struct font *font; | ||
| 147 | unsigned code; | ||
| 148 | int x, y; | ||
| 149 | XPoint *p; | ||
| 150 | int size, *n; | ||
| 151 | int flush; | ||
| 152 | { | 142 | { |
| 153 | struct font_bitmap bitmap; | 143 | struct font_bitmap bitmap; |
| 154 | unsigned char *b; | 144 | unsigned char *b; |
| @@ -224,11 +214,7 @@ ftxfont_draw_bitmap (f, gc_fore, gcs, font, code, x, y, p, size, n, flush) | |||
| 224 | } | 214 | } |
| 225 | 215 | ||
| 226 | static void | 216 | static void |
| 227 | ftxfont_draw_backgrond (f, font, gc, x, y, width) | 217 | ftxfont_draw_backgrond (FRAME_PTR f, struct font *font, GC gc, int x, int y, int width) |
| 228 | FRAME_PTR f; | ||
| 229 | struct font *font; | ||
| 230 | GC gc; | ||
| 231 | int x, y, width; | ||
| 232 | { | 218 | { |
| 233 | XGCValues xgcv; | 219 | XGCValues xgcv; |
| 234 | 220 | ||
| @@ -250,9 +236,7 @@ static int ftxfont_draw (struct glyph_string *, int, int, int, int, int); | |||
| 250 | struct font_driver ftxfont_driver; | 236 | struct font_driver ftxfont_driver; |
| 251 | 237 | ||
| 252 | static Lisp_Object | 238 | static Lisp_Object |
| 253 | ftxfont_list (frame, spec) | 239 | ftxfont_list (Lisp_Object frame, Lisp_Object spec) |
| 254 | Lisp_Object frame; | ||
| 255 | Lisp_Object spec; | ||
| 256 | { | 240 | { |
| 257 | Lisp_Object list = ftfont_driver.list (frame, spec), tail; | 241 | Lisp_Object list = ftfont_driver.list (frame, spec), tail; |
| 258 | 242 | ||
| @@ -262,9 +246,7 @@ ftxfont_list (frame, spec) | |||
| 262 | } | 246 | } |
| 263 | 247 | ||
| 264 | static Lisp_Object | 248 | static Lisp_Object |
| 265 | ftxfont_match (frame, spec) | 249 | ftxfont_match (Lisp_Object frame, Lisp_Object spec) |
| 266 | Lisp_Object frame; | ||
| 267 | Lisp_Object spec; | ||
| 268 | { | 250 | { |
| 269 | Lisp_Object entity = ftfont_driver.match (frame, spec); | 251 | Lisp_Object entity = ftfont_driver.match (frame, spec); |
| 270 | 252 | ||
| @@ -274,10 +256,7 @@ ftxfont_match (frame, spec) | |||
| 274 | } | 256 | } |
| 275 | 257 | ||
| 276 | static Lisp_Object | 258 | static Lisp_Object |
| 277 | ftxfont_open (f, entity, pixel_size) | 259 | ftxfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) |
| 278 | FRAME_PTR f; | ||
| 279 | Lisp_Object entity; | ||
| 280 | int pixel_size; | ||
| 281 | { | 260 | { |
| 282 | Lisp_Object font_object; | 261 | Lisp_Object font_object; |
| 283 | struct font *font; | 262 | struct font *font; |
| @@ -291,17 +270,13 @@ ftxfont_open (f, entity, pixel_size) | |||
| 291 | } | 270 | } |
| 292 | 271 | ||
| 293 | static void | 272 | static void |
| 294 | ftxfont_close (f, font) | 273 | ftxfont_close (FRAME_PTR f, struct font *font) |
| 295 | FRAME_PTR f; | ||
| 296 | struct font *font; | ||
| 297 | { | 274 | { |
| 298 | ftfont_driver.close (f, font); | 275 | ftfont_driver.close (f, font); |
| 299 | } | 276 | } |
| 300 | 277 | ||
| 301 | static int | 278 | static int |
| 302 | ftxfont_draw (s, from, to, x, y, with_background) | 279 | ftxfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_background) |
| 303 | struct glyph_string *s; | ||
| 304 | int from, to, x, y, with_background; | ||
| 305 | { | 280 | { |
| 306 | FRAME_PTR f = s->f; | 281 | FRAME_PTR f = s->f; |
| 307 | struct face *face = s->face; | 282 | struct face *face = s->face; |
| @@ -372,8 +347,7 @@ ftxfont_draw (s, from, to, x, y, with_background) | |||
| 372 | } | 347 | } |
| 373 | 348 | ||
| 374 | static int | 349 | static int |
| 375 | ftxfont_end_for_frame (f) | 350 | ftxfont_end_for_frame (FRAME_PTR f) |
| 376 | FRAME_PTR f; | ||
| 377 | { | 351 | { |
| 378 | struct ftxfont_frame_data *data = font_get_frame_data (f, &ftxfont_driver); | 352 | struct ftxfont_frame_data *data = font_get_frame_data (f, &ftxfont_driver); |
| 379 | 353 | ||
| @@ -396,7 +370,7 @@ ftxfont_end_for_frame (f) | |||
| 396 | 370 | ||
| 397 | 371 | ||
| 398 | void | 372 | void |
| 399 | syms_of_ftxfont () | 373 | syms_of_ftxfont (void) |
| 400 | { | 374 | { |
| 401 | DEFSYM (Qftx, "ftx"); | 375 | DEFSYM (Qftx, "ftx"); |
| 402 | 376 | ||