rpms/gcin/F-7 .cvsignore, 1.16, 1.17 gcin.spec, 1.25, 1.26 gcin_gtab.patch, 1.3, 1.4 gcin_update.patch, 1.3, 1.4 im-client.patch, 1.9, 1.10 sources, 1.16, 1.17
Chung-Yen Chang (candyz)
fedora-extras-commits at redhat.com
Wed Jan 23 04:54:40 UTC 2008
Author: candyz
Update of /cvs/extras/rpms/gcin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11886
Modified Files:
.cvsignore gcin.spec gcin_gtab.patch gcin_update.patch
im-client.patch sources
Log Message:
update to 1.3.8
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-7/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 27 Nov 2007 04:12:16 -0000 1.16
+++ .cvsignore 23 Jan 2008 04:53:53 -0000 1.17
@@ -1 +1 @@
-gcin-1.3.7.1.tar.bz2
+gcin-1.3.8.tar.bz2
Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-7/gcin.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gcin.spec 27 Nov 2007 04:12:16 -0000 1.25
+++ gcin.spec 23 Jan 2008 04:53:53 -0000 1.26
@@ -1,5 +1,5 @@
Name: gcin
-Version: 1.3.7.1
+Version: 1.3.8
Release: 1%{?dist}
Summary: Input method for Traditional Chinese
@@ -31,7 +31,7 @@
%prep
%setup -q
-#%patch10 -p1 -b .update
+%patch10 -p1 -b .update
%patch1 -p1 -b .im-client
%patch2 -p1 -b .qt
%patch3 -p1 -b .configure
@@ -112,6 +112,9 @@
%{_libdir}/libgcin-im-client.so*
%changelog
+* Wed Jan 23 2008 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.8-1
+- update to 1.3.8
+
* Tue Nov 27 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.7.1-1
- update to 1.3.7.1
gcin_gtab.patch:
Index: gcin_gtab.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-7/gcin_gtab.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcin_gtab.patch 17 Apr 2007 01:48:18 -0000 1.3
+++ gcin_gtab.patch 23 Jan 2008 04:53:53 -0000 1.4
@@ -1,16 +1,7 @@
-diff -urN gcin-1.3.4.orig/gtab.h gcin-1.3.4/gtab.h
---- gcin-1.3.4.orig/gtab.h 2007-04-04 09:44:09.000000000 +0800
-+++ gcin-1.3.4/gtab.h 2007-04-12 09:00:19.000000000 +0800
-@@ -1,4 +1,4 @@
--#define MAX_CIN_PHR (100*CH_SZ + 1)
-+#define MAX_CIN_PHR (200*CH_SZ + 1)
-
-
-
-diff -urN gcin-1.3.4.orig/gtab.c gcin-1.3.4/gtab.c
---- gcin-1.3.4.orig/gtab.c 2007-04-04 11:41:59.000000000 +0800
-+++ gcin-1.3.4/gtab.c 2007-04-12 12:07:08.000000000 +0800
-@@ -190,9 +190,12 @@
+diff -urN gcin-1.3.8.orig/gtab.c gcin-1.3.8/gtab.c
+--- gcin-1.3.8.orig/gtab.c 2008-01-11 09:36:52.000000000 +0800
++++ gcin-1.3.8/gtab.c 2008-01-22 11:36:28.000000000 +0800
+@@ -205,9 +205,12 @@
for(i=0; i < tbufN; i++) {
#define MAX_DISP_MATCH 40
if (strlen(out) < MAX_DISP_MATCH) {
@@ -24,24 +15,7 @@
}
free(tbuf[i]);
-@@ -883,10 +886,16 @@
- 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\">");
-+
- char selback[MAX_CIN_PHR+16];
- add_backslash(seltab[i], selback);
-
- b1_cat(tt, cur_inmd->selkey[i - ofs]);
-+ if (!gtab_vertical_select)
-+ strcat(tt, "</span>");
-+
- if (gtab_vertical_select)
- strcat(tt, ". ");
-
-@@ -898,7 +907,7 @@
+@@ -942,7 +945,7 @@
char uu[MAX_CIN_PHR];
if (gtab_vertical_select) {
@@ -50,7 +24,7 @@
strcat(tt, uu);
} else {
char *p = selback;
-@@ -1214,6 +1223,8 @@
+@@ -1258,6 +1261,8 @@
return 0;
}
case XK_Prior:
@@ -59,7 +33,7 @@
case XK_KP_Subtract:
if (wild_mode) {
if (wild_page >= cur_inmd->M_DUP_SEL) wild_page-=cur_inmd->M_DUP_SEL;
-@@ -1229,6 +1240,8 @@
+@@ -1273,6 +1278,8 @@
}
return 0;
case XK_Next:
@@ -68,3 +42,12 @@
case XK_KP_Add:
if (more_pg) {
next_page:
+diff -urN gcin-1.3.8.orig/gtab.h gcin-1.3.8/gtab.h
+--- gcin-1.3.8.orig/gtab.h 2007-12-24 11:32:12.000000000 +0800
++++ gcin-1.3.8/gtab.h 2008-01-22 11:36:28.000000000 +0800
+@@ -1,4 +1,4 @@
+-#define MAX_CIN_PHR (100*CH_SZ + 1)
++#define MAX_CIN_PHR (200*CH_SZ + 1)
+
+
+
gcin_update.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 gcin_update.patch
Index: gcin_update.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-7/gcin_update.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcin_update.patch 30 Jan 2007 02:12:23 -0000 1.3
+++ gcin_update.patch 23 Jan 2008 04:53:53 -0000 1.4
@@ -1,3669 +1,41 @@
-diff -urN gcin-1.3.3.orig/Changelog gcin-1.3.3/Changelog
---- gcin-1.3.3.orig/Changelog 2007-01-26 11:33:09.000000000 +0800
-+++ gcin-1.3.3/Changelog 2007-01-28 11:12:15.000000000 +0800
-@@ -1,4 +1,9 @@
- ** UTF-8 encoding **
-+1.3.4:
-+- ç±æ¼å¦æ使ç¨å½åºå¼(popup) 輸å
¥è¦çªï¼å
¶å¯¦åªæå¨é¡¯ç¤ºæéµçæåéè¦ç§»åè¦çªï¼é樣å¯ä»¥æ¸å°gcinå¨ firefox ä¸é¡ mozilla 家æç¨å¼çå¥æªåé¡ãç¾å¨ä¹æpopup æ¹æå
§å®çé¸æã
-+- gtab å¦æé¸ç¨ä¸è®é¯èª¤éµé²å
¥(éå³çµ±)ï¼æä¸ space ææ¯ç¡æçæåï¼ç¾å¨å¯ä»¥ç´æ¥è¼¸å
¥ä¸ä¸ååï¼ä¸ç¨æ Escape æ¸
é¤ã
-+- ãå¯ä¸é¸ææèªåéåºãéåé¸é
å¨æäºæåæé æ coredump çåé¡ã
-+- \ ç¾å¨å¯ä»¥å®ç¾©è¼¸å
¥æ³äºã
- 1.3.3:
- - è©é³æ°å¢åé³åè©é¸æéµå¨å¾çé¸é
ï¼é樣åç好èæ¯ç¶ä½ ç±å·¦å°å³çå°æååè©ç¬¦åå¾ï¼å°±ä¸ç¨ååé çæ¯é£ä¸åéµã
- - è©é³Tab æ·è©æ¹æå¯ä»¥å¨ä»»æå°æ¹æï¼ä»£è¡¨è©å¾éééé ï¼å¦æå¨çµå°¾æå代表ææå¾ä¸ååç¶éé ãä¾å¦è¼¸å
¥ãä»ç¤ºæèèãï¼æåæ³è¦çæ¯ãä»æ¯ä¸é»è±¬ãï¼éæç´æ¥å¨çµå°¾æ Tab ä¸æ¬¡å°±å¯ä»¥äºï¼ä»£è¡¨æ豬ç¶æä¸åå®åçè©ãç¶ä½¿ç¨è
èªå·±æ空ç½éµé¸è©æï¼ææéåæåæ·è©æ¸
é¤ãä¸éå¾å¯æçï¼å¨æäºç¨å¼ä¸è½ç¨ï¼ä¾å¦ geditï¼å çº geditæ²ææ Tab key å³çµ¦ gcin èçãçºäºè§£æ±ºéååé¡ï¼ä¹å¯ä»¥æ¹æ Escapeã
-@@ -15,7 +20,7 @@
- - ç±æä½æä¾ç ./configure --use_tray=Nï¼ä¸æ³è¦ tray æå¯ä»¥ç¨æ¤é¸é
ã
- - alsa2 è im-client èµ·è¡çªçåé¡ï¼é æ flash player coredumpãå¿
é update libgcin-im-client.soã
- - çºäºè§£æ±º flashplayer ç¶æçåé¡ï¼XIM ç IMdkit ææ scim çï¼ç¾å¨ä¸ç¨ unset XMODIFIERS ä¼¼ä¹ä¹ä¸æç¶äºãå¦æä½ å¿
é ç¶å¸¸éæ°åå gcin æ好éæ¯å¨ firefox ç start-script è£é¢ç¨ unset XMODIFIERSï¼å çºæ°ç IMdkit å¨ gcin éæ°ååææåéæ¯æé ææ£å¨å·è¡ç firefox coredumpãèä¸é樣å¯ä»¥ç¯ç memoryã
--- gtab å¯ä¸é¸ææèªåéåºçæ°é¸é
ãä¾å¦æåå¨åé ¡è£é¢å®ç¾©å®ç¾©ãbenq æåºãï¼ç¶æå° ben æï¼ç±æ¼æ¤ææ²æå
¶ä»çæ¯ç¬¦å 'ben*'ï¼éæåå°±æèªåéåºã
-+- gtab å¯ä¸é¸ææèªåéåºçæ°é¸é
ãä¾å¦æåå¨åé ¡è£é¢å®ç¾©ãbenq æåºãï¼ç¶æå° ben æï¼ç±æ¼æ¤ææ²æå
¶ä»çæ¯ç¬¦å 'ben*'ï¼éæåå°±æèªåéåºã
- - []\ ç¾å¨ä¹å¯ä»¥ç¨ä¾åæ輸å
¥æ³äºãå·²ç¶ææä¸åæ¯å帶調粵æ¼æ¾ä¸å»ã
-
- 1.3.2:
-diff -urN gcin-1.3.3.orig/data/gtab.list gcin-1.3.3/data/gtab.list
---- gcin-1.3.3.orig/data/gtab.list 2007-01-26 09:37:46.000000000 +0800
-+++ gcin-1.3.3/data/gtab.list 2007-01-27 16:34:31.000000000 +0800
-@@ -18,3 +18,4 @@
- greek ` greek.gtab greek.png
- latin-letters [ latin-letters.gtab latin-letters.png
- å¸¶èª¿ç²µæ¼ ] jyutping.gtab
-+äºåæé³¥ \ NewCJ3.gtab NewCJ3.png
-diff -urN gcin-1.3.3.orig/data/tsin.src gcin-1.3.3/data/tsin.src
---- gcin-1.3.3.orig/data/tsin.src 2007-01-26 11:44:17.000000000 +0800
-+++ gcin-1.3.3/data/tsin.src 2007-01-28 11:30:37.000000000 +0800
-@@ -123,7 +123,6 @@
- çç ã2 ãã¥4 0
- ç®äºä¸æª ã3 ãã1 ã§4 ãã§ã2 0
- ç®éç¥ ã3 ãã§ã¥2 ãã§4 0
--ç®å° ã3 ãã§ã 3 0
- ç®äººä¸æª ã3 ãã£2 ã§4 ãã§ã2 0
- æç¾è ã4 ã¦3 ãã¢2 0
- æç¾è人 ã4 ã¦3 ãã¢2 ãã£2 0
-@@ -1200,7 +1199,6 @@
- å£è¿« ã§ã ãã4 0
- å£è¿«æ ã§ã ãã4 ãã¢3 0
- é´ç ã§ã ãã§ã¢4 0
--é´¨æ¯ ã§ã ãã 2 0
- å£å ã§ã ãã 3 0
- å£åæ§å¤æ¸ ã§ã ãã 3 ãã§ã¥4 ãã¨ã ãã¨4 0
- å£åæ§åå© ã§ã ãã 3 ãã§ã¥4 ã㥠ãã§4 0
-@@ -2771,7 +2769,6 @@
- 硬ç´æ¿ ã§ã¥4 ã3 ã
ã¢3 0
- 硬èé ç® ã§ã¥4 ãã1 ãã¡2 ãã§2 0
- æå¬å¥³é ã§ã¥4 ãã ãã©3 ãã¤2 0
--ææ° ã§ã¥4 ãã¢4 0
- æå¾µ ã§ã¥4 ã㥠0
- æé
¬ ã§ã¥4 ãã¡2 0
- 硬æ ã§ã¥4 ã㥠0
-@@ -3069,7 +3066,6 @@
- äºå³° ã¨3 ã㥠0
- äºå³°é ã¨3 ã㥠ãã§ã¤ 0
- äºç¦è¨é ã¨3 ãã¨2 ãã§ã£2 ãã£2 0
--äºå¤§æ¹ ã¨3 ãã4 ãã¨2 0
- äºå¤§æ´² ã¨3 ãã4 ãã¡ 0
- èåå¼æ§ ã¨3 ãã ãã¨ã¥4 ãã§ã¤ 0
- èè¹ ã¨3 ãã 4 0
-@@ -3196,7 +3192,6 @@
- ææ§ ã¨4 ãã§ã¥4 0
- ç©è³ª ã¨4 ã2 0
- ç©è³ªä¸æ»
å®å¾ ã¨4 ã2 ã
ã¨2 ãã§ã4 ãã§ã¥4 ãã©4 0
--誤診 ã¨4 ãã£3 0
- ç©ç¨® ã¨4 ãã¨ã¥3 0
- 誤差 ã¨4 ãã 0
- ç©è¶
æå¼ ã¨4 ãã ãã¨ã3 ã2 0
-@@ -3507,7 +3502,6 @@
- ç¶å¤å©äº ã¨ã2 ãã¨ã ãã§4 ã§ã3 0
- ç¶ä»å½ ã¨ã2 ãã ãã§ã¥4 0
- ç¶ä»å½A ã¨ã2 ãã ãã§ã¥4 ã 0
--ç¶ä»å½K ã¨ã2 ãã ãã§ã¥4 ã 0
- ç¶ä»å½E ã¨ã2 ãã ãã§ã¥4 㧠0
- ç¶ä»å½B ã¨ã2 ãã ãã§ã¥4 ã
0
- ç¶ä»å½B1 ã¨ã2 ãã ãã§ã¥4 ã
1 0
-@@ -3542,7 +3536,6 @@
- å¾®ä¹å
¶å¾® ã¨ã2 ã㨠ãã§2 ã¨ã2 0
- ç¶è· ã¨ã2 ãã¨4 0
- å±æ© ã¨ã2 ã㧠0
--å±æ©æè ã¨ã2 ã㧠ã§4 ã4 0
- å±æ©æ ã¨ã2 ã㧠ãã¢3 0
- å±æ©éé ã¨ã2 ã㧠ãã¨ã¥2 ãã¨ã¥2 0
- å±æ©åä¼ ã¨ã2 ã㧠ã4 ãã¨2 0
-@@ -3748,7 +3741,6 @@
- è¡å£« ã¨ã4 ã4 0
- è¡è¦é»å½±å° ã¨ã4 ã4 ãã§ã¢4 ã§ã¥3 ãã2 0
- è¡è¦ä¸æå° ã¨ã4 ã4 ãã¨ã¥ ã¨ã£2 ãã2 0
--çºä»éº¼ ã¨ã4 ãã2 ã1 0
- çºä»éº¼ ã¨ã4 ãã2 ãã1 0
- çé¦çå°¾ ã¨ã4 ãã¡3 ã¨ã4 ã¨ã3 0
- å½å ã¨ã4 ãã¢4 0
-@@ -4424,7 +4416,6 @@
- 欲åç¡æ· ã©4 ã㨠ã¨2 ãã4 0
- çå ã©4 ãã2 0
- é害 ã©4 ãã4 0
--ç¦¦å¯ ã©4 ãã¢2 0
- æ
¾ç« ã©4 ãã¨ã3 0
- æ
¾ç«ç身 ã©4 ãã¨ã3 ãã£2 ã㣠0
- æµ´ç«éç ã©4 ãã¨ã3 ãã¨ã¥2 ã㥠0
-@@ -4836,7 +4827,6 @@
- éè²» ã©ã£4 ãã4 0
- å婦 ã©ã£4 ãã¨4 0
- åå©¦è£ ã©ã£4 ãã¨4 ãã¨ã¤ 0
--éå° ã©ã£4 ãã 4 0
- ç¨æ ã©ã£4 ãã¡3 0
- éå ã©ã£4 ãã¨ã¥4 0
- éåé ã©ã£4 ãã¨ã¥4 ãã§ã¤4 0
-@@ -5594,7 +5584,6 @@
- é®é ã
ã 4 ã©2 0
- æ´é¨ ã
ã 4 ã©3 0
- æ±æ¨ ã
ã 4 ã©ã¢4 0
--å ±å ã
ã 4 ã
ã4 0
- å ±è¡¨ ã
ã 4 ã
ã§ã 3 0
- éå° ã
ã 4 ã
ã§ã¥ 0
- æ±ç
ã
ã 4 ã
ã§ã¥4 0
-@@ -5629,7 +5618,6 @@
- æ´è·³å¦é· ã
ã 4 ãã§ã 4 ãã¨2 ãã2 0
- æ´æ®å¤©ç© ã
ã 4 ãã§ã¢3 ãã§ã¢ ã¨4 0
- æ´å¾ ã
ã 4 ãã¨2 0
--å ±äºä¸ç®ä¹ä» ã
ã 4 ãã1 ã§2 ãã§ã¢4 ã ãã¡2 0
- æ´é² ã
ã 4 ãã¡4 0
- çå·é ã
ã 4 ãã¥3 ãã£2 0
- æ´å© ã
ã 4 ãã§4 0
-@@ -5780,7 +5768,6 @@
- æå ã
ã¢4 ãã2 0
- æ®é»è ã
ã¢4 ãã ãã§ã¢3 0
- 辦å¾äº ã
ã¢4 ãã¡4 ã4 0
--辦家家é
ã
ã¢4 ãã§ã ãã§ã ãã§ã¡3 0
- åå¹ ã
ã¢4 ãã§ã4 0
- çµè
³ ã
ã¢4 ãã§ã 3 0
- åæ¤å
«å
© ã
ã¢4 ãã§ã£ ã
ã ãã§ã¤3 0
-@@ -5822,7 +5809,6 @@
- æ¬æ ã
ã£3 ã©ã4 0
- æ¬æ份 ã
ã£3 ã©ã4 ãã£4 0
- æ¬é¨ ã
ã£3 ã
ã¨4 0
--æ¬ç¥¨ ã
ã£3 ãã§ã 4 0
- æ¬æ«åç½® ã
ã£3 ãã4 ãã 3 ã4 0
- æ¬ä»½ ã
ã£3 ãã£4 0
- æ¬é»¨ ã
ã£3 ãã¤3 0
-@@ -6628,7 +6614,6 @@
- ä¸å¥åº· ã
ã¨2 ãã§ã¢4 ã㤠0
- ä¸ç¦ ã
ã¨2 ãã§ã£ 0
- ä¸é²åé ã
ã¨2 ãã§ã£4 ãã¢3 ãã¨ã4 0
--ä¸ç¡ç¸å ã
ã¨2 ãã§ã£4 ãã§ã¤ ãã¨ã¥2 0
- ä¸ç¡ç¶ ã
ã¨2 ãã§ã£4 ãã¢2 0
- ä¸é²åé ã
ã¨2 ãã§ã£4 ãã2 ãã¨ã4 0
- ä¸å
· ã
ã¨2 ãã©4 0
-@@ -6657,7 +6642,6 @@
- ä¸æ²»ä¹ç ã
ã¨2 ã4 ã ãã¥4 0
- ä¸æ¯ ã
ã¨2 ãã£4 0
- ä¸æ£ç¶ ã
ã¨2 ãã¥4 ã㤠0
--ä¸æ£ç¢º ã
ã¨2 ãã¥4 ãã©ã4 0
- ä¸æ£ç¢ºç ã
ã¨2 ãã¥4 ãã©ã4 ã1 0
- ä¸æ£å¸¸ ã
ã¨2 ãã¥4 ãã¤2 0
- ä¸æ£å¸¸ç ã
ã¨2 ãã¥4 ãã¤2 ã1 0
-@@ -7312,7 +7296,6 @@
- å¹è¨ ãã2 ãã©ã£4 0
- å¹è¨ç ãã2 ãã©ã£4 ã
㢠0
- å¹æ¤ ãã2 ã2 0
--éªè ãã2 ãã1 0
- è³ å ãã2 ãã¤2 0
- éªå¯©å ãã2 ãã£3 ãã¨ã¢2 0
- è³ ä¸ ãã2 ãã¤4 0
-@@ -7622,7 +7605,6 @@
- é£è© ãã§ã ãã¤4 0
- é£ä¾é£å» ãã§ã ãã2 ãã§ã ãã©4 0
- æ¼æµ ãã§ã ãã§ã¡2 0
--é£æµ ãã§ã ãã§ã¡2 0
- æ¼äº® ãã§ã ãã§ã¤4 0
- é£éå» ãã§ã ãã¨ã4 ãã©4 0
- é£å¿½ä¸å® ãã§ã ã㨠ã
ã¨2 ãã§ã¥4 0
-@@ -7681,7 +7663,6 @@
- ç麻岩 ãã§ã¢4 ãã2 ã§ã¢2 0
- çé¢ ãã§ã¢4 ãã§ã¢4 0
- çé¢ä¹è© ãã§ã¢4 ãã§ã¢4 ã ã2 0
--é¨å¾ååè½ ãã§ã¢4 ãã2 ãã¨ã¢2 ãã¨ã¢2 ãã¨ã¢4 0
- é¨å° ãã§ã¢4 ãã 4 0
- éå° ãã§ã¢4 ãã§4 0
- çæ· ãã§ã¢4 ãã¨ã¢4 0
-@@ -7845,7 +7826,6 @@
- å¹³è¡ç· ãã§ã¥2 ãã§ã¥2 ãã§ã¢4 0
- å¹³è¡åéå½¢ ãã§ã¥2 ãã§ã¥2 ã4 ã
ã§ã¢ ãã§ã¥2 0
- è©é¸çº ãã§ã¥2 ãã©ã¢3 ã¨ã2 0
--æè ãã§ã¥2 ãã1 0
- å¹³é®é ãã§ã¥2 ãã£4 ãã§ã¤ 0
[...3314 lines suppressed...]
-+ XIMPAnyStruct regkey;
-+ XIMPAnyStruct setfocus;
-+ XIMPAnyStruct unsetfocus;
-+ XIMPClientWindowStruct clientwin;
-+ XIMPFocusWindowStruct focuswin;
-+ XIMPMoveStruct move;
-+ XIMPEventMaskNotifyStruct evmasknotify;
-+ XIMPExtensionStruct extension;
-+ XIMPReadPropStruct readprop;
-+ XIMPResetStruct reset;
-+ XIMPCommitStringStruct commitstring;
-+ XIMPErrorStruct error;
-+ XIMPAnyStruct geometry_cb;
-+ XIMPPreeditCBStruct preedit_cb;
-+ XIMPStatusCBStruct status_cb;
-+ long pad[24];
-+} IMPProtocol;
-+
-+ The first entry of any XIMProtocol structure is always the
-+type member, which specifies the Ximp IMProtocol type.
-+
-+4. Writing IMservers
-+
-+When writing an IMserver that uses the IMdkit, you should make sure that
-+your IMserver performs the following:
-+
-+ 1. Include <X11/Xlib.h> in your IMserver programs.
-+
-+ 2. Include <X11/Ximd/IMdkit.h>. This header file defines all the
-+ necessary data types and IMdkit functions that you need to use.
-+
-+ 3. Include <X11/Ximd/Xi18n.h> for R6 standard IMProtocol, or
-+ <X11/Ximd/Ximp.h> for R5 Ximp IMProtocol, respectively.
-+
-+ 4. Call the IMOpenIM function with all the necessary IMValues to
-+ initialize the connection. The names of each IMValues have a global
-+ symbol that begins with IM to help catch spelling errors. For
-+ example, IMModifiers is defined for the XIMProtocol model, and
-+ IMLocale is defined for the locale resource. For further information,
-+ see "Section 1.1 Open IM Service" and Section 2 "IMValues"
-+
-+ 5. To set additional IMValues or override the existing IMValues you
-+ set by IMOpenIM, use IMSetIMValues. You can also use IMGetIMValues to
-+ look up at existing IMValues. Note that some of IMValues must be set
-+ at the IM service creation time, and never be changed by
-+ IMSetIMValues.
-+
-+ 6. You must set the IMProtocol callback routine by the
-+ IMProtocolHandler argument with IMOpenIM or IMSetIMValues functions.
-+ This callback is called whenever the IMProtocol is delivered by XIM
-+ clients.
-+
-+ 7. Now you should select all the necessary X events for your windows
-+ with XSelectInput function, and map the windows with XMapWindow
-+ function, then sit in a loop processing events as follows.
-+
-+ for (;;) {
-+ XEvent event;
-+ XNextEvent(your_display, &event);
-+ if (XFilterEvent(&event, NULL) == True)
-+ continue;
-+ YourXEventHandler(&event);
-+ }
-+
-+ Here, all the IMProtocols you need are passed to your IMProtocol
-+ callback routine by X Filtering mechanism of XFilterEvent function,
-+ and all unfiltered X events you want are passed to YourXEventHandler
-+ function above.
-+
-+ 8. Link your IMserver with libXimd (the IMdkit library) and libX11
-+ (the core X library). The following provides a sample command line:
-+
-+ cc -o sampleIM sampleIM.c -lXimd -lX11
-diff -urN gcin-1.3.3.orig/im-srv/im-dispatch.c gcin-1.3.3/im-srv/im-dispatch.c
---- gcin-1.3.3.orig/im-srv/im-dispatch.c 2007-01-22 00:54:10.000000000 +0800
-+++ gcin-1.3.3/im-srv/im-dispatch.c 2007-01-28 10:46:24.000000000 +0800
-@@ -182,6 +182,12 @@
- cs->b_raise_window = TRUE;
- // dbg("********* raise * window\n");
- }
-+
-+ int rflags = 0;
-+ if (gcin_pop_up_win)
-+ rflags = FLAG_GCIN_srv_ret_status_use_pop_up;
-+
-+ write_enc(fd, &rflags, sizeof(rflags));
- break;
- default:
- dbg_time("Invalid request %x from:", req.req_no);
-diff -urN gcin-1.3.3.orig/tscr/tscim gcin-1.3.3/tscr/tscim
---- gcin-1.3.3.orig/tscr/tscim 2007-01-23 17:32:51.000000000 +0800
-+++ gcin-1.3.3/tscr/tscim 2007-01-28 09:51:39.000000000 +0800
-@@ -13,4 +13,5 @@
- #leafpad
- #amsn
- #abiword
--firefox
-+export LD_LIBRARY_PATH=/usr/lib/firefox
-+$LD_LIBRARY_PATH/mozilla-firefox-bin
-diff -urN gcin-1.3.3.orig/tsin.c gcin-1.3.3/tsin.c
---- gcin-1.3.3.orig/tsin.c 2007-01-17 10:10:30.000000000 +0800
-+++ gcin-1.3.3/tsin.c 2007-01-27 09:35:30.000000000 +0800
-@@ -1294,15 +1294,13 @@
- return 1;
- }
-
-- if (tsin_tab_phrase_end) {
-+ if (tsin_tab_phrase_end && c_len > 1) {
- tab_phrase_end:
- if (c_idx==c_len)
- chpho[c_idx-1].flag |= FLAG_CHPHO_PHRASE_USER_HEAD;
- else
- chpho[c_idx].flag |= FLAG_CHPHO_PHRASE_USER_HEAD;
--#if 1
- call_tsin_parse();
--#endif
- return 1;
- } else {
- if (c_len) {
-diff -urN gcin-1.3.3.orig/VERSION.gcin gcin-1.3.3/VERSION.gcin
---- gcin-1.3.3.orig/VERSION.gcin 2007-01-26 11:31:36.000000000 +0800
-+++ gcin-1.3.3/VERSION.gcin 2007-01-28 11:13:40.000000000 +0800
-@@ -1 +1 @@
--1.3.3
-+1.3.4.pre1
-diff -urN gcin-1.3.3.orig/win0.c gcin-1.3.3/win0.c
---- gcin-1.3.3.orig/win0.c 2007-01-16 09:16:38.000000000 +0800
-+++ gcin-1.3.3/win0.c 2007-01-28 11:01:11.000000000 +0800
-@@ -665,8 +665,10 @@
- // dbg("show_win0 b\n");
- show_win_sym();
- #if 1
-- if (current_CS->b_raise_window)
-+ if (current_CS->b_raise_window) {
- gtk_window_present(gwin0);
-+ raise_tsin_selection_win();
-+ }
- #endif
- }
-
-diff -urN gcin-1.3.3.orig/win1.c gcin-1.3.3/win1.c
---- gcin-1.3.3.orig/win1.c 2007-01-16 09:21:21.000000000 +0800
-+++ gcin-1.3.3/win1.c 2007-01-28 11:00:50.000000000 +0800
-@@ -112,6 +112,12 @@
- #endif
- }
-
-+void raise_tsin_selection_win()
-+{
-+ if (gwin1 && GTK_WIDGET_VISIBLE(gwin1))
-+ gtk_window_present(gwin1);
+ void execute_message(char *message);
++static int b_show_win_kbm=0;
++void kbm_toggle()
++{
++ win_kbm_inited = 1;
++ b_show_win_kbm^=1;
++ if (b_show_win_kbm)
++ show_win_kbm();
++ else
++ hide_win_kbm();
+}
-+
- void hide_selections_win()
+ static GdkFilterReturn my_gdk_filter(GdkXEvent *xevent,
+ GdkEvent *event,
+diff -urN gcin-1.3.8.orig/tray.c gcin-1.3.8/tray.c
+--- gcin-1.3.8.orig/tray.c 2008-01-14 16:18:52.000000000 +0800
++++ gcin-1.3.8/tray.c 2008-01-22 19:36:08.000000000 +0800
+@@ -189,17 +189,6 @@
+ gint inmd_switch_popup_handler (GtkWidget *widget, GdkEvent *event);
+ extern gboolean win_kbm_inited;
+
+-static int b_show_win_kbm=0;
+-void kbm_toggle()
+-{
+- win_kbm_inited = 1;
+- b_show_win_kbm^=1;
+- if (b_show_win_kbm)
+- show_win_kbm();
+- else
+- hide_win_kbm();
+-}
+-
+ gboolean
+ tray_button_press_event_cb (GtkWidget * button, GdkEventButton * event, gpointer userdata)
{
-diff -urN gcin-1.3.3.orig/win-inmd-switch.c gcin-1.3.3/win-inmd-switch.c
---- gcin-1.3.3.orig/win-inmd-switch.c 2006-08-03 14:50:05.000000000 +0800
-+++ gcin-1.3.3/win-inmd-switch.c 2007-01-28 14:21:49.000000000 +0800
-@@ -16,7 +16,7 @@
- menu = gtk_menu_new ();
-
- int i;
-- for(i=0; i < MAX_GTAB_NUM_KEY; i++) {
-+ for(i=1; i <= MAX_GTAB_NUM_KEY; i++) {
- if (!inmd[i].cname || !inmd[i].cname[0])
- continue;
-
im-client.patch:
Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-7/im-client.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- im-client.patch 15 Oct 2007 02:39:07 -0000 1.9
+++ im-client.patch 23 Jan 2008 04:53:53 -0000 1.10
@@ -35,7 +35,7 @@
gcin_gtab_o = gtab.o win-gtab.o gtab-util.o gtab-list.o
-GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o
OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
- gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o \
@@ -57,10 +57,10 @@
pin-juyin: $(OBJS_pin_juyin)
$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico
-gcin1.so: $(gcin1_so)
- $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico
+#gcin1.so: $(gcin1_so)
+# $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 27 Nov 2007 04:12:16 -0000 1.16
+++ sources 23 Jan 2008 04:53:53 -0000 1.17
@@ -1 +1 @@
-f3c00bcbe0cadb1f6a8bf9de7da0288f gcin-1.3.7.1.tar.bz2
+1b3bc05ca9ae56eae2343b15af52d0b8 gcin-1.3.8.tar.bz2
More information about the fedora-extras-commits
mailing list