diff options
Diffstat (limited to 'src/FbTk/FbPixmap.cc')
-rw-r--r-- | src/FbTk/FbPixmap.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc index 3aebd62..14d05e7 100644 --- a/src/FbTk/FbPixmap.cc +++ b/src/FbTk/FbPixmap.cc | |||
@@ -30,9 +30,8 @@ | |||
30 | #include <X11/Xutil.h> | 30 | #include <X11/Xutil.h> |
31 | #include <X11/Xatom.h> | 31 | #include <X11/Xatom.h> |
32 | #include <iostream> | 32 | #include <iostream> |
33 | #include <string> | ||
34 | 33 | ||
35 | using namespace std; | 34 | using std::cerr; |
36 | 35 | ||
37 | namespace FbTk { | 36 | namespace FbTk { |
38 | 37 | ||
@@ -245,7 +244,7 @@ void FbPixmap::rotate(FbTk::Orientation orient) { | |||
245 | default: // kill warning | 244 | default: // kill warning |
246 | break; | 245 | break; |
247 | } | 246 | } |
248 | 247 | ||
249 | 248 | ||
250 | // copy new area | 249 | // copy new area |
251 | unsigned int srcx, srcy, destx, desty; | 250 | unsigned int srcx, srcy, destx, desty; |
@@ -349,7 +348,7 @@ Pixmap FbPixmap::release() { | |||
349 | } | 348 | } |
350 | 349 | ||
351 | void FbPixmap::rootwinPropertyNotify(int screen_num, Atom atom) { | 350 | void FbPixmap::rootwinPropertyNotify(int screen_num, Atom atom) { |
352 | if (!FbTk::Transparent::haveRender()) | 351 | if (!FbTk::Transparent::haveRender()) |
353 | return; | 352 | return; |
354 | 353 | ||
355 | checkAtoms(); | 354 | checkAtoms(); |
@@ -396,7 +395,7 @@ void FbPixmap::setRootPixmap(int screen_num, Pixmap pm) { | |||
396 | 395 | ||
397 | Pixmap FbPixmap::getRootPixmap(int screen_num, bool force_update) { | 396 | Pixmap FbPixmap::getRootPixmap(int screen_num, bool force_update) { |
398 | /* | 397 | /* |
399 | if (!FbTk::Transparent::haveRender()) | 398 | if (!FbTk::Transparent::haveRender()) |
400 | return None; | 399 | return None; |
401 | */ | 400 | */ |
402 | 401 | ||
@@ -404,7 +403,7 @@ Pixmap FbPixmap::getRootPixmap(int screen_num, bool force_update) { | |||
404 | if (m_root_pixmaps && !force_update) | 403 | if (m_root_pixmaps && !force_update) |
405 | return m_root_pixmaps[screen_num]; | 404 | return m_root_pixmaps[screen_num]; |
406 | 405 | ||
407 | // else setup pixmap cache | 406 | // else setup pixmap cache |
408 | int numscreens = ScreenCount(display()); | 407 | int numscreens = ScreenCount(display()); |
409 | for (int i=0; i < numscreens; ++i) { | 408 | for (int i=0; i < numscreens; ++i) { |
410 | Atom real_type; | 409 | Atom real_type; |