rpms/gcin/devel gcin_gtab.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 gcin.spec, 1.17, 1.18 sources, 1.11, 1.12

[Chung-Yen Chang (candyz)]

Author: candyz

Update of /cvs/extras/rpms/gcin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22529

Modified Files:
	.cvsignore gcin.spec sources 
Added Files:
	gcin_gtab.patch 
Log Message:
update to 1.3.2

gcin_gtab.patch:

--- NEW FILE gcin_gtab.patch ---
diff -urN gcin-1.3.2.orig/gtab.c gcin-1.3.2/gtab.c
--- gcin-1.3.2.orig/gtab.c	2006-12-29 23:51:37.000000000 +0800
+++ gcin-1.3.2/gtab.c	2007-01-01 08:59:01.000000000 +0800
@@ -190,9 +190,12 @@
   for(i=0; i < tbufN; i++) {
 #define MAX_DISP_MATCH 40
     if (strlen(out) < MAX_DISP_MATCH) {
+      strcat(out, "[");
       strcat(out, tbuf[i]);
       if (i < tbufN-1)
-        strcat(out, " |");
+           strcat(out, "] ");
+      else
+           strcat(out, "]");
     }
 
     free(tbuf[i]);
@@ -814,6 +817,7 @@
 static void disp_selection(gboolean phrase_selected)
 {
   char pgstr[32];
+  ClrSelArea();
   page_no_str(pgstr);
 
   if (!gtab_vertical_select && more_pg)
@@ -838,7 +842,14 @@
   int i;
   for(i=ofs; i< cur_inmd->M_DUP_SEL + ofs; i++) {
     if (seltab[i][0]) {
+      if (!gtab_vertical_select)
+        strcat(tt, "<span foreground=\"red\">");
+
       b1_cat(tt, cur_inmd->selkey[i - ofs]);
+
+      if (!gtab_vertical_select)
+        strcat(tt, "</span>");
+
       if (gtab_vertical_select)
         strcat(tt, ". ");
 
@@ -850,7 +861,7 @@
         char uu[512];
 
         if (gtab_vertical_select) {
-          utf8cpy_bytes(uu, seltab[i], 60);
+          utf8cpy_bytes(uu, seltab[i], 120);
           strcat(tt, uu);
         } else {
           char *p = seltab[i];
@@ -1167,6 +1178,8 @@
         return 0;
       }
     case XK_Prior:
+    case XK_Left:
+    case XK_Up:
     case XK_KP_Subtract:
       if (wild_mode) {
         if (wild_page >= cur_inmd->M_DUP_SEL) wild_page-=cur_inmd->M_DUP_SEL;
@@ -1182,6 +1195,8 @@
       }
       return 0;
     case XK_Next:
+    case XK_Right:
+    case XK_Down:
     case XK_KP_Add:
       if (more_pg) {
 next_page:
diff -urN gcin-1.3.2.orig/gtab.h gcin-1.3.2/gtab.h
--- gcin-1.3.2.orig/gtab.h	2006-12-18 11:15:18.000000000 +0800
+++ gcin-1.3.2/gtab.h	2007-01-01 08:59:01.000000000 +0800
@@ -1,4 +1,4 @@
-#define MAX_CIN_PHR (100*CH_SZ + 1)
+#define MAX_CIN_PHR (200*CH_SZ + 1)
 
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Dec 2006 07:24:32 -0000	1.11
+++ .cvsignore	1 Jan 2007 02:10:22 -0000	1.12
@@ -1 +1 @@
-gcin-1.3.1.tar.bz2
+gcin-1.3.2.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gcin.spec	3 Dec 2006 07:24:33 -0000	1.17
+++ gcin.spec	1 Jan 2007 02:10:22 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.3.1
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -14,7 +14,7 @@
 Patch2:         qt.patch
 Patch3:         configure.patch
 Patch4:         newcj3.patch
-Patch5:         gcin_update.patch
+Patch5:         gcin_gtab.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,7 +34,7 @@
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
-%patch5 -p1 -b .up
+%patch5 -p1 -b .gtab
 #cp -f gcinicon/gtab.list data/
 #cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
@@ -93,6 +93,7 @@
 %doc AUTHORS COPYING Changelog README
 %config(noreplace) %{_sysconfdir}/X11/xinit/xinput.d/gcin.conf
 %{_bindir}/gcin*
+%{_bindir}/gtab*
 %{_bindir}/juyin-learn
 %{_bindir}/pho*
 %{_bindir}/sim2trad
@@ -109,6 +110,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Mon Jan 01 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.2-1
+- update to 1.3.2
+
 * Sun Dec 03 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.1-1
 - update to 1.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Dec 2006 07:24:33 -0000	1.11
+++ sources	1 Jan 2007 02:10:22 -0000	1.12
@@ -1 +1 @@
-3b6fb7483bc894af3ba787268584b3c2  gcin-1.3.1.tar.bz2
+340a2d470be29fff64f455400e2886c5  gcin-1.3.2.tar.bz2