diff options
author | Hye-Shik Chang <perky@FreeBSD.org> | 2003-04-25 08:03:50 +0000 |
---|---|---|
committer | Hye-Shik Chang <perky@FreeBSD.org> | 2003-04-25 08:03:50 +0000 |
commit | cab3c9e5b87bf5338dc80c567c31b9e2c930514e (patch) | |
tree | 9aca834c6c285953b5097c19c50299ba71662da6 /korean | |
parent | 216a3c78538f519d2900394ae3fc415a4795f8d7 (diff) |
Notes
Diffstat (limited to 'korean')
-rw-r--r-- | korean/Makefile | 1 | ||||
-rw-r--r-- | korean/qt31/Makefile | 14 | ||||
-rw-r--r-- | korean/qt31/files/patch-src_kernel_qapplication_x11.cpp | 32 | ||||
-rw-r--r-- | korean/qt31/files/patch-src_kernel_qinputcontext_x11.cpp | 17 | ||||
-rw-r--r-- | korean/qt31/files/patch-src_kernel_qrichtext.cpp | 11 |
5 files changed, 75 insertions, 0 deletions
diff --git a/korean/Makefile b/korean/Makefile index 2a8c2e545560..43369cc9a7e3 100644 --- a/korean/Makefile +++ b/korean/Makefile @@ -68,6 +68,7 @@ SUBDIR += pgp.language SUBDIR += pinetreefonts SUBDIR += pycodec + SUBDIR += qt31 SUBDIR += texinfo SUBDIR += uniksc diff --git a/korean/qt31/Makefile b/korean/qt31/Makefile new file mode 100644 index 000000000000..8a79030101d9 --- /dev/null +++ b/korean/qt31/Makefile @@ -0,0 +1,14 @@ +# Ports collection makefile for: ko-qt31 +# Date created: 23 April 2003 +# Whom: Hye-Shik Chang +# +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../../x11-toolkits/qt31 +EXTRA_PATCHES= ${.CURDIR}/files/patch-* +CATEGORIES= korean x11-toolkits + +MAINTAINER= perky@FreeBSD.org +COMMENT= Korean-Localized Qt, the C++ GUI Toolkit + +.include "${MASTERDIR}/Makefile" diff --git a/korean/qt31/files/patch-src_kernel_qapplication_x11.cpp b/korean/qt31/files/patch-src_kernel_qapplication_x11.cpp new file mode 100644 index 000000000000..e747c75fbd45 --- /dev/null +++ b/korean/qt31/files/patch-src_kernel_qapplication_x11.cpp @@ -0,0 +1,32 @@ +--- src/kernel/qapplication_x11.cpp.orig Mon Dec 9 18:40:39 2002 ++++ src/kernel/qapplication_x11.cpp Fri Apr 25 16:57:49 2003 +@@ -3136,6 +3136,7 @@ + IMEnd with empty text (meaning the user has cancelled the + input). + */ ++#if 0 + QInputContext *qic = + (QInputContext *) keywidget->topLevelWidget()->topData()->xic; + extern bool qt_compose_emptied; // qinputcontext_x11.cpp +@@ -3168,6 +3169,7 @@ + qt_compose_emptied = FALSE; + qic->focusWidget = 0; + } ++#endif + #endif // QT_NO_XIM + + return 1; +@@ -4831,6 +4833,13 @@ + if ( qic ) { + mb=TRUE; + count = qic->lookupString(&xkeyevent, chars, &key, &status); ++ ++ if (qic->composing && qic->focusWidget) { ++ QIMEvent event(QEvent::IMEnd, QString::null, -1); ++ QApplication::sendEvent(qic->focusWidget, &event); ++ qic->composing = FALSE; ++ qic->focusWidget = 0; ++ } + } + } + if ( !mb ) { diff --git a/korean/qt31/files/patch-src_kernel_qinputcontext_x11.cpp b/korean/qt31/files/patch-src_kernel_qinputcontext_x11.cpp new file mode 100644 index 000000000000..0e9303e87a92 --- /dev/null +++ b/korean/qt31/files/patch-src_kernel_qinputcontext_x11.cpp @@ -0,0 +1,17 @@ +diff -uNr src/kernel/qinputcontext_x11.cpp.orig src/kernel/qinputcontext_x11.cpp +--- src/kernel/qinputcontext_x11.cpp.orig Thu Nov 7 22:07:34 2002 ++++ src/kernel/qinputcontext_x11.cpp Thu Nov 28 16:52:24 2002 +@@ -153,6 +153,13 @@ + } + } + ++ if (! qic->composing) { ++ qic->composing = TRUE; ++ qic->focusWidget = qApp->focusWidget(); ++ QIMEvent startevent(QEvent::IMStart, QString::null, -1); ++ QApplication::sendEvent(qic->focusWidget, &startevent); ++ } ++ + if (! qic->composing || ! qic->focusWidget) { + // qDebug("compose event: invalid compose event %d %p", + // qic->composing, qic->focusWidget); diff --git a/korean/qt31/files/patch-src_kernel_qrichtext.cpp b/korean/qt31/files/patch-src_kernel_qrichtext.cpp new file mode 100644 index 000000000000..924902fdc3e1 --- /dev/null +++ b/korean/qt31/files/patch-src_kernel_qrichtext.cpp @@ -0,0 +1,11 @@ +--- src/kernel/qrichtext.cpp.orig Fri Apr 25 14:57:22 2003 ++++ src/kernel/qrichtext.cpp Fri Apr 25 14:58:18 2003 +@@ -4636,7 +4636,7 @@ + color.setHsv( h1, s1, ( v1 + v2 ) / 2 ); + painter.setPen( cg.color( QColorGroup::Text ) ); + } else if ( selection == QTextDocument::IMSelectionText ) { +- color = cg.color( QColorGroup::Foreground ); ++ color = cg.color( QColorGroup::Highlight ); + painter.setPen( cg.color( QColorGroup::HighlightedText ) ); + } else if ( !hasdoc || document()->invertSelectionText( selection ) ) { + painter.setPen( cg.color( QColorGroup::HighlightedText ) ); |