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

Remote changes at Mon Aug 7 14:17:12 EDT 2017 by chuan on vivaldi

This commit is contained in:
Chuan Chen 2017-08-07 14:17:12 -04:00
parent 01b1832e23
commit 9bd159f1c8
1 changed files with 761 additions and 759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
graphics/grTCairo1.c
View File

@ -59,7 +59,8 @@ XVisualInfo *grVisualInfo;
// (Tk_Window)0, (Window)0, (MagWindow *)NULL}; // (Tk_Window)0, (Window)0, (MagWindow *)NULL};
TCAIRO_CURRENT tcairoCurrent = {(Tk_Font)0, 0, 0, 0, 0, TCAIRO_CURRENT tcairoCurrent = {(Tk_Font)0, 0, 0, 0, 0,
(Tk_Window)0, (Window)0, (MagWindow *)NULL}; (Tk_Window)0, (Window)0, (MagWindow *)NULL
};
/* This is kind of a long story, and very kludgy, but the following /* This is kind of a long story, and very kludgy, but the following
* things need to be defined as externals because of the way lint * things need to be defined as externals because of the way lint
@ -399,7 +400,7 @@ void
tcairoSetProjection(llx, lly, width, height) tcairoSetProjection(llx, lly, width, height)
int llx, lly, width, height; int llx, lly, width, height;
{ {
if (toglCurrent.mw->w_flags & WIND_OFFSCREEN) if (tcairoCurrent.mw->w_flags & WIND_OFFSCREEN)
{ {
/* /*
if (glpmap != None) glXDestroyGLXPixmap(grXdpy, glpmap); if (glpmap != None) glXDestroyGLXPixmap(grXdpy, glpmap);
@ -407,8 +408,9 @@ tcairoSetProjection(llx, lly, width, height)
(Pixmap)toglCurrent.windowid); (Pixmap)toglCurrent.windowid);
glXMakeCurrent(grXdpy, (GLXDrawable)glpmap, grXcontext); glXMakeCurrent(grXdpy, (GLXDrawable)glpmap, grXcontext);
*/ */
cairopmap = XCreatePixmap(grXdpy, grXscrn, width, height, toglCurrent.depth); cairopmap = XCreatePixmap(grXdpy, grXscrn, width, height, tcairoCurrent.depth);
cairo_set_source(grCairoContext); grCairoSurface = cairo_xlib_surface_create(grXdpy, cairopmap, grVisualInfo->visual, width, height);
//cairo_set_source(grCairoContext);
} }
else else
glXMakeCurrent(grXdpy, (GLXDrawable)toglCurrent.windowid, grXcontext); glXMakeCurrent(grXdpy, (GLXDrawable)toglCurrent.windowid, grXcontext);