ervin/comfortable-swipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43 from Hikari9/xdo-gesture

Browse Source 
Derive gestures from xdo_gesture interface
This commit is contained in:
Rico Tiongson 2019-02-07 21:32:10 +08:00 committed by GitHub
commit f3909f85f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 249 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/comfortable_swipe
View File

@ -25,6 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* Make sure to include all implementation (.cpp) files below to be ready for export. * Make sure to include all implementation (.cpp) files below to be ready for export.
*/ */
#include "gesture/xdo_gesture.cpp"
#include "gesture/swipe_gesture.cpp" #include "gesture/swipe_gesture.cpp"
#include "service/autostart.cpp" #include "service/autostart.cpp"
#include "service/buffer.cpp" #include "service/buffer.cpp"

209
src/lib/gesture/swipe_gesture.cpp
View File

@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream> // std::cout, std::endl #include <iostream> // std::cout, std::endl
#include "../index.hpp" #include "../index.hpp"
#include "xdo_gesture.h"
extern "C" extern "C"
{ {
@ -29,122 +30,118 @@ extern "C"
// CURRENT_WINDOW // CURRENT_WINDOW
} }
namespace comfortable_swipe namespace comfortable_swipe::gesture
{ {
namespace gesture /**
* Constructs a new swipe gesture, given configurations for certain swipe events.
*/
swipe_gesture::swipe_gesture
(
const float threshold,
const char* left3 /* 000 */,
const char* left4 /* 001 */,
const char* right3 /* 010 */,
const char* right4 /* 011 */,
const char* up3 /* 100 */,
const char* up4 /* 101 */,
const char* down3 /* 110 */,
const char* down4 /* 111 */
):
comfortable_swipe::gesture::xdo_gesture(),
commands(new const char*[8]{left3, left4, right3, right4, up3, up4, down3, down4})
{ }
/**
* Destructs this swipe gesture.
*/
swipe_gesture::~swipe_gesture()
{ {
/** delete[] commands;
* Constructs a new swipe gesture with xdo. }
*/
swipe_gesture::swipe_gesture
(
const float threshold,
const char* left3 /* 000 */,
const char* left4 /* 001 */,
const char* right3 /* 010 */,
const char* right4 /* 011 */,
const char* up3 /* 100 */,
const char* up4 /* 101 */,
const char* down3 /* 110 */,
const char* down4 /* 111 */
):
xdo(xdo_new(NULL)),
commands(new const char*[8]{left3, left4, right3, right4, up3, up4, down3, down4})
{ }
/** /**
* Constructs a new swipe gesture with xdo. * Hook on begin of swipe gesture.
*/ */
swipe_gesture::~swipe_gesture() void swipe_gesture::begin()
{ {
xdo_free(this->xdo); xdo_get_mouse_location(this->xdo, &this->ix, &this->iy, &this->screen_num);
delete[] commands; this->previous_gesture = swipe_gesture::FRESH;
} this->x = 0;
this->y = 0;
}
/** /**
* Hook on begin of swipe gesture. * Hook on update of swipe gesture.
*/ */
void swipe_gesture::begin() void swipe_gesture::update()
{
this->x += this->dx;
this->y += this->dy;
// scale threshold to 1/10 when gesture is not fresh
float scale = this->previous_gesture == swipe_gesture::FRESH
? 1.00f
: 0.01f; // square root of 1/10
if (this->x * this->x + this->y * this->y > this->threshold_squared * scale)
{ {
xdo_get_mouse_location(this->xdo, &this->ix, &this->iy, &this->screen_num); int mask = 0;
this->previous_gesture = swipe_gesture::FRESH; if (this->fingers == 3) mask |= swipe_gesture::MSK_THREE_FINGERS;
this->x = 0; else if (this->fingers == 4) mask |= swipe_gesture::MSK_FOUR_FINGERS;
this->y = 0;
}
/** const float absx = x >= 0 ? x : -x;
* Hook on update of swipe gesture. const float absy = y >= 0 ? y : -y;
*/ if (absx > absy)
void swipe_gesture::update() { // horizontal
{ mask |= swipe_gesture::MSK_HORIZONTAL;
this->x += this->dx; if (x < 0)
this->y += this->dy; mask |= swipe_gesture::MSK_NEGATIVE;
// scale threshold to 1/10 when gesture is not fresh else
float scale = this->previous_gesture == swipe_gesture::FRESH mask |= swipe_gesture::MSK_POSITIVE;
? 1.00f }
: 0.01f; // square root of 1/10 else /* std::abs(x) <= std::abs(y) */
if (this->x * this->x + this->y * this->y > this->threshold_squared * scale) { // vertical
mask |= swipe_gesture::MSK_VERTICAL;
if (y < 0)
mask |= swipe_gesture::MSK_NEGATIVE;
else
mask |= swipe_gesture::MSK_POSITIVE;
}
// send command on fresh OR opposite gesture
if (this->previous_gesture == swipe_gesture::FRESH
|| this->previous_gesture == (mask ^ swipe_gesture::MSK_POSITIVE))
{ {
int mask = 0; this->x = this->y = 0;
if (this->fingers == 3) mask |= swipe_gesture::MSK_THREE_FINGERS; this->previous_gesture = mask;
else if (this->fingers == 4) mask |= swipe_gesture::MSK_FOUR_FINGERS; std::cout << "SWIPE " << swipe_gesture::command_map[mask] << std::endl;
xdo_send_keysequence_window(xdo, CURRENTWINDOW, swipe_gesture::commands[mask], 0);
const float absx = x >= 0 ? x : -x;
const float absy = y >= 0 ? y : -y;
if (absx > absy)
{ // horizontal
mask |= swipe_gesture::MSK_HORIZONTAL;
if (x < 0)
mask |= swipe_gesture::MSK_NEGATIVE;
else
mask |= swipe_gesture::MSK_POSITIVE;
}
else /* std::abs(x) <= std::abs(y) */
{ // vertical
mask |= swipe_gesture::MSK_VERTICAL;
if (y < 0)
mask |= swipe_gesture::MSK_NEGATIVE;
else
mask |= swipe_gesture::MSK_POSITIVE;
}
// send command on fresh OR opposite gesture
if (this->previous_gesture == swipe_gesture::FRESH
|| this->previous_gesture == (mask ^ swipe_gesture::MSK_POSITIVE))
{
this->x = this->y = 0;
this->previous_gesture = mask;
std::cout << "SWIPE " << swipe_gesture::command_map[mask] << std::endl;
xdo_send_keysequence_window(xdo, CURRENTWINDOW, swipe_gesture::commands[mask], 0);
}
} }
} }
/**
* Hook on end of swipe gesture.
*/
void swipe_gesture::end()
{ }
/* STATICS DEFINITIONS */
const int swipe_gesture::MSK_THREE_FINGERS = 0;
const int swipe_gesture::MSK_FOUR_FINGERS = 1;
const int swipe_gesture::MSK_NEGATIVE = 0;
const int swipe_gesture::MSK_POSITIVE = 2;
const int swipe_gesture::MSK_HORIZONTAL = 0;
const int swipe_gesture::MSK_VERTICAL = 4;
const int swipe_gesture::FRESH = -1;
const char * const swipe_gesture::command_map[8] = {
"left 3",
"left 4",
"right 3",
"right 4",
"up 3",
"up 4",
"down 3",
"down 4"
};
} }
/**
* Hook on end of swipe gesture.
*/
void swipe_gesture::end()
{ }
/* STATICS DEFINITIONS */
const int swipe_gesture::MSK_THREE_FINGERS = 0;
const int swipe_gesture::MSK_FOUR_FINGERS = 1;
const int swipe_gesture::MSK_NEGATIVE = 0;
const int swipe_gesture::MSK_POSITIVE = 2;
const int swipe_gesture::MSK_HORIZONTAL = 0;
const int swipe_gesture::MSK_VERTICAL = 4;
const int swipe_gesture::FRESH = -1;
const char * const swipe_gesture::command_map[8] = {
"left 3",
"left 4",
"right 3",
"right 4",
"up 3",
"up 4",
"down 3",
"down 4"
};
} }
#endif /* __COMFORTABLE_SWIPE__gesture_swipe_gesture__ */ #endif /* __COMFORTABLE_SWIPE__gesture_swipe_gesture__ */

84
src/lib/gesture/swipe_gesture.h
View File

@ -24,60 +24,60 @@ extern "C"
#include <xdo.h> // xdo_t #include <xdo.h> // xdo_t
} }
#include "xdo_gesture.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
namespace comfortable_swipe namespace comfortable_swipe::gesture
{ {
namespace gesture class swipe_gesture : protected xdo_gesture
{ {
struct swipe_gesture public:
{ // constructor
// constructor swipe_gesture(
swipe_gesture( const float threshold,
const float, const char* left3 /* 000 */,
const char*, const char* left4 /* 001 */,
const char*, const char* right3 /* 010 */,
const char*, const char* right4 /* 011 */,
const char*, const char* up3 /* 100 */,
const char*, const char* up4 /* 101 */,
const char*, const char* down3 /* 110 */,
const char*, const char* down4 /* 111 */
const char* );
);
~swipe_gesture(); ~swipe_gesture();
// fields for xdo // fields for xdo
int fingers; int fingers;
float dx, dy, udx, udy; float dx, dy, udx, udy;
xdo_t * xdo;
// location of mouse void begin() override;
int screen_num, ix, iy; void update() override;
void end() override;
// current location protected:
float x, y, threshold_squared; // location of mouse
int previous_gesture; int screen_num, ix, iy;
const char ** commands;
// hooks // current location
void update(); float x, y, threshold_squared;
void begin(); int previous_gesture;
void end(); const char ** commands;
// statics public:
static const int MSK_THREE_FINGERS; // static constants
static const int MSK_FOUR_FINGERS; static const int MSK_THREE_FINGERS;
static const int MSK_NEGATIVE; static const int MSK_FOUR_FINGERS;
static const int MSK_POSITIVE; static const int MSK_NEGATIVE;
static const int MSK_HORIZONTAL; static const int MSK_POSITIVE;
static const int MSK_VERTICAL; static const int MSK_HORIZONTAL;
static const int FRESH; static const int MSK_VERTICAL;
static const char * const command_map[8]; static const int FRESH;
}; static const char * const command_map[8];
} };
} }
#ifdef __cplusplus #ifdef __cplusplus

45
src/lib/gesture/xdo_gesture.cpp Normal file
View File

@ -0,0 +1,45 @@
#ifndef __COMFORTABLE_SWIPE__xdo_gesture__
#define __COMFORTABLE_SWIPE__xdo_gesture__
/*
Comfortable Swipe
by Rico Tiongson
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
extern "C"
{
#include <xdo.h> // xdo, xdo_new
}
namespace comfortable_swipe::gesture
{
/**
* Constructs a new gesture handler with xdo.
*/
xdo_gesture::xdo_gesture():
xdo(xdo_new(NULL))
{ }
/**
* Constructs a new swipe gesture with xdo.
*/
xdo_gesture::~xdo_gesture()
{
xdo_free(this->xdo);
}
}
#endif /* __COMFORTABLE_SWIPE__xdo_gesture__ */

56
src/lib/gesture/xdo_gesture.h Normal file
View File

@ -0,0 +1,56 @@
#ifndef __COMFORTABLE_SWIPE__xdo_gesture_h__
#define __COMFORTABLE_SWIPE__xdo_gesture_h__
/*
Comfortable Swipe
by Rico Tiongson
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
extern "C"
{
#include <xdo.h> // xdo_t
}
#ifdef __cplusplus
extern "C" {
#endif
namespace comfortable_swipe
{
namespace gesture
{
class xdo_gesture
{
protected:
xdo_t * xdo;
public:
xdo_gesture();
~xdo_gesture();
// hooks
virtual void begin() = 0;
virtual void update() = 0;
virtual void end() = 0;
};
}
}
#ifdef __cplusplus
}
#endif
#endif /* __COMFORTABLE_SWIPE__xdo_gesture_h__ */

1
src/lib/index.hpp
View File

@ -34,6 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/** /**
* Make sure to include your header files here so that they can be imported by other modules. * Make sure to include your header files here so that they can be imported by other modules.
*/ */
#include "gesture/xdo_gesture.h"
#include "gesture/swipe_gesture.h" #include "gesture/swipe_gesture.h"
extern "C" extern "C"
{ {