rpms/kinput2/FC-5 kinput2-v3.1-status-update-204892.patch, NONE, 1.1 kinput2.spec, 1.4, 1.5 kinput2-redraw.patch, 1.1, NONE
Akira Tagoh (tagoh)
fedora-extras-commits at redhat.com
Fri Jan 26 12:00:13 UTC 2007
Author: tagoh
Update of /cvs/extras/rpms/kinput2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15034
Modified Files:
kinput2.spec
Added Files:
kinput2-v3.1-status-update-204892.patch
Removed Files:
kinput2-redraw.patch
Log Message:
* Fri Jan 26 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-28
- Backport a patch to update the status with XmbResetIC() properly.
- Disable Wnn support so that no *Wnn* devel package available anymore.
- Install ccdef files under /usr/lib on even 64bit archs according to the path
imake generates. (#209622)
kinput2-v3.1-status-update-204892.patch:
--- NEW FILE kinput2-v3.1-status-update-204892.patch ---
diff -ur kinput2-v3.1.orig/lib/imlib/imattr.c kinput2-v3.1/lib/imlib/imattr.c
--- kinput2-v3.1.orig/lib/imlib/imattr.c 2006-07-13 18:26:54.000000000 +0900
+++ kinput2-v3.1/lib/imlib/imattr.c 2006-07-13 18:28:12.000000000 +0900
@@ -1851,7 +1851,7 @@
if (mask & ATTR_MASK_PREEDIT_STATE) {
/* unless the client specified, we should start with disabled state. */
ap->set_mask |= ATTR_MASK_PREEDIT_STATE;
- ap->reset_state = XIMPreeditDisable;
+ ap->preedit_state = XIMPreeditDisable;
}
if (mask & ATTR_MASK_RESET_STATE) {
/* the default reset state must be the initial state. */
diff -ur kinput2-v3.1.orig/lib/imlib/imconv.c kinput2-v3.1/lib/imlib/imconv.c
--- kinput2-v3.1.orig/lib/imlib/imconv.c 2006-07-13 18:26:54.000000000 +0900
+++ kinput2-v3.1/lib/imlib/imconv.c 2006-07-13 18:28:12.000000000 +0900
@@ -911,11 +911,20 @@
ICClearConversion(input_obj);
TRACE(("\twas converting. %d bytes left\n", num_bytes));
+#if 0
+ /*
+ * IMStopConversion() seems to not work correctly while
+ * resetting IC. So this block was moved to ximResetICProc().
+ * If calling IMResetIC() is required in other functions,
+ * the following block is also used in it.
+ */
if (icp->common_attr.reset_state == XIMInitialState) {
/* Force to end the conversion. */
TRACE(("\tback to the initial state\n"));
IMStopConversion(icp);
}
+#endif
+
}
return num_bytes;
}
@@ -967,6 +976,42 @@
/* ARGSUSED */
void
+IMStatusDraw(icp)
+IMIC *icp;
+{
+ Widget input_obj;
+ OCCPreeditDrawArg arg;
+
+ TRACE(("IMStatusDraw(ic%d)\n", icp->id));
+ if (!(icp->common_attr.input_style & XIMStatusCallbacks))
+ return;
+
+
+ arg.caret = 0; /* ignored */
+ arg.chg_first = 0; /* ignored */
+ arg.chg_length = 0; /* ignored */
+ arg.encoding = IMCtextAtom(icp->im->connection->proto_widget);
+ arg.format = 0; /* set by ICGetStatusString */
+ arg.text_length = 0; /* set by ICGetStatusString */
+ arg.text = NULL; /* set by ICGetStatusString */
+ arg.attrs_length = 0; /* ignored */
+ arg.attrs = NULL; /* ignored */
+
+ if (icp->conversion) {
+ XtVaGetValues(icp->conversion, XtNinputObject, &input_obj, NULL);
+ if (ICGetStatusString(input_obj, &arg.encoding, &arg.format,
+ &arg.text_length, &arg.text,
+ &arg.attrs_length) == -1)
+ return;
+ }
+
+ statusDraw(icp, &arg);
+
+ XtFree((char *)arg.text);
+}
+
+/* ARGSUSED */
+void
IMStatusDone(icp)
IMIC *icp;
{
diff -ur kinput2-v3.1.orig/lib/imlib/imfuncs.h kinput2-v3.1/lib/imlib/imfuncs.h
--- kinput2-v3.1.orig/lib/imlib/imfuncs.h 2006-07-13 18:26:54.000000000 +0900
+++ kinput2-v3.1/lib/imlib/imfuncs.h 2006-07-13 18:28:12.000000000 +0900
@@ -102,6 +102,7 @@
extern void IMSetFocus _Pt_((IMIC *icp));
extern void IMUnsetFocus _Pt_((IMIC *icp));
extern void IMStatusStart _Pt_((IMIC *icp));
+extern void IMStatusDraw _Pt_((IMIC *icp));
extern void IMStatusDone _Pt_((IMIC *icp));
extern void IMStartForwarding _Pt_((IMIC *icp));
extern void IMStopForwarding _Pt_((IMIC *icp));
diff -ur kinput2-v3.1.orig/lib/imlib/imrequest.c kinput2-v3.1/lib/imlib/imrequest.c
--- kinput2-v3.1.orig/lib/imlib/imrequest.c 2006-07-13 18:26:54.000000000 +0900
+++ kinput2-v3.1/lib/imlib/imrequest.c 2006-07-13 18:28:16.000000000 +0900
@@ -1352,8 +1352,20 @@
IMPutC16(conn, (unsigned int)text_length);
if (text_length > 0) IMPutString(conn, text, text_length);
IMFinishRequest(conn, offset);
+ /*
+ * Send RESET_IC_REPLY
+ */
+ IMFlush(conn);
if (text != NULL) XtFree(text);
icp->state &= ~IC_RESETTING;
+
+ IMStatusDraw(icp);
+ /* moved from IMResetIC() */
+ if (icp->common_attr.reset_state == XIMInitialState) {
+ /* Force to end the conversion. */
+ TRACE(("\tback to the initial state\n"));
+ IMStopConversion(icp);
+ }
}
/*- ximExtMoveProc: handle XIM_EXT_MOVE request -*/
Only in kinput2-v3.1/lib/imlib: imrequest.c.orig
Index: kinput2.spec
===================================================================
RCS file: /cvs/extras/rpms/kinput2/FC-5/kinput2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kinput2.spec 7 Mar 2006 13:03:56 -0000 1.4
+++ kinput2.spec 26 Jan 2007 11:59:42 -0000 1.5
@@ -25,7 +25,7 @@
Name: kinput2
Version: v3.1
-Release: 27%{?dist}
+Release: 28%{?dist}
License: Distributable
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel
@@ -59,11 +59,13 @@
Patch7: kinput2-v3.1-fix-gcc-warning.patch
Patch8: kinput2-v3.1-activate_im_with_kanji.patch
Patch9: kinput2-v3.1-jp106_xfer.patch
-Patch10: kinput2-redraw.patch
+Patch10: kinput2-v3.1-status-update-204892.patch
Summary: kinput2 - kanji input server for X11
Group: User Interface/X
-Requires(post,preun,triggerpostun): %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives
+Requires(triggerpostun): %{_sbindir}/alternatives
Obsoletes: kinput2-canna, kinput2-wnn4, kinput2-wnn6, kinput2-canna-wnn4, kinput2-canna-wnn6
%description
@@ -92,7 +94,7 @@
%if %{build_with_wnn4}
ln -sf Kinput2.conf.wnn4 Kinput2.conf
xmkmf -a
-make
+make %{?_smp_mflags}
mv cmd/kinput2 kinput2.wnn4
make clean
%endif
@@ -100,7 +102,7 @@
%if %{build_with_wnn6}
ln -sf Kinput2.conf.wnn6 Kinput2.conf
xmkmf -a
-make
+make %{?_smp_mflags}
mv cmd/kinput2 kinput2.wnn6
make clean
%endif
@@ -109,7 +111,7 @@
rm -f Kinput2.conf
ln -sf Kinput2.conf.canna Kinput2.conf
xmkmf -a
-make
+make %{?_smp_mflags}
mv cmd/kinput2 kinput2.canna
make clean
%endif
@@ -117,7 +119,7 @@
%if %{build_with_canna_wnn4}
ln -sf Kinput2.conf.canna-wnn4 Kinput2.conf
xmkmf -a
-make
+make %{?_smp_mflags}
mv cmd/kinput2 kinput2.canna-wnn4
make clean
%endif
@@ -125,7 +127,7 @@
%if %{build_with_canna_wnn6}
ln -sf Kinput2.conf.canna-wnn6 Kinput2.conf
xmkmf -a
-make
+make %{?_smp_mflags}
mv cmd/kinput2 kinput2.canna-wnn6
%endif
@@ -152,9 +154,11 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
install -c -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/ccdef
-install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT%{_libdir}/X11/ccdef
-install -c -m 0444 ccdef/rule.* $RPM_BUILD_ROOT%{_libdir}/X11/ccdef
+%if %{is_wnn_used}
+mkdir -p $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+install -c -m 0444 ccdef/rule.* $RPM_BUILD_ROOT/usr/lib/X11/ccdef
+%endif
make install.man DESTDIR=$RPM_BUILD_ROOT
@@ -230,13 +234,19 @@
%doc Copyright NEWS README doc
%config %{_datadir}/X11/app-defaults/Kinput2
%if %{is_wnn_used}
-%{_libdir}/X11/ccdef
+/usr/lib/X11/ccdef
%endif
%{_bindir}/kinput2*
%{_mandir}/man1/kinput2.1x*
%{_sysconfdir}/X11/xinit/xinput.d
%changelog
+* Fri Jan 26 2007 Akira TAGOH <tagoh at redhat.com> - v3.1-28
+- Backport a patch to update the status with XmbResetIC() properly.
+- Disable Wnn support so that no *Wnn* devel package available anymore.
+- Install ccdef files under /usr/lib on even 64bit archs according to the path
+ imake generates. (#209622)
+
* Tue Mar 7 2006 Akira TAGOH <tagoh at redhat.com> - v3.1-27
- moved out from /usr/X11R6. (#170934)
--- kinput2-redraw.patch DELETED ---
More information about the scm-commits
mailing list