Changeset 561 for trunk/src/gui/inputmethod/qinputcontext.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/inputmethod/qinputcontext.cpp (modified) (14 diffs)

trunk/src/gui/inputmethod/qinputcontext.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -79 +79 @@
     \ingroup i18n
 
-    An input method is responsible to input complex text that cannot
+    An input method is responsible  complex text that cannot
     be inputted via simple keymap. It converts a sequence of input
     events (typically key events) into a text string through the input
@@ -90 +90 @@
     information, Qt offers the QInputContext as base class. The
     concept is well known as 'input context' in the input method
-    domain. an input context is created for a text widget in response
+    domain. n input context is created for a text widget in response
     to a demand. It is ensured that an input context is prepared for
     an input method before input to a text widget.
 
-    Multiple input contexts that is belonging to a single input method
+    Multiple input contexts that ng to a single input method
     may concurrently coexist. Suppose multi-window text editor. Each
     text widget of window A and B holds different QInputContext
@@ -106 +106 @@
 
     \row \o Receiving information \o
-        x11FilterEvent(),
-        filterEvent(),
-        mouseHandler()
+x11FilterEvent(),
+filterEvent(),
+mouseHandler()
 
     \row \o Sending back composed text \o
-        sendEvent()
+sendEvent()
 
     \row \o State change notification \o
-        setFocusWidget(),
-        reset()
+setFocusWidget(),
+reset()
 
     \row \o Context information \o
-        identifierName(),
-        language(),
-        font(),
-        isComposing()
+identifierName(),
+language(),
+font(),
+isComposing()
 
     \endtable
+
+
 
     \legalese
@@ -155 +157 @@
 
 /*!
-    \internal
     Returns the widget that has an input focus for this input
-    context. Ordinary input methods should not call this function
-    directly to keep platform independence and flexible configuration
-    possibility.
+    context.
 
     The return value may differ from holderWidget() if the input
     context is shared between several text widgets.
 
-    \sa setFocusWidget(), holderWidget()
+    \warning To ensure platform independence and support flexible
+    configuration of widgets, ordinary input methods should not call
+    this function directly.
+
+    \sa setFocusWidget()
 */
 QWidget *QInputContext::focusWidget() const
@@ -174 +177 @@
 
 /*!
-    \internal
-    Sets the widget that has an input focus for this input
-    context. Ordinary input methods must not call this function
+    
+
+     Ordinary input methods must not call this function
     directly.
 
@@ -210 +213 @@
     methods, leave it untouched.
 
-    \a event is currently restricted to QKeyEvent. But some input
-    method related events such as QWheelEvent or QTabletEvent may be
-    added in future.
+    \a event is currently restricted to events of these types:
+
+    \list
+        \i CloseSoftwareInputPanel
+        \i KeyPress
+        \i KeyRelease
+        \i MouseButtonDblClick
+        \i MouseButtonPress
+        \i MouseButtonRelease
+        \i MouseMove
+        \i RequestSoftwareInputPanel
+    \endlist
+
+    But some input method related events such as QWheelEvent or
+    QTabletEvent may be added in future.
 
     The filtering opportunity is always given to the input context as
@@ -263 +278 @@
 
     QInputMethodEvent e(event);
-    qApp->sendEvent(focus, &e);
+    sendEvent(focus, &e);
 }
 
@@ -281 +296 @@
     widget. The event type is QEvent::MouseButtonPress,
     QEvent::MouseButtonRelease, QEvent::MouseButtonDblClick or
-    QEvent::MouseButtonMove. The event's button and state indicate
+    QEvent::MouseMove. The event's button and state indicate
     the kind of operation that was performed.
 */
@@ -409 +424 @@
 {
     QWidget *focus = focusWidget();
-    const QPalette &pal = focus ? focus->palette() : qApp->palette();
+    const QPalette &pal = focus ? focus->palette() : palette();
 
     QTextCharFormat fmt;
@@ -416 +431 @@
     case QInputContext::PreeditFormat: {
         fmt.setUnderlineStyle(QTextCharFormat::DashUnderline);
-#ifndef Q_WS_WIN
-        int h1, s1, v1, h2, s2, v2;
-        pal.color(QPalette::Base).getHsv(&h1, &s1, &v1);
-        pal.color(QPalette::Background).getHsv(&h2, &s2, &v2);
-        bg.setHsv(h1, s1, (v1 + v2) / 2);
-        fmt.setBackground(QBrush(bg));
-#endif
         break;
     }
@@ -460 +468 @@
 #endif // Q_WS_X11
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE