Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>

Browse Source 
Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>

	* gdk/gdkps.c: better guessing of postscript font names
	and misc fixes.
	* gtk/Makefile.am: compile testps.c
This commit is contained in:
Paolo Molaro
1998-10-21 17:14:31 +00:00
parent 77336fd714
commit 457984f991
10 changed files with 68 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkps.c: better guessing of postscript font name.
* gtk/Makefile.am: compile testps.c
Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkprivate.h: GdkGCPrivate now stores complete info

5
ChangeLog.pre-2-0
View File

@@ -1,3 +1,8 @@
Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkps.c: better guessing of postscript font name.
* gtk/Makefile.am: compile testps.c
Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkprivate.h: GdkGCPrivate now stores complete info

5
ChangeLog.pre-2-10
View File

@@ -1,3 +1,8 @@
Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkps.c: better guessing of postscript font name.
* gtk/Makefile.am: compile testps.c
Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkprivate.h: GdkGCPrivate now stores complete info

5
ChangeLog.pre-2-2
View File

@@ -1,3 +1,8 @@
Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkps.c: better guessing of postscript font name.
* gtk/Makefile.am: compile testps.c
Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkprivate.h: GdkGCPrivate now stores complete info

5
ChangeLog.pre-2-4
View File

@@ -1,3 +1,8 @@
Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkps.c: better guessing of postscript font name.
* gtk/Makefile.am: compile testps.c
Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkprivate.h: GdkGCPrivate now stores complete info

5
ChangeLog.pre-2-6
View File

@@ -1,3 +1,8 @@
Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkps.c: better guessing of postscript font name.
* gtk/Makefile.am: compile testps.c
Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkprivate.h: GdkGCPrivate now stores complete info

5
ChangeLog.pre-2-8
View File

@@ -1,3 +1,8 @@
Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkps.c: better guessing of postscript font name.
* gtk/Makefile.am: compile testps.c
Tue, 20 Oct 1998 12:03:46 +0200 Paolo Molaro <lupus@debian.org>
* gdk/gdkprivate.h: GdkGCPrivate now stores complete info

44
gdk/gdkps.c
View File

@@ -249,7 +249,7 @@ ps_out_begin(GdkPsDrawable *d, gchar* title, gchar* author) {
ps_out_text(d, "%!PS-Adobe-3.0 EPSF-3.0\n");
ps_out_text(d, "%%Creator: Gdk PostScript Print Driver\n");
ps_out_text(d, "%%DocumentMedia: A4 595 842 80 white {}\n"); /* FIXME */
ps_out_text(d, "%%DocumentMedia: A4 595 842 80 white ()\n"); /* FIXME */
ps_out_text(d, "%%CreationDate: ");
ps_out_text(d, ctime(&date));
if (title ) {
@@ -258,7 +258,7 @@ ps_out_begin(GdkPsDrawable *d, gchar* title, gchar* author) {
ps_out_text(d, "\n");
}
if ( author ) {
ps_out_text(d, "%%CreatedFor: ");
ps_out_text(d, "%%For: ");
ps_out_text(d, author?author:"");
ps_out_text(d, "\n");
}
@@ -697,6 +697,7 @@ ps_out_font(GdkPsDrawable* d, GdkFont* font, GdkGC* gc) {
GdkFontPrivate* fp;
unsigned long value;
gchar *pname=NULL;
gchar* psname=NULL;
gchar buf[128];
gint iso=1;
@@ -709,22 +710,35 @@ ps_out_font(GdkPsDrawable* d, GdkFont* font, GdkGC* gc) {
fp = (GdkFontPrivate*)font;
face = XInternAtom(fp->xdisplay, "FACE_NAME", True);
/* FIXME: check fontset */
if ( face != None ) {
if ( (face = XInternAtom(fp->xdisplay, "_ADOBE_PSFONT", True)) != None ) {
if (XGetFontProperty(fp->xfont, face, &value)) {
psname = pname = XGetAtomName(fp->xdisplay, value);
}
} else if ( (face = XInternAtom(fp->xdisplay, "_ADOBE_POSTSCRIPT_FONTNAME", True)) != None ) {
if (XGetFontProperty(fp->xfont, face, &value)) {
psname = pname = XGetAtomName(fp->xdisplay, value);
}
} else if ( (face = XInternAtom(fp->xdisplay, "_DEC_DEVICE_FONTNAMES", True)) != None ) {
if (XGetFontProperty(fp->xfont, face, &value)) {
pname = XGetAtomName(fp->xdisplay, value);
if ( (psname=ststr(pname, "PS=")) )
psname = psname+3;
}
} else if ( (face = XInternAtom(fp->xdisplay, "FACE", True)) != None ) {
if (XGetFontProperty(fp->xfont, face, &value)) {
gint i;
pname = XGetAtomName(fp->xdisplay, value);
for (i=0; pname[i]; ++i) /* FIXME: Need better font guessing! */
if (pname[i] == ' ')
pname[i] = '-';
psname = pname;
if ( strlen(psname) > 29 )
psname[29]=0;
}
}
if (!pname)
if (!psname)
g_warning("Using a non-PS font");
else {
gint i;
for (i=0; pname[i]; ++i) /* FIXME: Need better font guessing! */
if (pname[i] == ' ')
pname[i] = '-';
}
sprintf(buf, " /%s %d %c Tf\n", pname?pname:fname,
sprintf(buf, " /%s %d %c Tf\n", psname?psname:fname,
font->ascent+font->descent, iso?'t':'f');
ps_out_text(d, buf);
if (pname)
@@ -897,9 +911,9 @@ gdk_ps_drawable_page_start (GdkDrawable *w, gint orientation, gint count, gint p
d = GDKPS(w);
wp = (GdkWindowPrivate*)w;
/*wp->width = width;
wp->width = width;
wp->height = height;
*/
ps_out_page(w, orientation, count, plex, resolution, width, height);
}

1
gtk/.cvsignore
View File

@@ -9,6 +9,7 @@ testgtk
testinput
testselection
testrgb
testps
simple
testtree
gtkfeatures.h

4
gtk/Makefile.am
View File

@@ -310,7 +310,7 @@ EXTRA_DIST = \
INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@
noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb testdnd simple
noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb testdnd simple testps
# FIXME, we currently rely on linking against libglib-1.1
@@ -333,6 +333,7 @@ testselection_DEPENDENCIES = $(DEPS)
testrgb_DEPENDENCIES = $(DEPS)
testdnd_DEPENDENCIES = $(DEPS)
simple_DEPENDENCIES = $(DEPS)
testps_DEPENDENCIES = $(DEPS)
testgtk_LDADD = $(LDADDS)
testinput_LDADD = $(LDADDS)
@@ -341,6 +342,7 @@ testselection_LDADD = $(LDADDS)
testrgb_LDADD = $(LDADDS)
testdnd_LDADD = $(LDADDS)
simple_LDADD = $(LDADDS)
testps_LDADD = $(LDADDS)
.PHONY: files test test-debug