Use Deskflow Name (#7519)
* Use Deskflow Name * Remove business-oriented options from issue templates * Remove business-oriented workflow * Bump version to 3.0.0 (to avoid confusion with previously used version numbers 1.x & 2.x) * Update readme to reflect new project name and goals * Found some more "synergy" to rename * Rename `synlib` to `app` * Rename `syntool` to `deskflow-legacy` * Rename `synwinhk` to `dfwhook` * Rename dirs from synergy to deskflow * Rename more "Synergy" files * Rename app bundle ID * Fixed copyright typo * Rename only title in serial key dialog (to be moved downstream later) * Preserve original serial key window for moving downstream * Restore dialogs ready for moving downstream * Rename `QDeskflowApplication` to `DeskflowApplication` (the Q is confusing) * Restore Volker's original project name * Fixed mimetype * Fixed weird grammar * Fixed (more) weird grammar * Broken link, restoring (but we should move all links out of source) * Broken link, restoring (but we should move all links out of source) * Add write permission to valgrind-analysis.yml * Restore AUR conflicts * Apply Clang format * Update ChangeLog * Back out version change --------- Co-authored-by: Nick Bolton <nick@symless.com>
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* synergy -- mouse and keyboard sharing utility
|
||||
* Deskflow -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2012-2016 Symless Ltd.
|
||||
* Copyright (C) 2002 Chris Schoeneman
|
||||
*
|
||||
@ -25,24 +25,24 @@
|
||||
#include "base/Stopwatch.h"
|
||||
#include "base/String.h"
|
||||
#include "base/TMethodEventJob.h"
|
||||
#include "deskflow/App.h"
|
||||
#include "deskflow/ArgsBase.h"
|
||||
#include "deskflow/ClientApp.h"
|
||||
#include "deskflow/ClientArgs.h"
|
||||
#include "deskflow/Clipboard.h"
|
||||
#include "deskflow/KeyMap.h"
|
||||
#include "deskflow/XScreen.h"
|
||||
#include "platform/XWindowsClipboard.h"
|
||||
#include "platform/XWindowsEventQueueBuffer.h"
|
||||
#include "platform/XWindowsKeyState.h"
|
||||
#include "platform/XWindowsScreenSaver.h"
|
||||
#include "platform/XWindowsUtil.h"
|
||||
#include "synergy/App.h"
|
||||
#include "synergy/ArgsBase.h"
|
||||
#include "synergy/ClientApp.h"
|
||||
#include "synergy/ClientArgs.h"
|
||||
#include "synergy/Clipboard.h"
|
||||
#include "synergy/KeyMap.h"
|
||||
#include "synergy/XScreen.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#if X_DISPLAY_MISSING
|
||||
#error X11 is required to build synergy
|
||||
#error X11 is required to build deskflow
|
||||
#else
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xutil.h>
|
||||
@ -57,7 +57,7 @@ extern "C" {
|
||||
#if HAVE_X11_EXTENSIONS_XTEST_H
|
||||
#include <X11/extensions/XTest.h>
|
||||
#else
|
||||
#error The XTest extension is required to build synergy
|
||||
#error The XTest extension is required to build deskflow
|
||||
#endif
|
||||
#if HAVE_X11_EXTENSIONS_XINERAMA_H
|
||||
// Xinerama.h may lack extern "C" for inclusion by C++
|
||||
@ -98,7 +98,7 @@ XWindowsScreen *XWindowsScreen::s_screen = NULL;
|
||||
XWindowsScreen::XWindowsScreen(
|
||||
const char *displayName, bool isPrimary, bool disableXInitThreads,
|
||||
int mouseScrollDelta, IEventQueue *events,
|
||||
synergy::ClientScrollDirection scrollDirection)
|
||||
deskflow::ClientScrollDirection scrollDirection)
|
||||
: PlatformScreen(events, scrollDirection),
|
||||
m_isPrimary(isPrimary),
|
||||
m_mouseScrollDelta(mouseScrollDelta),
|
||||
@ -710,13 +710,13 @@ UInt32 XWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask) {
|
||||
m_hotKeys.erase(id);
|
||||
LOG(
|
||||
(CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)",
|
||||
synergy::KeyMap::formatKey(key, mask).c_str(), key, mask));
|
||||
deskflow::KeyMap::formatKey(key, mask).c_str(), key, mask));
|
||||
return 0;
|
||||
}
|
||||
|
||||
LOG(
|
||||
(CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d",
|
||||
synergy::KeyMap::formatKey(key, mask).c_str(), key, mask, id));
|
||||
deskflow::KeyMap::formatKey(key, mask).c_str(), key, mask, id));
|
||||
return id;
|
||||
}
|
||||
|
||||
@ -933,7 +933,7 @@ void XWindowsScreen::saveShape() {
|
||||
// 0,0 to Wm,Hm where Wm (Hm) is the minimum width (height) over
|
||||
// all physical screens. this warp only seems to happen if the
|
||||
// pointer wasn't in that region before the XWarpPointer(). the
|
||||
// second (unexpected) warp causes synergy to think the pointer
|
||||
// second (unexpected) warp causes deskflow to think the pointer
|
||||
// has been moved when it hasn't. to work around the problem,
|
||||
// we warp the pointer to the center of the first physical
|
||||
// screen instead of the logical screen.
|
||||
@ -978,7 +978,7 @@ void XWindowsScreen::setShape(SInt32 width, SInt32 height) {
|
||||
// 0,0 to Wm,Hm where Wm (Hm) is the minimum width (height) over
|
||||
// all physical screens. this warp only seems to happen if the
|
||||
// pointer wasn't in that region before the XWarpPointer(). the
|
||||
// second (unexpected) warp causes synergy to think the pointer
|
||||
// second (unexpected) warp causes deskflow to think the pointer
|
||||
// has been moved when it hasn't. to work around the problem,
|
||||
// we warp the pointer to the center of the first physical
|
||||
// screen instead of the logical screen.
|
||||
@ -1056,7 +1056,7 @@ void XWindowsScreen::openIM() {
|
||||
return;
|
||||
}
|
||||
|
||||
// find the appropriate style. synergy supports XIMPreeditNothing
|
||||
// find the appropriate style. deskflow supports XIMPreeditNothing
|
||||
// only at the moment.
|
||||
XIMStyles *styles;
|
||||
if (XGetIMValues(im, XNQueryInputStyle, &styles, NULL) != NULL ||
|
||||
|
||||
Reference in New Issue
Block a user