rpms/gcin/FC-6 .cvsignore, 1.12, 1.13 NewCJ3.cin, 1.4, 1.5 gcin.spec, 1.17, 1.18 gcin_gtab.patch, 1.1, 1.2 gcin_update.patch, 1.2, 1.3 im-client.patch, 1.5, 1.6 sources, 1.12, 1.13
Chung-Yen Chang (candyz)
fedora-extras-commits at redhat.com
Tue Jan 30 02:20:52 UTC 2007
- Previous message: rpms/tango-icon-theme-extras/devel tango-icon-theme-extras.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/gcin/FC-5 .cvsignore, 1.12, 1.13 NewCJ3.cin, 1.4, 1.5 gcin.spec, 1.16, 1.17 gcin_gtab.patch, 1.1, 1.2 gcin_update.patch, 1.2, 1.3 im-client.patch, 1.5, 1.6 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: candyz
Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17755
Modified Files:
.cvsignore NewCJ3.cin gcin.spec gcin_gtab.patch
gcin_update.patch im-client.patch sources
Log Message:
update to 1.3.3
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 1 Jan 2007 02:12:39 -0000 1.12
+++ .cvsignore 30 Jan 2007 02:20:21 -0000 1.13
@@ -1 +1 @@
-gcin-1.3.2.tar.bz2
+gcin-1.3.3.tar.bz2
Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/NewCJ3.cin,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NewCJ3.cin 3 Dec 2006 07:27:37 -0000 1.4
+++ NewCJ3.cin 30 Jan 2007 02:20:21 -0000 1.5
@@ -3,6 +3,7 @@
%cname 亂倉打鳥
%selkey 123456789
%keyname begin
+` `
' ã€
, ，
. 。
Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gcin.spec 1 Jan 2007 02:12:39 -0000 1.17
+++ gcin.spec 30 Jan 2007 02:20:21 -0000 1.18
@@ -1,5 +1,5 @@
Name: gcin
-Version: 1.3.2
+Version: 1.3.3
Release: 1%{?dist}
Summary: Input method for Traditional Chinese
@@ -15,6 +15,7 @@
Patch3: configure.patch
Patch4: newcj3.patch
Patch5: gcin_gtab.patch
+Patch10: gcin_update.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +31,7 @@
%prep
%setup -q
+%patch10 -p1 -b .update
%patch1 -p1 -b .im-client
%patch2 -p1 -b .qt
%patch3 -p1 -b .configure
@@ -110,6 +112,9 @@
%{_libdir}/libgcin-im-client.so*
%changelog
+* Tue Jan 30 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.3-1
+- update to 1.3.3
+
* Mon Jan 01 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.2-1
- update to 1.3.2
gcin_gtab.patch:
Index: gcin_gtab.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin_gtab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcin_gtab.patch 1 Jan 2007 02:12:39 -0000 1.1
+++ gcin_gtab.patch 30 Jan 2007 02:20:21 -0000 1.2
@@ -15,14 +15,6 @@
}
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++) {
gcin_update.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 gcin_update.patch
Index: gcin_update.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin_update.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcin_update.patch 3 Dec 2006 07:27:38 -0000 1.2
+++ gcin_update.patch 30 Jan 2007 02:20:21 -0000 1.3
@@ -1,11 +1,3669 @@
---- gcin-1.3.1/gtab.h.orig 2006-11-22 15:15:11.000000000 +0800
-+++ gcin-1.3.1/gtab.h 2006-12-03 15:15:24.000000000 +0800
-@@ -104,7 +104,7 @@
- #define GTAB_LIST "gtab.list"
+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
[...3286 lines suppressed...]
++ In R5 Ximp IMProtocol model, all the event structures have the
++following common members:
++
++typedef struct {
++ INT32 type; /* message type */
++ CARD32 icid; /* input context ID */
++ Window focus_win; /* focus window */
++ long fwin_sel_mask; /* focus window select-mask */
++ CARD32 ximp_type_mask; /* Ximp event flow type */
++ Window client_win; /* client window */
++} XIMPAnyStruct;
++
++ The type member specifies the Ximp IMProtocol type constant name that
++uniquely identies itself.
++ In addition to the individual structures declared for each Ximp
++XIMProtocol type, the Ximp IMProtocol structure is a union of the
++individual structures declared for each Ximp IMProtocol type. Depending
++on the type, you should access members of each Ximp IMProtocol by using
++the XIMProtocol union.
++
++typedef union _IMPProtocol {
++ int type;
++ XIMPAnyStruct any;
++ XIMPKeyEventStruct keyevent;
++ XIMPICValuesStruct create;
++ XIMPICValuesStruct setvalue;
++ XIMPICValuesStruct getvalue;
++ XIMPAnyStruct destroy;
++ 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
--#define NEED_SWAP (__BYTE_ORDER == __BIG_ENDIAN && 1)
-+#define NEED_SWAP (__BYTE_ORDER == __BIG_ENDIAN && 0)
- #else
- #define NEED_SWAP (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 hide_selections_win()
+ {
+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/FC-6/im-client.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- im-client.patch 3 Dec 2006 07:27:38 -0000 1.5
+++ im-client.patch 30 Jan 2007 02:20:21 -0000 1.6
@@ -7,7 +7,7 @@
-im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so
- export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
++im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so.1.0.2
$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
rm -f core.*
@@ -32,28 +32,28 @@
+++ gcin-1.3.0.1/Makefile 2006-11-23 16:26:15.000000000 +0800
@@ -8,10 +8,10 @@
gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
- gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
+ 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
OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
-- gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
-+ gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
+- gcin-switch.o $(GCIN_SO) \
++ gcin-switch.o $(gcin1_o) \
$(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -71,8 +71,7 @@
+@@ -77,8 +77,7 @@
if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
gcin: $(OBJS) $(IMdkitLIB) $(im-srv)
-- export LD_RUN_PATH=.:$(gcinlibdir) ;\
+- LD_RUN_PATH=.:$(gcinlibdir) \
- $(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
+ $(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
rm -f core.*
ln -sf $@ $@.test
-@@ -125,9 +124,9 @@
+@@ -135,9 +134,9 @@
pin-juyin: $(OBJS_pin_juyin)
$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
@@ -66,7 +66,7 @@
### making the following as .so actuall makes the RSS larger
gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -152,14 +151,11 @@
+@@ -162,14 +161,11 @@
ibin:
install $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -81,3 +81,17 @@
install -d $(bindir)
$(MAKE) -C data install
$(MAKE) -C im-client install
+@@ -177,13 +173,9 @@
+ if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi
+ if [ $(prefix) = /usr/local ]; then \
+ install -m 644 gcin.png /usr/share/icons; \
+- install -d $(DOC_DIR); \
+- install -m 644 README Changelog $(DOC_DIR); \
+ install $(PROGS) $(bindir); \
+ rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
+ else \
+- install -d $(DOC_DIR_i); \
+- install -m 644 README Changelog $(DOC_DIR_i); \
+ install -s $(PROGS) $(bindir); \
+ rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
+ fi
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 1 Jan 2007 02:12:39 -0000 1.12
+++ sources 30 Jan 2007 02:20:21 -0000 1.13
@@ -1 +1 @@
-340a2d470be29fff64f455400e2886c5 gcin-1.3.2.tar.bz2
+8cf166c401b23eb42454170befbcacad gcin-1.3.3.tar.bz2
- Previous message: rpms/tango-icon-theme-extras/devel tango-icon-theme-extras.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/gcin/FC-5 .cvsignore, 1.12, 1.13 NewCJ3.cin, 1.4, 1.5 gcin.spec, 1.16, 1.17 gcin_gtab.patch, 1.1, 1.2 gcin_update.patch, 1.2, 1.3 im-client.patch, 1.5, 1.6 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list