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

Catch dash symbol before event, remove trimming

Browse Source
This commit is contained in:
Rico Tiongson 2019-02-07 04:18:43 +08:00
parent cdaa98abe1
commit 2b3dfd00b1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/comfortable-swipe.cpp
View File

@ -343,12 +343,12 @@ namespace util {
* fingers * fingers
*/ */
const char* GESTURE_SWIPE_BEGIN_REGEX_PATTERN = const char* GESTURE_SWIPE_BEGIN_REGEX_PATTERN =
"^\\s*" // trim start of string "^" // start of string
"\\s+event\\d+" // event "[ -]event\\d+" // event
"\\s+GESTURE_SWIPE_BEGIN" // gesture "\\s+GESTURE_SWIPE_BEGIN" // gesture
"\\s+\\S+" // timestamp "\\s+\\S+" // timestamp
"\\s+(\\d+)" // fingers "\\s+(\\d+)" // fingers
"\\s*$" // trim end of string "$" // end of string
; ;
/** /**
@ -360,12 +360,12 @@ namespace util {
* fingers * fingers
*/ */
const char* GESTURE_SWIPE_END_REGEX_PATTERN = const char* GESTURE_SWIPE_END_REGEX_PATTERN =
"^\\s*" // trim start of string "^" // start of string
"\\s+event\\d+" // event "[ -]event\\d+" // event
"\\s+GESTURE_SWIPE_END" // gesture "\\s+GESTURE_SWIPE_END" // gesture
"\\s+\\S+" // timestamp "\\s+\\S+" // timestamp
"\\s+(\\d+)" // fingers "\\s+(\\d+)" // fingers
"\\s*$" // trim end of string "$" // end of string
; ;
// matches signed decimal numbers (eg. "6.02" "-1.1") // matches signed decimal numbers (eg. "6.02" "-1.1")
@ -383,14 +383,14 @@ namespace util {
* fingers dx dy udx udy * fingers dx dy udx udy
*/ */
const char* GESTURE_SWIPE_UPDATE_REGEX_PATTERN = const char* GESTURE_SWIPE_UPDATE_REGEX_PATTERN =
"^\\s*" // trim start of string "^" // start of string
"\\s+event\\d+" // event "[ -]event\\d+" // event
"\\s+GESTURE_SWIPE_UPDATE" // gesture "\\s+GESTURE_SWIPE_UPDATE" // gesture
"\\s+\\S+" // timestamp "\\s+\\S+" // timestamp
"\\s+(\\d+)" // fingers "\\s+(\\d+)" // fingers
"\\s+" CF_NUMBER_DIVISION // speed (dx/dy) "\\s+" CF_NUMBER_DIVISION // speed (dx/dy)
"\\s+\\(" CF_NUMBER_DIVISION "\\s+unaccelerated\\)" // unaccelerated speed (udx/udy) "\\s+\\(" CF_NUMBER_DIVISION "\\s+unaccelerated\\)" // unaccelerated speed (udx/udy)
"\\s*$" // trim end of string "$" // end of string
; ;
// delete macros // delete macros