patches that didn't make 3.9
This commit is contained in:
parent
f54f510b84
commit
22fdfc5af0
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.60 2006/02/27 16:40:25 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.61 2006/03/04 10:07:10 espie Exp $
|
||||
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
|
||||
|
||||
COMMENT= "C++ X11 GUI toolkit"
|
||||
@ -11,7 +11,7 @@ PKGNAME= qt3-${VERSION}
|
||||
PKGNAME-mysql= qt3-mysql-${VERSION}p1
|
||||
PKGNAME-postgresql= qt3-postgresql-${VERSION}p1
|
||||
PKGNAME-examples= qt3-examples-${VERSION}
|
||||
FULLPKGNAME= qt3-mt-${VERSION}p4${PKGDEBUG}
|
||||
FULLPKGNAME= qt3-mt-${VERSION}p5${PKGDEBUG}
|
||||
FULLPKGNAME-html= qt3-html-${VERSION}
|
||||
SHARED_LIBS= qt-mt 30.0 \
|
||||
qui 2.0 \
|
||||
|
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-plugins_src_inputmethods_imsw-multi_qmultiinputcontext_cpp,v 1.1 2006/03/04 10:07:10 espie Exp $
|
||||
--- plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp.orig Mon Feb 27 12:38:25 2006
|
||||
+++ plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp Mon Feb 27 12:48:56 2006
|
||||
@@ -306,8 +306,8 @@ void QMultiInputContext::changeInputMeth
|
||||
|
||||
currentIMKey = key;
|
||||
|
||||
- qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s",
|
||||
- imIndex, (const char *)_slave->identifierName() );
|
||||
+ //qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s",
|
||||
+ // imIndex, (const char *)_slave->identifierName() );
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,73 @@
|
||||
$OpenBSD: patch-plugins_src_inputmethods_simple_qsimpleinputcontext_cpp,v 1.1 2006/03/04 10:07:10 espie Exp $
|
||||
--- plugins/src/inputmethods/simple/qsimpleinputcontext.cpp.orig Mon Feb 27 12:38:25 2006
|
||||
+++ plugins/src/inputmethods/simple/qsimpleinputcontext.cpp Mon Feb 27 12:48:56 2006
|
||||
@@ -140,7 +140,7 @@ bool QSimpleInputContext::filterEvent( c
|
||||
// only one character. See description of
|
||||
// QInputContext::filterEvent() about key compression.
|
||||
val = text[0].unicode();
|
||||
- qDebug( "str = %s", (const char*)keyevent->text().local8Bit() );
|
||||
+ //qDebug( "str = %s", (const char*)keyevent->text().local8Bit() );
|
||||
}
|
||||
|
||||
// Store value
|
||||
@@ -164,14 +164,14 @@ bool QSimpleInputContext::filterEvent( c
|
||||
|
||||
void QSimpleInputContext::setFocus()
|
||||
{
|
||||
- qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p",
|
||||
- this, focusWidget() );
|
||||
+ //qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p",
|
||||
+ // this, focusWidget() );
|
||||
}
|
||||
|
||||
void QSimpleInputContext::unsetFocus()
|
||||
{
|
||||
- qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p",
|
||||
- this, focusWidget() );
|
||||
+ //qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p",
|
||||
+ // this, focusWidget() );
|
||||
reset();
|
||||
}
|
||||
|
||||
@@ -188,8 +188,8 @@ void QSimpleInputContext::mouseHandler(
|
||||
case QEvent::MouseButtonRelease:
|
||||
case QEvent::MouseButtonDblClick:
|
||||
case QEvent::MouseMove:
|
||||
- qDebug( "QSimpleInputContext::mouseHandler: "
|
||||
- "x=%d, type=%d, button=%d, state=%d", x, type, button, state );
|
||||
+ //qDebug( "QSimpleInputContext::mouseHandler: "
|
||||
+ // "x=%d, type=%d, button=%d, state=%d", x, type, button, state );
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -240,7 +240,7 @@ bool QSimpleInputContext::checkComposeTa
|
||||
|
||||
// no entries were found
|
||||
if ( p == composeTable->data + composeTable->size ) {
|
||||
- qDebug( "no match" );
|
||||
+ //qDebug( "no match" );
|
||||
clearComposeBuffer();
|
||||
return FALSE;
|
||||
}
|
||||
@@ -250,18 +250,18 @@ bool QSimpleInputContext::checkComposeTa
|
||||
|
||||
// check if partial match
|
||||
if ( composeBuffer[i] == 0 && p->keys[i] ) {
|
||||
- qDebug("partial match");
|
||||
+ //qDebug("partial match");
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if ( composeBuffer[i] != p->keys[i] ) {
|
||||
- qDebug("different entry");
|
||||
+ //qDebug("different entry");
|
||||
clearComposeBuffer();
|
||||
return i!=0;
|
||||
}
|
||||
}
|
||||
|
||||
- qDebug("match exactly");
|
||||
+ //qDebug("match exactly");
|
||||
|
||||
// match exactly
|
||||
commitChar( p->value );
|
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-plugins_src_inputmethods_xim_qximinputcontext_x11_cpp,v 1.1 2006/03/04 10:07:10 espie Exp $
|
||||
--- plugins/src/inputmethods/xim/qximinputcontext_x11.cpp.orig Mon Feb 27 12:38:25 2006
|
||||
+++ plugins/src/inputmethods/xim/qximinputcontext_x11.cpp Mon Feb 27 12:48:56 2006
|
||||
@@ -361,7 +361,7 @@ void QXIMInputContext::setHolderWidget(
|
||||
}
|
||||
|
||||
if (! widget->isTopLevel()) {
|
||||
- qWarning("QInputContext: cannot create input context for non-toplevel widgets");
|
||||
+ // qWarning("QInputContext: cannot create input context for non-toplevel widgets");
|
||||
return;
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_inputmethod_qinputcontextfactory_cpp,v 1.1 2006/02/27 16:40:25 espie Exp $
|
||||
--- src/inputmethod/qinputcontextfactory.cpp.orig Mon Feb 27 17:39:37 2006
|
||||
+++ src/inputmethod/qinputcontextfactory.cpp Mon Feb 27 17:40:37 2006
|
||||
$OpenBSD: patch-src_inputmethod_qinputcontextfactory_cpp,v 1.2 2006/03/04 10:07:10 espie Exp $
|
||||
--- src/inputmethod/qinputcontextfactory.cpp.orig Mon Feb 27 12:38:25 2006
|
||||
+++ src/inputmethod/qinputcontextfactory.cpp Mon Feb 27 12:47:56 2006
|
||||
@@ -102,7 +102,8 @@ QInputContext *QInputContextFactory::cre
|
||||
if ( iface ) {
|
||||
ret = iface->create( inputcontext );
|
||||
|
30
x11/qt3/patches/patch-src_kernel_qapplication_x11_cpp
Normal file
30
x11/qt3/patches/patch-src_kernel_qapplication_x11_cpp
Normal file
@ -0,0 +1,30 @@
|
||||
$OpenBSD: patch-src_kernel_qapplication_x11_cpp,v 1.3 2006/03/04 10:07:10 espie Exp $
|
||||
--- src/kernel/qapplication_x11.cpp.orig Mon Feb 27 13:00:20 2006
|
||||
+++ src/kernel/qapplication_x11.cpp Mon Feb 27 13:12:05 2006
|
||||
@@ -3294,11 +3294,7 @@ int QApplication::x11ProcessEvent( XEven
|
||||
// filtering opportunity first to ensure all input methods work
|
||||
// properly regardless of application design.
|
||||
|
||||
-#ifndef QT_NO_IM_EXTENSIONS
|
||||
if( keywidget && keywidget->isEnabled() && keywidget->isInputMethodEnabled() ) {
|
||||
-#else
|
||||
- if( keywidget && keywidget->isEnabled() ) {
|
||||
-#endif
|
||||
if( ( event->type==XKeyPress || event->type==XKeyRelease ) &&
|
||||
sm_blockUserInput ) // block user interaction during session management
|
||||
return TRUE;
|
||||
@@ -5220,11 +5216,12 @@ bool QETWidget::translateKeyEventInterna
|
||||
} else {
|
||||
key = (int)(long)keyDict->find( keycode );
|
||||
if ( key )
|
||||
- if( !willRepeat ) // Take out key of dictionary only if this call.
|
||||
+ if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call.
|
||||
keyDict->take( keycode );
|
||||
long s = (long)textDict->find( keycode );
|
||||
if ( s ) {
|
||||
- textDict->take( keycode );
|
||||
+ if( statefulTranslation )
|
||||
+ textDict->take( keycode );
|
||||
ascii = (char)(s-256);
|
||||
}
|
||||
}
|
@ -1,12 +1,28 @@
|
||||
$OpenBSD: patch-src_kernel_qwidget_x11_cpp,v 1.5 2006/02/27 16:40:25 espie Exp $
|
||||
--- src/kernel/qwidget_x11.cpp.orig Mon Feb 27 17:39:38 2006
|
||||
+++ src/kernel/qwidget_x11.cpp Mon Feb 27 17:40:23 2006
|
||||
@@ -2754,7 +2754,7 @@ void QWidget::changeInputContext( const
|
||||
$OpenBSD: patch-src_kernel_qwidget_x11_cpp,v 1.6 2006/03/04 10:07:10 espie Exp $
|
||||
--- src/kernel/qwidget_x11.cpp.orig Mon Feb 27 13:00:21 2006
|
||||
+++ src/kernel/qwidget_x11.cpp Mon Feb 27 13:02:18 2006
|
||||
@@ -2698,11 +2698,10 @@ QInputContext *QWidget::getInputContext(
|
||||
{
|
||||
QInputContext *qic = 0;
|
||||
|
||||
-#if !defined(QT_NO_IM_EXTENSIONS)
|
||||
if ( isInputMethodEnabled() ) {
|
||||
+#if !defined(QT_NO_IM_EXTENSIONS)
|
||||
qic = icHolderWidget()->ic;
|
||||
#else
|
||||
- {
|
||||
// icHolderWidget is always topLevelWidget
|
||||
QTLWExtra *topdata = icHolderWidget()->topData();
|
||||
qic = (QInputContext *)topdata->xic;
|
||||
@@ -2753,10 +2752,8 @@ void QWidget::changeInputContext( const
|
||||
*/
|
||||
void QWidget::createInputContext()
|
||||
{
|
||||
#if !defined(QT_NO_IM_EXTENSIONS)
|
||||
-#if !defined(QT_NO_IM_EXTENSIONS)
|
||||
- if( !isInputMethodEnabled() )
|
||||
+ if( !isInputMethodEnabled() || QApplication::closingDown() )
|
||||
+ if( !isInputMethodEnabled() || QApplication::closingDown() )
|
||||
return;
|
||||
#endif
|
||||
-#endif
|
||||
|
||||
QWidget *icWidget = icHolderWidget();
|
||||
#ifndef QT_NO_IM
|
||||
|
Loading…
x
Reference in New Issue
Block a user