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
Chung-Yen Chang (candyz)
fedora-extras-commits at redhat.com
Tue Jan 30 02:24:06 UTC 2007
- Previous message: 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
- Next message: rpms/gcin/FC-4 .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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: candyz
Update of /cvs/extras/rpms/gcin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17835
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-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 1 Jan 2007 02:15:14 -0000 1.12
+++ .cvsignore 30 Jan 2007 02:23:36 -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-5/NewCJ3.cin,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NewCJ3.cin 3 Dec 2006 07:30:30 -0000 1.4
+++ NewCJ3.cin 30 Jan 2007 02:23:36 -0000 1.5
@@ -3,6 +3,7 @@
%cname äºåæé³¥
%selkey 123456789
%keyname begin
+` `
' ã
, ï¼
. ã
Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-5/gcin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gcin.spec 1 Jan 2007 02:15:14 -0000 1.16
+++ gcin.spec 30 Jan 2007 02:23:36 -0000 1.17
@@ -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 02 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-5/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:15:14 -0000 1.1
+++ gcin_gtab.patch 30 Jan 2007 02:23:36 -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-5/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:30:30 -0000 1.2
+++ gcin_update.patch 30 Jan 2007 02:23:36 -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-5/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:30:30 -0000 1.5
+++ im-client.patch 30 Jan 2007 02:23:36 -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-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 1 Jan 2007 02:15:14 -0000 1.12
+++ sources 30 Jan 2007 02:23:36 -0000 1.13
@@ -1 +1 @@
-340a2d470be29fff64f455400e2886c5 gcin-1.3.2.tar.bz2
+8cf166c401b23eb42454170befbcacad gcin-1.3.3.tar.bz2
- Previous message: 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
- Next message: rpms/gcin/FC-4 .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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list