diff --git a/docs/user/configuration.md b/docs/user/configuration.md index 588fc1e9f..463b9c519 100644 --- a/docs/user/configuration.md +++ b/docs/user/configuration.md @@ -275,12 +275,6 @@ screens\9\switchCornerArray\4\switchCorner=false screens\9\switchCornerArray\size=4 screens\9\switchCornerSize=0 screens\size=15 -switchCornerArray\1\switchCorner=false -switchCornerArray\2\switchCorner=false -switchCornerArray\3\switchCorner=false -switchCornerArray\4\switchCorner=false -switchCornerArray\size=4 -switchCornerSize=0 ``` @@ -331,8 +325,8 @@ A computer can have the following options: |halfDuplexScrollLock| `true` or `false`| This computer has a ''Scroll Lock'' key that doesn't report a press and a release event when the user presses it but instead reports a press event when it's turned on and a release event when it's turned off. If ''Scroll Lock'' acts strangely on all computers then you may need to set this option to true on the server. If it acts strangely on one computer then that computer may need the option set to true.| |xtestIsXineramaUnaware| `true` or `false`| This option works around a bug in the XTest extension when used in combination with Xinerama. It affects X11 clients only. Not all versions of the XTest extension are aware of the Xinerama extension. As a result, they do not move the mouse correctly when using multiple Xinerama screens. This option is currently ''true'' by default. If you know your XTest extension is Xinerama aware then set this option to ''false''.| |preserveFocus| `true` or `false` | When true don't drop focus when switching computers -|switchCorners| corners |See switchCorners below.| -|switchCornerSize | integer | see switchCornerSize below.| +|switchCorners | none top-left top-right bottom-left bottom-right left right top bottom all | Deskflow won't switch computers when the mouse reaches the edge of the computer if it's in a listed corner. The size of all corners is given by the `switchCornerSize` option. The first name in the list is one of the above names and defines the initial set of corners. Subsequent names are prefixed with + or - to add the corner to or remove the corner from the set, respectively. For example: `all -left +top-left` starts will all corners, removes the left corners (top and bottom) then adds the top-left back in, resulting in the top-left, bottom-left and bottom-right corners.| +|switchCornerSize | integer (N) | Sets the size of all corners in pixels. The cursor must be within `N` pixels of the corner to be considered to be in the corner.| |shift | shift ctrl alt meta super none | Map the server's shift modifer to different key on a client computer| |ctrl | shift ctrl alt meta super none | Map the server's ctrl modifer to different key on a client computer| |alt | shift ctrl alt meta super none | Map the server's alt modifer to different key on a client computer| @@ -399,8 +393,6 @@ end | Options | Value Values| Description| |:--------|:-----------:|:-----------| -|switchCorners | none top-left top-right bottom-left bottom-right left right top bottom all | Deskflow won't switch computers when the mouse reaches the edge of the computer if it's in a listed corner. The size of all corners is given by the `switchCornerSize` option. The first name in the list is one of the above names and defines the initial set of corners. Subsequent names are prefixed with + or - to add the corner to or remove the corner from the set, respectively. For example: `all -left +top-left` starts will all corners, removes the left corners (top and bottom) then adds the top-left back in, resulting in the top-left, bottom-left and bottom-right corners.| -|switchCornerSize | integer (N) | Sets the size of all corners in pixels. The cursor must be within `N` pixels of the corner to be considered to be in the corner.| |screenSaverSync| `true` or `false`| ''Note: Removed in v1.14.1'' If set to ''false'' then Deskflow won't synchronize screen savers. Client screen savers will start according to their individual configurations. The server screen saver won't start if there is input, even if that input is directed toward a client computer.| |keystroke(key) | actions | Binds the ''key'' combination key to the given ''actions''. ''key'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') optionally followed by a character or a key name, all separated by + (plus signs). You must have either modifiers or a character/key name or both. See below for `valid key names` and `actions`. Keyboard hot keys are handled while the cursor any computer. Separate actions can be assigned to press and release.| |mousebutton(button) | actions| Binds the modifier and mouse button combination ''button'' to the given ''actions''. ''button'' is an optional list of modifiers (''shift'', ''control'', ''alt'', ''meta'' or ''super'') followed by a button number. The primary button (the left button for right handed users) is button 1, the middle button is 2, etc. Actions can be found below. Mouse button actions are not handled while the cursor is on the server. You cannot use these to perform an action while on the server. Separate actions can be assigned to press and release.| diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h index 4b81dae8c..7e475fb4e 100644 --- a/src/lib/common/Settings.h +++ b/src/lib/common/Settings.h @@ -333,7 +333,8 @@ private: , QStringLiteral("internalConfig/protocol") , QStringLiteral("internalConfig/numColumns") , QStringLiteral("internalConfig/numRows") - , QStringLiteral("interlanConfig/relativeMouseMoves") + , QStringLiteral("internalConfig/relativeMouseMoves") + , QStringLiteral("internalConfig/switchCorner") , QStringLiteral("internalConfig/switchDelay") , QStringLiteral("internalConfig/switchDoubleTap") , QStringLiteral("internalConfig/win32KeepForeground") diff --git a/src/lib/gui/config/ServerConfig.cpp b/src/lib/gui/config/ServerConfig.cpp index 3c634e163..b37041541 100644 --- a/src/lib/gui/config/ServerConfig.cpp +++ b/src/lib/gui/config/ServerConfig.cpp @@ -52,10 +52,8 @@ bool ServerConfig::save(const QString &fileName) const bool ServerConfig::operator==(const ServerConfig &sc) const { - return m_Screens == sc.m_Screens && // - m_SwitchCornerSize == sc.m_SwitchCornerSize && // - m_SwitchCorners == sc.m_SwitchCorners && // - m_Hotkeys == sc.m_Hotkeys; // + return m_Screens == sc.m_Screens && // + m_Hotkeys == sc.m_Hotkeys; // } void ServerConfig::save(QFile &file) const @@ -66,14 +64,9 @@ void ServerConfig::save(QFile &file) const void ServerConfig::setupScreens() { - switchCorners().clear(); screens().clear(); hotkeys().clear(); - // m_NumSwitchCorners is used as a fixed size array. See Screen::init() - for (int i = 0; i < static_cast(NumSwitchCorners); i++) - switchCorners() << false; - // There must always be screen objects for each cell in the screens QList. // Unused screens are identified by having an empty name. for (int i = 0; i < m_columns * m_rows; i++) @@ -87,9 +80,6 @@ void ServerConfig::commit() settings().beginGroup("internalConfig"); settings().remove(""); - settings().setValue("switchCornerSize", switchCornerSize()); - writeSettings(settings(), switchCorners(), "switchCorner"); - settings().beginWriteArray("screens"); for (int i = 0; i < screens().size(); i++) { settings().setArrayIndex(i); @@ -125,9 +115,6 @@ void ServerConfig::recall() // ourselves setupScreens(); - setSwitchCornerSize(settings().value("switchCornerSize").toInt()); - readSettings(settings(), switchCorners(), "switchCorner", false, static_cast(NumSwitchCorners)); - int numScreens = settings().beginReadArray("screens"); Q_ASSERT(numScreens <= screens().size()); for (int i = 0; i < numScreens; i++) { @@ -206,15 +193,6 @@ QTextStream &operator<<(QTextStream &outStream, const ServerConfig &config) outStream << "end" << Qt::endl << Qt::endl; outStream << "section: options" << Qt::endl; - outStream << "\t" - << "switchCorners = none "; - for (int i = 0; i < config.switchCorners().size(); i++) - if (config.switchCorners()[i]) - outStream << "+" << ServerConfig::switchCornerName(i) << " "; - outStream << Qt::endl; - - outStream << "\t" - << "switchCornerSize = " << config.switchCornerSize() << Qt::endl; for (const Hotkey &hotkey : config.hotkeys()) outStream << hotkey; diff --git a/src/lib/gui/config/ServerConfig.h b/src/lib/gui/config/ServerConfig.h index b0b92d825..9e3d1fd04 100644 --- a/src/lib/gui/config/ServerConfig.h +++ b/src/lib/gui/config/ServerConfig.h @@ -40,18 +40,6 @@ public: // // New methods // - bool switchCorner(int c) const - { - return m_SwitchCorners[c]; - } - int switchCornerSize() const - { - return m_SwitchCornerSize; - } - const QList &switchCorners() const - { - return m_SwitchCorners; - } const HotkeyList &hotkeys() const { return m_Hotkeys; @@ -85,20 +73,8 @@ private: { m_Screens.append(screen); } - void setSwitchCorner(int c, bool on) - { - m_SwitchCorners[c] = on; - } - void setSwitchCornerSize(int val) - { - m_SwitchCornerSize = val; - } void setConfigFile(const QString &configFile) const; void setUseExternalConfig(bool useExternalConfig) const; - QList &switchCorners() - { - return m_SwitchCorners; - } HotkeyList &hotkeys() { return m_Hotkeys; @@ -108,8 +84,6 @@ private: bool fixNoServer(const QString &name, int &index); private: - int m_SwitchCornerSize = 0; - QList m_SwitchCorners; HotkeyList m_Hotkeys; ScreenList m_Screens; diff --git a/src/lib/gui/dialogs/ServerConfigDialog.cpp b/src/lib/gui/dialogs/ServerConfigDialog.cpp index 4e7acdd5d..c06264e66 100644 --- a/src/lib/gui/dialogs/ServerConfigDialog.cpp +++ b/src/lib/gui/dialogs/ServerConfigDialog.cpp @@ -270,36 +270,6 @@ void ServerConfigDialog::toggleProtocol() onChange(); } -void ServerConfigDialog::setSwitchCornerSize(int size) -{ - serverConfig().setSwitchCornerSize(size); - onChange(); -} - -void ServerConfigDialog::toggleCornerBottomLeft(bool enable) -{ - serverConfig().setSwitchCorner(static_cast(BottomLeft), enable); - onChange(); -} - -void ServerConfigDialog::toggleCornerTopLeft(bool enable) -{ - serverConfig().setSwitchCorner(static_cast(TopLeft), enable); - onChange(); -} - -void ServerConfigDialog::toggleCornerBottomRight(bool enable) -{ - serverConfig().setSwitchCorner(static_cast(BottomRight), enable); - onChange(); -} - -void ServerConfigDialog::toggleCornerTopRight(bool enable) -{ - serverConfig().setSwitchCorner(static_cast(TopRight), enable); - onChange(); -} - void ServerConfigDialog::listActionsSelectionChanged(const QItemSelection &selected, const QItemSelection &) { bool enabled = !selected.isEmpty(); @@ -377,7 +347,6 @@ void ServerConfigDialog::toggleExternalConfig(bool checked) ui->widgetExternalConfigControls->setEnabled(checked); ui->tabWidget->setTabEnabled(0, !checked); ui->tabWidget->setTabEnabled(1, !checked); - ui->groupCorners->setEnabled(!checked); serverConfig().setUseExternalConfig(checked); onChange(); } @@ -441,12 +410,6 @@ void ServerConfigDialog::loadFromConfig() ui->widgetExternalConfigControls->setEnabled(ui->groupExternalConfig->isChecked()); toggleExternalConfig(ui->groupExternalConfig->isChecked()); - ui->cbCornerTopLeft->setChecked(serverConfig().switchCorner(static_cast(TopLeft))); - ui->cbCornerTopRight->setChecked(serverConfig().switchCorner(static_cast(TopRight))); - ui->cbCornerBottomLeft->setChecked(serverConfig().switchCorner(static_cast(BottomLeft))); - ui->cbCornerBottomRight->setChecked(serverConfig().switchCorner(static_cast(BottomRight))); - ui->sbSwitchCornerSize->setValue(serverConfig().switchCornerSize()); - m_defaultLockToComputerState = Settings::value(Settings::Server::DefaultLockToComputerState).toBool(); ui->cbDefaultLockToComputerState->setChecked(m_defaultLockToComputerState); @@ -518,18 +481,11 @@ void ServerConfigDialog::initConnections() const connect(ui->cbEnableClipboard, &QCheckBox::toggled, this, &ServerConfigDialog::toggleClipboard); connect(ui->btnBrowseConfigFile, &QPushButton::clicked, this, &ServerConfigDialog::browseConfigFile); connect(ui->groupExternalConfig, &QGroupBox::toggled, this, &ServerConfigDialog::toggleExternalConfig); - connect( - ui->sbSwitchCornerSize, QOverload::of(&QSpinBox::valueChanged), this, - &ServerConfigDialog::setSwitchCornerSize - ); + connect( ui->sbClipboardSizeLimit, QOverload::of(&QSpinBox::valueChanged), this, &ServerConfigDialog::setClipboardLimit ); - connect(ui->cbCornerTopLeft, &QCheckBox::toggled, this, &ServerConfigDialog::toggleCornerTopLeft); - connect(ui->cbCornerTopRight, &QCheckBox::toggled, this, &ServerConfigDialog::toggleCornerTopRight); - connect(ui->cbCornerBottomLeft, &QCheckBox::toggled, this, &ServerConfigDialog::toggleCornerBottomLeft); - connect(ui->cbCornerBottomRight, &QCheckBox::toggled, this, &ServerConfigDialog::toggleCornerBottomRight); connect( ui->cbDefaultLockToComputerState, &QCheckBox::toggled, this, &ServerConfigDialog::toggleDefaultLockToComputerState ); diff --git a/src/lib/gui/dialogs/ServerConfigDialog.h b/src/lib/gui/dialogs/ServerConfigDialog.h index 09ebf45f0..db999ee5c 100644 --- a/src/lib/gui/dialogs/ServerConfigDialog.h +++ b/src/lib/gui/dialogs/ServerConfigDialog.h @@ -73,12 +73,6 @@ protected: void toggleRelativeMouseMoves(bool enabled); void toggleProtocol(); - void setSwitchCornerSize(int size); - void toggleCornerBottomLeft(bool enable); - void toggleCornerTopLeft(bool enable); - void toggleCornerBottomRight(bool enable); - void toggleCornerTopRight(bool enable); - void toggleExternalConfig(bool enable = false); bool browseConfigFile(); diff --git a/src/lib/gui/dialogs/ServerConfigDialog.ui b/src/lib/gui/dialogs/ServerConfigDialog.ui index 10d52193f..0dac46dd5 100644 --- a/src/lib/gui/dialogs/ServerConfigDialog.ui +++ b/src/lib/gui/dialogs/ServerConfigDialog.ui @@ -6,8 +6,8 @@ 0 0 - 814 - 588 + 724 + 586 @@ -307,116 +307,20 @@ Advanced - - - - - - true - - - - &Dead corners (for this computer) - - - false - - - - 6 - - - - - - - &Bottom-left - - - - - - - To&p-left - - - - - - - Bottom-ri&ght - - - - - - - Top-rig&ht - - - - - - - - - - - Cor&ner size - - - sbSwitchCornerSize - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - px - - - 30000 - - - - - - - - - Qt::Orientation::Vertical - - - - 20 - 0 - - - - - - - - + + + 15 + + + 15 + + + 15 + + + 15 + + @@ -427,6 +331,18 @@ &Misc + + 6 + + + 6 + + + 6 + + + 6 + @@ -521,30 +437,216 @@ + + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Fixed + + + + 50 + 20 + + + + - - - - Qt::Orientation::Vertical - - - - 20 - 0 - - - - - + + + + + true + + + + &Switching + + + + 6 + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + + true + + + Switch &after waiting + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + false + + + + 0 + 0 + + + + ms + + + 10 + + + 10000 + + + 10 + + + 250 + + + + + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Fixed + + + + 50 + 20 + + + + + + + + + + + + true + + + Switch on double &tap within + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + false + + + + 0 + 0 + + + + ms + + + 10 + + + 10000 + + + 10 + + + 250 + + + + + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Fixed + + + + 50 + 20 + + + + + + + + + + &Network + + 6 + + + 6 + + + 6 + + + 6 + @@ -608,6 +710,22 @@ + + + + Qt::Orientation::Horizontal + + + QSizePolicy::Policy::Fixed + + + + 50 + 20 + + + + @@ -623,19 +741,6 @@ - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - @@ -655,181 +760,9 @@ - - - - Qt::Orientation::Vertical - - - - 20 - 0 - - - - - - - - - true - - - - &Switching - - - - 6 - - - 6 - - - 6 - - - - - - - true - - - Switch &after waiting - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - false - - - - 0 - 0 - - - - ms - - - 10 - - - 10000 - - - 10 - - - 250 - - - - - - - - - - - true - - - Switch on double &tap within - - - - - - - Qt::Orientation::Horizontal - - - - 40 - 20 - - - - - - - - false - - - - 0 - 0 - - - - ms - - - 10 - - - 10000 - - - 10 - - - 250 - - - - - - - - - Qt::Orientation::Vertical - - - - 20 - 0 - - - - - - - - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - @@ -1077,7 +1010,6 @@ Enabling this setting will disable the server config GUI. cbHeartbeat sbHeartbeat cbRelativeMouseMoves - sbSwitchCornerSize tabWidget diff --git a/src/lib/server/Config.cpp b/src/lib/server/Config.cpp index f798f1c1a..ca22d3f16 100644 --- a/src/lib/server/Config.cpp +++ b/src/lib/server/Config.cpp @@ -665,10 +665,6 @@ void Config::readSectionOptions(ConfigReadContext &s) } catch (SocketAddressException &e) { throw ServerConfigReadException(s, std::string("invalid address argument ") + e.what()); } - } else if (name == "switchCorners") { - addOption("", kOptionScreenSwitchCorners, s.parseCorners(value)); - } else if (name == "switchCornerSize") { - addOption("", kOptionScreenSwitchCornerSize, s.parseInt(value)); } else if (name == "switchNeedsShift") { addOption("", kOptionScreenSwitchNeedsShift, s.parseBoolean(value)); } else if (name == "switchNeedsControl") { diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h index c1e3c882c..92c65f71c 100644 --- a/src/lib/server/Config.h +++ b/src/lib/server/Config.h @@ -478,6 +478,8 @@ private: inline static const QStringList m_oldNames = { QStringLiteral("clipboardSharing"), QStringLiteral("clipboardSharingSize"), + QStringLiteral("switchCornerSize"), + QStringLiteral("switchCorners"), QStringLiteral("protocol"), QStringLiteral("heartbeat"), QStringLiteral("switchDelay"), diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp index 11cea8673..7aeee34f5 100644 --- a/src/lib/server/Server.cpp +++ b/src/lib/server/Server.cpp @@ -825,7 +825,6 @@ bool Server::isSwitchOkay( if (i != options->end()) { size = i->second; } - // see if we're in a locked corner if ((getCorner(m_active, xActive, yActive, size) & corners) != 0) { // yep, no switching diff --git a/translations/deskflow_es.ts b/translations/deskflow_es.ts index eaf387831..608cf56b4 100644 --- a/translations/deskflow_es.ts +++ b/translations/deskflow_es.ts @@ -992,34 +992,6 @@ Además, verifique que puede %1 el archivo de configuración del servidor: %2Advanced Avanzado - - &Dead corners (for this computer) - Esquinas &muertas (para esta computadora) - - - &Bottom-left - A&bajo a la izquierda - - - To&p-left - Arriba y abajo a la iz&quierda - - - Bottom-ri&ght - Aba&jo a la derecha - - - Top-rig&ht - Derecha superio&r - - - Cor&ner size - Tamaño de la esqui&na - - - px - px - &Misc &Misc diff --git a/translations/deskflow_it.ts b/translations/deskflow_it.ts index 06b2cf9ee..33544d09a 100644 --- a/translations/deskflow_it.ts +++ b/translations/deskflow_it.ts @@ -992,34 +992,6 @@ Inoltre, verifica di poter %1 il file di configurazione del server: %2Advanced Avanzate - - &Dead corners (for this computer) - &Angoli morti (per questo computer) - - - &Bottom-left - &In basso a sinistra - - - To&p-left - In a&lto a sinistra - - - Bottom-ri&ght - In basso a de&stra - - - Top-rig&ht - In alto a de&stra - - - Cor&ner size - Di&mensioni angolo - - - px - px - &Misc &Varie diff --git a/translations/deskflow_ja.ts b/translations/deskflow_ja.ts index 51d42c062..6f3f63b98 100644 --- a/translations/deskflow_ja.ts +++ b/translations/deskflow_ja.ts @@ -994,34 +994,6 @@ Additionally, check you are able to %1 the server config file: %2 Advanced 詳細設定 - - &Dead corners (for this computer) - 無効領域(&D) (このコンピューター) - - - &Bottom-left - 左下(&B) - - - To&p-left - 左上(&P) - - - Bottom-ri&ght - 右下(&G) - - - Top-rig&ht - 右上(&H) - - - Cor&ner size - 大きさ(&N) - - - px - ピクセル - &Misc その他(&M) diff --git a/translations/deskflow_ko.ts b/translations/deskflow_ko.ts index 4db228054..a2e61bf52 100644 --- a/translations/deskflow_ko.ts +++ b/translations/deskflow_ko.ts @@ -992,34 +992,6 @@ Additionally, check you are able to %1 the server config file: %2 Advanced 고급 - - &Dead corners (for this computer) - 화면 걸림 방지(&D) (이 컴퓨터) - - - &Bottom-left - 왼쪽 아래(&B) - - - To&p-left - 왼쪽 위(&P) - - - Bottom-ri&ght - 오른쪽 아래(&G) - - - Top-rig&ht - 오른쪽 위(&H) - - - Cor&ner size - 모서리 크기(&N) - - - px - 픽셀 - &Misc 기타(&M) diff --git a/translations/deskflow_ru.ts b/translations/deskflow_ru.ts index fdbcbe5b0..697758b65 100644 --- a/translations/deskflow_ru.ts +++ b/translations/deskflow_ru.ts @@ -992,34 +992,6 @@ Additionally, check you are able to %1 the server config file: %2 Advanced Расширенные - - &Dead corners (for this computer) - &Мертвые зоны (для этого компьютера) - - - &Bottom-left - &Снизу слева - - - To&p-left - Свер&ху слева - - - Bottom-ri&ght - Снизу с&права - - - Top-rig&ht - Сверху спр&ава - - - Cor&ner size - Разме&р угла - - - px - пикс - &Misc &Разное diff --git a/translations/deskflow_zh_CN.ts b/translations/deskflow_zh_CN.ts index 676054721..78b3cdb86 100644 --- a/translations/deskflow_zh_CN.ts +++ b/translations/deskflow_zh_CN.ts @@ -994,34 +994,6 @@ Additionally, check you are able to %1 the server config file: %2 Advanced 高级 - - &Dead corners (for this computer) - 屏幕死角 (针对此计算机)(&D) - - - &Bottom-left - 左下(&B) - - - To&p-left - 左上(&P) - - - Bottom-ri&ght - 右下(&G) - - - Top-rig&ht - 右上(&H) - - - Cor&ner size - 角落大小(&N) - - - px - 像素 - &Misc 杂项(&M)