aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Gumz <akira@fluxbox.org>2015-01-22 08:45:35 (GMT)
committerMathias Gumz <akira@fluxbox.org>2015-01-22 08:45:35 (GMT)
commit1ec4fb6b6cb6d4b93dddc40c59abf62552445ad2 (patch)
tree9d3c5b39bc22ca0e01327e988c96cd7b273d6bdc
parent6d749d6f1a79f609b1a123fad013ae8bc25888ce (diff)
downloadfluxbox-1ec4fb6b6cb6d4b93dddc40c59abf62552445ad2.zip
fluxbox-1ec4fb6b6cb6d4b93dddc40c59abf62552445ad2.tar.bz2
Cosmetic
-rw-r--r--src/Ewmh.cc14
-rw-r--r--src/Window.cc20
-rw-r--r--src/Window.hh1
-rw-r--r--src/fluxbox.cc22
4 files changed, 12 insertions, 45 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index e7ba9a9..b6793e0 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -44,18 +44,8 @@
44#include <iostream> 44#include <iostream>
45#include <algorithm> 45#include <algorithm>
46#include <new> 46#include <new>
47 47#include <cstring>
48#ifdef HAVE_CSTRING 48#include <cstdlib>
49 #include <cstring>
50#else
51 #include <string.h>
52#endif
53
54#ifdef HAVE_CSTDLIB
55 #include <cstdlib>
56#else
57 #include <stdlib.h>
58#endif
59 49
60 50
61using std::cerr; 51using std::cerr;
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.
259struct TestCornerHelper { 247struct 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;
diff --git a/src/Window.hh b/src/Window.hh
index b7975f5..da126ec 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -42,6 +42,7 @@
42#include <string> 42#include <string>
43#include <memory> 43#include <memory>
44#include <map> 44#include <map>
45#include <inttypes.h>
45 46
46class WinClient; 47class WinClient;
47class FbWinFrameTheme; 48class FbWinFrameTheme;
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 5771cb3..ab05f56 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -81,21 +81,9 @@
81 81
82// system headers 82// system headers
83 83
84#ifdef HAVE_CSTDIO 84#include <cstdio>
85 #include <cstdio> 85#include <cstdlib>
86#else 86#include <cstring>
87 #include <stdio.h>
88#endif
89#ifdef HAVE_CSTDLIB
90 #include <cstdlib>
91#else
92 #include <stdlib.h>
93#endif
94#ifdef HAVE_CSTRING
95 #include <cstring>
96#else
97 #include <string.h>
98#endif
99 87
100#ifdef HAVE_UNISTD_H 88#ifdef HAVE_UNISTD_H
101#include <sys/types.h> 89#include <sys/types.h>
@@ -1302,8 +1290,8 @@ void Fluxbox::revertFocus() {
1302 return; // already handled 1290 return; // already handled
1303 1291
1304 Window win; 1292 Window win;
1305 int blah; 1293 int ignore;
1306 XGetInputFocus(display(), &win, &blah); 1294 XGetInputFocus(display(), &win, &ignore);
1307 1295
1308 // we only want to revert focus if it's left dangling, as some other 1296 // we only want to revert focus if it's left dangling, as some other
1309 // application may have set the focus to an unmanaged window 1297 // application may have set the focus to an unmanaged window