luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remote changes at Thu Aug 17 13:47:38 EDT 2017 by chuan on vivaldi

This commit is contained in:
Chuan Chen 2017-08-17 13:47:38 -04:00
parent 1ad0d77537
commit cb55befc20
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/grTCairo3.c
View File

@ -133,6 +133,7 @@ Rect *clip; /* a clipping rectangle */
bool bool
grtoglLoadFont() grtoglLoadFont()
{ {
/*
Font id; Font id;
unsigned int i; unsigned int i;
@ -146,6 +147,8 @@ grtoglLoadFont()
} }
glXUseXFont(id, 0, 256, grXBases[i]); glXUseXFont(id, 0, 256, grXBases[i]);
} }
*/
cairo_select_font_face(grCairoContext, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
return TRUE; return TRUE;
} }
@ -166,6 +169,7 @@ grtcairoSetCharSize (size)
int size; /* Width of characters, in pixels (6 or 8). */ int size; /* Width of characters, in pixels (6 or 8). */
{ {
tcairoCurrent.fontSize = size; tcairoCurrent.fontSize = size;
cairo_set_font_size(grCairoContext, size);
switch (size) switch (size)
{ {
case GR_TEXT_DEFAULT: case GR_TEXT_DEFAULT:
@ -820,8 +824,10 @@ LinkedRect *obscure; /* A list of obscuring rectangles */
/* copy the text to the color screen */ /* copy the text to the color screen */
if ((overlap.r_xbot < overlap.r_xtop) && (overlap.r_ybot <= overlap.r_ytop)) if ((overlap.r_xbot < overlap.r_xtop) && (overlap.r_ybot <= overlap.r_ytop))
{ {
glScissor(overlap.r_xbot, overlap.r_ybot, overlap.r_xtop - overlap.r_xbot, //glScissor(overlap.r_xbot, overlap.r_ybot, overlap.r_xtop - overlap.r_xbot,
overlap.r_ytop - overlap.r_ybot); // overlap.r_ytop - overlap.r_ybot);
cairo_clip(grCairoContext);
/*
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
glDisable(GL_BLEND); glDisable(GL_BLEND);
glRasterPos2i(pos->p_x, pos->p_y); glRasterPos2i(pos->p_x, pos->p_y);
@ -829,6 +835,9 @@ LinkedRect *obscure; /* A list of obscuring rectangles */
GR_TEXT_SMALL : toglCurrent.fontSize]); GR_TEXT_SMALL : toglCurrent.fontSize]);
glCallLists(strlen(text), GL_UNSIGNED_BYTE, (unsigned char *)text); glCallLists(strlen(text), GL_UNSIGNED_BYTE, (unsigned char *)text);
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
*/
cairo_move_to(grCairoContext, location.r_xbot, location.r_ybot);
cairo_show_text(grCairoContext, text);
} }
} }