View | Details | Raw Unified | Return to bug 272660 | Differences between
and this patch

Collapse All | Expand All

(-)src/blackbox.cc (-4 / +7 lines)
Lines 27-32 Link Here
27
#include "Slit.hh"
27
#include "Slit.hh"
28
#include "Window.hh"
28
#include "Window.hh"
29
29
30
#include <cstdlib>
31
30
#include <Pen.hh>
32
#include <Pen.hh>
31
#include <PixmapCache.hh>
33
#include <PixmapCache.hh>
32
#include <Util.hh>
34
#include <Util.hh>
Lines 36-41 Link Here
36
#include <sys/stat.h>
38
#include <sys/stat.h>
37
#include <assert.h>
39
#include <assert.h>
38
#include <signal.h>
40
#include <signal.h>
41
#include <stdlib.h>
39
#include <unistd.h>
42
#include <unistd.h>
40
43
41
// #define FOCUS_DEBUG
44
// #define FOCUS_DEBUG
Lines 113-119 void Blackbox::shutdown(void) { Link Here
113
  XSetInputFocus(XDisplay(), PointerRoot, RevertToPointerRoot, XTime());
116
  XSetInputFocus(XDisplay(), PointerRoot, RevertToPointerRoot, XTime());
114
117
115
  std::for_each(screen_list, screen_list + screen_list_count,
118
  std::for_each(screen_list, screen_list + screen_list_count,
116
                std::mem_fun(&BScreen::shutdown));
119
                std::mem_fn(&BScreen::shutdown));
117
120
118
  XSync(XDisplay(), false);
121
  XSync(XDisplay(), false);
119
122
Lines 367-373 void Blackbox::timeout(bt::Timer *) { Link Here
367
  menuTimestamps.clear();
370
  menuTimestamps.clear();
368
371
369
  std::for_each(screen_list, screen_list + screen_list_count,
372
  std::for_each(screen_list, screen_list + screen_list_count,
370
                std::mem_fun(&BScreen::reconfigure));
373
                std::mem_fn(&BScreen::reconfigure));
371
374
372
  bt::Font::clearCache();
375
  bt::Font::clearCache();
373
  bt::PixmapCache::clearCache();
376
  bt::PixmapCache::clearCache();
Lines 422-428 Blackbox::Blackbox(char **m_argv, const char *dpy_name Link Here
422
  if (managed == 0) {
425
  if (managed == 0) {
423
    fprintf(stderr, "%s: no managable screens found, exiting...\n",
426
    fprintf(stderr, "%s: no managable screens found, exiting...\n",
424
            applicationName().c_str());
427
            applicationName().c_str());
425
    ::exit(3);
428
    std::exit(3);
426
  }
429
  }
427
430
428
  screen_list_count = managed;
431
  screen_list_count = managed;
Lines 620-624 void Blackbox::rereadMenu(void) { Link Here
620
  menuTimestamps.clear();
623
  menuTimestamps.clear();
621
624
622
  std::for_each(screen_list, screen_list + screen_list_count,
625
  std::for_each(screen_list, screen_list + screen_list_count,
623
                std::mem_fun(&BScreen::rereadMenu));
626
                std::mem_fn(&BScreen::rereadMenu));
624
}
627
}

Return to bug 272660