Commit 1675728f authored by Paul Eggert's avatar Paul Eggert

* ftxfont.c: Make symbols static if they're not exported.

(ftxfont_driver): Export only if !defined HAVE_XFT && def8ined
HAVE_FREETYPE.
* font.h (ftxfont_driver): Likewise.
parent e4cebfca
2011-04-12 Paul Eggert <eggert@cs.ucla.edu> 2011-04-12 Paul Eggert <eggert@cs.ucla.edu>
* ftxfont.c: Make symbols static if they're not exported.
(ftxfont_driver): Export only if !defined HAVE_XFT && def8ined
HAVE_FREETYPE.
* font.h (ftxfont_driver): Likewise.
* xfns.c: Make symbols static if they're not exported. * xfns.c: Make symbols static if they're not exported.
(x_last_font_name, x_display_info_for_name): (x_last_font_name, x_display_info_for_name):
(x_set_foreground_color, x_set_background_color, x_set_mouse_color): (x_set_foreground_color, x_set_background_color, x_set_mouse_color):
......
...@@ -821,13 +821,14 @@ extern void syms_of_ftfont (void); ...@@ -821,13 +821,14 @@ extern void syms_of_ftfont (void);
#endif /* HAVE_FREETYPE */ #endif /* HAVE_FREETYPE */
#ifdef HAVE_X_WINDOWS #ifdef HAVE_X_WINDOWS
extern struct font_driver xfont_driver; extern struct font_driver xfont_driver;
extern struct font_driver ftxfont_driver;
extern void syms_of_xfont (void); extern void syms_of_xfont (void);
extern void syms_of_ftxfont (void); extern void syms_of_ftxfont (void);
#ifdef HAVE_XFT #ifdef HAVE_XFT
extern struct font_driver xftfont_driver; extern struct font_driver xftfont_driver;
extern void syms_of_xftfont (void); extern void syms_of_xftfont (void);
#endif /* HAVE_XFT */ #elif defined HAVE_FREETYPE
extern struct font_driver ftxfont_driver;
#endif
#ifdef HAVE_BDFFONT #ifdef HAVE_BDFFONT
extern void syms_of_bdffont (void); extern void syms_of_bdffont (void);
#endif /* HAVE_BDFFONT */ #endif /* HAVE_BDFFONT */
......
...@@ -38,6 +38,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -38,6 +38,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
static Lisp_Object Qftx; static Lisp_Object Qftx;
#if defined HAVE_XFT || !defined HAVE_FREETYPE
static
#endif
struct font_driver ftxfont_driver;
/* Prototypes for helper function. */ /* Prototypes for helper function. */
static GC *ftxfont_get_gcs (FRAME_PTR, unsigned long, unsigned long); static GC *ftxfont_get_gcs (FRAME_PTR, unsigned long, unsigned long);
static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *, static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *,
...@@ -233,13 +238,11 @@ static Lisp_Object ftxfont_open (FRAME_PTR, Lisp_Object, int); ...@@ -233,13 +238,11 @@ static Lisp_Object ftxfont_open (FRAME_PTR, Lisp_Object, int);
static void ftxfont_close (FRAME_PTR, struct font *); static void ftxfont_close (FRAME_PTR, struct font *);
static int ftxfont_draw (struct glyph_string *, int, int, int, int, int); static int ftxfont_draw (struct glyph_string *, int, int, int, int, int);
struct font_driver ftxfont_driver;
static Lisp_Object static Lisp_Object
ftxfont_list (Lisp_Object frame, Lisp_Object spec) ftxfont_list (Lisp_Object frame, Lisp_Object spec)
{ {
Lisp_Object list = ftfont_driver.list (frame, spec), tail; Lisp_Object list = ftfont_driver.list (frame, spec), tail;
for (tail = list; CONSP (tail); tail = XCDR (tail)) for (tail = list; CONSP (tail); tail = XCDR (tail))
ASET (XCAR (tail), FONT_TYPE_INDEX, Qftx); ASET (XCAR (tail), FONT_TYPE_INDEX, Qftx);
return list; return list;
...@@ -350,13 +353,13 @@ static int ...@@ -350,13 +353,13 @@ static int
ftxfont_end_for_frame (FRAME_PTR f) ftxfont_end_for_frame (FRAME_PTR f)
{ {
struct ftxfont_frame_data *data = font_get_frame_data (f, &ftxfont_driver); struct ftxfont_frame_data *data = font_get_frame_data (f, &ftxfont_driver);
BLOCK_INPUT; BLOCK_INPUT;
while (data) while (data)
{ {
struct ftxfont_frame_data *next = data->next; struct ftxfont_frame_data *next = data->next;
int i; int i;
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
XFreeGC (FRAME_X_DISPLAY (f), data->gcs[i]); XFreeGC (FRAME_X_DISPLAY (f), data->gcs[i]);
free (data); free (data);
...@@ -384,4 +387,3 @@ syms_of_ftxfont (void) ...@@ -384,4 +387,3 @@ syms_of_ftxfont (void)
ftxfont_driver.end_for_frame = ftxfont_end_for_frame; ftxfont_driver.end_for_frame = ftxfont_end_for_frame;
register_font_driver (&ftxfont_driver, NULL); register_font_driver (&ftxfont_driver, NULL);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment