diff options
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/Window.cc b/src/Window.cc index cb0689e..daea663 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -62,22 +62,10 @@ | |||
62 | #include <X11/Xatom.h> | 62 | #include <X11/Xatom.h> |
63 | #include <X11/keysym.h> | 63 | #include <X11/keysym.h> |
64 | 64 | ||
65 | #ifdef HAVE_CSTRING | 65 | #include <cstring> |
66 | #include <cstring> | 66 | #include <cstdio> |
67 | #else | ||
68 | #include <string.h> | ||
69 | #endif | ||
70 | #ifdef HAVE_CSTDIO | ||
71 | #include <cstdio> | ||
72 | #else | ||
73 | #include <stdio.h> | ||
74 | #endif | ||
75 | #include <iostream> | 67 | #include <iostream> |
76 | #ifdef HAVE_CASSERT | 68 | #include <cassert> |
77 | #include <cassert> | ||
78 | #else | ||
79 | #include <assert.h> | ||
80 | #endif | ||
81 | #include <functional> | 69 | #include <functional> |
82 | #include <algorithm> | 70 | #include <algorithm> |
83 | 71 | ||
@@ -258,7 +246,7 @@ private: | |||
258 | // Tests whether a point is on an edge or the corner. | 246 | // Tests whether a point is on an edge or the corner. |
259 | struct TestCornerHelper { | 247 | struct TestCornerHelper { |
260 | int corner_size_px, corner_size_pc; | 248 | int corner_size_px, corner_size_pc; |
261 | inline bool operator()(int xy, int wh) | 249 | bool operator()(int xy, int wh) |
262 | { | 250 | { |
263 | /* The % checking must be right: 0% must fail, 100% must succeed. */ | 251 | /* The % checking must be right: 0% must fail, 100% must succeed. */ |
264 | return xy < corner_size_px || 100 * xy < corner_size_pc * wh; | 252 | return xy < corner_size_px || 100 * xy < corner_size_pc * wh; |