Update to 1.2.13

7 files changed, 39 insertions, 107 deletions

diff --git a/japanese/gnomelibs/files/patch-ad b/japanese/gnomelibs/files/patch-ad
deleted file mode 100644
index c2770ef0c4a6..000000000000
--- a/japanese/gnomelibs/files/patch-ad
+++ /dev/null
@@ -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/
diff --git a/japanese/gnomelibs/files/patch-ae b/japanese/gnomelibs/files/patch-ae
index ae60c3e38c7a..537cc3e9086e 100644
--- a/japanese/gnomelibs/files/patch-ae
+++ b/japanese/gnomelibs/files/patch-ae
@@ -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 {
diff --git a/japanese/gnomelibs/files/patch-af b/japanese/gnomelibs/files/patch-af
index 13a4f24e2f3c..ea73c508a625 100644
--- a/japanese/gnomelibs/files/patch-af
+++ b/japanese/gnomelibs/files/patch-af
@@ -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;
diff --git a/japanese/gnomelibs/files/patch-ag b/japanese/gnomelibs/files/patch-ag
index b5ac9094ff21..8fc48ec0274a 100644
--- a/japanese/gnomelibs/files/patch-ag
+++ b/japanese/gnomelibs/files/patch-ag
@@ -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
diff --git a/japanese/gnomelibs/files/patch-ah b/japanese/gnomelibs/files/patch-ah
index 6909955ccdb3..279d55c06e99 100644
--- a/japanese/gnomelibs/files/patch-ah
+++ b/japanese/gnomelibs/files/patch-ah
@@ -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"
diff --git a/japanese/gnomelibs/files/patch-ai b/japanese/gnomelibs/files/patch-ai
index 331a475fc543..b3d94577a632 100644
--- a/japanese/gnomelibs/files/patch-ai
+++ b/japanese/gnomelibs/files/patch-ai
@@ -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;
    }
 +
  }
diff --git a/japanese/gnomelibs/files/patch-aj b/japanese/gnomelibs/files/patch-aj
index 8375a0052ca5..8cb4ba6caf99 100644
--- a/japanese/gnomelibs/files/patch-aj
+++ b/japanese/gnomelibs/files/patch-aj
@@ -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 */