[Scummvm-cvs-logs] CVS: residual driver_gl.cpp,1.10,1.11

James Brown ender at users.sourceforge.net
Thu Mar 25 04:38:24 CET 2004


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19878

Modified Files:
	driver_gl.cpp 
Log Message:
Reenable *nix temporary font hack


Index: driver_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- driver_gl.cpp	24 Mar 2004 13:02:12 -0000	1.10
+++ driver_gl.cpp	25 Mar 2004 12:27:02 -0000	1.11
@@ -63,11 +63,15 @@
 	}
 #else
 	{
-		//Display *dpy = XOpenDisplay(NULL);
-		//XFontStruct *XFont = XLoadQueryFont(dpy, "-misc-fixed-medium-r-*-*-20-*-*-*-*-*-*-*" );
-		//glXUseXFont(XFont->fid, 0, 256, hackFont);
-		//XFreeFont(dpy, XFont);
-		//XCloseDisplay(dpy);
+		Display *dpy = XOpenDisplay(NULL);
+		XFontStruct *XFont = XLoadQueryFont(dpy, "-misc-fixed-medium-r-*-*-20-*-*-*-*-*-*-*" );
+		if (XFont) {
+			glXUseXFont(XFont->fid, 0, 256, hackFont);
+			XFreeFont(dpy, XFont);
+			XCloseDisplay(dpy);
+		} else {
+			warning("Couldn't load default font -misc-fixed-medium");
+		}
 	}
 #endif
 





More information about the Scummvm-git-logs mailing list