TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

kcontrol touchpad: rename syndaemon to tdesyndaemon

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/533/head
Michele Calgaro 1 year ago
parent 90365e7b11
commit 06b225fe1e
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
6 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File

2
doc/kcontrol/touchpad/index.docbook
Unescape Escape View File

@ -391,7 +391,7 @@ method. On-button scrolling converts the motion of a device into scroll events w
</tgroup> </tgroup>
</informaltable> </informaltable>
<para>* Synaptics supported using external <guilabel>syndaemon</guilabel> service, automatically started/stopped.</para> <para>* Synaptics supported using external <guilabel>tdesyndaemon</guilabel> service, automatically started/stopped.</para>
<para>** Not configurable with the Synaptics driver.</para> <para>** Not configurable with the Synaptics driver.</para>
<para>*** Disabling vertical scrolling under the Libinput driver disables scrolling entirely.</para> <para>*** Disabling vertical scrolling under the Libinput driver disables scrolling entirely.</para>

6
kcontrol/input/CMakeLists.txt
Unescape Escape View File

@ -69,11 +69,11 @@ tde_add_kpart( kcm_input AUTOMOC
) )
##### syndaemon (executable) #################### ##### tdesyndaemon (executable) ####################
tde_add_executable( syndaemon AUTOMOC tde_add_executable( tdesyndaemon AUTOMOC
SOURCES SOURCES
syndaemon.cpp syndaemon_iface.skel tdesyndaemon.cpp tdesyndaemon_iface.skel
touchpad_settings.cpp touchpad_settings.cpp
LINK tdecore-shared ${XINPUT_LIBRARIES} LINK tdecore-shared ${XINPUT_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}

42
kcontrol/input/syndaemon.cpp → kcontrol/input/tdesyndaemon.cpp
Unescape Escape View File

@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
syndaemon - daemon for the Synaptics touchpad driver which disables touchpad tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad
on keyboard input on keyboard input
Copyright © 2004 Nadeem Hasan <nhasan@kde.org> Copyright © 2004 Nadeem Hasan <nhasan@kde.org>
Stefan Kombrink <katakombi@web.de> Stefan Kombrink <katakombi@web.de>
@ -38,17 +38,17 @@
// tdecm_touchpad // tdecm_touchpad
#include "touchpad_settings.h" #include "touchpad_settings.h"
// SynDaemon // TDESynDaemon
#include "syndaemon.h" #include "tdesyndaemon.h"
#include "syndaemon.moc" #include "tdesyndaemon.moc"
const unsigned int SynDaemon::TIME_OUT = 150; const unsigned int TDESynDaemon::TIME_OUT = 150;
const unsigned int SynDaemon::POLL_INTERVAL = 100; const unsigned int TDESynDaemon::POLL_INTERVAL = 100;
const unsigned int SynDaemon::KEYMAP_SIZE = 32; const unsigned int TDESynDaemon::KEYMAP_SIZE = 32;
unsigned char* SynDaemon::m_keyboard_mask; unsigned char* TDESynDaemon::m_keyboard_mask;
SynDaemon::SynDaemon() : DCOPObject("syndaemon"), TQObject() TDESynDaemon::TDESynDaemon() : DCOPObject("tdesyndaemon"), TQObject()
{ {
m_typing = false; m_typing = false;
m_time = new TQTime(); m_time = new TQTime();
@ -81,19 +81,19 @@ SynDaemon::SynDaemon() : DCOPObject("syndaemon"), TQObject()
m_poll->start(POLL_INTERVAL); m_poll->start(POLL_INTERVAL);
} }
SynDaemon::~SynDaemon() TDESynDaemon::~TDESynDaemon()
{ {
setTouchpadOn(true); setTouchpadOn(true);
m_poll->stop(); m_poll->stop();
delete m_keyboard_mask; delete m_keyboard_mask;
} }
void SynDaemon::stop() void TDESynDaemon::stop()
{ {
kapp->quit(); kapp->quit();
} }
void SynDaemon::poll() void TDESynDaemon::poll()
{ {
// do nothing if the user has explicitly disabled the touchpad in the settings // do nothing if the user has explicitly disabled the touchpad in the settings
if (!touchpadEnabled()) return; if (!touchpadEnabled()) return;
@ -117,7 +117,7 @@ void SynDaemon::poll()
} }
} }
bool SynDaemon::touchpadEnabled() bool TDESynDaemon::touchpadEnabled()
{ {
// We can't read from our own TouchpadSettings // We can't read from our own TouchpadSettings
// as it contains the currently applied value // as it contains the currently applied value
@ -127,7 +127,7 @@ bool SynDaemon::touchpadEnabled()
return cfg.readBoolEntry("Enabled", true); return cfg.readBoolEntry("Enabled", true);
} }
void SynDaemon::setTouchpadOn(bool on) void TDESynDaemon::setTouchpadOn(bool on)
{ {
m_typing = !on; m_typing = !on;
if (!d_settings->setTouchpadEnabled(on)) if (!d_settings->setTouchpadEnabled(on))
@ -136,14 +136,14 @@ void SynDaemon::setTouchpadOn(bool on)
} }
} }
void SynDaemon::clearBit(unsigned char *ptr, int bit) void TDESynDaemon::clearBit(unsigned char *ptr, int bit)
{ {
int byteNum = bit / 8; int byteNum = bit / 8;
int bitNum = bit % 8; int bitNum = bit % 8;
ptr[byteNum] &= ~(1 << bitNum); ptr[byteNum] &= ~(1 << bitNum);
} }
bool SynDaemon::hasKeyboardActivity() bool TDESynDaemon::hasKeyboardActivity()
{ {
static unsigned char oldKeyState[KEYMAP_SIZE]; static unsigned char oldKeyState[KEYMAP_SIZE];
unsigned char keyState[KEYMAP_SIZE]; unsigned char keyState[KEYMAP_SIZE];
@ -183,8 +183,8 @@ bool SynDaemon::hasKeyboardActivity()
extern "C" TDE_EXPORT int main(int argc, char *argv[]) extern "C" TDE_EXPORT int main(int argc, char *argv[])
{ {
TDEAboutData aboutData( "syndaemon", I18N_NOOP("Synaptics helper daemon"), TDEAboutData aboutData( "tdesyndaemon", I18N_NOOP("TDE Synaptics helper daemon"),
"0.1", I18N_NOOP("Synaptics helper daemon"), TDEAboutData::License_GPL_V2, "0.1", I18N_NOOP("TDE Synaptics helper daemon"), TDEAboutData::License_GPL_V2,
"© 2024 Mavridis Philippe" ); "© 2024 Mavridis Philippe" );
aboutData.addAuthor("Nadeem Hasan", I18N_NOOP("Author"), "nhasan@kde.org"); aboutData.addAuthor("Nadeem Hasan", I18N_NOOP("Author"), "nhasan@kde.org");
@ -194,8 +194,8 @@ extern "C" TDE_EXPORT int main(int argc, char *argv[])
TDEApplication app; TDEApplication app;
app.disableSessionManagement(); app.disableSessionManagement();
app.dcopClient()->registerAs("syndaemon", false); app.dcopClient()->registerAs("tdesyndaemon", false);
SynDaemon syndaemon; TDESynDaemon tdesyndaemon;
return app.exec(); return app.exec();
} }

18
kcontrol/input/syndaemon.h → kcontrol/input/tdesyndaemon.h
Unescape Escape View File

@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
syndaemon - daemon for the Synaptics touchpad driver which disables touchpad tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad
on keyboard input on keyboard input
Copyright © 2004 Nadeem Hasan <nhasan@kde.org> Copyright © 2004 Nadeem Hasan <nhasan@kde.org>
Stefan Kombrink <katakombi@web.de> Stefan Kombrink <katakombi@web.de>
@ -20,8 +20,8 @@
*******************************************************************************/ *******************************************************************************/
#ifndef __SYNDAEMON_H__ #ifndef __TDESYNDAEMON_H__
#define __SYNDAEMON_H__ #define __TDESYNDAEMON_H__
// TQt // TQt
#include <tqobject.h> #include <tqobject.h>
@ -35,19 +35,19 @@
#undef Bool /* fix problems in --enable-final mode */ #undef Bool /* fix problems in --enable-final mode */
#undef None /* fix problems in --enable-final mode */ #undef None /* fix problems in --enable-final mode */
// Syndaemon // TDESynDaemon
#include "syndaemon_iface.h" #include "tdesyndaemon_iface.h"
class TQTimer; class TQTimer;
class SynDaemon : public TQObject, public virtual SynDaemonIface class TDESynDaemon : public TQObject, public virtual TDESynDaemonIface
{ {
TQ_OBJECT TQ_OBJECT
public: public:
SynDaemon(); TDESynDaemon();
~SynDaemon(); ~TDESynDaemon();
bool touchpadEnabled(); bool touchpadEnabled();

10
kcontrol/input/syndaemon_iface.h → kcontrol/input/tdesyndaemon_iface.h
Unescape Escape View File

@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
syndaemon - daemon for the Synaptics touchpad driver which disables touchpad tdesyndaemon - daemon for the Synaptics touchpad driver which disables touchpad
on keyboard input on keyboard input
Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com> Copyright © 2024 Mavridis Philippe <mavridisf@gmail.com>
@ -18,13 +18,13 @@
*******************************************************************************/ *******************************************************************************/
#ifndef __SYNDAEMON_IFACE_H__ #ifndef __TDESYNDAEMON_IFACE_H__
#define __SYNDAEMON_IFACE_H__ #define __TDESYNDAEMON_IFACE_H__
// DCOP // DCOP
#include <dcopobject.h> #include <dcopobject.h>
class SynDaemonIface : virtual public DCOPObject class TDESynDaemonIface : virtual public DCOPObject
{ {
K_DCOP K_DCOP
k_dcop: k_dcop:

8
kcontrol/input/touchpad_settings.cpp
Unescape Escape View File

@ -339,13 +339,13 @@ void TouchpadSettings::apply(bool force)
prop->set(); prop->set();
} }
// start/stop syndaemon // start/stop tdesyndaemon
DCOPRef syndaemon("syndaemon", "syndaemon"); DCOPRef tdesyndaemon("tdesyndaemon", "tdesyndaemon");
syndaemon.call("stop()"); tdesyndaemon.call("stop()");
if (offWhileTyping) if (offWhileTyping)
{ {
kapp->tdeinitExec("syndaemon"); kapp->tdeinitExec("tdesyndaemon");
} }
} }

Write Preview
Loading…
Cancel
Save