kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 1.2.13

Browse source
This commit is contained in:
Yukihiro Nakai 2001-06-23 23:41:54 +00:00
parent 490b27d5a8
commit add390abc9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=44371
9 changed files with 189 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
japanese/gnomelibs/Makefile
View file

@ -6,7 +6,7 @@
#
# This port does not work with another version of master port.
#PORTVERSION= 1.2.8
#PORTVERSION= 1.2.13
CATEGORIES= japanese x11 gnome
MASTERDIR= ${.CURDIR}/../../x11/gnomelibs

61
japanese/gnomelibs/files/patch-ad
View file

@ -1,61 +0,0 @@
--- ./zvt/README.mb.jp2 Sun Oct 29 18:32:20 2000
+++ ./zvt/README.mb Sun Oct 29 18:32:20 2000
@@ -0,0 +1,58 @@
+*Poor* Multibyte Kanji patch for gnome-zvt.
+
+ Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>
+
+This patch make gnome-libs to use multibyte
+(ex kanji, Japanese character), and to support "OverTheSpot" Input
+Method.
+
+If you use multibyte characters in the gnome-terminal, you require
+gnome-core-x.y.z-terminal_mb-*.patch, too.
+
+-----------
+ TODO
+-----------
+ - JIS locale support.
+ - JIS curses support in EUC.
+ - integrate UTF and multibyte code.
+ - support half Katakana character(JISX201).
+ - optimize the routine for redrawing in multibyte environment.
+ (DONE at 0.5)
+ - more speedy.
+ (DONE at 0.4)
+
+-----------
+ ChangeLog
+-----------
+* Sun Jan 16 2000 Yasuyuki Furukawa <furukawa@vinelinux.org>
+ - Release 0.6 -- bug fix
+ - prevend to be into alt mode with half katakana.
+ - fixed to fail getting of character-wdith in startup.
+
+* Thu Nov 4 1999 Yasuyuki Furukawa <furukawa@vinelinux.org>
+ - Release 0.5 -- a little faster.
+ - update.c (vt_line_update): enable optimize redrawing for
+ multibyte locale. Now more clear for redrawing multibyte
+ character. but there is a problem wheln scrolled dumping.
+
+* Tue Nov 2 1999 Yasuyuki Furukawa <furukawa@vinelinux.org>
+ - Release 0.2 -- bug fix
+ - update.c (vt_line_update): disable optimizing routine for
+ redrawing
+ - zvtterm (zvt_term_convert_selection): fix for selection memory
+ bug in compound_text.
+
+ - Release 0.3 -- a little optimized.
+ - vt.c (vt_query_line_mbchar): more optimize.
+ - zvtterm.c (vt_draw_text): reduce zvt_im_preedit_set_spot() call
+
+ - Release 0.4 -- JIS dumping support in EUC locale.
+ - vt.c (vt_parse_vt): add escape sequence "ESC$B" and "ESC)B".
+ JIS text can be dumped at least.(NOT IN CURSES...)
+
+* Tue Nov 1 1999 Yasuyuki Furukawa <furukawa@vinelinux.org
+ - Release 0.1
+ - update.c, zvtterm.c, vt.c, zterm.c, vt.h, zterm.h: updated for
+ gnome-libs-1.0.54 based on my old kanji patch.
+ old patch is following:
+ http://www.on.cs.keio.ac.jp/~yasu/linux/gnome/

4
japanese/gnomelibs/files/patch-ae
View file

@ -1,5 +1,5 @@
--- ./zvt/update.c.jp2 Mon Aug 28 01:22:23 2000
+++ ./zvt/update.c Sun Oct 29 18:32:20 2000
--- zvt/update.c.zvtmb Mon Aug 28 01:22:23 2000
+++ zvt/update.c Sun Jun 24 07:35:48 2001
@@ -170,6 +170,11 @@
run++;
} else {

10
japanese/gnomelibs/files/patch-af
View file

@ -1,5 +1,5 @@
--- ./zvt/vt.c.jp2 Sat Mar 18 16:57:13 2000
+++ ./zvt/vt.c Sun Oct 29 18:32:20 2000
--- zvt/vt.c.zvtmb Sun Nov 26 03:49:08 2000
+++ zvt/vt.c Sun Jun 24 07:35:48 2001
@@ -109,6 +109,62 @@
#endif
@ -74,7 +74,7 @@
/* states:
* 0: normal escape mode
@@ -1516,7 +1576,26 @@
@@ -1521,7 +1581,26 @@
switch (state) {
@ -101,7 +101,7 @@
if (mode & VT_LIT) {
/* remap character? */
if (vt->remaptable && c<=0xff)
@@ -1526,17 +1605,43 @@
@@ -1531,17 +1610,43 @@
if (vt->mode & VTMODE_INSERT)
vt_insert_chars(vt, 1);
@ -145,7 +145,7 @@
vt->this_line->data[vt->cursorx] = ((vt->attr) & VTATTR_MASK) | c;
vt->this_line->modcount++;
/* d(printf("literal %c\n", c)); */
@@ -1566,6 +1671,12 @@
@@ -1571,6 +1676,12 @@
} else if (c==']') { /* set text parameters, read parameters */
state = 4;
vt->arg.txt.outptr = vt->arg.txt.args_mem;

4
japanese/gnomelibs/files/patch-ag
View file

@ -1,5 +1,5 @@
--- ./zvt/vt.h.jp2 Sat Oct 30 03:35:49 1999
+++ ./zvt/vt.h Sun Oct 29 18:32:20 2000
--- zvt/vt.h.zvtmb Sat Oct 30 03:35:49 1999
+++ zvt/vt.h Sun Jun 24 07:35:48 2001
@@ -28,6 +28,10 @@
/* for utf-8 input support */
#define ZVT_UTF 1

4
japanese/gnomelibs/files/patch-ah
View file

@ -1,5 +1,5 @@
--- ./zvt/zterm.c.jp2 Sat Mar 18 16:57:13 2000
+++ ./zvt/zterm.c Sun Oct 29 18:32:20 2000
--- zvt/zterm.c.zvtmb Sat Mar 18 16:57:13 2000
+++ zvt/zterm.c Sun Jun 24 07:35:48 2001
@@ -41,7 +41,12 @@
#include "zvtterm.h"

59
japanese/gnomelibs/files/patch-ai
View file

@ -1,5 +1,5 @@
--- ./zvt/zvtterm.c.jp2 Tue Oct 24 08:12:43 2000
+++ ./zvt/zvtterm.c Sun Oct 29 18:32:20 2000
--- zvt/zvtterm.c.zvtmb Sun Jun 24 07:35:48 2001
+++ zvt/zvtterm.c Sun Jun 24 07:35:48 2001
@@ -49,12 +49,15 @@
#include <X11/Xatom.h>
#include <X11/Xos.h>
@ -62,7 +62,7 @@
GTK_WIDGET_SET_FLAGS (term, GTK_CAN_FOCUS);
@@ -329,19 +356,9 @@
@@ -328,19 +355,9 @@
term);
/* selection received */
@ -85,7 +85,7 @@
}
/**
@@ -666,6 +683,11 @@
@@ -647,6 +664,11 @@
clone_col(&zp->queue_red, 0);
clone_col(&zp->queue_green, 0);
clone_col(&zp->queue_blue, 0);
@ -97,7 +97,7 @@
}
/**
@@ -801,6 +823,9 @@
@@ -782,6 +804,9 @@
term_force_size(term);
/* input context */
@ -107,7 +107,7 @@
if (gdk_im_ready () && !term->ic) {
GdkICAttr attr;
@@ -813,6 +838,7 @@
@@ -794,6 +819,7 @@
g_warning("Can't create input context.");
}
}
@ -115,7 +115,7 @@
}
static void
@@ -1280,7 +1306,11 @@
@@ -1261,7 +1287,11 @@
case GDK_FONT_FONTSET: {
XFontSet fontset = (XFontSet) ((GdkFontPrivate *)font)->xfont;
XFontSetExtents *extents = XExtentsOfFontSet(fontset);
@ -127,7 +127,7 @@
term->charheight = extents->max_logical_extent.height;
zp->fonttype = ZVT_FONT_FONTSET;
}
@@ -1295,6 +1325,9 @@
@@ -1276,6 +1306,9 @@
if (term->font)
gdk_font_unref (term->font);
term->font = font;
@ -137,7 +137,7 @@
if (term->font_bold)
gdk_font_unref (term->font_bold);
@@ -1395,16 +1428,28 @@
@@ -1376,16 +1409,28 @@
if (rest) {
g_string_sprintf (outname, "%s-medium-r%s", newname->str, rest);
@ -166,7 +166,7 @@
zvt_term_set_fonts_internal (term, font, 0);
}
@@ -1444,7 +1489,11 @@
@@ -1425,7 +1470,11 @@
{
GdkAtom string_atom;
#ifdef ZVT_UTF
@ -178,7 +178,7 @@
int index;
struct _zvtprivate *zp = _ZVT_PRIVATE(widget);
@@ -1464,7 +1513,11 @@
@@ -1445,7 +1494,11 @@
d(printf(" %s atom = %d\n", types[index], (int)string_atom));
#else
/* Get the atom corresonding to the target "STRING" */
@ -190,7 +190,7 @@
#endif
if (string_atom == GDK_NONE) {
@@ -1890,10 +1943,15 @@
@@ -1871,10 +1924,15 @@
switch (type) {
default:
@ -208,7 +208,7 @@
o = out;
for(i=0;i<term->vx->selection_size;i++) {
c = term->vx->selection_data[i];
@@ -1902,7 +1960,7 @@
@@ -1883,7 +1941,7 @@
*outlen = term->vx->selection_size;
break;
}
@ -217,7 +217,7 @@
unsigned char *o;
unsigned int len=0;
d(printf("converting selection to UTF-8\n"));
@@ -1991,10 +2049,34 @@
@@ -1972,10 +2030,34 @@
term = ZVT_TERM (widget);
vx = term->vx;
@ -253,7 +253,7 @@
atom = gdk_atom_intern ("UTF-8", FALSE);
else
atom = GDK_SELECTION_TYPE_STRING;
@@ -2045,6 +2127,7 @@
@@ -2026,6 +2108,7 @@
/* Make sure we got the data in the expected form */
if (selection_data->type != GDK_SELECTION_TYPE_STRING
@ -261,7 +261,7 @@
&& selection_data->type != gdk_atom_intern("UTF-8", FALSE)) {
g_print ("Selection \"STRING\" was not returned as strings!\n");
return;
@@ -2055,13 +2138,40 @@
@@ -2036,13 +2119,40 @@
{
int i;
char *ctmp = selection_data->data;
@ -308,7 +308,7 @@
}
}
@@ -2113,6 +2223,141 @@
@@ -2094,6 +2204,141 @@
return length;
}
@ -450,7 +450,7 @@
static void
zvt_term_writemore (gpointer data, gint fd, GdkInputCondition condition)
{
@@ -2343,7 +2588,7 @@
@@ -2324,7 +2569,7 @@
static gint
zvt_term_key_press (GtkWidget *widget, GdkEventKey *event)
{
@ -459,22 +459,15 @@
char *p=buffer;
struct _vtx *vx;
ZvtTerm *term;
@@ -2547,11 +2792,12 @@
@@ -2535,6 +2780,7 @@
break;
default:
if (event->length > 0){
+ gint length = MIN(((buffer+ sizeof(buffer)) - p)/sizeof(char), event->length);
if (event->state & GDK_MOD1_MASK){
+ gint length = MIN(((buffer+ sizeof(buffer)) - p)/sizeof(char), event->length);
if (event->state & (GDK_MOD1_MASK | GDK_MOD4_MASK)){
*p++ = '\033';
}
- memcpy(p, event->string, event->length*sizeof(char));
- p += event->length;
+ memcpy(p, event->string, length);
+ p += length;
} else {
handled = FALSE;
}
@@ -3161,24 +3407,24 @@
@@ -3149,24 +3395,24 @@
break;
/* this is limited to 65535 characters! */
case ZVT_FONT_FONTSET: {
@ -507,7 +500,7 @@
}
}
@@ -3199,6 +3445,10 @@
@@ -3187,6 +3433,10 @@
x + offx + len*term->charwidth, offy + row*term->charheight,
1, term->charheight);
}
@ -518,9 +511,9 @@
}
@@ -3833,6 +4083,7 @@
} else {
d(printf("background hasn't moved, leaving\n"));
@@ -3856,6 +4106,7 @@
gdk_gc_set_foreground (term->back_gc, &pen);
return;
}
+
}

4
japanese/gnomelibs/files/patch-aj
View file

@ -1,5 +1,5 @@
--- ./zvt/zvtterm.h.jp2 Sat Mar 18 16:57:13 2000
+++ ./zvt/zvtterm.h Sun Oct 29 18:32:20 2000
--- zvt/zvtterm.h.zvtmb Sun Jun 24 07:35:48 2001
+++ zvt/zvtterm.h Sun Jun 24 07:35:48 2001
@@ -33,6 +33,7 @@
/* if one doesn't want to compile in transparency one would define this */

169
japanese/gnomelibs/pkg-plist
View file

@ -180,28 +180,28 @@ include/zvt/vtx.h
include/zvt/zvtterm.h
lib/libart_lgpl.a
lib/libart_lgpl.so
lib/libart_lgpl.so.4
lib/libart_lgpl.so.5
lib/libgnome.a
lib/libgnome.so
lib/libgnome.so.4
lib/libgnome.so.5
lib/libgnomesupport.a
lib/libgnomesupport.so
lib/libgnomesupport.so.4
lib/libgnomesupport.so.5
lib/libgnomeui.a
lib/libgnomeui.so
lib/libgnomeui.so.4
lib/libgnomeui.so.5
lib/libgnorba.a
lib/libgnorba.so
lib/libgnorba.so.4
lib/libgnorba.so.5
lib/libgnorbagtk.a
lib/libgnorbagtk.so
lib/libgnorbagtk.so.4
lib/libgnorbagtk.so.5
lib/libgtkxmhtml.a
lib/libgtkxmhtml.so
lib/libgtkxmhtml.so.4
lib/libgtkxmhtml.so.5
lib/libzvt.a
lib/libzvt.so
lib/libzvt.so.4
lib/libzvt.so.5
share/aclocal/libart.m4
share/gnome/gtkrc
share/gnome/gtkrc.el
@ -222,6 +222,123 @@ share/gnome/gtkrc.vi_VN.tcvn
share/gnome/gtkrc.vi_VN.viscii
share/gnome/gtkrc.zh_CN
share/gnome/gtkrc.zh_TW.Big5
share/gnome/doc/gnome-doc
share/gnome/doc/gnome-doc.el
share/gnome/doc/mkstub
share/gnome/html/gnome-decl.txt
share/gnome/html/gnome-sections.txt
share/gnome/html/gnome.html
share/gnome/html/gnome/book1.html
share/gnome/html/gnome/gnome-gnome-config.html
share/gnome/html/gnome/gnome-gnome-defs.html
share/gnome/html/gnome/gnome-gnome-dentry.html
share/gnome/html/gnome/gnome-gnome-exec.html
share/gnome/html/gnome/gnome-gnome-fileconvert.html
share/gnome/html/gnome/gnome-gnome-help.html
share/gnome/html/gnome/gnome-gnome-history.html
share/gnome/html/gnome/gnome-gnome-i18n.html
share/gnome/html/gnome/gnome-gnome-metadata.html
share/gnome/html/gnome/gnome-gnome-mime-info.html
share/gnome/html/gnome/gnome-gnome-mime.html
share/gnome/html/gnome/gnome-gnome-paper.html
share/gnome/html/gnome/gnome-gnome-popt.html
share/gnome/html/gnome/gnome-gnome-regex.html
share/gnome/html/gnome/gnome-gnome-remote.html
share/gnome/html/gnome/gnome-gnome-score.html
share/gnome/html/gnome/gnome-gnome-sound.html
share/gnome/html/gnome/gnome-gnome-triggers.html
share/gnome/html/gnome/gnome-gnome-url.html
share/gnome/html/gnome/gnome-gnome-util.html
share/gnome/html/gnome/gnome-libgnome.html
share/gnome/html/gnome/libgnome.html
share/gnome/html/gnomeui-decl.txt
share/gnome/html/gnomeui-sections.txt
share/gnome/html/gnomeui.hierarchy
share/gnome/html/gnomeui.html
share/gnome/html/gnomeui.types
share/gnome/html/gnomeui/book1.html
share/gnome/html/gnomeui/gnome-objects.html
share/gnome/html/gnomeui/gnomeabout.html
share/gnome/html/gnomeui/gnomeanimator.html
share/gnome/html/gnomeui/gnomeapp.html
share/gnome/html/gnomeui/gnomeappbar.html
share/gnome/html/gnomeui/gnomecalculator.html
share/gnome/html/gnomeui/gnomecanvas.html
share/gnome/html/gnomeui/gnomecanvasellipse.html
share/gnome/html/gnomeui/gnomecanvasgroup.html
share/gnome/html/gnomeui/gnomecanvasimage.html
share/gnome/html/gnomeui/gnomecanvasitem.html
share/gnome/html/gnomeui/gnomecanvasline.html
share/gnome/html/gnomeui/gnomecanvaspolygon.html
share/gnome/html/gnomeui/gnomecanvasre.html
share/gnome/html/gnomeui/gnomecanvasrect.html
share/gnome/html/gnomeui/gnomecanvastext.html
share/gnome/html/gnomeui/gnomecanvaswidget.html
share/gnome/html/gnomeui/gnomeclient.html
share/gnome/html/gnomeui/gnomecolorpicker.html
share/gnome/html/gnomeui/gnomedateedit.html
share/gnome/html/gnomeui/gnomedentryedit.html
share/gnome/html/gnomeui/gnomedialog.html
share/gnome/html/gnomeui/gnomedock.html
share/gnome/html/gnomeui/gnomedockband.html
share/gnome/html/gnomeui/gnomedockitem.html
share/gnome/html/gnomeui/gnomedocklayout.html
share/gnome/html/gnomeui/gnomedruid.html
share/gnome/html/gnomeui/gnomedruidpage.html
share/gnome/html/gnomeui/gnomedruidpagefinish.html
share/gnome/html/gnomeui/gnomedruidpagestandard.html
share/gnome/html/gnomeui/gnomedruidpagestart.html
share/gnome/html/gnomeui/gnomeentry.html
share/gnome/html/gnomeui/gnomefileentry.html
share/gnome/html/gnomeui/gnomefontpicker.html
share/gnome/html/gnomeui/gnomefontselector.html
share/gnome/html/gnomeui/gnomehref.html
share/gnome/html/gnomeui/gnomeiconentry.html
share/gnome/html/gnomeui/gnomeiconlist.html
share/gnome/html/gnomeui/gnomeiconselection.html
share/gnome/html/gnomeui/gnomeicontextitem.html
share/gnome/html/gnomeui/gnomeless.html
share/gnome/html/gnomeui/gnomemdi.html
share/gnome/html/gnomeui/gnomemdichild.html
share/gnome/html/gnomeui/gnomemdigenericchild.html
share/gnome/html/gnomeui/gnomemessagebox.html
share/gnome/html/gnomeui/gnomenumberentry.html
share/gnome/html/gnomeui/gnomepaperselector.html
share/gnome/html/gnomeui/gnomepixmap.html
share/gnome/html/gnomeui/gnomepixmapentry.html
share/gnome/html/gnomeui/gnomeprocbar.html
share/gnome/html/gnomeui/gnomepropertybox.html
share/gnome/html/gnomeui/gnomescores.html
share/gnome/html/gnomeui/gnomespell.html
share/gnome/html/gnomeui/gnomestock.html
share/gnome/html/gnomeui/gnomeui-gnome-app-helper.html
share/gnome/html/gnomeui/gnomeui-gnome-app-util.html
share/gnome/html/gnomeui/gnomeui-gnome-canvas-util.html
share/gnome/html/gnomeui/gnomeui-gnome-dialog-util.html
share/gnome/html/gnomeui/gnomeui-gnome-dns.html
share/gnome/html/gnomeui/gnomeui-gnome-geometry.html
share/gnome/html/gnomeui/gnomeui-gnome-ice.html
share/gnome/html/gnomeui/gnomeui-gnome-icon-text.html
share/gnome/html/gnomeui/gnomeui-gnome-init.html
share/gnome/html/gnomeui/gnomeui-gnome-mdi-session.html
share/gnome/html/gnomeui/gnomeui-gnome-popup-help.html
share/gnome/html/gnomeui/gnomeui-gnome-popup-menu.html
share/gnome/html/gnomeui/gnomeui-gnome-preferences.html
share/gnome/html/gnomeui/gnomeui-gnome-properties.html
share/gnome/html/gnomeui/gnomeui-gnome-property-entries.html
share/gnome/html/gnomeui/gnomeui-gnome-startup.html
share/gnome/html/gnomeui/gnomeui-gnome-types.html
share/gnome/html/gnomeui/gnomeui-gnome-uidefs.html
share/gnome/html/gnomeui/gnomeui-gnome-window-icon.html
share/gnome/html/gnomeui/gnomeui-gnome-winhints.html
share/gnome/html/gnomeui/gnomeui-gtkcauldron.html
share/gnome/html/gnomeui/gtkclock.html
share/gnome/html/gnomeui/gtkdial.html
share/gnome/html/gnomeui/gtkpixmapmenuitem.html
share/gnome/html/gnomeui/gtkted.html
share/gnome/html/gnomeui/libgnomeui.html
share/gnome/html/gnorba-decl.txt
share/gnome/html/gnorba-sections.txt
share/gnome/idl/GnomeObject.idl
share/gnome/idl/Table.idl
share/gnome/idl/desktop-editor.idl
@ -241,6 +358,7 @@ share/gnome/pixmaps/yes.xpm
share/gnome/type-convert/gnome-make-postscript-mimes
share/gnome/type-convert/postscript.convert
share/gnome/type-convert/type.convert
share/locale/az/LC_MESSAGES/gnome-libs.mo
share/locale/ca/LC_MESSAGES/gnome-libs.mo
share/locale/cs/LC_MESSAGES/gnome-libs.mo
share/locale/da/LC_MESSAGES/gnome-libs.mo
@ -273,22 +391,33 @@ share/locale/sl/LC_MESSAGES/gnome-libs.mo
share/locale/sp/LC_MESSAGES/gnome-libs.mo
share/locale/sr/LC_MESSAGES/gnome-libs.mo
share/locale/sv/LC_MESSAGES/gnome-libs.mo
share/locale/ta/LC_MESSAGES/gnome-libs.mo
share/locale/tr/LC_MESSAGES/gnome-libs.mo
share/locale/uk/LC_MESSAGES/gnome-libs.mo
share/locale/vi/LC_MESSAGES/gnome-libs.mo
share/locale/wa/LC_MESSAGES/gnome-libs.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
@exec mkdir -p %D/share/gnome/games
@dirrm share/gnome/type-convert
@dirrm share/gnome/pixmaps
@dirrm share/gnome/mime-info
@dirrm share/gnome/idl
@dirrm share/gnome/html/zvt
@dirrm share/gnome/html/gnorba
@dirrm share/gnome/html/gnomeui
@dirrm share/gnome/html/gnome
@dirrm share/gnome/html
@dirrm share/gnome/help/gnome-dev-info/C
@dirrm share/gnome/help/gnome-dev-info
@dirrm share/gnome/help
@dirrm share/gnome/games
@dirrm share/gnome/doc
@dirrm include/zvt
@dirrm include/libgnorba
@dirrm include/libgnomeui
@dirrm include/libgnome
@dirrm include/libart_lgpl
@dirrm include/gtk-xmhtml
@dirrm etc/sound/events
@dirrm etc/sound
@dirrm include/gtk-xmhtml
@dirrm include/libart_lgpl
@dirrm include/libgnome
@dirrm include/libgnomeui
@dirrm include/libgnorba
@dirrm include/zvt
@dirrm share/gnome/games
@dirrm share/gnome/idl
@dirrm share/gnome/mime-info
@dirrm share/gnome/pixmaps
@dirrm share/gnome/type-convert
@dirrm share/gnome