Changeset 5132 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Oct 1, 2007 9:41:31 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

24996

Message:

FE/Qt: OS/2: Implemented keyboard input to the VM.

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• QIHotKeyEdit.h (modified) (4 diffs)
• VBoxConsoleView.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/QIHotKeyEdit.h

@@ -28 +28 @@
 #endif
 
+#if defined(Q_WS_PM)
+/* Extra virtual keys returned by QIHotKeyEdit::virtualKey() */
+#define VK_LSHIFT   VK_USERFIRST + 0
+#define VK_LCTRL    VK_USERFIRST + 1
+#define VK_LWIN     VK_USERFIRST + 2
+#define VK_RWIN     VK_USERFIRST + 3
+#define VK_WINMENU  VK_USERFIRST + 4
+#define VK_FORWARD  VK_USERFIRST + 5
+#define VK_BACKWARD VK_USERFIRST + 6
+#endif
 
 class QIHotKeyEdit : public QLabel
@@ -35 +45 @@
 public:
 
-    QIHotKeyEdit( QWidget * parent, const char * name = 0 );
+    QIHotKeyEdit (QWidget *aParent, const char *aName = 0);
     virtual ~QIHotKeyEdit();
 
-    void setKey( int keyval );
-    int key() const { return keyval; }
+    void setKey (int aKeyVal);
+    int key() const { return mKeyVal; }
 
-    QString symbolicName() const { return symbname; }
+    QString symbolicName() const { return mSymbName; }
 
     QSize sizeHint() const;
     QSize minimumSizeHint() const;
 
-#if defined(Q_WS_X11)
-    static void languageChange(void);
+#if defined (Q_WS_PM)
+    static int virtualKey (QMSG *aMsg);
 #endif
-    static QString keyName (int key);
-    static bool isValidKey (int k);
+
+#if defined (Q_WS_PM) || defined (Q_WS_X11)
+    static void languageChange();
+#endif
+    static QString keyName (int aKeyVal);
+    static bool isValidKey (int aKeyVal);
 
 public slots:
@@ -58 +72 @@
 protected:
 
-#if defined(Q_WS_WIN32)
-    bool winEvent( MSG *msg );
-#elif defined(Q_WS_X11)
-    bool x11Event( XEvent *event );
-#elif defined(Q_WS_MAC)
-    static pascal OSStatus darwinEventHandlerProc( EventHandlerCallRef inHandlerCallRef,
-                                                   EventRef inEvent, void *inUserData );
-    bool darwinKeyboardEvent( EventRef inEvent );
+#if defined (Q_WS_WIN32)
+    bool winEvent (MSG *msg);
+#elif defined (Q_WS_PM)
+    bool pmEvent (QMSG *aMsg);
+#elif defined (Q_WS_X11)
+    bool x11Event (XEvent *event);
+#elif defined (Q_WS_MAC)
+    static pascal OSStatus darwinEventHandlerProc (EventHandlerCallRef inHandlerCallRef,
+                                                   EventRef inEvent, void *inUserData);
+    bool darwinKeyboardEvent (EventRef inEvent);
 #endif
 
-    void focusInEvent( QFocusEvent * );
-    void focusOutEvent( QFocusEvent * );
+    void focusInEvent (QFocusEvent *);
+    void focusOutEvent (QFocusEvent *);
 
-    void drawContents( QPainter * p );
+    void drawContents (QPainter *p);
 
 private:
@@ -77 +93 @@
     void updateText();
 
-    int keyval;
-    QString symbname;
+    int mKeyVal;
+    QString mSymbName;
 
-    QColorGroup true_acg;
+    QColorGroup mTrueACG;
 
-#if defined(Q_WS_X11)
-    static QMap<QString, QString> keyNames;
+#if defined (Q_WS_PM)
+    static QMap <int, QString> sKeyNames;
+#elif defined (Q_WS_X11)
+    static QMap <QString, QString> sKeyNames;
 #endif
 
-#if defined(Q_WS_MAC)
+#if defined (Q_WS_MAC)
     /** Event handler reference. NULL if the handler isn't installed. */
-    EventHandlerRef m_darwinEventHandlerRef;
+    EventHandlerRef mDarwinEventHandlerRef;
     /** The current modifier key mask. Used to figure out which modifier
      *  key was pressed when we get a kEventRawKeyModifiersChanged event. */
-    UInt32 m_darwinKeyModifiers;
+    UInt32 mDarwinKeyModifiers;
 #endif
 
-    static const char *NoneSymbName;
+    static const char *kNoneSymbName;
 };
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -110 +110 @@
 
     // events
-    bool event( QEvent *e );
-    bool eventFilter( QObject *watched, QEvent *e );
+    bool event (QEvent *e);
+    bool eventFilter (QObject *watched, QEvent *e);
 
 #if defined(Q_WS_WIN32)
     bool winLowKeyboardEvent (UINT msg, const KBDLLHOOKSTRUCT &event);
     bool winEvent (MSG *msg);
+#elif defined(Q_WS_PM)
+    bool pmEvent (QMSG *aMsg);
 #elif defined(Q_WS_X11)
-    bool x11Event (XEvent *event );
+    bool x11Event (XEvent *event);
 #elif defined(Q_WS_MAC)
     bool darwinKeyboardEvent (EventRef inEvent);
@@ -125 +127 @@
 private:
 
-    // flags for keyEvent()
+    /** Flags for keyEvent(). */
     enum {
         KeyExtended = 0x01,
@@ -134 +136 @@
 
     void focusEvent (bool focus);
-    bool keyEvent (int key, uint8_t scan, int flags, wchar_t *aUniKey = NULL);
+    bool keyEvent (int aKey, uint8_t aScan, int aFlags,
+                   wchar_t *aUniKey = NULL);
     bool mouseEvent (int aType, const QPoint &aPos, const QPoint &aGlobalPos,
                      ButtonState aButton,