Changeset 213

Timestamp:

Dec 18, 2010, 12:41:53 AM (15 years ago)

Author:

dmik

Message:

jdk: Search for font files in directories where registered fonts from the OS/2 font palette reside. This causes JDK to pick up system fonts and eliminates the need to distribute any fonts with it.

Location:

trunk/openjdk/jdk

Files:

• make/sun/font/FILES_c.gmk (modified) (1 diff)
• make/sun/font/Makefile (modified) (1 diff)
• src/os2/native/sun (added)
• src/os2/native/sun/font (added)
• src/os2/native/sun/font/fontpath_os2.c (added)
• src/windows/native/sun/font/fontpath.c (modified) (4 diffs)

trunk/openjdk/jdk/make/sun/font/FILES_c.gmk

@@ -115 +115 @@
 ifeq ($(filter-out windows os2,$(PLATFORM)),)
 FILES_c_platform = fontpath.c
-ifneq ($(PLATFORM), os2)  
+ifeq ($(PLATFORM), os2)  
+FILES_c_platform += fontpath_os2.c
 # no D3D on OS/2
+else
 FILES_cpp_platform = D3DTextRenderer.cpp
 endif

trunk/openjdk/jdk/make/sun/font/Makefile

@@ -171 +171 @@
 vpath %.cpp   $(SHARE_SRC)/native/$(PKGDIR)
 
+ifeq ($(PLATFORM), os2)  
+vpath %.c   $(PLATFORM_SRC_OS2)/native/$(PKGDIR)
+endif
+
 #
 # Fontmanager is headless (independent of X/Motif)

trunk/openjdk/jdk/src/windows/native/sun/font/fontpath.c

@@ -37 +37 @@
 #include <wchar.h>
 #include <minivcrt.h>
+extern char *getOs2FontPath();
 #endif
 
@@ -43 +44 @@
     char windir[BSIZE];
     char sysdir[BSIZE];
+#ifdef __WIN32OS2__
+    char *fontpath;
+#else
     char fontpath[BSIZE*2];
+#endif
     char *end;
+
+#ifdef __WIN32OS2__
+    /* Find out all folders containing registered fonts in OS/2 to let Java
+     * pick them up */
+    fontpath = getOs2FontPath();
+    fontpath = fontpath ? realloc(fontpath, strlen(fontpath) + BSIZE*2)
+                        : malloc(BSIZE*2);
+    if (!fontpath)
+        return NULL;
+#endif
 
     /* Locate fonts directories relative to the Windows System directory.
@@ -65 +80 @@
     }
 
+#ifdef __WIN32OS2__
+    strcat(fontpath,sysdir);
+#else
     strcpy(fontpath,sysdir);
+#endif
     if (stricmp(sysdir,windir)) {
         strcat(fontpath,";");
@@ -71 +90 @@
     }
 
-    return JNU_NewStringPlatform(env, fontpath);
+    jstring ret = JNU_NewStringPlatform(env, fontpath);
+#ifdef __WIN32OS2__
+    free(fontpath);
+#endif
+
+    return ret;
 }