[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-08-28 14:42:06
Message-ID: 1156776126.591919.25037.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 578151 by mueller:

trying to make it pick the right font directories. for X.org 7.x


 M  +24 -5     test_regression.cpp  


--- branches/KDE/3.5/kdelibs/khtml/test_regression.cpp #578150:578151
@@ -422,6 +422,13 @@
     KCmdLineLastOption
 };
 
+static bool existsDir(QCString dir)
+{
+    struct stat st;
+
+    return (!stat(dir.data(), &st) && S_ISDIR(st.st_mode));
+}
+
 int main(int argc, char *argv[])
 {
     // forget about any settings
@@ -476,14 +483,26 @@
         }
         
         QCString xvfbPath8 = QFile::encodeName(xvfbPath);
+        QStringList fpaths;
+        fpaths.append(baseDir+"/resources");
 
+        const char* const fontdirs[] = { "75dpi", "misc", "Type1" };
+        const char* const fontpaths[] =  {"/usr/share/fonts/", \
"/usr/X11/lib/X11/fonts/", +            "/usr/lib/X11/fonts" };
+
+        for (size_t fp=0; fp < sizeof(fontpaths)/sizeof(*fontpaths); ++fp)
+            for (size_t fd=0; fd < sizeof(fontdirs)/sizeof(*fontdirs); ++fd)
+                if (existsDir(QCString(fontpaths[fp])+QCString(fontdirs[fd])))
+                    if (strcmp(fontdirs[fd] , "Type1"))
+                        \
fpaths.append(QCString(fontpaths[fp])+QCString(fontdirs[fd])+":unscaled"); +          \
else +                        \
fpaths.append(QCString(fontpaths[fp])+QCString(fontdirs[fd])); +
         xvfb = fork();
         if ( !xvfb ) {
-            char buffer[2000];
-            sprintf( buffer, \
"%s/resources,/usr/X11R6/lib/X11/fonts/75dpi:unscaled,/usr/X11R6/lib/X11/fonts/misc:un \
scaled,/usr/X11R6/lib/X11/fonts/Type1,/usr/share/fonts/X11/misc,/usr/share/fonts/X11/75dpi:unscaled,/usr/share/fonts/X11/Type1,"
                
-            "/usr/lib/X11/fonts/75dpi:unscaled,/usr/lib/X11/fonts/misc:unscaled,/usr/lib/X11/fonts/Type1",
                
-             (const char *)baseDir );
-            execl( xvfbPath8.data(), xvfbPath8.data(), "-once", "-dpi", "100", \
"-screen", "0", "1024x768x16", "-ac", "-fp", buffer, ":47", (char*)NULL ); +          \
QCString buffer = fpaths.join(",").latin1(); +            execl( xvfbPath8.data(), \
xvfbPath8.data(), "-once", "-dpi", "100", "-screen", "0", +                    \
"1024x768x16", "-ac", "-fp", buffer.data(), ":47", (char*)NULL );  }
 
         setenv( "DISPLAY", ":47", 1 );


[prev in list] [next in list] [prev in thread] [next in thread]