# include <stdio.h>
#endif // HAVE_STDIO_H
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
# include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef HAVE_STRING_H
# include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
#ifdef HAVE_UNISTD_H
# include <sys/types.h>
#include "i18n.h"
#include "BaseDisplay.h"
-#include "LinkedList.h"
#include "Timer.h"
+#include <algorithm>
+
// X error handler to handle any and all X errors while the application is
// running
static Bool internal_error = False;
char errtxt[128];
XGetErrorText(d, e->error_code, errtxt, 128);
- fprintf(stderr, i18n->getMessage(BaseDisplaySet, BaseDisplayXError,
- "%s: X error: %s(%d) opcodes %d/%d\n resource 0x%lx\n"),
+ fprintf(stderr, i18n(BaseDisplaySet, BaseDisplayXError,
+ "%s: X error: %s(%d) opcodes %d/%d\n resource 0x%lx\n"
+ ),
base_display->getApplicationName(), errtxt, e->error_code,
e->request_code, e->minor_code, e->resourceid);
#endif // DEBUG
// signal handler to allow for proper and gentle shutdown
#ifndef HAVE_SIGACTION
-static RETSIGTYPE signalhandler(int sig) {
+static RETSIGTYPE signalhandler(int sig)
#else // HAVE_SIGACTION
-static void signalhandler(int sig) {
+static void signalhandler(int sig)
#endif // HAVE_SIGACTION
-
+{
static int re_enter = 0;
switch (sig) {
return;
}
- fprintf(stderr, i18n->getMessage(BaseDisplaySet, BaseDisplaySignalCaught,
- "%s: signal %d caught\n"),
- base_display->getApplicationName(), sig);
+ fprintf(stderr, i18n(BaseDisplaySet, BaseDisplaySignalCaught,
+ "%s: signal %d caught\n"),
+ base_display->getApplicationName(), sig);
if (! base_display->isStartup() && ! re_enter) {
internal_error = True;
re_enter = 1;
- fprintf(stderr, i18n->getMessage(BaseDisplaySet, BaseDisplayShuttingDown,
- "shutting down\n"));
+ fprintf(stderr, i18n(BaseDisplaySet, BaseDisplayShuttingDown,
+ "shutting down\n"));
base_display->shutdown();
}
if (sig != SIGTERM && sig != SIGINT) {
- fprintf(stderr, i18n->getMessage(BaseDisplaySet, BaseDisplayAborting,
- "aborting... dumping core\n"));
+ fprintf(stderr, i18n(BaseDisplaySet, BaseDisplayAborting,
+ "aborting... dumping core\n"));
abort();
}
return n;
}
-BaseDisplay::BaseDisplay(char *app_name, char *dpy_name) {
- application_name = app_name;
+BaseDisplay::BaseDisplay(const char *app_name, char *dpy_name) {
+ application_name = bstrdup(app_name);
_startup = True;
_shutdown = False;
#endif // HAVE_SIGACTION
if (! (display = XOpenDisplay(dpy_name))) {
- fprintf(stderr, i18n->getMessage(BaseDisplaySet, BaseDisplayXConnectFail,
- "BaseDisplay::BaseDisplay: connection to X server failed.\n"));
+ fprintf(stderr, i18n(BaseDisplaySet, BaseDisplayXConnectFail,
+ "BaseDisplay::BaseDisplay: connection to X server failed.\n"));
::exit(2);
} else if (fcntl(ConnectionNumber(display), F_SETFD, 1) == -1) {
fprintf(stderr,
- i18n->getMessage(BaseDisplaySet, BaseDisplayCloseOnExecFail,
- "BaseDisplay::BaseDisplay: couldn't mark display connection "
- "as close-on-exec\n"));
+ i18n(BaseDisplaySet, BaseDisplayCloseOnExecFail,
+ "BaseDisplay::BaseDisplay: couldn't mark display connection "
+ "as close-on-exec\n"));
::exit(2);
}
- number_of_screens = ScreenCount(display);
display_name = XDisplayName(dpy_name);
#ifdef SHAPE
XSetErrorHandler((XErrorHandler) handleXErrors);
- timerList = new LinkedList<BTimer>;
-
- screenInfoList = new LinkedList<ScreenInfo>;
- for (int i = 0; i < number_of_screens; i++) {
- ScreenInfo *screeninfo = new ScreenInfo(this, i);
- screenInfoList->insert(screeninfo);
- }
+ screenInfoList.reserve(numberOfScreens());
+ for (unsigned int s = 0; s < numberOfScreens(); s++)
+ screenInfoList.push_back(new ScreenInfo(*this, s));
#ifndef NOCLOBBER
NumLockMask = ScrollLockMask = 0;
// since it doesn't need to be.
const KeyCode num_lock_code = XKeysymToKeycode(display, XK_Num_Lock);
const KeyCode scroll_lock_code = XKeysymToKeycode(display, XK_Scroll_Lock);
-
+
for (size_t cnt = 0; cnt < size; ++cnt) {
if (! modmap->modifiermap[cnt]) continue;
if (num_lock_code == modmap->modifiermap[cnt])
- NumLockMask = mask_table[cnt / modmap->max_keypermod];
+ NumLockMask = mask_table[cnt / modmap->max_keypermod];
if (scroll_lock_code == modmap->modifiermap[cnt])
- ScrollLockMask = mask_table[cnt / modmap->max_keypermod];
+ ScrollLockMask = mask_table[cnt / modmap->max_keypermod];
}
}
MaskList[6] = LockMask | ScrollLockMask;
MaskList[7] = LockMask | NumLockMask | ScrollLockMask;
MaskListLength = sizeof(MaskList) / sizeof(MaskList[0]);
-
+
if (modmap) XFreeModifiermap(const_cast<XModifierKeymap*>(modmap));
#else
NumLockMask = Mod2Mask;
BaseDisplay::~BaseDisplay(void) {
- while (screenInfoList->count()) {
- ScreenInfo *si = screenInfoList->first();
-
- screenInfoList->remove(si);
- delete si;
- }
-
- delete screenInfoList;
-
+ std::for_each(screenInfoList.begin(), screenInfoList.end(),
+ PointerAssassin());
// we don't create the BTimers, we don't delete them
- while (timerList->count())
- timerList->remove(0);
- delete timerList;
+ if (application_name != NULL)
+ delete [] application_name;
XCloseDisplay(display);
}
if (last_bad_window != None && e.xany.window == last_bad_window) {
#ifdef DEBUG
- fprintf(stderr, i18n->getMessage(BaseDisplaySet,
- BaseDisplayBadWindowRemove,
- "BaseDisplay::eventLoop(): removing bad window "
- "from event queue\n"));
+ fprintf(stderr, i18n(BaseDisplaySet,
+ BaseDisplayBadWindowRemove,
+ "BaseDisplay::eventLoop(): removing bad window "
+ "from event queue\n"));
#endif // DEBUG
} else {
- last_bad_window = None;
+ last_bad_window = None;
process_event(&e);
}
} else {
FD_ZERO(&rfds);
FD_SET(xfd, &rfds);
- if (timerList->count()) {
+ if (!timerList.empty()) {
gettimeofday(&now, 0);
tm.tv_sec = tm.tv_usec = 0l;
- BTimer *timer = timerList->first();
+ BTimer *timer = timerList.front();
+ ASSERT(timer != NULL);
tm.tv_sec = timer->getStartTime().tv_sec +
timer->getTimeout().tv_sec - now.tv_sec;
// check for timer timeout
gettimeofday(&now, 0);
- LinkedListIterator<BTimer> it(timerList);
- for(BTimer *timer = it.current(); timer; it++, timer = it.current()) {
+ TimerList::iterator it;
+ for (it = timerList.begin(); it != timerList.end(); ++it) {
+ BTimer *timer = *it;
+ ASSERT(timer != NULL);
+
tm.tv_sec = timer->getStartTime().tv_sec +
timer->getTimeout().tv_sec;
tm.tv_usec = timer->getStartTime().tv_usec +
timer->fireTimeout();
// restart the current timer so that the start time is updated
- if (! timer->doOnce()) timer->start();
- else timer->stop();
+ if (! timer->doOnce()) {
+ // reorder
+ removeTimer(timer);
+ addTimer(timer);
+ timer->start();
+ } else
+ timer->stop();
+ it = timerList.begin(); // we no longer have any idea if the iterator is
+ // valid, but what was at the front() is no
+ // longer.
}
}
}
void BaseDisplay::ungrab(void) {
if (! --server_grabs)
XUngrabServer(display);
-
- if (server_grabs < 0) server_grabs = 0;
}
void BaseDisplay::addTimer(BTimer *timer) {
- if (! timer) return;
+ ASSERT(timer != (BTimer *) 0);
- LinkedListIterator<BTimer> it(timerList);
- int index = 0;
- for (BTimer *tmp = it.current(); tmp; it++, index++, tmp = it.current())
+ TimerList::iterator it;
+ for (it = timerList.begin(); it != timerList.end(); ++it) {
+ BTimer *tmp = *it;
if ((tmp->getTimeout().tv_sec > timer->getTimeout().tv_sec) ||
((tmp->getTimeout().tv_sec == timer->getTimeout().tv_sec) &&
(tmp->getTimeout().tv_usec >= timer->getTimeout().tv_usec)))
break;
+ }
- timerList->insert(timer, index);
+ timerList.insert(it, timer);
}
void BaseDisplay::removeTimer(BTimer *timer) {
- timerList->remove(timer);
+ ASSERT(timer != (BTimer *) 0);
+ timerList.remove(timer);
}
* the keyboard lock keys, so that they do not cancel out the event.
*/
void BaseDisplay::grabButton(unsigned int button, unsigned int modifiers,
- Window grab_window, Bool owner_events,
- unsigned int event_mask, int pointer_mode,
- int keybaord_mode, Window confine_to,
- Cursor cursor) const
+ Window grab_window, Bool owner_events,
+ unsigned int event_mask, int pointer_mode,
+ int keybaord_mode, Window confine_to,
+ Cursor cursor) const
{
#ifndef NOCLOBBER
for (size_t cnt = 0; cnt < MaskListLength; ++cnt)
owner_events, event_mask, pointer_mode, keybaord_mode,
confine_to, cursor);
#else // NOCLOBBER
- XGrabButton(display, button, modifiers, grab_window,
- owner_events, event_mask, pointer_mode, keybaord_mode,
- confine_to, cursor);
+ XGrabButton(display, button, modifiers, grab_window,
+ owner_events, event_mask, pointer_mode, keybaord_mode,
+ confine_to, cursor);
#endif // NOCLOBBER
}
* keyboard lock keys.
*/
void BaseDisplay::ungrabButton(unsigned int button, unsigned int modifiers,
- Window grab_window) const {
+ Window grab_window) const {
#ifndef NOCLOBBER
for (size_t cnt = 0; cnt < MaskListLength; ++cnt)
XUngrabButton(display, button, modifiers | MaskList[cnt], grab_window);
#else // NOCLOBBER
- XUngrabButton(display, button, modifiers, grab_window);
+ XUngrabButton(display, button, modifiers, grab_window);
#endif // NOCLOBBER
}
-ScreenInfo::ScreenInfo(BaseDisplay *d, int num) {
- basedisplay = d;
- screen_number = num;
+ScreenInfo::ScreenInfo(BaseDisplay &d, int num) : basedisplay(d),
+screen_number(num)
+{
- root_window = RootWindow(basedisplay->getXDisplay(), screen_number);
- depth = DefaultDepth(basedisplay->getXDisplay(), screen_number);
+ root_window = RootWindow(basedisplay.getXDisplay(), screen_number);
+ depth = DefaultDepth(basedisplay.getXDisplay(), screen_number);
- width =
- WidthOfScreen(ScreenOfDisplay(basedisplay->getXDisplay(), screen_number));
- height =
- HeightOfScreen(ScreenOfDisplay(basedisplay->getXDisplay(), screen_number));
+ m_size = Size(WidthOfScreen(ScreenOfDisplay(basedisplay.getXDisplay(),
+ screen_number)),
+ HeightOfScreen(ScreenOfDisplay(basedisplay.getXDisplay(),
+ screen_number)));
// search for a TrueColor Visual... if we can't find one... we will use the
// default visual for the screen
visual = (Visual *) 0;
- if ((vinfo_return = XGetVisualInfo(basedisplay->getXDisplay(),
+ if ((vinfo_return = XGetVisualInfo(basedisplay.getXDisplay(),
VisualScreenMask | VisualClassMask,
&vinfo_template, &vinfo_nitems)) &&
vinfo_nitems > 0) {
}
if (visual) {
- colormap = XCreateColormap(basedisplay->getXDisplay(), root_window,
- visual, AllocNone);
+ colormap = XCreateColormap(basedisplay.getXDisplay(), root_window,
+ visual, AllocNone);
} else {
- visual = DefaultVisual(basedisplay->getXDisplay(), screen_number);
- colormap = DefaultColormap(basedisplay->getXDisplay(), screen_number);
+ visual = DefaultVisual(basedisplay.getXDisplay(), screen_number);
+ colormap = DefaultColormap(basedisplay.getXDisplay(), screen_number);
}
}
projects / chaz / openbox / blobdiff