diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 05caf67e1..6a54bf200 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -808,7 +808,6 @@ std::array x11_to_xt_vnc 0, 0, 0, - 0, 0x1D, 0x11D, 0x2A, diff --git a/src/qt/qt_settingsdisplay.ui b/src/qt/qt_settingsdisplay.ui index 58a2e6aef..2ed153a21 100644 --- a/src/qt/qt_settingsdisplay.ui +++ b/src/qt/qt_settingsdisplay.ui @@ -38,6 +38,12 @@ + + + 0 + 0 + + Configure diff --git a/src/qt/qt_settingsfloppycdrom.ui b/src/qt/qt_settingsfloppycdrom.ui index dfe8283ab..8f7ffa995 100644 --- a/src/qt/qt_settingsfloppycdrom.ui +++ b/src/qt/qt_settingsfloppycdrom.ui @@ -41,6 +41,9 @@ QAbstractItemView::SelectRows + + false + false @@ -102,6 +105,9 @@ QAbstractItemView::SelectRows + + false + false diff --git a/src/qt/qt_settingsharddisks.ui b/src/qt/qt_settingsharddisks.ui index b670dd512..fa913beea 100644 --- a/src/qt/qt_settingsharddisks.ui +++ b/src/qt/qt_settingsharddisks.ui @@ -34,6 +34,9 @@ QAbstractItemView::SelectRows + + false + false diff --git a/src/qt/qt_settingsinput.ui b/src/qt/qt_settingsinput.ui index 7332ad907..8f4f46167 100644 --- a/src/qt/qt_settingsinput.ui +++ b/src/qt/qt_settingsinput.ui @@ -13,7 +13,7 @@ Form - + 0 @@ -23,102 +23,49 @@ 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Mouse: - - - - - - - - - - Configure - - - - - - - Joystick: - - - - - - - + + + + Joystick 2... + - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Joystick 1... - - - - - - - Joystick 2... - - - - - - - Joystick 3... - - - - - - - Joystick 4... - - - - + + + + Joystick: + - + + + + Joystick 4... + + + + + + + Mouse: + + + + + + + Joystick 3... + + + + Qt::Vertical + + QSizePolicy::Expanding + 20 @@ -127,6 +74,39 @@ + + + + Joystick 1... + + + + + + + + 0 + 0 + + + + Configure + + + + + + + + 0 + 0 + + + + + + + diff --git a/src/qt/qt_settingsmachine.ui b/src/qt/qt_settingsmachine.ui index e61eca023..fabb52fe9 100644 --- a/src/qt/qt_settingsmachine.ui +++ b/src/qt/qt_settingsmachine.ui @@ -93,7 +93,14 @@ - + + + + 0 + 0 + + + @@ -111,7 +118,14 @@ 0 - + + + + 0 + 0 + + + @@ -119,12 +133,19 @@ Speed: - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - + + + + 0 + 0 + + + @@ -179,19 +200,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -222,6 +230,19 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/src/qt/qt_settingsnetwork.ui b/src/qt/qt_settingsnetwork.ui index 0b99769a7..751e3854d 100644 --- a/src/qt/qt_settingsnetwork.ui +++ b/src/qt/qt_settingsnetwork.ui @@ -26,24 +26,7 @@ 0 - - - - PCap device: - - - - - - - Network adapter: - - - - - - - + Qt::Vertical @@ -56,8 +39,12 @@ - - + + + + PCap device: + + @@ -67,33 +54,42 @@ - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - Configure - - - - + + + + 0 + 0 + + + + + + Network adapter: + + + + + + + Configure + + + + + + + + 0 + 0 + + + + + + + diff --git a/src/qt/qt_settingsotherperipherals.ui b/src/qt/qt_settingsotherperipherals.ui index 0a8d93efb..62a4b9308 100644 --- a/src/qt/qt_settingsotherperipherals.ui +++ b/src/qt/qt_settingsotherperipherals.ui @@ -36,7 +36,14 @@ - + + + + 0 + 0 + + + @@ -92,7 +99,14 @@ - + + + + 0 + 0 + + + diff --git a/src/qt/qt_settingsotherremovable.ui b/src/qt/qt_settingsotherremovable.ui index 81b76f10a..a82c296ae 100644 --- a/src/qt/qt_settingsotherremovable.ui +++ b/src/qt/qt_settingsotherremovable.ui @@ -41,6 +41,9 @@ QAbstractItemView::SelectRows + + false + false @@ -108,6 +111,9 @@ QAbstractItemView::SelectRows + + false + false diff --git a/src/qt/qt_settingssound.ui b/src/qt/qt_settingssound.ui index f8bad2c61..65f5d7fd6 100644 --- a/src/qt/qt_settingssound.ui +++ b/src/qt/qt_settingssound.ui @@ -62,7 +62,14 @@ - + + + + 0 + 0 + + + @@ -106,11 +113,15 @@ - - - - + + + + 0 + 0 + + + @@ -153,6 +164,16 @@ + + + + + 0 + 0 + + + + diff --git a/src/qt/qt_settingsstoragecontrollers.ui b/src/qt/qt_settingsstoragecontrollers.ui index 00f7c9619..c4c44b019 100644 --- a/src/qt/qt_settingsstoragecontrollers.ui +++ b/src/qt/qt_settingsstoragecontrollers.ui @@ -50,7 +50,14 @@ - + + + + 0 + 0 + + + @@ -104,8 +111,12 @@ SCSI - - + + + + Configure + + @@ -114,47 +125,6 @@ - - - - Controller 1: - - - - - - - - - - - - - Controller 4: - - - - - - - Controller 2: - - - - - - - Configure - - - - - - - Configure - - - @@ -162,9 +132,53 @@ + + + + + 0 + 0 + + + + + + + + Configure + + + + + + + + + + + + + Controller 1: + + + + + + + Controller 2: + + + + + + + Controller 4: + + + diff --git a/src/qt/qt_specifydimensions.ui b/src/qt/qt_specifydimensions.ui index 855b9f3b7..8012ced71 100644 --- a/src/qt/qt_specifydimensions.ui +++ b/src/qt/qt_specifydimensions.ui @@ -13,81 +13,45 @@ Specify Main Window Dimensions - - - - 20 - 110 - 361 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 70 - 50 - 81 - 21 - - - - - - - 30 - 50 - 41 - 21 - - - - Width: - - - - - - 20 - 90 - 131 - 23 - - - - Lock to this size - - - - - - 200 - 50 - 51 - 21 - - - - Height: - - - - - - 250 - 50 - 81 - 21 - - - + + + + + Width: + + + + + + + + + + Height: + + + + + + + + + + Lock to this size + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + diff --git a/src/qt/xinput2_mouse.cpp b/src/qt/xinput2_mouse.cpp index 361917bfc..ff67b6a2c 100644 --- a/src/qt/xinput2_mouse.cpp +++ b/src/qt/xinput2_mouse.cpp @@ -34,6 +34,7 @@ extern MainWindow* main_window; extern "C" { #include +#include #include #include #include @@ -50,7 +51,7 @@ static QThread* procThread = nullptr; static bool xi2childinit = false; static XIEventMask ximask; static std::atomic exitfromthread = false; -static std::atomic xi2_mouse_x = 0, xi2_mouse_y = 0; +static std::atomic xi2_mouse_x = 0, xi2_mouse_y = 0, xi2_mouse_abs_x = 0, xi2_mouse_abs_y = 0; static int xi2opcode = 0; static double prev_rel_coords[2] = { 0., 0. }; static Time prev_time = 0; @@ -91,6 +92,7 @@ void xinput2_proc() XISetMask(ximask.mask, XI_RawButtonPress); XISetMask(ximask.mask, XI_RawButtonRelease); XISetMask(ximask.mask, XI_RawMotion); + if (XKeysymToKeycode(disp, XK_Home) == 69) XISetMask(ximask.mask, XI_Motion); XISelectEvents(disp, win, &ximask, 1); @@ -119,6 +121,18 @@ void xinput2_proc() prev_rel_coords[1] = relative_coords[1]; prev_time = rawev->time; } + case XI_Motion: { + if (XKeysymToKeycode(disp, XK_Home) == 69) { + // No chance we will get raw motion events on VNC. + const XIDeviceEvent *motionev = (const XIDeviceEvent*)cookie->data; + if (xi2_mouse_abs_x != 0 || xi2_mouse_abs_y != 0) { + xi2_mouse_x = xi2_mouse_x + (motionev->event_x - xi2_mouse_abs_x); + xi2_mouse_y = xi2_mouse_y + (motionev->event_y - xi2_mouse_abs_y); + } + xi2_mouse_abs_x = motionev->event_x; + xi2_mouse_abs_y = motionev->event_y; + } + } } } diff --git a/src/video/vid_im1024.c b/src/video/vid_im1024.c index 870f0205f..4e6453b31 100644 --- a/src/video/vid_im1024.c +++ b/src/video/vid_im1024.c @@ -1032,7 +1032,7 @@ im1024_speed_changed(void *priv) const device_t im1024_device = { "ImageManager 1024", "im1024", - DEVICE_ISA, 0, + DEVICE_ISA | DEVICE_AT, 0, im1024_init, im1024_close, NULL, { im1024_available }, im1024_speed_changed, diff --git a/src/win/win_ui.c b/src/win/win_ui.c index 6f0301d09..ad2c23484 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -1171,6 +1171,7 @@ ui_init(int nCmdShow) int bRet; TASKDIALOGCONFIG tdconfig = {0}; TASKDIALOG_BUTTON tdbuttons[] = {{IDCANCEL, MAKEINTRESOURCE(IDS_2119)}}; + uint32_t helper_lang; /* Load DPI related Windows 10 APIs */ user32_handle = dynld_module("user32.dll", user32_imports); @@ -1204,6 +1205,12 @@ ui_init(int nCmdShow) return(6); } + + /* Load the desired language */ + helper_lang = lang_id; + lang_id = 0; + set_language(helper_lang); + win_settings_open(NULL); return(0); } @@ -1321,7 +1328,7 @@ ui_init(int nCmdShow) } /* Load the desired language */ - uint32_t helper_lang = lang_id; + helper_lang = lang_id; lang_id = 0; set_language(helper_lang);