|
 |
9276142 |
diff -up qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp.fix-key-release-event-with-imm qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp
|
|
|
9276142 |
--- qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp.fix-key-release-event-with-imm 2008-10-08 14:50:10.000000000 +0200
|
|
|
9276142 |
+++ qt-x11-free-3.3.8b/src/kernel/qapplication_x11.cpp 2008-10-08 14:50:10.000000000 +0200
|
|
|
9276142 |
@@ -3297,11 +3297,7 @@ int QApplication::x11ProcessEvent( XEven
|
|
 |
cacaa8c |
// filtering opportunity first to ensure all input methods work
|
|
|
cacaa8c |
// properly regardless of application design.
|
|
|
cacaa8c |
|
|
|
cacaa8c |
-#ifndef QT_NO_IM_EXTENSIONS
|
|
|
cacaa8c |
if( keywidget && keywidget->isEnabled() && keywidget->isInputMethodEnabled() ) {
|
|
|
cacaa8c |
-#else
|
|
|
cacaa8c |
- if( keywidget && keywidget->isEnabled() ) {
|
|
|
cacaa8c |
-#endif
|
|
|
cacaa8c |
if( ( event->type==XKeyPress || event->type==XKeyRelease ) &&
|
|
|
cacaa8c |
sm_blockUserInput ) // block user interaction during session management
|
|
|
cacaa8c |
return TRUE;
|
|
|
9276142 |
@@ -5223,11 +5219,12 @@ bool QETWidget::translateKeyEventInterna
|
|
|
cacaa8c |
} else {
|
|
|
cacaa8c |
key = (int)(long)keyDict->find( keycode );
|
|
|
cacaa8c |
if ( key )
|
|
|
cacaa8c |
- if( !willRepeat ) // Take out key of dictionary only if this call.
|
|
|
cacaa8c |
+ if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call.
|
|
|
cacaa8c |
keyDict->take( keycode );
|
|
|
cacaa8c |
long s = (long)textDict->find( keycode );
|
|
|
cacaa8c |
if ( s ) {
|
|
|
cacaa8c |
- textDict->take( keycode );
|
|
|
cacaa8c |
+ if( statefulTranslation )
|
|
|
cacaa8c |
+ textDict->take( keycode );
|
|
|
cacaa8c |
ascii = (char)(s-256);
|
|
|
cacaa8c |
}
|
|
|
cacaa8c |
}
|
|
|
9276142 |
diff -up qt-x11-free-3.3.8b/src/kernel/qwidget_x11.cpp.fix-key-release-event-with-imm qt-x11-free-3.3.8b/src/kernel/qwidget_x11.cpp
|
|
|
9276142 |
--- qt-x11-free-3.3.8b/src/kernel/qwidget_x11.cpp.fix-key-release-event-with-imm 2008-10-08 14:50:10.000000000 +0200
|
|
|
9276142 |
+++ qt-x11-free-3.3.8b/src/kernel/qwidget_x11.cpp 2008-10-08 14:59:03.000000000 +0200
|
|
|
9276142 |
@@ -2700,11 +2700,10 @@ QInputContext *QWidget::getInputContext(
|
|
|
cacaa8c |
{
|
|
|
cacaa8c |
QInputContext *qic = 0;
|
|
|
cacaa8c |
|
|
|
cacaa8c |
-#if !defined(QT_NO_IM_EXTENSIONS)
|
|
|
cacaa8c |
if ( isInputMethodEnabled() ) {
|
|
|
cacaa8c |
+#if !defined(QT_NO_IM_EXTENSIONS)
|
|
|
9276142 |
qic = icHolderWidget()->ic;
|
|
|
cacaa8c |
#else
|
|
|
cacaa8c |
- {
|
|
|
9276142 |
// icHolderWidget is always topLevelWidget
|
|
|
9276142 |
QTLWExtra *topdata = icHolderWidget()->topData();
|
|
|
9276142 |
qic = (QInputContext *)topdata->xic;
|
|
|
9276142 |
@@ -2755,10 +2754,8 @@ void QWidget::changeInputContext( const
|
|
|
cacaa8c |
*/
|
|
|
cacaa8c |
void QWidget::createInputContext()
|
|
|
cacaa8c |
{
|
|
|
cacaa8c |
-#if !defined(QT_NO_IM_EXTENSIONS)
|
|
|
cacaa8c |
if( !isInputMethodEnabled() || QApplication::closingDown() )
|
|
|
9276142 |
return;
|
|
|
cacaa8c |
-#endif
|
|
|
cacaa8c |
|
|
|
cacaa8c |
QWidget *icWidget = icHolderWidget();
|
|
|
cacaa8c |
#ifndef QT_NO_IM
|