diff options
| author | Keith Packard <keithp@keithp.com> | 2015-09-01 18:50:55 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-07-18 15:25:59 -0400 |
| commit | 05a793f5b3c40747d5a92a076def7f4fb673c7e7 (patch) | |
| tree | 222f652ac4e1b982fd45e5f79479b1caf10526d1 /glamor/glamor_font.c | |
| parent | 950ffb8d6fd1480f305e38c571bda44f247f1de2 (diff) | |
dix: Switch to the libXfont2 API (v2)
This new libXfont API eliminates exposing internal X server symbols to
the font library, replacing those with a struct full of the entire API
needed to use that library.
v2: Use libXfont2 instead of libXfont_2
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'glamor/glamor_font.c')
| -rw-r--r-- | glamor/glamor_font.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glamor/glamor_font.c b/glamor/glamor_font.c index 637e0dce1..9199a355b 100644 --- a/glamor/glamor_font.c +++ b/glamor/glamor_font.c @@ -55,7 +55,7 @@ glamor_font_get(ScreenPtr screen, FontPtr font) privates = calloc(glamor_font_screen_count, sizeof (glamor_font_t)); if (!privates) return NULL; - FontSetPrivate(font, glamor_font_private_index, privates); + xfont2_font_set_private(font, glamor_font_private_index, privates); } glamor_font = &privates[screen->myNum]; @@ -201,7 +201,7 @@ glamor_unrealize_font(ScreenPtr screen, FontPtr font) return TRUE; free(privates); - FontSetPrivate(font, glamor_font_private_index, NULL); + xfont2_font_set_private(font, glamor_font_private_index, NULL); return TRUE; } @@ -214,7 +214,7 @@ glamor_font_init(ScreenPtr screen) return TRUE; if (glamor_font_generation != serverGeneration) { - glamor_font_private_index = AllocateFontPrivateIndex(); + glamor_font_private_index = xfont2_allocate_font_private_index(); if (glamor_font_private_index == -1) return FALSE; glamor_font_screen_count = 0; |