Mercurial > emacs
diff src/fontset.c @ 109126:aec1143e8d85
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.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sun, 04 Jul 2010 00:50:25 -0700 |
parents | 2bc9a0c04c87 |
children | 8cfee7d2955f |
line wrap: on
line diff
--- a/src/fontset.c Sat Jul 03 23:05:43 2010 -0700 +++ b/src/fontset.c Sun Jul 04 00:50:25 2010 -0700 @@ -306,9 +306,7 @@ : fontset_ref ((fontset), (c))) static Lisp_Object -fontset_ref (fontset, c) - Lisp_Object fontset; - int c; +fontset_ref (Lisp_Object fontset, int c) { Lisp_Object elt; @@ -343,8 +341,7 @@ : fontset_add ((fontset), (range), (elt), (add))) static Lisp_Object -fontset_add (fontset, range, elt, add) - Lisp_Object fontset, range, elt, add; +fontset_add (Lisp_Object fontset, Lisp_Object range, Lisp_Object elt, Lisp_Object add) { Lisp_Object args[2]; int idx = (EQ (add, Qappend) ? 0 : 1); @@ -376,8 +373,7 @@ } static int -fontset_compare_rfontdef (val1, val2) - const void *val1, *val2; +fontset_compare_rfontdef (const void *val1, const void *val2) { return (RFONT_DEF_SCORE (*(Lisp_Object *) val1) - RFONT_DEF_SCORE (*(Lisp_Object *) val2)); @@ -392,12 +388,10 @@ If PREFERRED_FAMILY is not nil, that family has the higher priority if the encoding charsets or languages in font-specs are the same. */ -extern Lisp_Object Fassoc_string (); +extern Lisp_Object Fassoc_string (Lisp_Object, Lisp_Object, Lisp_Object); static void -reorder_font_vector (font_group, font) - Lisp_Object font_group; - struct font *font; +reorder_font_vector (Lisp_Object font_group, struct font *font) { Lisp_Object vec, font_object; int size; @@ -525,11 +519,7 @@ If FALLBACK is nonzero, search only fallback fonts. */ static Lisp_Object -fontset_find_font (fontset, c, face, id, fallback) - Lisp_Object fontset; - int c; - struct face *face; - int id, fallback; +fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id, int fallback) { Lisp_Object vec, font_group; int i, charset_matched = 0, found_index; @@ -728,11 +718,7 @@ static Lisp_Object -fontset_font (fontset, c, face, id) - Lisp_Object fontset; - int c; - struct face *face; - int id; +fontset_font (Lisp_Object fontset, int c, struct face *face, int id) { Lisp_Object rfont_def, default_rfont_def; Lisp_Object base_fontset; @@ -793,8 +779,7 @@ BASE. */ static Lisp_Object -make_fontset (frame, name, base) - Lisp_Object frame, name, base; +make_fontset (Lisp_Object frame, Lisp_Object name, Lisp_Object base) { Lisp_Object fontset; int size = ASIZE (Vfontset_table); @@ -835,8 +820,7 @@ /* Return the name of the fontset who has ID. */ Lisp_Object -fontset_name (id) - int id; +fontset_name (int id) { Lisp_Object fontset; @@ -848,8 +832,7 @@ /* Return the ASCII font name of the fontset who has ID. */ Lisp_Object -fontset_ascii (id) - int id; +fontset_ascii (int id) { Lisp_Object fontset, elt; @@ -861,9 +844,7 @@ } void -free_realized_fontset (f, fontset) - FRAME_PTR f; - Lisp_Object fontset; +free_realized_fontset (FRAME_PTR f, Lisp_Object fontset) { Lisp_Object tail; @@ -879,9 +860,7 @@ free_realized_face. */ void -free_face_fontset (f, face) - FRAME_PTR f; - struct face *face; +free_face_fontset (FRAME_PTR f, struct face *face) { Lisp_Object fontset; @@ -915,9 +894,7 @@ when C is not an ASCII character. */ int -face_suitable_for_char_p (face, c) - struct face *face; - int c; +face_suitable_for_char_p (struct face *face, int c) { Lisp_Object fontset, rfont_def; @@ -934,11 +911,7 @@ the macro FACE_FOR_CHAR. */ int -face_for_char (f, face, c, pos, object) - FRAME_PTR f; - struct face *face; - int c, pos; - Lisp_Object object; +face_for_char (FRAME_PTR f, struct face *face, int c, int pos, Lisp_Object object) { Lisp_Object fontset, rfont_def, charset; int face_id; @@ -1006,10 +979,7 @@ Lisp_Object -font_for_char (face, c, pos, object) - struct face *face; - int c, pos; - Lisp_Object object; +font_for_char (struct face *face, int c, int pos, Lisp_Object object) { Lisp_Object fontset, rfont_def, charset; int id; @@ -1059,10 +1029,7 @@ Called from realize_x_face. */ int -make_fontset_for_ascii_face (f, base_fontset_id, face) - FRAME_PTR f; - int base_fontset_id; - struct face *face; +make_fontset_for_ascii_face (FRAME_PTR f, int base_fontset_id, struct face *face) { Lisp_Object base_fontset, fontset, frame; @@ -1096,8 +1063,7 @@ expression corresponding to PATTERN. */ static Lisp_Object -fontset_pattern_regexp (pattern) - Lisp_Object pattern; +fontset_pattern_regexp (Lisp_Object pattern) { if (!index ((char *) SDATA (pattern), '*') && !index ((char *) SDATA (pattern), '?')) @@ -1171,9 +1137,7 @@ */ int -fs_query_fontset (name, name_pattern) - Lisp_Object name; - int name_pattern; +fs_query_fontset (Lisp_Object name, int name_pattern) { Lisp_Object tem; int i; @@ -1246,10 +1210,7 @@ /* Return a list of base fontset names matching PATTERN on frame F. */ Lisp_Object -list_fontsets (f, pattern, size) - FRAME_PTR f; - Lisp_Object pattern; - int size; +list_fontsets (FRAME_PTR f, Lisp_Object pattern, int size) { Lisp_Object frame, regexp, val; int id; @@ -1285,8 +1246,7 @@ /* Free all realized fontsets whose base fontset is BASE. */ static void -free_realized_fontsets (base) - Lisp_Object base; +free_realized_fontsets (Lisp_Object base) { int id; @@ -1343,8 +1303,7 @@ Set *FRAME to the actual frame. */ static Lisp_Object -check_fontset_name (name, frame) - Lisp_Object name, *frame; +check_fontset_name (Lisp_Object name, Lisp_Object *frame) { int id; @@ -1373,8 +1332,7 @@ } static void -accumulate_script_ranges (arg, range, val) - Lisp_Object arg, range, val; +accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val) { if (EQ (XCAR (arg), val)) { @@ -1399,8 +1357,7 @@ case. */ static void -set_fontset_font (arg, range) - Lisp_Object arg, range; +set_fontset_font (Lisp_Object arg, Lisp_Object range) { Lisp_Object fontset, font_def, add, ascii, script_range_list; int from = XINT (XCAR (range)), to = XINT (XCDR (range)); @@ -1762,8 +1719,7 @@ user intends to use FONT-OBJECT for Latin characters. */ int -fontset_from_font (font_object) - Lisp_Object font_object; +fontset_from_font (Lisp_Object font_object) { Lisp_Object font_name = font_get_name (font_object); Lisp_Object font_spec = Fcopy_font_spec (font_object); @@ -1819,8 +1775,7 @@ fontset_from_font. */ static void -update_auto_fontset_alist (font_object, fontset) - Lisp_Object font_object, fontset; +update_auto_fontset_alist (Lisp_Object font_object, Lisp_Object fontset) { Lisp_Object prev, tail; @@ -2224,7 +2179,7 @@ #endif /* FONTSET_DEBUG */ void -syms_of_fontset () +syms_of_fontset (void) { DEFSYM (Qfontset, "fontset"); Fput (Qfontset, Qchar_table_extra_slots, make_number (9));