blob: 9b4ab63828dbf074c0a0cb214fa06330666be5be (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
--- a/handler.cc
+++ b/handler.cc
@@ -533,7 +533,7 @@
virtual Grabber::State grab_mode() { return parent->grab_mode(); }
};
-static inline float abs(float x) { return x > 0 ? x : -x; }
+static inline float easystroke_abs(float x) { return x > 0 ? x : -x; }
class AbstractScrollHandler : public Handler {
bool have_x, have_y;
@@ -559,7 +559,7 @@
xstate->fake_click(b2);
}
static float curve(float v) {
- return v * exp(log(abs(v))/3);
+ return v * exp(log(easystroke_abs(v))/3);
}
protected:
void move_back() {
@@ -597,8 +597,8 @@
offset_x += factor * curve(dx/dt)*dt/20.0;
offset_y += factor * curve(dy/dt)*dt/10.0;
int b1 = 0, n1 = 0, b2 = 0, n2 = 0;
- if (abs(offset_x) > 1.0) {
- n1 = (int)floor(abs(offset_x));
+ if (easystroke_abs(offset_x) > 1.0) {
+ n1 = (int)floor(easystroke_abs(offset_x));
if (offset_x > 0) {
b1 = 7;
offset_x -= n1;
@@ -607,10 +607,10 @@
offset_x += n1;
}
}
- if (abs(offset_y) > 1.0) {
- if (abs(offset_y) < 1.0)
+ if (easystroke_abs(offset_y) > 1.0) {
+ if (easystroke_abs(offset_y) < 1.0)
return;
- n2 = (int)floor(abs(offset_y));
+ n2 = (int)floor(easystroke_abs(offset_y));
if (offset_y > 0) {
b2 = 5;
offset_y -= n2;
|
