Skip to content

Commit

Permalink
Add support for native key events, upgrade to Ultralight 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@niutech
niutech committed Jul 17, 2021
1 parent 34cbb3b commit 0b5810e
Show file tree
Hide file tree
Showing 4 changed files with 135 additions and 8 deletions.
5 changes: 4 additions & 1 deletion mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi

QString home("https://duckduckgo.com/");

app_ = App::Create();
Settings settings_;
settings_.developer_name = "Niu Tech";
settings_.app_name = "Qt Ultralight Browser";
app_ = App::Create(settings_);

// URL bar
urlBar_ = new QLineEdit(ui->toolBar);
Expand Down
7 changes: 3 additions & 4 deletions qt-ultralight-browser.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ unix|win32: LIBS += -L$$PWD/$$ULTRALIGHT_PATH/lib/ -lUltralight -lUltralightCore
INCLUDEPATH += $$PWD/$$ULTRALIGHT_PATH/include
DEPENDPATH += $$PWD/$$ULTRALIGHT_PATH/include

DISTFILES += \
assets/ultralight.ico
DISTFILES += assets/ultralight.ico

RC_ICONS = assets/ultralight.ico

Expand All @@ -51,5 +50,5 @@ debug: ultralightBin.path = $$OUT_PWD/debug
release: ultralightBin.path = $$OUT_PWD/release

ultralightRes.files = $$files($$PWD/$$ULTRALIGHT_PATH/bin/resources/*)
debug: ultralightRes.path = $$OUT_PWD/debug/resources
release: ultralightRes.path = $$OUT_PWD/release/resources
debug: ultralightRes.path = $$OUT_PWD/debug/assets/resources
release: ultralightRes.path = $$OUT_PWD/release/assets/resources
129 changes: 126 additions & 3 deletions qultralight.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,124 @@
#include "qultralight.h"

int QUltralight::QtModsToUltralightMods(int mods)
{
int result = 0;
if (mods & Qt::AltModifier)
result |= KeyEvent::kMod_AltKey;
if (mods & Qt::ControlModifier)
result |= KeyEvent::kMod_CtrlKey;
if (mods & Qt::MetaModifier)
result |= KeyEvent::kMod_MetaKey;
if (mods & Qt::ShiftModifier)
result |= KeyEvent::kMod_ShiftKey;
return result;
}

int QUltralight::QtKeyCodeToUltralightKeyCode(int key)
{
using namespace KeyCodes;
switch (key) {
case Qt::Key_Space: return GK_SPACE;
case Qt::Key_Apostrophe: return GK_OEM_7;
case Qt::Key_Comma: return GK_OEM_COMMA;
case Qt::Key_Minus: return GK_OEM_MINUS;
case Qt::Key_Period: return GK_OEM_PERIOD;
case Qt::Key_Slash: return GK_OEM_2;
case Qt::Key_0: return GK_0;
case Qt::Key_1: return GK_1;
case Qt::Key_2: return GK_2;
case Qt::Key_3: return GK_3;
case Qt::Key_4: return GK_4;
case Qt::Key_5: return GK_5;
case Qt::Key_6: return GK_6;
case Qt::Key_7: return GK_7;
case Qt::Key_8: return GK_8;
case Qt::Key_9: return GK_9;
case Qt::Key_Semicolon: return GK_OEM_1;
case Qt::Key_Equal: return GK_OEM_PLUS;
case Qt::Key_A: return GK_A;
case Qt::Key_B: return GK_B;
case Qt::Key_C: return GK_C;
case Qt::Key_D: return GK_D;
case Qt::Key_E: return GK_E;
case Qt::Key_F: return GK_F;
case Qt::Key_G: return GK_G;
case Qt::Key_H: return GK_H;
case Qt::Key_I: return GK_I;
case Qt::Key_J: return GK_J;
case Qt::Key_K: return GK_K;
case Qt::Key_L: return GK_L;
case Qt::Key_M: return GK_M;
case Qt::Key_N: return GK_N;
case Qt::Key_O: return GK_O;
case Qt::Key_P: return GK_P;
case Qt::Key_Q: return GK_Q;
case Qt::Key_R: return GK_R;
case Qt::Key_S: return GK_S;
case Qt::Key_T: return GK_T;
case Qt::Key_U: return GK_U;
case Qt::Key_V: return GK_V;
case Qt::Key_W: return GK_W;
case Qt::Key_X: return GK_X;
case Qt::Key_Y: return GK_Y;
case Qt::Key_Z: return GK_Z;
case Qt::Key_BracketLeft: return GK_OEM_4;
case Qt::Key_Backslash: return GK_OEM_5;
case Qt::Key_BracketRight: return GK_OEM_6;
case Qt::Key_QuoteLeft: return GK_OEM_3;
case Qt::Key_Escape: return GK_ESCAPE;
case Qt::Key_Enter: return GK_RETURN;
case Qt::Key_Tab: return GK_TAB;
case Qt::Key_Backspace: return GK_BACK;
case Qt::Key_Insert: return GK_INSERT;
case Qt::Key_Delete: return GK_DELETE;
case Qt::Key_Right: return GK_RIGHT;
case Qt::Key_Left: return GK_LEFT;
case Qt::Key_Down: return GK_DOWN;
case Qt::Key_Up: return GK_UP;
case Qt::Key_PageUp: return GK_PRIOR;
case Qt::Key_PageDown: return GK_NEXT;
case Qt::Key_Home: return GK_HOME;
case Qt::Key_End: return GK_END;
case Qt::Key_CapsLock: return GK_CAPITAL;
case Qt::Key_ScrollLock: return GK_SCROLL;
case Qt::Key_NumLock: return GK_NUMLOCK;
case Qt::Key_SysReq: return GK_SNAPSHOT;
case Qt::Key_Pause: return GK_PAUSE;
case Qt::Key_F1: return GK_F1;
case Qt::Key_F2: return GK_F2;
case Qt::Key_F3: return GK_F3;
case Qt::Key_F4: return GK_F4;
case Qt::Key_F5: return GK_F5;
case Qt::Key_F6: return GK_F6;
case Qt::Key_F7: return GK_F7;
case Qt::Key_F8: return GK_F8;
case Qt::Key_F9: return GK_F9;
case Qt::Key_F10: return GK_F10;
case Qt::Key_F11: return GK_F11;
case Qt::Key_F12: return GK_F12;
case Qt::Key_F13: return GK_F13;
case Qt::Key_F14: return GK_F14;
case Qt::Key_F15: return GK_F15;
case Qt::Key_F16: return GK_F16;
case Qt::Key_F17: return GK_F17;
case Qt::Key_F18: return GK_F18;
case Qt::Key_F19: return GK_F19;
case Qt::Key_F20: return GK_F20;
case Qt::Key_F21: return GK_F21;
case Qt::Key_F22: return GK_F22;
case Qt::Key_F23: return GK_F23;
case Qt::Key_F24: return GK_F24;
case Qt::Key_Shift: return GK_SHIFT;
case Qt::Key_Control: return GK_CONTROL;
case Qt::Key_Alt: return GK_MENU;
case Qt::Key_Super_L: return GK_LWIN;
case Qt::Key_AltGr: return GK_MENU;
case Qt::Key_Super_R: return GK_RWIN;
default: return GK_UNKNOWN;
}
}

QUltralight::QUltralight(QWidget *parent, Monitor *monitor) : QWidget(parent)
{
window_ = Window::Create(monitor, 0, 0, false, kWindowFlags_Hidden);
Expand Down Expand Up @@ -109,11 +228,15 @@ void QUltralight::stop() {

void QUltralight::sendKey(QKeyEvent *event) {
KeyEvent evt;
evt.type = KeyEvent::kType_RawKeyDown;
evt.virtual_key_code = QtKeyCodeToUltralightKeyCode(event->key());
evt.native_key_code = event->nativeScanCode();
GetKeyIdentifierFromVirtualKeyCode(event->nativeVirtualKey(), evt.key_identifier);
evt.modifiers = QtModsToUltralightMods(event->modifiers());
overlay_->view()->FireKeyEvent(evt);
// Support typing chars
evt.type = KeyEvent::kType_Char;
evt.text = (String8) event->text().toUtf8().constData();
evt.unmodified_text = evt.text;
evt.native_key_code = event->nativeScanCode();
evt.virtual_key_code = event->nativeVirtualKey();
evt.modifiers = event->modifiers();
overlay_->view()->FireKeyEvent(evt);
}
2 changes: 2 additions & 0 deletions qultralight.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ class QUltralight : public QWidget,
Q_OBJECT
RefPtr<Window> window_;
RefPtr<Overlay> overlay_;
static int QtModsToUltralightMods(int mods);
static int QtKeyCodeToUltralightKeyCode(int key);

public:
QUltralight(QWidget *parent = nullptr, Monitor *monitor = nullptr);
Expand Down

0 comments on commit 0b5810e

Please sign in to comment.