FVWM Bug Tracking notification
new message incoming/772
Message summary for PR#772
From: [EMAIL PROTECTED]
Subject: FvwmButtons is not internationalized
Date: Thu, 06 Sep 2001 09:33:23 -0500
0 replies 0 followups
====> ORIGINAL MESSAGE FOLLOWS <====
>From [EMAIL PROTECTED] Thu Sep 06 09:33:25 2001
Received: from karazm.math.uh.edu ([129.7.128.1])
by malifon.math.uh.edu with esmtp (Exim 3.20 #1)
id 15f0Dd-0001wi-00
for [EMAIL PROTECTED]; Thu, 06 Sep 2001 09:33:25 -0500
Received: from malifon.math.uh.edu (IDENT:[EMAIL PROTECTED] [129.7.128.13])
by karazm.math.uh.edu (8.9.3/8.9.3) with ESMTP id JAA08521
for <[EMAIL PROTECTED]>; Thu, 6 Sep 2001 09:33:24 -0500 (CDT)
From: [EMAIL PROTECTED]
Received: from localhost ([127.0.0.1] ident=65534)
by malifon.math.uh.edu with esmtp (Exim 3.20 #1)
id 15f0Db-0001we-00
for [EMAIL PROTECTED]; Thu, 06 Sep 2001 09:33:23 -0500
To: [EMAIL PROTECTED]
Subject: FvwmButtons is not internationalized
Message-Id: <[EMAIL PROTECTED]>
Date: Thu, 06 Sep 2001 09:33:23 -0500
Full_Name: Shingo YAMAGUCHI
Version: 2.4.0
CVS_Date:
OS: Linux 2.4.9
X_Server: XFree86 4.1.0
Submission from: (NULL) (160.26.11.4)
FvwmButtons can not deal fontset and multibyte characters.
I made this patch from fvwm 2.2.4 i18n patch.
----- cut here -----
diff -aurN fvwm-2.4.0.orig/modules/FvwmButtons/draw.c
fvwm-2.4.0/modules/FvwmButtons/draw.c
--- fvwm-2.4.0.orig/modules/FvwmButtons/draw.c Thu Sep 6 22:29:35 2001
+++ fvwm-2.4.0/modules/FvwmButtons/draw.c Thu Sep 6 23:20:00 2001
@@ -107,6 +107,9 @@
*/
int ih,iw,ix,iy;
XFontStruct *font;
+#ifdef I18N_MB
+ XFontSet fontset = buttonFontSet(b);
+#endif
if(!b)
{
@@ -194,10 +197,7 @@
int ix,iy,iw,ih;
XFontStruct *font = buttonFont(b);
#ifdef I18N_MB
- /*
- there seems to be no I18N patch here
XFontSet fontset = buttonFontSet(b);
- */
#endif
XGCValues gcv;
int rev = 0;
@@ -507,15 +507,26 @@
((buttonSwallowCount(b)==3) && (b->flags&b_Swallow))) &&
!(justify&b_Horizontal))
{
- XDrawString(Dpy, win, gc, xpos, iy+ih-font->descent, s, l);
+#ifdef I18N_MB
+ XmbDrawString(Dpy, win, fontset, gc, xpos,
+ iy+ih-font->descent, s, l);
+#else
+ XDrawString(Dpy, win, gc, xpos,
+ iy+ih-font->descent, s, l);
+#endif
/* Shrink the space available for icon/window */
ih-=font->descent+font->ascent;
}
/* Or else center vertically */
else
{
- XDrawString(
- Dpy, win, gc, xpos, iy+(ih+font->ascent-font->descent)/2, s, l);
+#ifdef I18N_MB
+ XmbDrawString(Dpy, win, fontset, gc, xpos,
+ iy+(ih+font->ascent-font->descent)/2, s, l);
+#else
+ XDrawString(Dpy, win, gc, xpos,
+ iy+(ih+font->ascent-font->descent)/2, s, l);
+#endif
}
}
}
----- cut here -----
--
Visit the official FVWM web page at <URL:http://www.fvwm.org/>.
To unsubscribe from the list, send "unsubscribe fvwm-workers" in the
body of a message to [EMAIL PROTECTED]
To report problems, send mail to [EMAIL PROTECTED]
