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

Use constants for regex patterns

Browse Source
This commit is contained in:
Rico Tiongson 2019-02-07 01:45:44 +08:00
parent d4f7504643
commit 1079d0afe2
1 changed files with 71 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
src/comfortable-swipe.cpp
View File

@ -56,10 +56,9 @@ extern "C" {
/* FORWARD DECLARATIONS */ /* FORWARD DECLARATIONS */
namespace util { namespace util {
string join(cstr, string[], int); extern const char* GESTURE_SWIPE_BEGIN_REGEX_PATTERN;
string build_gesture_begin(); extern const char* GESTURE_SWIPE_UPDATE_REGEX_PATTERN;
string build_gesture_update(); extern const char* GESTURE_SWIPE_END_REGEX_PATTERN;
string build_gesture_end();
map<string, string> read_config_file(const char*); map<string, string> read_config_file(const char*);
} }
@ -212,9 +211,9 @@ namespace service {
// check first if $user // check first if $user
ios::sync_with_stdio(false); ios::sync_with_stdio(false);
cin.tie(0); cout.tie(0); cin.tie(0); cout.tie(0);
const regex gesture_begin(util::build_gesture_begin()); const regex gesture_begin(util::GESTURE_SWIPE_BEGIN_REGEX_PATTERN);
const regex gesture_update(util::build_gesture_update()); const regex gesture_update(util::GESTURE_SWIPE_UPDATE_REGEX_PATTERN);
const regex gesture_end(util::build_gesture_end()); const regex gesture_end(util::GESTURE_SWIPE_END_REGEX_PATTERN);
string sentence; string sentence;
// read config file // read config file
auto config = util::read_config_file(conf_filename().data()); auto config = util::read_config_file(conf_filename().data());
@ -331,52 +330,76 @@ namespace service {
namespace util { namespace util {
string number_regex() {
return "-?\\d+(?:\\.\\d+)";
}
string join(cstr delim, string arr[], int n) { /**
string ans = "^\\s*" + arr[0]; * Regex pattern for the libinput entry for start of swipe.
for (int i = 1; i < n; ++i) { * Extracts one match for the number of fingers used during the swipe.
ans += delim; *
ans += arr[i]; * eg. event15 GESTURE_SWIPE_BEGIN +34.33s 3
} * ^
ans += "\\s*$"; * fingers
return ans; */
} const char* GESTURE_SWIPE_BEGIN_REGEX_PATTERN =
"^\\s*" // trim start of string
"\\s+event\\d+" // event
"\\s+GESTURE_SWIPE_BEGIN" // gesture
"\\s+\\S+" // timestamp
"\\s+(\\d+)" // fingers
"\\s*$" // trim end of string
;
string build_gesture_begin() { /**
string device = "\\S+"; * Regex pattern for the libinput entry for the end of swipe.
string gesture = "GESTURE_SWIPE_BEGIN"; * Extracts one match for the number of fingers used during the swipe.
string seconds = "\\S+"; *
string fingers = "(\\d+)"; * eg. event15 GESTURE_SWIPE_END +35.03s 3
string arr[] = {device, gesture, seconds, fingers}; * ^
return join("\\s+", arr, 4); * fingers
} */
const char* GESTURE_SWIPE_END_REGEX_PATTERN =
"^\\s*" // trim start of string
"\\s+event\\d+" // event
"\\s+GESTURE_SWIPE_END" // gesture
"\\s+\\S+" // timestamp
"\\s+(\\d+)" // fingers
"\\s*$" // trim end of string
;
string build_gesture_update() { // matches signed decimal numbers (eg. "6.02" "-1.1")
string device = "\\S+"; #define CF_NUMBER_REGEX "-?\\d+(?:\\.\\d+)"
string gesture = "GESTURE_SWIPE_UPDATE";
string seconds = "\\S+";
string fingers = "(\\d+)";
string num_1 = "\\s*(" + number_regex() + ")";
string num_2 = num_1;
string num_div = num_1 + "/" + num_2;
string num_accel = "\\(" + num_div + "\\s+unaccelerated\\)";
string arr[] = {device, gesture, seconds, fingers, num_div, num_accel};
string result = join("\\s+", arr, 6);
return result;
}
string build_gesture_end() { // matches and extracts a space-prefixed signed fraction (eg. "-3.00/ 5.12")
string device = "\\S+"; #define CF_NUMBER_DIVISION "\\s*(" CF_NUMBER_REGEX ")/\\s*(" CF_NUMBER_REGEX ")"
string gesture = "GESTURE_SWIPE_END";
string seconds = "\\S+";
string fingers = "(\\d+)";
string arr[] = {device, gesture, seconds, fingers};
return join("\\s+", arr, 4);
}
/**
* Regex pattern for the libinput entry for during a swipe.
* Extracts number of fingers used and the speed (normal and accelerated) of the swipe.
*
* eg. event15 GESTURE_SWIPE_UPDATE +34.70s 3 -0.12/ 4.99 (-0.33/13.50 unaccelerated)
* ^ ^ ^ ^ ^
* fingers dx dy udx udy
*/
const char* GESTURE_SWIPE_UPDATE_REGEX_PATTERN =
"^\\s*" // trim start of string
"\\s+event\\d+" // event
"\\s+GESTURE_SWIPE_UPDATE" // gesture
"\\s+\\S+" // timestamp
"\\s+(\\d+)" // fingers
"\\s+" CF_NUMBER_DIVISION // speed (dx/dy)
"\\s+\\(" CF_NUMBER_DIVISION "\\s+unaccelerated\\)" // unaccelerated speed (udx/udy)
"\\s*$" // trim end of string
;
// delete macros
#undef CF_NUMBER_DIVISION
#undef CF_NUMBER_EXTRACT
#undef CF_NUMBER_REGEX
/**
* A utility method for reading the config file.
*
* @param filename (const char*) the path of the config file.
*/
map<string, string> read_config_file(const char* filename) { map<string, string> read_config_file(const char* filename) {
map<string, string> conf; map<string, string> conf;
ifstream fin(filename); ifstream fin(filename);