-#include <iostream.h>
-// Screen.cc for Openbox
-// Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// Screen.cc for Blackbox - an X11 Window manager
+// Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh@debian.org>
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
//
// Permission is hereby granted, free of charge, to any person obtaining a
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-// stupid macros needed to access some functions in version 2 of the GNU C
-// library
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
#ifdef HAVE_CONFIG_H
-# include "../config.h"
+#include "../config.h"
#endif // HAVE_CONFIG_H
+extern "C" {
#include <X11/Xatom.h>
#include <X11/keysym.h>
-#include "i18n.h"
-#include "openbox.h"
-#include "Clientmenu.h"
-#include "Iconmenu.h"
-#include "Image.h"
-#include "Screen.h"
-
-#ifdef SLIT
-#include "Slit.h"
-#endif // SLIT
-
-#include "Rootmenu.h"
-#include "Toolbar.h"
-#include "Window.h"
-#include "Workspace.h"
-#include "Workspacemenu.h"
-#include "Util.h"
-
-#ifdef HAVE_STDLIB_H
+#ifdef XINERAMA
+# include <X11/Xlib.h>
+# include <X11/extensions/Xinerama.h>
+#endif // XINERAMA
+
+#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif // HAVE_STDLIB_H
-#ifdef HAVE_STRING_H
+#ifdef HAVE_STRING_H
# include <string.h>
#endif // HAVE_STRING_H
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif // HAVE_SYS_TYPES_H
-
#ifdef HAVE_CTYPE_H
# include <ctype.h>
#endif // HAVE_CTYPE_H
+#ifdef HAVE_UNISTD_H
+# include <sys/types.h>
+# include <unistd.h>
+#endif // HAVE_UNISTD_H
+
#ifdef HAVE_DIRENT_H
# include <dirent.h>
#endif // HAVE_DIRENT_H
# include <locale.h>
#endif // HAVE_LOCALE_H
-#ifdef HAVE_UNISTD_H
-# include <sys/types.h>
-# include <unistd.h>
-#endif // HAVE_UNISTD_H
-
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif // HAVE_SYS_STAT_H
#ifdef HAVE_STDARG_H
# include <stdarg.h>
#endif // HAVE_STDARG_H
+}
-#ifndef HAVE_SNPRINTF
-# include "bsd-snprintf.h"
-#endif // !HAVE_SNPRINTF
+#include <assert.h>
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 255
-#endif // MAXPATHLEN
+#include <algorithm>
+#include <functional>
+#include <string>
+using std::string;
+
+#include "i18n.hh"
+#include "blackbox.hh"
+#include "Clientmenu.hh"
+#include "Font.hh"
+#include "GCCache.hh"
+#include "Iconmenu.hh"
+#include "Image.hh"
+#include "Screen.hh"
+#include "Slit.hh"
+#include "Rootmenu.hh"
+#include "Toolbar.hh"
+#include "Util.hh"
+#include "Window.hh"
+#include "Workspace.hh"
+#include "Workspacemenu.hh"
+#include "Util.hh"
+#include "XAtom.hh"
#ifndef FONT_ELEMENT_SIZE
#define FONT_ELEMENT_SIZE 50
#endif // FONT_ELEMENT_SIZE
-#include <strstream>
-#include <string>
-#include <algorithm>
-#include <functional>
-using namespace std;
-static Bool running = True;
+static bool running = True;
static int anotherWMRunning(Display *display, XErrorEvent *) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenAnotherWMRunning,
- "BScreen::BScreen: an error occured while querying the X server.\n"
- " another window manager already running on display %s.\n"),
+ fprintf(stderr, i18n(ScreenSet, ScreenAnotherWMRunning,
+ "BScreen::BScreen: an error occured while querying the X server.\n"
+ " another window manager already running on display %s.\n"),
DisplayString(display));
running = False;
return(-1);
}
-struct dcmp {
- bool operator()(const char *one, const char *two) const {
- return (strcmp(one, two) < 0) ? True : False;
- }
-};
-
-#ifndef HAVE_STRCASESTR
-static const char * strcasestr(const char *str, const char *ptn) {
- const char *s2, *p2;
- for( ; *str; str++) {
- for(s2=str,p2=ptn; ; s2++,p2++) {
- if (!*p2) return str;
- if (toupper(*s2) != toupper(*p2)) break;
- }
- }
- return NULL;
-}
-#endif // HAVE_STRCASESTR
-
-static const char *getFontElement(const char *pattern, char *buf, int bufsiz, ...) {
- const char *p, *v;
- char *p2;
- va_list va;
-
- va_start(va, bufsiz);
- buf[bufsiz-1] = 0;
- buf[bufsiz-2] = '*';
- while((v = va_arg(va, char *)) != NULL) {
- p = strcasestr(pattern, v);
- if (p) {
- strncpy(buf, p+1, bufsiz-2);
- p2 = strchr(buf, '-');
- if (p2) *p2=0;
- va_end(va);
- return p;
- }
- }
- va_end(va);
- strncpy(buf, "*", bufsiz);
- return NULL;
-}
-
-static const char *getFontSize(const char *pattern, int *size) {
- const char *p;
- const char *p2=NULL;
- int n=0;
-
- for (p=pattern; 1; p++) {
- if (!*p) {
- if (p2!=NULL && n>1 && n<72) {
- *size = n; return p2+1;
- } else {
- *size = 16; return NULL;
- }
- } else if (*p=='-') {
- if (n>1 && n<72 && p2!=NULL) {
- *size = n;
- return p2+1;
- }
- p2=p; n=0;
- } else if (*p>='0' && *p<='9' && p2!=NULL) {
- n *= 10;
- n += *p-'0';
- } else {
- p2=NULL; n=0;
- }
- }
-}
+BScreen::BScreen(Blackbox *bb, unsigned int scrn) : ScreenInfo(bb, scrn) {
+ blackbox = bb;
+ screenstr = "session.screen" + itostring(scrn) + '.';
+ config = blackbox->getConfig();
+ xatom = blackbox->getXAtom();
-BScreen::BScreen(Openbox &ob, int scrn, Resource &conf) : ScreenInfo(ob, scrn),
- openbox(ob), config(conf)
-{
event_mask = ColormapChangeMask | EnterWindowMask | PropertyChangeMask |
- SubstructureRedirectMask | KeyPressMask | KeyReleaseMask |
- ButtonPressMask | ButtonReleaseMask;
+ SubstructureRedirectMask | ButtonPressMask | ButtonReleaseMask;
XErrorHandler old = XSetErrorHandler((XErrorHandler) anotherWMRunning);
- XSelectInput(getBaseDisplay().getXDisplay(), getRootWindow(), event_mask);
- XSync(getBaseDisplay().getXDisplay(), False);
+ XSelectInput(getBaseDisplay()->getXDisplay(), getRootWindow(), event_mask);
+ XSync(getBaseDisplay()->getXDisplay(), False);
XSetErrorHandler((XErrorHandler) old);
managed = running;
if (! managed) return;
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenManagingScreen,
- "BScreen::BScreen: managing screen %d "
- "using visual 0x%lx, depth %d\n"),
- getScreenNumber(), XVisualIDFromVisual(getVisual()),
+ fprintf(stderr, i18n(ScreenSet, ScreenManagingScreen,
+ "BScreen::BScreen: managing screen %d "
+ "using visual 0x%lx, depth %d\n"),
+ getScreenNumber(), XVisualIDFromVisual(getVisual()),
getDepth());
rootmenu = 0;
- resource.mstyle.t_fontset = resource.mstyle.f_fontset =
- resource.tstyle.fontset = resource.wstyle.fontset = NULL;
resource.mstyle.t_font = resource.mstyle.f_font = resource.tstyle.font =
- resource.wstyle.font = NULL;
- resource.root_command = NULL;
-#ifdef HAVE_STRFTIME
- resource.strftime_format = NULL;
-#endif // HAVE_STRFTIME
+ resource.wstyle.font = (BFont *) 0;
-#ifdef SLIT
- slit = NULL;
-#endif // SLIT
- toolbar = NULL;
+ geom_pixmap = None;
+ xatom->setSupported(this); // set-up netwm support
#ifdef HAVE_GETPID
- pid_t bpid = getpid();
-
- XChangeProperty(getBaseDisplay().getXDisplay(), getRootWindow(),
- openbox.getOpenboxPidAtom(), XA_CARDINAL,
- sizeof(pid_t) * 8, PropModeReplace,
- (unsigned char *) &bpid, 1);
+ xatom->setValue(getRootWindow(), XAtom::blackbox_pid, XAtom::cardinal,
+ (unsigned long) getpid());
#endif // HAVE_GETPID
+ unsigned long geometry[] = { getWidth(),
+ getHeight()};
+ xatom->setValue(getRootWindow(), XAtom::net_desktop_geometry,
+ XAtom::cardinal, geometry, 2);
+ unsigned long viewport[] = {0,0};
+ xatom->setValue(getRootWindow(), XAtom::net_desktop_viewport,
+ XAtom::cardinal, viewport, 2);
+
+
+ XDefineCursor(blackbox->getXDisplay(), getRootWindow(),
+ blackbox->getSessionCursor());
- XDefineCursor(getBaseDisplay().getXDisplay(), getRootWindow(),
- openbox.getSessionCursor());
+ updateAvailableArea();
image_control =
- new BImageControl(openbox, *this, True, openbox.getColorsPerChannel(),
- openbox.getCacheLife(), openbox.getCacheMax());
+ new BImageControl(blackbox, this, True, blackbox->getColorsPerChannel(),
+ blackbox->getCacheLife(), blackbox->getCacheMax());
image_control->installRootColormap();
root_colormap_installed = True;
- load(); // load config options from Resources
+ load_rc();
LoadStyle();
XGCValues gcv;
- unsigned long gc_value_mask = GCForeground;
- if (! i18n->multibyte()) gc_value_mask |= GCFont;
-
- gcv.foreground = WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber())
- ^ BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber());
+ gcv.foreground = WhitePixel(blackbox->getXDisplay(), getScreenNumber())
+ ^ BlackPixel(blackbox->getXDisplay(), getScreenNumber());
gcv.function = GXxor;
gcv.subwindow_mode = IncludeInferiors;
- opGC = XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
+ opGC = XCreateGC(blackbox->getXDisplay(), getRootWindow(),
GCForeground | GCFunction | GCSubwindowMode, &gcv);
- gcv.foreground = resource.wstyle.l_text_focus.getPixel();
- if (resource.wstyle.font)
- gcv.font = resource.wstyle.font->fid;
- resource.wstyle.l_text_focus_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.wstyle.l_text_unfocus.getPixel();
- if (resource.wstyle.font)
- gcv.font = resource.wstyle.font->fid;
- resource.wstyle.l_text_unfocus_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.wstyle.b_pic_focus.getPixel();
- resource.wstyle.b_pic_focus_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- GCForeground, &gcv);
-
- gcv.foreground = resource.wstyle.b_pic_unfocus.getPixel();
- resource.wstyle.b_pic_unfocus_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- GCForeground, &gcv);
-
- gcv.foreground = resource.mstyle.t_text.getPixel();
- if (resource.mstyle.t_font)
- gcv.font = resource.mstyle.t_font->fid;
- resource.mstyle.t_text_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.mstyle.f_text.getPixel();
- if (resource.mstyle.f_font)
- gcv.font = resource.mstyle.f_font->fid;
- resource.mstyle.f_text_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.mstyle.h_text.getPixel();
- resource.mstyle.h_text_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.mstyle.d_text.getPixel();
- resource.mstyle.d_text_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.mstyle.hilite.getColor()->getPixel();
- resource.mstyle.hilite_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.tstyle.l_text.getPixel();
- if (resource.tstyle.font)
- gcv.font = resource.tstyle.font->fid;
- resource.tstyle.l_text_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.tstyle.w_text.getPixel();
- resource.tstyle.w_text_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.tstyle.c_text.getPixel();
- resource.tstyle.c_text_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.tstyle.b_pic.getPixel();
- resource.tstyle.b_pic_gc =
- XCreateGC(getBaseDisplay().getXDisplay(), getRootWindow(),
- gc_value_mask, &gcv);
-
- const char *s = i18n->getMessage(ScreenSet, ScreenPositionLength,
- "0: 0000 x 0: 0000");
- int l = strlen(s);
-
- if (i18n->multibyte()) {
- XRectangle ink, logical;
- XmbTextExtents(resource.wstyle.fontset, s, l, &ink, &logical);
- geom_w = logical.width;
-
- geom_h = resource.wstyle.fontset_extents->max_ink_extent.height;
- } else {
- geom_h = resource.wstyle.font->ascent +
- resource.wstyle.font->descent;
-
- geom_w = XTextWidth(resource.wstyle.font, s, l);
- }
-
- geom_w += (resource.bevel_width * 2);
- geom_h += (resource.bevel_width * 2);
+ const char *s = i18n(ScreenSet, ScreenPositionLength,
+ "0: 0000 x 0: 0000");
+ geom_w = resource.wstyle.font->measureString(s) + resource.bevel_width * 2;
+ geom_h = resource.wstyle.font->height() + resource.bevel_width * 2;
XSetWindowAttributes attrib;
unsigned long mask = CWBorderPixel | CWColormap | CWSaveUnder;
- attrib.border_pixel = getBorderColor()->getPixel();
+ attrib.border_pixel = getBorderColor()->pixel();
attrib.colormap = getColormap();
attrib.save_under = True;
- geom_window =
- XCreateWindow(getBaseDisplay().getXDisplay(), getRootWindow(),
- 0, 0, geom_w, geom_h, resource.border_width, getDepth(),
- InputOutput, getVisual(), mask, &attrib);
+ geom_window = XCreateWindow(blackbox->getXDisplay(), getRootWindow(),
+ 0, 0, geom_w, geom_h, resource.border_width,
+ getDepth(), InputOutput, getVisual(),
+ mask, &attrib);
geom_visible = False;
- if (resource.wstyle.l_focus.getTexture() & BImage_ParentRelative) {
- if (resource.wstyle.t_focus.getTexture() ==
- (BImage_Flat | BImage_Solid)) {
- geom_pixmap = None;
- XSetWindowBackground(getBaseDisplay().getXDisplay(), geom_window,
- resource.wstyle.t_focus.getColor()->getPixel());
- } else {
- geom_pixmap = image_control->renderImage(geom_w, geom_h,
- &resource.wstyle.t_focus);
- XSetWindowBackgroundPixmap(getBaseDisplay().getXDisplay(),
- geom_window, geom_pixmap);
- }
- } else {
- if (resource.wstyle.l_focus.getTexture() ==
- (BImage_Flat | BImage_Solid)) {
- geom_pixmap = None;
- XSetWindowBackground(getBaseDisplay().getXDisplay(), geom_window,
- resource.wstyle.l_focus.getColor()->getPixel());
- } else {
- geom_pixmap = image_control->renderImage(geom_w, geom_h,
- &resource.wstyle.l_focus);
- XSetWindowBackgroundPixmap(getBaseDisplay().getXDisplay(),
- geom_window, geom_pixmap);
- }
+ BTexture* texture = &(resource.wstyle.l_focus);
+ geom_pixmap = texture->render(geom_w, geom_h, geom_pixmap);
+ if (geom_pixmap == ParentRelative) {
+ texture = &(resource.wstyle.t_focus);
+ geom_pixmap = texture->render(geom_w, geom_h, geom_pixmap);
}
+ if (! geom_pixmap)
+ XSetWindowBackground(blackbox->getXDisplay(), geom_window,
+ texture->color().pixel());
+ else
+ XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ geom_window, geom_pixmap);
- workspacemenu = new Workspacemenu(*this);
- iconmenu = new Iconmenu(*this);
- configmenu = new Configmenu(*this);
+ workspacemenu = new Workspacemenu(this);
+ iconmenu = new Iconmenu(this);
+ configmenu = new Configmenu(this);
- Workspace *wkspc = NULL;
- if (resource.workspaces != 0) {
- for (int i = 0; i < resource.workspaces; ++i) {
- wkspc = new Workspace(*this, workspacesList.size());
+ if (resource.workspaces > 0) {
+ for (unsigned int i = 0; i < resource.workspaces; ++i) {
+ Workspace *wkspc = new Workspace(this, workspacesList.size());
workspacesList.push_back(wkspc);
- workspacemenu->insert(wkspc->getName(), wkspc->getMenu());
+ workspacemenu->insertWorkspace(wkspc);
+ workspacemenu->update();
+
}
} else {
- setWorkspaceCount(1);
- wkspc = new Workspace(*this, workspacesList.size());
+ Workspace *wkspc = new Workspace(this, workspacesList.size());
workspacesList.push_back(wkspc);
- workspacemenu->insert(wkspc->getName(), wkspc->getMenu());
+ workspacemenu->insertWorkspace(wkspc);
+ workspacemenu->update();
}
saveWorkspaceNames();
- workspacemenu->insert(i18n->getMessage(IconSet, IconIcons, "Icons"),
- iconmenu);
+ updateNetizenWorkspaceCount();
+
+ workspacemenu->insert(i18n(IconSet, IconIcons, "Icons"), iconmenu);
workspacemenu->update();
current_workspace = workspacesList.front();
+
+ xatom->setValue(getRootWindow(), XAtom::net_current_desktop,
+ XAtom::cardinal, 0); //first workspace
+
workspacemenu->setItemSelected(2, True);
- toolbar = new Toolbar(*this, config);
+ toolbar = new Toolbar(this);
-#ifdef SLIT
- slit = new Slit(*this, config);
-#endif // SLIT
+ slit = new Slit(this);
InitMenu();
- raiseWindows(0, 0);
+ raiseWindows(0, 0); // this also initializes the empty stacking list
rootmenu->update();
+ updateClientList(); // initialize the client lists, which will be empty
+ updateAvailableArea();
+
changeWorkspaceID(0);
- int i;
- unsigned int nchild;
+ unsigned int i, j, nchild;
Window r, p, *children;
- XQueryTree(getBaseDisplay().getXDisplay(), getRootWindow(), &r, &p,
- &children, &nchild);
+ XQueryTree(blackbox->getXDisplay(), getRootWindow(), &r, &p,
+ &children, &nchild);
// preen the window list of all icon windows... for better dockapp support
- for (i = 0; i < (int) nchild; i++) {
+ for (i = 0; i < nchild; i++) {
if (children[i] == None) continue;
- XWMHints *wmhints = XGetWMHints(getBaseDisplay().getXDisplay(),
- children[i]);
+ XWMHints *wmhints = XGetWMHints(blackbox->getXDisplay(),
+ children[i]);
if (wmhints) {
if ((wmhints->flags & IconWindowHint) &&
- (wmhints->icon_window != children[i]))
- for (int j = 0; j < (int) nchild; j++)
+ (wmhints->icon_window != children[i])) {
+ for (j = 0; j < nchild; j++) {
if (children[j] == wmhints->icon_window) {
children[j] = None;
-
break;
}
+ }
+ }
XFree(wmhints);
}
}
// manage shown windows
- for (i = 0; i < (int) nchild; ++i) {
- if (children[i] == None || (! openbox.validateWindow(children[i])))
+ for (i = 0; i < nchild; ++i) {
+ if (children[i] == None || ! blackbox->validateWindow(children[i]))
continue;
XWindowAttributes attrib;
- if (XGetWindowAttributes(getBaseDisplay().getXDisplay(), children[i],
- &attrib)) {
+ if (XGetWindowAttributes(blackbox->getXDisplay(), children[i], &attrib)) {
if (attrib.override_redirect) continue;
if (attrib.map_state != IsUnmapped) {
- new OpenboxWindow(openbox, children[i], this);
-
- OpenboxWindow *win = openbox.searchWindow(children[i]);
- if (win) {
- XMapRequestEvent mre;
- mre.window = children[i];
- win->restoreAttributes();
- win->mapRequestEvent(&mre);
- }
+ manageWindow(children[i]);
}
}
}
- XSetInputFocus(getBaseDisplay().getXDisplay(),
- PointerRoot, None, CurrentTime);
-
XFree(children);
- XFlush(getBaseDisplay().getXDisplay());
+
+ // call this again just in case a window we found updates the Strut list
+ updateAvailableArea();
}
image_control->removeImage(geom_pixmap);
if (geom_window != None)
- XDestroyWindow(getBaseDisplay().getXDisplay(), geom_window);
-
- removeWorkspaceNames();
+ XDestroyWindow(blackbox->getXDisplay(), geom_window);
std::for_each(workspacesList.begin(), workspacesList.end(),
PointerAssassin());
+
std::for_each(iconList.begin(), iconList.end(), PointerAssassin());
+
std::for_each(netizenList.begin(), netizenList.end(), PointerAssassin());
-#ifdef HAVE_STRFTIME
- if (resource.strftime_format)
- delete [] resource.strftime_format;
-#endif // HAVE_STRFTIME
+ while (! systrayWindowList.empty())
+ removeSystrayWindow(systrayWindowList[0]);
delete rootmenu;
delete workspacemenu;
delete iconmenu;
delete configmenu;
-
-#ifdef SLIT
delete slit;
-#endif // SLIT
-
delete toolbar;
delete image_control;
- if (resource.wstyle.fontset)
- XFreeFontSet(getBaseDisplay().getXDisplay(), resource.wstyle.fontset);
- if (resource.mstyle.t_fontset)
- XFreeFontSet(getBaseDisplay().getXDisplay(), resource.mstyle.t_fontset);
- if (resource.mstyle.f_fontset)
- XFreeFontSet(getBaseDisplay().getXDisplay(), resource.mstyle.f_fontset);
- if (resource.tstyle.fontset)
- XFreeFontSet(getBaseDisplay().getXDisplay(), resource.tstyle.fontset);
-
if (resource.wstyle.font)
- XFreeFont(getBaseDisplay().getXDisplay(), resource.wstyle.font);
+ delete resource.wstyle.font;
if (resource.mstyle.t_font)
- XFreeFont(getBaseDisplay().getXDisplay(), resource.mstyle.t_font);
+ delete resource.mstyle.t_font;
if (resource.mstyle.f_font)
- XFreeFont(getBaseDisplay().getXDisplay(), resource.mstyle.f_font);
+ delete resource.mstyle.f_font;
if (resource.tstyle.font)
- XFreeFont(getBaseDisplay().getXDisplay(), resource.tstyle.font);
- if (resource.root_command != NULL)
- delete [] resource.root_command;
-
- XFreeGC(getBaseDisplay().getXDisplay(), opGC);
-
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.wstyle.l_text_focus_gc);
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.wstyle.l_text_unfocus_gc);
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.wstyle.b_pic_focus_gc);
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.wstyle.b_pic_unfocus_gc);
-
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.mstyle.t_text_gc);
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.mstyle.f_text_gc);
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.mstyle.h_text_gc);
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.mstyle.d_text_gc);
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.mstyle.hilite_gc);
-
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.tstyle.l_text_gc);
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.tstyle.w_text_gc);
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.tstyle.c_text_gc);
- XFreeGC(getBaseDisplay().getXDisplay(),
- resource.tstyle.b_pic_gc);
-}
-
-
-Rect BScreen::availableArea() const {
- // the following code is temporary and will be taken care of by Screen in the
- // future (with the NETWM 'strut')
- Rect space(0, 0, size().w(), size().h());
- if (!resource.full_max) {
-#ifdef SLIT
- int slit_x = slit->autoHide() ? slit->hiddenOrigin().x() : slit->area().x(),
- slit_y = slit->autoHide() ? slit->hiddenOrigin().y() : slit->area().y();
- int tbarh = resource.hide_toolbar ? 0 :
- toolbar->getExposedHeight() + resource.border_width * 2;
- bool tbartop;
- switch (toolbar->placement()) {
- case Toolbar::TopLeft:
- case Toolbar::TopCenter:
- case Toolbar::TopRight:
- tbartop = true;
- break;
- case Toolbar::BottomLeft:
- case Toolbar::BottomCenter:
- case Toolbar::BottomRight:
- tbartop = false;
- break;
- default:
- ASSERT(false); // unhandled placement
- }
- if ((slit->direction() == Slit::Horizontal &&
- (slit->placement() == Slit::TopLeft ||
- slit->placement() == Slit::TopRight)) ||
- slit->placement() == Slit::TopCenter) {
- // exclude top
- if (tbartop && slit_y + slit->area().h() < tbarh) {
- space.setY(space.y() + tbarh);
- space.setH(space.h() - tbarh);
- } else {
- space.setY(space.y() + (slit_y + slit->area().h() +
- resource.border_width * 2));
- space.setH(space.h() - (slit_y + slit->area().h() +
- resource.border_width * 2));
- if (!tbartop)
- space.setH(space.h() - tbarh);
- }
- } else if ((slit->direction() == Slit::Vertical &&
- (slit->placement() == Slit::TopRight ||
- slit->placement() == Slit::BottomRight)) ||
- slit->placement() == Slit::CenterRight) {
- // exclude right
- space.setW(space.w() - (size().w() - slit_x));
- if (tbartop)
- space.setY(space.y() + tbarh);
- space.setH(space.h() - tbarh);
- } else if ((slit->direction() == Slit::Horizontal &&
- (slit->placement() == Slit::BottomLeft ||
- slit->placement() == Slit::BottomRight)) ||
- slit->placement() == Slit::BottomCenter) {
- // exclude bottom
- if (!tbartop && (size().h() - slit_y) < tbarh) {
- space.setH(space.h() - tbarh);
- } else {
- space.setH(space.h() - (size().h() - slit_y));
- if (tbartop) {
- space.setY(space.y() + tbarh);
- space.setH(space.h() - tbarh);
- }
- }
- } else {// if ((slit->direction() == Slit::Vertical &&
- // (slit->placement() == Slit::TopLeft ||
- // slit->placement() == Slit::BottomLeft)) ||
- // slit->placement() == Slit::CenterLeft)
- // exclude left
- space.setX(slit_x + slit->area().w() +
- resource.border_width * 2);
- space.setW(space.w() - (slit_x + slit->area().w() +
- resource.border_width * 2));
- if (tbartop)
- space.setY(space.y() + tbarh);
- space.setH(space.h() - tbarh);
- }
-#else // !SLIT
- int tbarh = resource.hide_toolbar() ? 0 :
- toolbar->getExposedHeight() + resource.border_width * 2;
- switch (toolbar->placement()) {
- case Toolbar::TopLeft:
- case Toolbar::TopCenter:
- case Toolbar::TopRight:
- space.setY(toolbar->getExposedHeight());
- space.setH(space.h() - toolbar->getExposedHeight());
- break;
- case Toolbar::BottomLeft:
- case Toolbar::BottomCenter:
- case Toolbar::BottomRight:
- space.setH(space.h() - tbarh);
- break;
- default:
- ASSERT(false); // unhandled placement
- }
-#endif // SLIT
- }
- return space;
-}
-
-
-void BScreen::readDatabaseTexture(const char *rname, const char *rclass,
- BTexture *texture,
- unsigned long default_pixel)
-{
- std::string s;
-
- if (resource.styleconfig.getValue(rname, rclass, s))
- image_control->parseTexture(texture, s.c_str());
- else
- texture->setTexture(BImage_Solid | BImage_Flat);
-
- if (texture->getTexture() & BImage_Solid) {
- int clen = strlen(rclass) + 32, nlen = strlen(rname) + 32;
-
- char *colorclass = new char[clen], *colorname = new char[nlen];
-
- sprintf(colorclass, "%s.Color", rclass);
- sprintf(colorname, "%s.color", rname);
-
- readDatabaseColor(colorname, colorclass, texture->getColor(),
- default_pixel);
-
-#ifdef INTERLACE
- sprintf(colorclass, "%s.ColorTo", rclass);
- sprintf(colorname, "%s.colorTo", rname);
-
- readDatabaseColor(colorname, colorclass, texture->getColorTo(),
- default_pixel);
-#endif // INTERLACE
-
- delete [] colorclass;
- delete [] colorname;
-
- if ((! texture->getColor()->isAllocated()) ||
- (texture->getTexture() & BImage_Flat))
- return;
-
- XColor xcol;
-
- xcol.red = (unsigned int) (texture->getColor()->getRed() +
- (texture->getColor()->getRed() >> 1));
- if (xcol.red >= 0xff) xcol.red = 0xffff;
- else xcol.red *= 0xff;
- xcol.green = (unsigned int) (texture->getColor()->getGreen() +
- (texture->getColor()->getGreen() >> 1));
- if (xcol.green >= 0xff) xcol.green = 0xffff;
- else xcol.green *= 0xff;
- xcol.blue = (unsigned int) (texture->getColor()->getBlue() +
- (texture->getColor()->getBlue() >> 1));
- if (xcol.blue >= 0xff) xcol.blue = 0xffff;
- else xcol.blue *= 0xff;
-
- if (! XAllocColor(getBaseDisplay().getXDisplay(),
- getColormap(), &xcol))
- xcol.pixel = 0;
-
- texture->getHiColor()->setPixel(xcol.pixel);
-
- xcol.red =
- (unsigned int) ((texture->getColor()->getRed() >> 2) +
- (texture->getColor()->getRed() >> 1)) * 0xff;
- xcol.green =
- (unsigned int) ((texture->getColor()->getGreen() >> 2) +
- (texture->getColor()->getGreen() >> 1)) * 0xff;
- xcol.blue =
- (unsigned int) ((texture->getColor()->getBlue() >> 2) +
- (texture->getColor()->getBlue() >> 1)) * 0xff;
-
- if (! XAllocColor(getBaseDisplay().getXDisplay(),
- getColormap(), &xcol))
- xcol.pixel = 0;
-
- texture->getLoColor()->setPixel(xcol.pixel);
- } else if (texture->getTexture() & BImage_Gradient) {
- int clen = strlen(rclass) + 10, nlen = strlen(rname) + 10;
-
- char *colorclass = new char[clen], *colorname = new char[nlen],
- *colortoclass = new char[clen], *colortoname = new char[nlen];
-
- sprintf(colorclass, "%s.Color", rclass);
- sprintf(colorname, "%s.color", rname);
-
- sprintf(colortoclass, "%s.ColorTo", rclass);
- sprintf(colortoname, "%s.colorTo", rname);
-
- readDatabaseColor(colorname, colorclass, texture->getColor(),
- default_pixel);
- readDatabaseColor(colortoname, colortoclass, texture->getColorTo(),
- default_pixel);
-
- delete [] colorclass;
- delete [] colorname;
- delete [] colortoclass;
- delete [] colortoname;
- }
-}
-
+ delete resource.tstyle.font;
-void BScreen::readDatabaseColor(const char *rname, const char *rclass,
- BColor *color, unsigned long default_pixel)
-{
- std::string s;
-
- if (resource.styleconfig.getValue(rname, rclass, s))
- image_control->parseColor(color, s.c_str());
- else {
- // parsing with no color std::string just deallocates the color, if it has
- // been previously allocated
- image_control->parseColor(color);
- color->setPixel(default_pixel);
- }
+ XFreeGC(blackbox->getXDisplay(), opGC);
}
-void BScreen::readDatabaseFontSet(const char *rname, const char *rclass,
- XFontSet *fontset) {
- if (! fontset) return;
-
- static char *defaultFont = "fixed";
- bool load_default = false;
- std::string s;
-
- if (*fontset)
- XFreeFontSet(getBaseDisplay().getXDisplay(), *fontset);
-
- if (resource.styleconfig.getValue(rname, rclass, s)) {
- if (! (*fontset = createFontSet(s.c_str())))
- load_default = true;
- } else
- load_default = true;
-
- if (load_default) {
- *fontset = createFontSet(defaultFont);
+void BScreen::saveSloppyFocus(bool s) {
+ resource.sloppy_focus = s;
- if (! *fontset) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenDefaultFontLoadFail,
- "BScreen::LoadStyle(): couldn't load default font.\n"));
- exit(2);
- }
+ string fmodel;
+ if (resource.sloppy_focus) {
+ fmodel = "SloppyFocus";
+ if (resource.auto_raise) fmodel += " AutoRaise";
+ if (resource.click_raise) fmodel += " ClickRaise";
+ } else {
+ fmodel = "ClickToFocus";
}
+ config->setValue(screenstr + "focusModel", fmodel);
}
-void BScreen::readDatabaseFont(const char *rname, const char *rclass,
- XFontStruct **font) {
- if (! font) return;
-
- static char *defaultFont = "fixed";
- bool load_default = false;
- std::string s;
-
- if (*font)
- XFreeFont(getBaseDisplay().getXDisplay(), *font);
-
- if (resource.styleconfig.getValue(rname, rclass, s)) {
- if ((*font = XLoadQueryFont(getBaseDisplay().getXDisplay(),
- s.c_str())) == NULL) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenFontLoadFail,
- "BScreen::LoadStyle(): couldn't load font '%s'\n"),
- s.c_str());
- load_default = true;
- }
- } else
- load_default = true;
-
- if (load_default) {
- if ((*font = XLoadQueryFont(getBaseDisplay().getXDisplay(),
- defaultFont)) == NULL) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenDefaultFontLoadFail,
- "BScreen::LoadStyle(): couldn't load default font.\n"));
- exit(2);
- }
- }
+void BScreen::saveAutoRaise(bool a) {
+ resource.auto_raise = a;
+ saveSloppyFocus(resource.sloppy_focus);
}
-XFontSet BScreen::createFontSet(const char *fontname) {
- XFontSet fs;
- char **missing, *def = "-";
- int nmissing, pixel_size = 0, buf_size = 0;
- char weight[FONT_ELEMENT_SIZE], slant[FONT_ELEMENT_SIZE];
-
- fs = XCreateFontSet(getBaseDisplay().getXDisplay(),
- fontname, &missing, &nmissing, &def);
- if (fs && (! nmissing)) return fs;
-
-#ifdef HAVE_SETLOCALE
- if (! fs) {
- if (nmissing) XFreeStringList(missing);
-
- setlocale(LC_CTYPE, "C");
- fs = XCreateFontSet(getBaseDisplay().getXDisplay(), fontname,
- &missing, &nmissing, &def);
- setlocale(LC_CTYPE, "");
- }
-#endif // HAVE_SETLOCALE
-
- if (fs) {
- XFontStruct **fontstructs;
- char **fontnames;
- XFontsOfFontSet(fs, &fontstructs, &fontnames);
- fontname = fontnames[0];
- }
+void BScreen::saveClickRaise(bool c) {
+ resource.click_raise = c;
+ saveSloppyFocus(resource.sloppy_focus);
+}
- getFontElement(fontname, weight, FONT_ELEMENT_SIZE,
- "-medium-", "-bold-", "-demibold-", "-regular-", NULL);
- getFontElement(fontname, slant, FONT_ELEMENT_SIZE,
- "-r-", "-i-", "-o-", "-ri-", "-ro-", NULL);
- getFontSize(fontname, &pixel_size);
- if (! strcmp(weight, "*")) strncpy(weight, "medium", FONT_ELEMENT_SIZE);
- if (! strcmp(slant, "*")) strncpy(slant, "r", FONT_ELEMENT_SIZE);
- if (pixel_size < 3) pixel_size = 3;
- else if (pixel_size > 97) pixel_size = 97;
+void BScreen::saveImageDither(bool d) {
+ image_control->setDither(d);
+ config->setValue(screenstr + "imageDither", doImageDither());
+}
- buf_size = strlen(fontname) + (FONT_ELEMENT_SIZE * 2) + 64;
- char *pattern2 = new char[buf_size];
- snprintf(pattern2, buf_size - 1,
- "%s,"
- "-*-*-%s-%s-*-*-%d-*-*-*-*-*-*-*,"
- "-*-*-*-*-*-*-%d-*-*-*-*-*-*-*,*",
- fontname, weight, slant, pixel_size, pixel_size);
- fontname = pattern2;
- if (nmissing) XFreeStringList(missing);
- if (fs) XFreeFontSet(getBaseDisplay().getXDisplay(), fs);
+void BScreen::saveOpaqueMove(bool o) {
+ resource.opaque_move = o;
+ config->setValue(screenstr + "opaqueMove", resource.opaque_move);
+}
- fs = XCreateFontSet(getBaseDisplay().getXDisplay(), fontname,
- &missing, &nmissing, &def);
- delete [] pattern2;
- return fs;
+void BScreen::saveFullMax(bool f) {
+ resource.full_max = f;
+ config->setValue(screenstr + "fullMaximization", resource.full_max);
}
-void BScreen::setSloppyFocus(bool b) {
- resource.sloppy_focus = b;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".focusModel" << ends;
- config.setValue(s.str(),
- (resource.sloppy_focus ?
- (resource.auto_raise ? "AutoRaiseSloppyFocus" : "SloppyFocus")
- : "ClickToFocus"));
- s.rdbuf()->freeze(0);
+void BScreen::saveFocusNew(bool f) {
+ resource.focus_new = f;
+ config->setValue(screenstr + "focusNewWindows", resource.focus_new);
}
-void BScreen::setAutoRaise(bool a) {
- resource.auto_raise = a;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".focusModel" << ends;
- config.setValue(s.str(),
- (resource.sloppy_focus ?
- (resource.auto_raise ? "AutoRaiseSloppyFocus" : "SloppyFocus")
- : "ClickToFocus"));
- s.rdbuf()->freeze(0);
+void BScreen::saveFocusLast(bool f) {
+ resource.focus_last = f;
+ config->setValue(screenstr + "focusLastWindow", resource.focus_last);
}
-void BScreen::setImageDither(bool d, bool reconfig) {
- image_control->setDither(d);
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".imageDither" << ends;
- config.setValue(s.str(), imageDither());
- if (reconfig)
- reconfigure();
- s.rdbuf()->freeze(0);
+void BScreen::saveAAFonts(bool f) {
+ resource.aa_fonts = f;
+ reconfigure();
+ config->setValue(screenstr + "antialiasFonts", resource.aa_fonts);
}
-void BScreen::setOpaqueMove(bool o) {
- resource.opaque_move = o;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".opaqueMove" << ends;
- config.setValue(s.str(), resource.opaque_move);
- s.rdbuf()->freeze(0);
+void BScreen::saveHideToolbar(bool h) {
+ resource.hide_toolbar = h;
+ if (resource.hide_toolbar)
+ toolbar->unmapToolbar();
+ else
+ toolbar->mapToolbar();
+ config->setValue(screenstr + "hideToolbar", resource.hide_toolbar);
}
-void BScreen::setFullMax(bool f) {
- resource.full_max = f;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".fullMaximization" << ends;
- config.setValue(s.str(), resource.full_max);
- s.rdbuf()->freeze(0);
+void BScreen::saveWindowToEdgeSnap(int s) {
+ resource.snap_to_edges = s;
+
+ const char *snap;
+ switch (resource.snap_to_edges) {
+ case WindowNoSnap: snap = "NoSnap"; break;
+ case WindowResistance: snap = "Resistance"; break;
+ case WindowSnap: default: snap = "Snap"; break;
+ }
+ config->setValue(screenstr + "windowToEdgeSnap", snap);
}
-void BScreen::setFocusNew(bool f) {
- resource.focus_new = f;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".focusNewWindows" << ends;
- config.setValue(s.str(), resource.focus_new);
- s.rdbuf()->freeze(0);
+void BScreen::saveWindowToWindowSnap(int s) {
+ resource.snap_to_windows = s;
+
+ const char *snap;
+ switch (resource.snap_to_windows) {
+ case WindowNoSnap: snap = "NoSnap"; break;
+ case WindowResistance: snap = "Resistance"; break;
+ case WindowSnap: default: snap = "Snap"; break;
+ }
+ config->setValue(screenstr + "windowToWindowSnap", snap);
}
-void BScreen::setFocusLast(bool f) {
- resource.focus_last = f;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".focusLastWindow" << ends;
- config.setValue(s.str(), resource.focus_last);
- s.rdbuf()->freeze(0);
+void BScreen::saveResizeZones(unsigned int z) {
+ resource.resize_zones = z;
+ config->setValue(screenstr + "resizeZones", resource.resize_zones);
}
-void BScreen::setWindowZones(int z) {
- resource.zones = z;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".windowZones" << ends;
- config.setValue(s.str(), resource.zones);
- s.rdbuf()->freeze(0);
+void BScreen::saveWindowCornerSnap(bool s) {
+ resource.window_corner_snap = s;
+ config->setValue(screenstr + "windowCornerSnap",
+ resource.window_corner_snap);
}
-void BScreen::setWorkspaceCount(int w) {
+void BScreen::saveWorkspaces(unsigned int w) {
resource.workspaces = w;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".workspaces" << ends;
- config.setValue(s.str(), resource.workspaces);
- s.rdbuf()->freeze(0);
+ config->setValue(screenstr + "workspaces", resource.workspaces);
}
-void BScreen::setPlacementPolicy(int p) {
- resource.placement_policy = p;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".windowPlacement" << ends;
+void BScreen::savePlacementPolicy(int p) {
+ resource.placement_policy = p;
const char *placement;
switch (resource.placement_policy) {
case CascadePlacement: placement = "CascadePlacement"; break;
- case BestFitPlacement: placement = "BestFitPlacement"; break;
- case ColSmartPlacement: placement = "ColSmartPlacement"; break;
case UnderMousePlacement: placement = "UnderMousePlacement"; break;
case ClickMousePlacement: placement = "ClickMousePlacement"; break;
- default:
- case RowSmartPlacement: placement = "RowSmartPlacement"; break;
+ case ColSmartPlacement: placement = "ColSmartPlacement"; break;
+ case RowSmartPlacement: default: placement = "RowSmartPlacement"; break;
}
- config.setValue(s.str(), placement);
- s.rdbuf()->freeze(0);
+ config->setValue(screenstr + "windowPlacement", placement);
}
-void BScreen::setEdgeSnapThreshold(int t) {
- resource.edge_snap_threshold = t;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".edgeSnapThreshold" << ends;
- config.setValue(s.str(), resource.edge_snap_threshold);
- s.rdbuf()->freeze(0);
+void BScreen::saveResistanceSize(int s) {
+ resource.resistance_size = s;
+ config->setValue(screenstr + "resistanceSize",
+ resource.resistance_size);
}
-void BScreen::setRowPlacementDirection(int d) {
- resource.row_direction = d;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".rowPlacementDirection" << ends;
- config.setValue(s.str(),
- resource.row_direction == LeftRight ?
- "LeftToRight" : "RightToLeft");
- s.rdbuf()->freeze(0);
+void BScreen::saveSnapThreshold(int t) {
+ resource.snap_threshold = t;
+ config->setValue(screenstr + "edgeSnapThreshold",
+ resource.snap_threshold);
}
-void BScreen::setColPlacementDirection(int d) {
- resource.col_direction = d;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".colPlacementDirection" << ends;
- config.setValue(s.str(),
- resource.col_direction == TopBottom ?
- "TopToBottom" : "BottomToTop");
- s.rdbuf()->freeze(0);
+void BScreen::saveSnapOffset(int t) {
+ resource.snap_offset = t;
+ config->setValue(screenstr + "edgeSnapOffset",
+ resource.snap_offset);
}
-void BScreen::setRootCommand(const char *cmd) {
-if (resource.root_command != NULL)
- delete [] resource.root_command;
- if (cmd != NULL)
- resource.root_command = bstrdup(cmd);
- else
- resource.root_command = NULL;
- // this doesn't save to the Resources config because it can't be changed
- // inside Openbox, and this way we dont add an empty command which would over-
- // ride the styles command when none has been specified
+void BScreen::saveRowPlacementDirection(int d) {
+ resource.row_direction = d;
+ config->setValue(screenstr + "rowPlacementDirection",
+ resource.row_direction == LeftRight ?
+ "LeftToRight" : "RightToLeft");
}
-#ifdef HAVE_STRFTIME
-void BScreen::setStrftimeFormat(const char *f) {
- if (resource.strftime_format != NULL)
- delete [] resource.strftime_format;
+void BScreen::saveColPlacementDirection(int d) {
+ resource.col_direction = d;
+ config->setValue(screenstr + "colPlacementDirection",
+ resource.col_direction == TopBottom ?
+ "TopToBottom" : "BottomToTop");
+}
- resource.strftime_format = bstrdup(f);
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".strftimeFormat" << ends;
- config.setValue(s.str(), resource.strftime_format);
- s.rdbuf()->freeze(0);
+
+#ifdef HAVE_STRFTIME
+void BScreen::saveStrftimeFormat(const std::string& format) {
+ resource.strftime_format = format;
+ config->setValue(screenstr + "strftimeFormat", resource.strftime_format);
}
#else // !HAVE_STRFTIME
-void BScreen::setDateFormat(int f) {
+void BScreen::saveDateFormat(int f) {
resource.date_format = f;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".dateFormat" << ends;
- config.setValue(s.str(), resource.date_format == B_EuropeanDate ?
- "European" : "American");
- s.rdbuf()->freeze(0);
+ config->setValue(screenstr + "dateFormat",
+ resource.date_format == B_EuropeanDate ?
+ "European" : "American");
}
-void BScreen::setClock24Hour(Bool c) {
+void BScreen::saveClock24Hour(bool c) {
resource.clock24hour = c;
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".clockFormat" << ends;
- config.setValue(s.str(), resource.clock24hour ? 24 : 12);
- s.rdbuf()->freeze(0);
+ config->setValue(screenstr + "clockFormat", resource.clock24hour ? 24 : 12);
}
#endif // HAVE_STRFTIME
-void BScreen::setHideToolbar(bool b) {
- resource.hide_toolbar = b;
- if (resource.hide_toolbar)
- getToolbar()->unMapToolbar();
- else
- getToolbar()->mapToolbar();
- ostrstream s;
- s << "session.screen" << getScreenNumber() << ".hideToolbar" << ends;
- config.setValue(s.str(), resource.hide_toolbar ? "True" : "False");
- s.rdbuf()->freeze(0);
+void BScreen::saveWorkspaceNames() {
+ string names;
+
+ for (unsigned int i = 0; i < workspacesList.size(); ++i) {
+ names += workspacesList[i]->getName();
+ if (i < workspacesList.size() - 1)
+ names += ',';
+ }
+
+ config->setValue(screenstr + "workspaceNames", names);
}
-void BScreen::saveWorkspaceNames() {
- ostrstream rc, names;
-
- wkspList::iterator it;
- wkspList::iterator last = workspacesList.end() - 1;
- for (it = workspacesList.begin(); it != workspacesList.end(); ++it) {
- names << (*it)->getName();
- if (it != last)
- names << ",";
+void BScreen::savePlaceIgnoreShaded(bool i) {
+ resource.ignore_shaded = i;
+ config->setValue(screenstr + "placementIgnoreShaded",
+ resource.ignore_shaded);
+}
+
+
+void BScreen::savePlaceIgnoreMaximized(bool i) {
+ resource.ignore_maximized = i;
+ config->setValue(screenstr + "placementIgnoreMaximized",
+ resource.ignore_maximized);
+}
+
+
+void BScreen::saveAllowScrollLock(bool a) {
+ resource.allow_scroll_lock = a;
+ config->setValue(screenstr + "disableBindingsWithScrollLock",
+ resource.allow_scroll_lock);
+}
+
+
+void BScreen::saveWorkspaceWarping(bool w) {
+ resource.workspace_warping = w;
+ config->setValue(screenstr + "workspaceWarping",
+ resource.workspace_warping);
+}
+
+
+void BScreen::saveRootScrollDirection(int d) {
+ resource.root_scroll = d;
+ const char *dir;
+ switch (resource.root_scroll) {
+ case NoScroll: dir = "None"; break;
+ case ReverseScroll: dir = "Reverse"; break;
+ case NormalScroll: default: dir = "Normal"; break;
}
- names << ends;
-
- rc << "session.screen" << getScreenNumber() << ".workspaceNames" << ends;
- config.setValue(rc.str(), names.str());
- rc.rdbuf()->freeze(0);
- names.rdbuf()->freeze(0);
-}
-
-void BScreen::save() {
- setSloppyFocus(resource.sloppy_focus);
- setAutoRaise(resource.auto_raise);
- setImageDither(imageDither(), false);
- setOpaqueMove(resource.opaque_move);
- setFullMax(resource.full_max);
- setFocusNew(resource.focus_new);
- setFocusLast(resource.focus_last);
- setWindowZones(resource.zones);
- setWorkspaceCount(resource.workspaces);
- setPlacementPolicy(resource.placement_policy);
- setEdgeSnapThreshold(resource.edge_snap_threshold);
- setRowPlacementDirection(resource.row_direction);
- setColPlacementDirection(resource.col_direction);
- setRootCommand(resource.root_command);
+ config->setValue(screenstr + "rootScrollDirection", dir);
+}
+
+
+void BScreen::save_rc(void) {
+ saveSloppyFocus(resource.sloppy_focus);
+ saveAutoRaise(resource.auto_raise);
+ saveImageDither(doImageDither());
+ saveAAFonts(resource.aa_fonts);
+ saveResizeZones(resource.resize_zones);
+ saveOpaqueMove(resource.opaque_move);
+ saveFullMax(resource.full_max);
+ saveFocusNew(resource.focus_new);
+ saveFocusLast(resource.focus_last);
+ saveHideToolbar(resource.hide_toolbar);
+ saveWindowToWindowSnap(resource.snap_to_windows);
+ saveWindowToEdgeSnap(resource.snap_to_edges);
+ saveWindowCornerSnap(resource.window_corner_snap);
+ saveWorkspaces(resource.workspaces);
+ savePlacementPolicy(resource.placement_policy);
+ saveSnapThreshold(resource.snap_threshold);
+ saveSnapOffset(resource.snap_offset);
+ saveResistanceSize(resource.resistance_size);
+ saveRowPlacementDirection(resource.row_direction);
+ saveColPlacementDirection(resource.col_direction);
#ifdef HAVE_STRFTIME
- // it deletes the current value before setting the new one, so we have to
- // duplicate the current value.
- std::string s = resource.strftime_format;
- setStrftimeFormat(s.c_str());
+ saveStrftimeFormat(resource.strftime_format);
#else // !HAVE_STRFTIME
- setDateFormat(resource.date_format);
- setClock24Hour(resource.clock24hour);
+ saveDateFormat(resource.date_format);
+ savwClock24Hour(resource.clock24hour);
#endif // HAVE_STRFTIME
- setHideToolbar(resource.hide_toolbar);
-
- toolbar->save();
-#ifdef SLIT
- slit->save();
-#endif // SLIT
+ savePlaceIgnoreShaded(resource.ignore_shaded);
+ savePlaceIgnoreMaximized(resource.ignore_maximized);
+ saveAllowScrollLock(resource.allow_scroll_lock);
+ saveWorkspaceWarping(resource.workspace_warping);
+ saveRootScrollDirection(resource.root_scroll);
+
+ toolbar->save_rc();
+ slit->save_rc();
}
-void BScreen::load() {
- ostrstream rscreen, rname, rclass;
+void BScreen::load_rc(void) {
std::string s;
bool b;
- long l;
- rscreen << "session.screen" << getScreenNumber() << '.' << ends;
-
- rname << rscreen.str() << "hideToolbar" << ends;
- rclass << rscreen.str() << "HideToolbar" << ends;
- if (config.getValue(rname.str(), rclass.str(), b))
- resource.hide_toolbar = b;
- else
- resource.hide_toolbar = false;
- Toolbar *t = getToolbar();
- if (t != NULL) {
- if (resource.hide_toolbar)
- t->unMapToolbar();
- else
- t->mapToolbar();
- }
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "fullMaximization" << ends;
- rclass << rscreen.str() << "FullMaximization" << ends;
- if (config.getValue(rname.str(), rclass.str(), b))
- resource.full_max = b;
- else
+ if (! config->getValue(screenstr + "fullMaximization", resource.full_max))
resource.full_max = false;
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "focusNewWindows" << ends;
- rclass << rscreen.str() << "FocusNewWindows" << ends;
- if (config.getValue(rname.str(), rclass.str(), b))
- resource.focus_new = b;
- else
+ if (! config->getValue(screenstr + "focusNewWindows", resource.focus_new))
resource.focus_new = false;
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "focusLastWindow" << ends;
- rclass << rscreen.str() << "FocusLastWindow" << ends;
- if (config.getValue(rname.str(), rclass.str(), b))
- resource.focus_last = b;
- else
+ if (! config->getValue(screenstr + "focusLastWindow", resource.focus_last))
resource.focus_last = false;
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "rowPlacementDirection" << ends;
- rclass << rscreen.str() << "RowPlacementDirection" << ends;
- if (config.getValue(rname.str(), rclass.str(), s)) {
- if (0 == strncasecmp(s.c_str(), "RightToLeft", s.length()))
- resource.row_direction = RightLeft;
- else //if (0 == strncasecmp(s.c_str(), "LeftToRight", s.length()))
- resource.row_direction = LeftRight;
- } else
+ if (! config->getValue(screenstr + "workspaces", resource.workspaces))
+ resource.workspaces = 1;
+
+ if (! config->getValue(screenstr + "opaqueMove", resource.opaque_move))
+ resource.opaque_move = false;
+
+ if (! config->getValue(screenstr + "antialiasFonts", resource.aa_fonts))
+ resource.aa_fonts = true;
+
+ if (! config->getValue(screenstr + "resizeZones", resource.resize_zones) ||
+ (resource.resize_zones != 1 && resource.resize_zones != 2 &&
+ resource.resize_zones != 4))
+ resource.resize_zones = 4;
+
+ if (! config->getValue(screenstr + "hideToolbar", resource.hide_toolbar))
+ resource.hide_toolbar = false;
+
+ resource.snap_to_windows = WindowResistance;
+ if (config->getValue(screenstr + "windowToWindowSnap", s)) {
+ if (s == "NoSnap")
+ resource.snap_to_windows = WindowNoSnap;
+ else if (s == "Snap")
+ resource.snap_to_windows = WindowSnap;
+ }
+
+ resource.snap_to_edges = WindowResistance;
+ if (config->getValue(screenstr + "windowToEdgeSnap", s)) {
+ if (s == "NoSnap")
+ resource.snap_to_edges = WindowNoSnap;
+ else if (s == "Snap")
+ resource.snap_to_edges = WindowSnap;
+ }
+
+ if (! config->getValue(screenstr + "windowCornerSnap",
+ resource.window_corner_snap))
+ resource.window_corner_snap = true;
+
+ if (! config->getValue(screenstr + "imageDither", b))
+ b = true;
+ image_control->setDither(b);
+
+ if (! config->getValue(screenstr + "edgeSnapOffset",
+ resource.snap_offset))
+ resource.snap_offset = 0;
+ if (resource.snap_offset > 50) // sanity check, setting this huge would
+ resource.snap_offset = 50; // seriously suck.
+
+ if (! config->getValue(screenstr + "edgeSnapThreshold",
+ resource.snap_threshold))
+ resource.snap_threshold = 4;
+
+ if (! config->getValue(screenstr + "resistanceSize",
+ resource.resistance_size))
+ resource.resistance_size = 18;
+
+ if (config->getValue(screenstr + "rowPlacementDirection", s) &&
+ s == "RightToLeft")
+ resource.row_direction = RightLeft;
+ else
resource.row_direction = LeftRight;
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "colPlacementDirection" << ends;
- rclass << rscreen.str() << "ColPlacementDirection" << ends;
- if (config.getValue(rname.str(), rclass.str(), s)) {
- if (0 == strncasecmp(s.c_str(), "BottomToTop", s.length()))
- resource.col_direction = BottomTop;
- else //if (0 == strncasecmp(s.c_str(), "TopToBottom", s.length()))
- resource.col_direction = TopBottom;
- } else
+ if (config->getValue(screenstr + "colPlacementDirection", s) &&
+ s == "BottomToTop")
+ resource.col_direction = BottomTop;
+ else
resource.col_direction = TopBottom;
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "workspaces" << ends;
- rclass << rscreen.str() << "Workspaces" << ends;
- if (config.getValue(rname.str(), rclass.str(), l)) {
- resource.workspaces = l;
- } else
- resource.workspaces = 1;
+ if (config->getValue(screenstr + "workspaceNames", s)) {
+ XAtom::StringVect workspaceNames;
- removeWorkspaceNames();
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "workspaceNames" << ends;
- rclass << rscreen.str() << "WorkspaceNames" << ends;
- if (config.getValue(rname.str(), rclass.str(), s)) {
string::const_iterator it = s.begin(), end = s.end();
while(1) {
- string::const_iterator tmp = it;// current string.begin()
+ string::const_iterator tmp = it; // current string.begin()
it = std::find(tmp, end, ','); // look for comma between tmp and end
- std::string name(tmp, it); // name = s[tmp:it]
- addWorkspaceName(name.c_str());
+ workspaceNames.push_back(string(tmp, it)); // s[tmp:it]
if (it == end)
break;
++it;
}
+
+ xatom->setValue(getRootWindow(), XAtom::net_desktop_names, XAtom::utf8,
+ workspaceNames);
}
-
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "focusModel" << ends;
- rclass << rscreen.str() << "FocusModel" << ends;
- if (config.getValue(rname.str(), rclass.str(), s)) {
- if (0 == strncasecmp(s.c_str(), "ClickToFocus", s.length())) {
- resource.auto_raise = false;
+
+ resource.sloppy_focus = true;
+ resource.auto_raise = false;
+ resource.click_raise = false;
+ if (config->getValue(screenstr + "focusModel", s)) {
+ if (s.find("ClickToFocus") != string::npos) {
resource.sloppy_focus = false;
- } else if (0 == strncasecmp(s.c_str(), "AutoRaiseSloppyFocus",
- s.length())) {
- resource.sloppy_focus = true;
- resource.auto_raise = true;
- } else { //if (0 == strncasecmp(s.c_str(), "SloppyFocus", s.length())) {
- resource.sloppy_focus = true;
- resource.auto_raise = false;
+ } else {
+ // must be sloppy
+ if (s.find("AutoRaise") != string::npos)
+ resource.auto_raise = true;
+ if (s.find("ClickRaise") != string::npos)
+ resource.click_raise = true;
}
- } else {
- resource.sloppy_focus = true;
- resource.auto_raise = false;
}
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "windowZones" << ends;
- rclass << rscreen.str() << "WindowZones" << ends;
- if (config.getValue(rname.str(), rclass.str(), l))
- resource.zones = (l == 1 || l == 2 || l == 4) ? l : 1;
- else
- resource.zones = 4;
-
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "windowPlacement" << ends;
- rclass << rscreen.str() << "WindowPlacement" << ends;
- if (config.getValue(rname.str(), rclass.str(), s)) {
- if (0 == strncasecmp(s.c_str(), "RowSmartPlacement", s.length()))
- resource.placement_policy = RowSmartPlacement;
- else if (0 == strncasecmp(s.c_str(), "ColSmartPlacement", s.length()))
- resource.placement_policy = ColSmartPlacement;
- else if (0 == strncasecmp(s.c_str(), "BestFitPlacement", s.length()))
- resource.placement_policy = BestFitPlacement;
- else if (0 == strncasecmp(s.c_str(), "UnderMousePlacement", s.length()))
+ if (config->getValue(screenstr + "windowPlacement", s)) {
+ if (s == "CascadePlacement")
+ resource.placement_policy = CascadePlacement;
+ else if (s == "UnderMousePlacement")
resource.placement_policy = UnderMousePlacement;
- else if (0 == strncasecmp(s.c_str(), "ClickMousePlacement", s.length()))
+ else if (s == "ClickMousePlacement")
resource.placement_policy = ClickMousePlacement;
- else //if (0 == strncasecmp(s.c_str(), "CascadePlacement", s.length()))
- resource.placement_policy = CascadePlacement;
+ else if (s == "ColSmartPlacement")
+ resource.placement_policy = ColSmartPlacement;
+ else //if (s == "RowSmartPlacement")
+ resource.placement_policy = RowSmartPlacement;
} else
- resource.placement_policy = CascadePlacement;
+ resource.placement_policy = RowSmartPlacement;
#ifdef HAVE_STRFTIME
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "strftimeFormat" << ends;
- rclass << rscreen.str() << "StrftimeFormat" << ends;
-
- if (resource.strftime_format != NULL)
- delete [] resource.strftime_format;
-
- if (config.getValue(rname.str(), rclass.str(), s))
- resource.strftime_format = bstrdup(s.c_str());
- else
- resource.strftime_format = bstrdup("%I:%M %p");
+ if (! config->getValue(screenstr + "strftimeFormat",
+ resource.strftime_format))
+ resource.strftime_format = "%I:%M %p";
#else // !HAVE_STRFTIME
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "dateFormat" << ends;
- rclass << rscreen.str() << "DateFormat" << ends;
- if (config.getValue(rname.str(), rclass.str(), s)) {
- if (strncasecmp(s.c_str(), "European", s.length()))
- resource.date_format = B_EuropeanDate;
- else //if (strncasecmp(s.c_str(), "American", s.length()))
- resource.date_format = B_AmericanDate;
- } else
+ long l;
+
+ if (config->getValue(screenstr + "dateFormat", s) && s == "European")
+ resource.date_format = B_EuropeanDate;
+ else
resource.date_format = B_AmericanDate;
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "clockFormat" << ends;
- rclass << rscreen.str() << "ClockFormat" << ends;
- if (config.getValue(rname.str(), rclass.str(), l)) {
- if (clock == 24)
- resource.clock24hour = true;
- else if (clock == 12)
- resource.clock24hour = false;
- } else
- resource.clock24hour = false;
+ if (! config->getValue(screenstr + "clockFormat", l))
+ l = 12;
+ resource.clock24hour = l == 24;
#endif // HAVE_STRFTIME
+
+ if (! config->getValue(screenstr + "placementIgnoreShaded",
+ resource.ignore_shaded))
+ resource.ignore_shaded = true;
+
+ if (! config->getValue(screenstr + "placementIgnoreMaximized",
+ resource.ignore_maximized))
+ resource.ignore_maximized = true;
+
+ if (! config->getValue(screenstr + "disableBindingsWithScrollLock",
+ resource.allow_scroll_lock))
+ resource.allow_scroll_lock = false;
+
+ if (! config->getValue(screenstr + "workspaceWarping",
+ resource.workspace_warping))
+ resource.workspace_warping = false;
+
+ resource.root_scroll = NormalScroll;
+ if (config->getValue(screenstr + "rootScrollDirection", s)) {
+ if (s == "None")
+ resource.root_scroll = NoScroll;
+ else if (s == "Reverse")
+ resource.root_scroll = ReverseScroll;
+ }
+}
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "edgeSnapThreshold" << ends;
- rclass << rscreen.str() << "EdgeSnapThreshold" << ends;
- if (config.getValue(rname.str(), rclass.str(), l))
- resource.edge_snap_threshold = l;
- else
- resource.edge_snap_threshold = 4;
-
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "imageDither" << ends;
- rclass << rscreen.str() << "ImageDither" << ends;
- if (config.getValue(rname.str(), rclass.str(), b))
- image_control->setDither(b);
- else
- image_control->setDither(true);
-
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "rootCommand" << ends;
- rclass << rscreen.str() << "RootCommand" << ends;
- if (resource.root_command != NULL)
- delete [] resource.root_command;
-
- if (config.getValue(rname.str(), rclass.str(), s))
- resource.root_command = bstrdup(s.c_str());
- else
- resource.root_command = NULL;
-
- rname.seekp(0); rclass.seekp(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
- rname << rscreen.str() << "opaqueMove" << ends;
- rclass << rscreen.str() << "OpaqueMove" << ends;
- if (config.getValue(rname.str(), rclass.str(), b))
- resource.opaque_move = b;
- else
- resource.opaque_move = false;
+void BScreen::changeWorkspaceCount(unsigned int new_count) {
+ assert(new_count > 0);
- rscreen.rdbuf()->freeze(0);
- rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0);
+ if (new_count < workspacesList.size()) {
+ // shrink
+ for (unsigned int i = workspacesList.size(); i > new_count; --i)
+ removeLastWorkspace();
+ // removeLast already sets the current workspace to the
+ // last available one.
+ } else if (new_count > workspacesList.size()) {
+ // grow
+ for(unsigned int i = workspacesList.size(); i < new_count; ++i)
+ addWorkspace();
+ }
}
+
void BScreen::reconfigure(void) {
- load();
- toolbar->load();
-#ifdef SLIT
- slit->load();
-#endif // SLIT
+ // don't reconfigure while saving the initial rc file, it's a waste and it
+ // breaks somethings (workspace names)
+ if (blackbox->isStartup()) return;
+
+ load_rc();
+ toolbar->load_rc();
+ slit->load_rc();
LoadStyle();
- XGCValues gcv;
- unsigned long gc_value_mask = GCForeground;
- if (! i18n->multibyte()) gc_value_mask |= GCFont;
+ // we need to do this explicitly, because just loading this value from the rc
+ // does nothing
+ changeWorkspaceCount(resource.workspaces);
- gcv.foreground = WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber());
+ XGCValues gcv;
+ gcv.foreground = WhitePixel(blackbox->getXDisplay(),
+ getScreenNumber());
gcv.function = GXinvert;
gcv.subwindow_mode = IncludeInferiors;
- XChangeGC(getBaseDisplay().getXDisplay(), opGC,
- GCForeground | GCFunction | GCSubwindowMode, &gcv);
+ XChangeGC(blackbox->getXDisplay(), opGC,
+ GCForeground | GCFunction | GCSubwindowMode, &gcv);
- gcv.foreground = resource.wstyle.l_text_focus.getPixel();
- if (resource.wstyle.font)
- gcv.font = resource.wstyle.font->fid;
- XChangeGC(getBaseDisplay().getXDisplay(), resource.wstyle.l_text_focus_gc,
- gc_value_mask, &gcv);
+ const char *s = i18n(ScreenSet, ScreenPositionLength,
+ "0: 0000 x 0: 0000");
- gcv.foreground = resource.wstyle.l_text_unfocus.getPixel();
- XChangeGC(getBaseDisplay().getXDisplay(), resource.wstyle.l_text_unfocus_gc,
- gc_value_mask, &gcv);
+ geom_w = resource.wstyle.font->measureString(s) + resource.bevel_width * 2;
+ geom_h = resource.wstyle.font->height() + resource.bevel_width * 2;
- gcv.foreground = resource.wstyle.b_pic_focus.getPixel();
- XChangeGC(getBaseDisplay().getXDisplay(), resource.wstyle.b_pic_focus_gc,
- GCForeground, &gcv);
+ BTexture* texture = &(resource.wstyle.l_focus);
+ geom_pixmap = texture->render(geom_w, geom_h, geom_pixmap);
+ if (geom_pixmap == ParentRelative) {
+ texture = &(resource.wstyle.t_focus);
+ geom_pixmap = texture->render(geom_w, geom_h, geom_pixmap);
+ }
+ if (! geom_pixmap)
+ XSetWindowBackground(blackbox->getXDisplay(), geom_window,
+ texture->color().pixel());
+ else
+ XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ geom_window, geom_pixmap);
- gcv.foreground = resource.wstyle.b_pic_unfocus.getPixel();
- XChangeGC(getBaseDisplay().getXDisplay(), resource.wstyle.b_pic_unfocus_gc,
- GCForeground, &gcv);
+ XSetWindowBorderWidth(blackbox->getXDisplay(), geom_window,
+ resource.border_width);
+ XSetWindowBorder(blackbox->getXDisplay(), geom_window,
+ resource.border_color.pixel());
- gcv.foreground = resource.mstyle.t_text.getPixel();
- if (resource.mstyle.t_font)
- gcv.font = resource.mstyle.t_font->fid;
- XChangeGC(getBaseDisplay().getXDisplay(), resource.mstyle.t_text_gc,
- gc_value_mask, &gcv);
+ workspacemenu->reconfigure();
+ iconmenu->reconfigure();
- gcv.foreground = resource.mstyle.f_text.getPixel();
- if (resource.mstyle.f_font)
- gcv.font = resource.mstyle.f_font->fid;
- XChangeGC(getBaseDisplay().getXDisplay(), resource.mstyle.f_text_gc,
- gc_value_mask, &gcv);
+ typedef std::vector<int> SubList;
+ SubList remember_subs;
- gcv.foreground = resource.mstyle.h_text.getPixel();
- XChangeGC(getBaseDisplay().getXDisplay(), resource.mstyle.h_text_gc,
- gc_value_mask, &gcv);
+ // save the current open menus
+ Basemenu *menu = rootmenu;
+ int submenu;
+ while ((submenu = menu->getCurrentSubmenu()) >= 0) {
+ remember_subs.push_back(submenu);
+ menu = menu->find(submenu)->submenu();
+ assert(menu);
+ }
+
+ InitMenu();
+ raiseWindows(0, 0);
+ rootmenu->reconfigure();
- gcv.foreground = resource.mstyle.d_text.getPixel();
- XChangeGC(getBaseDisplay().getXDisplay(), resource.mstyle.d_text_gc,
- gc_value_mask, &gcv);
+ // reopen the saved menus
+ menu = rootmenu;
+ const SubList::iterator subs_end = remember_subs.end();
+ for (SubList::iterator it = remember_subs.begin(); it != subs_end; ++it) {
+ menu->drawSubmenu(*it);
+ menu = menu->find(*it)->submenu();
+ if (! menu)
+ break;
+ }
- gcv.foreground = resource.mstyle.hilite.getColor()->getPixel();
- XChangeGC(getBaseDisplay().getXDisplay(), resource.mstyle.hilite_gc,
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.tstyle.l_text.getPixel();
- if (resource.tstyle.font)
- gcv.font = resource.tstyle.font->fid;
- XChangeGC(getBaseDisplay().getXDisplay(), resource.tstyle.l_text_gc,
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.tstyle.w_text.getPixel();
- XChangeGC(getBaseDisplay().getXDisplay(), resource.tstyle.w_text_gc,
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.tstyle.c_text.getPixel();
- XChangeGC(getBaseDisplay().getXDisplay(), resource.tstyle.c_text_gc,
- gc_value_mask, &gcv);
-
- gcv.foreground = resource.tstyle.b_pic.getPixel();
- XChangeGC(getBaseDisplay().getXDisplay(), resource.tstyle.b_pic_gc,
- gc_value_mask, &gcv);
-
- const char *s = i18n->getMessage(ScreenSet, ScreenPositionLength,
- "0: 0000 x 0: 0000");
- int l = strlen(s);
-
- if (i18n->multibyte()) {
- XRectangle ink, logical;
- XmbTextExtents(resource.wstyle.fontset, s, l, &ink, &logical);
- geom_w = logical.width;
-
- geom_h = resource.wstyle.fontset_extents->max_ink_extent.height;
- } else {
- geom_w = XTextWidth(resource.wstyle.font, s, l);
-
- geom_h = resource.wstyle.font->ascent +
- resource.wstyle.font->descent;
- }
-
- geom_w += (resource.bevel_width * 2);
- geom_h += (resource.bevel_width * 2);
-
- Pixmap tmp = geom_pixmap;
- if (resource.wstyle.l_focus.getTexture() & BImage_ParentRelative) {
- if (resource.wstyle.t_focus.getTexture() ==
- (BImage_Flat | BImage_Solid)) {
- geom_pixmap = None;
- XSetWindowBackground(getBaseDisplay().getXDisplay(), geom_window,
- resource.wstyle.t_focus.getColor()->getPixel());
- } else {
- geom_pixmap = image_control->renderImage(geom_w, geom_h,
- &resource.wstyle.t_focus);
- XSetWindowBackgroundPixmap(getBaseDisplay().getXDisplay(),
- geom_window, geom_pixmap);
- }
- } else {
- if (resource.wstyle.l_focus.getTexture() ==
- (BImage_Flat | BImage_Solid)) {
- geom_pixmap = None;
- XSetWindowBackground(getBaseDisplay().getXDisplay(), geom_window,
- resource.wstyle.l_focus.getColor()->getPixel());
- } else {
- geom_pixmap = image_control->renderImage(geom_w, geom_h,
- &resource.wstyle.l_focus);
- XSetWindowBackgroundPixmap(getBaseDisplay().getXDisplay(),
- geom_window, geom_pixmap);
- }
- }
- if (tmp) image_control->removeImage(tmp);
-
- XSetWindowBorderWidth(getBaseDisplay().getXDisplay(), geom_window,
- resource.border_width);
- XSetWindowBorder(getBaseDisplay().getXDisplay(), geom_window,
- resource.border_color.getPixel());
-
- workspacemenu->reconfigure();
- iconmenu->reconfigure();
-
- {
- int remember_sub = rootmenu->getCurrentSubmenu();
- InitMenu();
- raiseWindows(0, 0);
- rootmenu->reconfigure();
- rootmenu->drawSubmenu(remember_sub);
- }
-
- configmenu->reconfigure();
+ configmenu->reconfigure();
toolbar->reconfigure();
-#ifdef SLIT
slit->reconfigure();
-#endif // SLIT
std::for_each(workspacesList.begin(), workspacesList.end(),
std::mem_fun(&Workspace::reconfigure));
- for (winList::iterator it = iconList.begin(); it != iconList.end(); ++it)
- if ((*it)->validateClient())
- (*it)->reconfigure();
+ BlackboxWindowList::iterator iit = iconList.begin();
+ for (; iit != iconList.end(); ++iit) {
+ BlackboxWindow *bw = *iit;
+ if (bw->validateClient())
+ bw->reconfigure();
+ }
image_control->timeout();
}
}
-void BScreen::removeWorkspaceNames(void) {
- workspaceNames.clear();
-}
-
-
void BScreen::LoadStyle(void) {
- Resource &conf = resource.styleconfig;
-
- const char *sfile = openbox.getStyleFilename();
- bool loaded = false;
+ Configuration style(False);
+
+ const char *sfile = blackbox->getStyleFilename();
if (sfile != NULL) {
- conf.setFile(sfile);
- loaded = conf.load();
- }
- if (!loaded) {
- conf.setFile(DEFAULTSTYLE);
- if (!conf.load()) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenDefaultStyleLoadFail,
- "BScreen::LoadStyle(): couldn't load "
- "default style.\n"));
- exit(2);
+ style.setFile(sfile);
+ if (! style.load()) {
+ style.setFile(DEFAULTSTYLE);
+ if (! style.load())
+ style.create(); // hardcoded default values will be used.
}
}
- std::string s;
- long l;
-
+ // merge in the rc file
+ style.merge(config->file(), True);
+
+ string s;
+
// load fonts/fontsets
+ if (resource.wstyle.font)
+ delete resource.wstyle.font;
+ if (resource.tstyle.font)
+ delete resource.tstyle.font;
+ if (resource.mstyle.f_font)
+ delete resource.mstyle.f_font;
+ if (resource.mstyle.t_font)
+ delete resource.mstyle.t_font;
+ resource.wstyle.font = resource.tstyle.font = resource.mstyle.f_font =
+ resource.mstyle.t_font = (BFont *) 0;
- if (i18n->multibyte()) {
- readDatabaseFontSet("window.font", "Window.Font",
- &resource.wstyle.fontset);
- readDatabaseFontSet("toolbar.font", "Toolbar.Font",
- &resource.tstyle.fontset);
- readDatabaseFontSet("menu.title.font", "Menu.Title.Font",
- &resource.mstyle.t_fontset);
- readDatabaseFontSet("menu.frame.font", "Menu.Frame.Font",
- &resource.mstyle.f_fontset);
-
- resource.mstyle.t_fontset_extents =
- XExtentsOfFontSet(resource.mstyle.t_fontset);
- resource.mstyle.f_fontset_extents =
- XExtentsOfFontSet(resource.mstyle.f_fontset);
- resource.tstyle.fontset_extents =
- XExtentsOfFontSet(resource.tstyle.fontset);
- resource.wstyle.fontset_extents =
- XExtentsOfFontSet(resource.wstyle.fontset);
- } else {
- readDatabaseFont("window.font", "Window.Font",
- &resource.wstyle.font);
- readDatabaseFont("menu.title.font", "Menu.Title.Font",
- &resource.mstyle.t_font);
- readDatabaseFont("menu.frame.font", "Menu.Frame.Font",
- &resource.mstyle.f_font);
- readDatabaseFont("toolbar.font", "Toolbar.Font",
- &resource.tstyle.font);
- }
+ resource.wstyle.font = readDatabaseFont("window.", style);
+ resource.tstyle.font = readDatabaseFont("toolbar.", style);
+ resource.mstyle.t_font = readDatabaseFont("menu.title.", style);
+ resource.mstyle.f_font = readDatabaseFont("menu.frame.", style);
// load window config
- readDatabaseTexture("window.title.focus", "Window.Title.Focus",
- &resource.wstyle.t_focus,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("window.title.unfocus", "Window.Title.Unfocus",
- &resource.wstyle.t_unfocus,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("window.label.focus", "Window.Label.Focus",
- &resource.wstyle.l_focus,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("window.label.unfocus", "Window.Label.Unfocus",
- &resource.wstyle.l_unfocus,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("window.handle.focus", "Window.Handle.Focus",
- &resource.wstyle.h_focus,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("window.handle.unfocus", "Window.Handle.Unfocus",
- &resource.wstyle.h_unfocus,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("window.grip.focus", "Window.Grip.Focus",
- &resource.wstyle.g_focus,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("window.grip.unfocus", "Window.Grip.Unfocus",
- &resource.wstyle.g_unfocus,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("window.button.focus", "Window.Button.Focus",
- &resource.wstyle.b_focus,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("window.button.unfocus", "Window.Button.Unfocus",
- &resource.wstyle.b_unfocus,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("window.button.pressed", "Window.Button.Pressed",
- &resource.wstyle.b_pressed,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("window.frame.focusColor",
- "Window.Frame.FocusColor",
- &resource.wstyle.f_focus,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("window.frame.unfocusColor",
- "Window.Frame.UnfocusColor",
- &resource.wstyle.f_unfocus,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("window.label.focus.textColor",
- "Window.Label.Focus.TextColor",
- &resource.wstyle.l_text_focus,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("window.label.unfocus.textColor",
- "Window.Label.Unfocus.TextColor",
- &resource.wstyle.l_text_unfocus,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("window.button.focus.picColor",
- "Window.Button.Focus.PicColor",
- &resource.wstyle.b_pic_focus,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("window.button.unfocus.picColor",
- "Window.Button.Unfocus.PicColor",
- &resource.wstyle.b_pic_unfocus,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
-
- if (conf.getValue("window.justify", "Window.Justify", s)) {
- if (0 == strncasecmp(s.c_str(), "right", s.length()))
- resource.wstyle.justify = BScreen::RightJustify;
- else if (0 == strncasecmp(s.c_str(), "center", s.length()))
- resource.wstyle.justify = BScreen::CenterJustify;
- else
- resource.wstyle.justify = BScreen::LeftJustify;
- } else
- resource.wstyle.justify = BScreen::LeftJustify;
-
- // load toolbar config
- readDatabaseTexture("toolbar", "Toolbar",
- &resource.tstyle.toolbar,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("toolbar.label", "Toolbar.Label",
- &resource.tstyle.label,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("toolbar.windowLabel", "Toolbar.WindowLabel",
- &resource.tstyle.window,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("toolbar.button", "Toolbar.Button",
- &resource.tstyle.button,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("toolbar.button.pressed", "Toolbar.Button.Pressed",
- &resource.tstyle.pressed,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("toolbar.clock", "Toolbar.Clock",
- &resource.tstyle.clock,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("toolbar.label.textColor", "Toolbar.Label.TextColor",
- &resource.tstyle.l_text,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("toolbar.windowLabel.textColor",
- "Toolbar.WindowLabel.TextColor",
- &resource.tstyle.w_text,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("toolbar.clock.textColor", "Toolbar.Clock.TextColor",
- &resource.tstyle.c_text,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("toolbar.button.picColor", "Toolbar.Button.PicColor",
- &resource.tstyle.b_pic,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
-
- if (conf.getValue("toolbar.justify", "Toolbar.Justify", s)) {
- if (0 == strncasecmp(s.c_str(), "right", s.length()))
- resource.tstyle.justify = BScreen::RightJustify;
- else if (0 == strncasecmp(s.c_str(), "center", s.length()))
- resource.tstyle.justify = BScreen::CenterJustify;
- else
- resource.tstyle.justify = BScreen::LeftJustify;
- } else
- resource.tstyle.justify = BScreen::LeftJustify;
+ resource.wstyle.t_focus =
+ readDatabaseTexture("window.title.focus", "white", style);
+ resource.wstyle.t_unfocus =
+ readDatabaseTexture("window.title.unfocus", "black", style);
+ resource.wstyle.l_focus =
+ readDatabaseTexture("window.label.focus", "white", style);
+ resource.wstyle.l_unfocus =
+ readDatabaseTexture("window.label.unfocus", "black", style);
+ resource.wstyle.h_focus =
+ readDatabaseTexture("window.handle.focus", "white", style);
+ resource.wstyle.h_unfocus =
+ readDatabaseTexture("window.handle.unfocus", "black", style);
+ resource.wstyle.g_focus =
+ readDatabaseTexture("window.grip.focus", "white", style);
+ resource.wstyle.g_unfocus =
+ readDatabaseTexture("window.grip.unfocus", "black", style);
+ resource.wstyle.b_focus =
+ readDatabaseTexture("window.button.focus", "white", style);
+ resource.wstyle.b_unfocus =
+ readDatabaseTexture("window.button.unfocus", "black", style);
+ resource.wstyle.b_pressed =
+ readDatabaseTexture("window.button.pressed", "black", style);
+
+ // we create the window.frame texture by hand because it exists only to
+ // make the code cleaner and is not actually used for display
+ BColor color = readDatabaseColor("window.frame.focusColor", "white", style);
+ resource.wstyle.f_focus = BTexture("solid flat", getBaseDisplay(),
+ getScreenNumber(), image_control);
+ resource.wstyle.f_focus.setColor(color);
+
+ color = readDatabaseColor("window.frame.unfocusColor", "white", style);
+ resource.wstyle.f_unfocus = BTexture("solid flat", getBaseDisplay(),
+ getScreenNumber(), image_control);
+ resource.wstyle.f_unfocus.setColor(color);
+
+ resource.wstyle.l_text_focus =
+ readDatabaseColor("window.label.focus.textColor", "black", style);
+ resource.wstyle.l_text_unfocus =
+ readDatabaseColor("window.label.unfocus.textColor", "white", style);
+ resource.wstyle.b_pic_focus =
+ readDatabaseColor("window.button.focus.picColor", "black", style);
+ resource.wstyle.b_pic_unfocus =
+ readDatabaseColor("window.button.unfocus.picColor", "white", style);
+
+ resource.wstyle.justify = LeftJustify;
+ if (style.getValue("window.justify", s)) {
+ if (s == "right" || s == "Right")
+ resource.wstyle.justify = RightJustify;
+ else if (s == "center" || s == "Center")
+ resource.wstyle.justify = CenterJustify;
+ }
+
+ // sanity checks
+ if (resource.wstyle.t_focus.texture() == BTexture::Parent_Relative)
+ resource.wstyle.t_focus = resource.wstyle.f_focus;
+ if (resource.wstyle.t_unfocus.texture() == BTexture::Parent_Relative)
+ resource.wstyle.t_unfocus = resource.wstyle.f_unfocus;
+ if (resource.wstyle.h_focus.texture() == BTexture::Parent_Relative)
+ resource.wstyle.h_focus = resource.wstyle.f_focus;
+ if (resource.wstyle.h_unfocus.texture() == BTexture::Parent_Relative)
+ resource.wstyle.h_unfocus = resource.wstyle.f_unfocus;
+
+// load toolbar config
+ resource.tstyle.toolbar =
+ readDatabaseTexture("toolbar", "black", style);
+ resource.tstyle.label =
+ readDatabaseTexture("toolbar.label", "black", style);
+ resource.tstyle.window =
+ readDatabaseTexture("toolbar.windowLabel", "black", style);
+ resource.tstyle.button =
+ readDatabaseTexture("toolbar.button", "white", style);
+ resource.tstyle.pressed =
+ readDatabaseTexture("toolbar.button.pressed", "black", style);
+ resource.tstyle.clock =
+ readDatabaseTexture("toolbar.clock", "black", style);
+ resource.tstyle.l_text =
+ readDatabaseColor("toolbar.label.textColor", "white", style);
+ resource.tstyle.w_text =
+ readDatabaseColor("toolbar.windowLabel.textColor", "white", style);
+ resource.tstyle.c_text =
+ readDatabaseColor("toolbar.clock.textColor", "white", style);
+ resource.tstyle.b_pic =
+ readDatabaseColor("toolbar.button.picColor", "black", style);
+
+ resource.tstyle.justify = LeftJustify;
+ if (style.getValue("toolbar.justify", s)) {
+ if (s == "right" || s == "Right")
+ resource.tstyle.justify = RightJustify;
+ else if (s == "center" || s == "Center")
+ resource.tstyle.justify = CenterJustify;
+ }
+
+ // sanity checks
+ if (resource.tstyle.toolbar.texture() == BTexture::Parent_Relative) {
+ resource.tstyle.toolbar = BTexture("solid flat", getBaseDisplay(),
+ getScreenNumber(), image_control);
+ resource.tstyle.toolbar.setColor(BColor("black", getBaseDisplay(),
+ getScreenNumber()));
+ }
// load menu config
- readDatabaseTexture("menu.title", "Menu.Title",
- &resource.mstyle.title,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("menu.frame", "Menu.Frame",
- &resource.mstyle.frame,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseTexture("menu.hilite", "Menu.Hilite",
- &resource.mstyle.hilite,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("menu.title.textColor", "Menu.Title.TextColor",
- &resource.mstyle.t_text,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("menu.frame.textColor", "Menu.Frame.TextColor",
- &resource.mstyle.f_text,
- WhitePixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("menu.frame.disableColor", "Menu.Frame.DisableColor",
- &resource.mstyle.d_text,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
- readDatabaseColor("menu.hilite.textColor", "Menu.Hilite.TextColor",
- &resource.mstyle.h_text,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
-
- if (conf.getValue("menu.title.justify", "Menu.Title.Justify", s)) {
- if (0 == strncasecmp(s.c_str(), "right", s.length()))
- resource.mstyle.t_justify = BScreen::RightJustify;
- else if (0 == strncasecmp(s.c_str(), "center", s.length()))
- resource.mstyle.t_justify = BScreen::CenterJustify;
- else
- resource.mstyle.t_justify = BScreen::LeftJustify;
- } else
- resource.mstyle.t_justify = BScreen::LeftJustify;
+ resource.mstyle.title =
+ readDatabaseTexture("menu.title", "white", style);
+ resource.mstyle.frame =
+ readDatabaseTexture("menu.frame", "black", style);
+ resource.mstyle.hilite =
+ readDatabaseTexture("menu.hilite", "white", style);
+ resource.mstyle.t_text =
+ readDatabaseColor("menu.title.textColor", "black", style);
+ resource.mstyle.f_text =
+ readDatabaseColor("menu.frame.textColor", "white", style);
+ resource.mstyle.d_text =
+ readDatabaseColor("menu.frame.disableColor", "black", style);
+ resource.mstyle.h_text =
+ readDatabaseColor("menu.hilite.textColor", "black", style);
+
+ resource.mstyle.t_justify = LeftJustify;
+ if (style.getValue("menu.title.justify", s)) {
+ if (s == "right" || s == "Right")
+ resource.mstyle.t_justify = RightJustify;
+ else if (s == "center" || s == "Center")
+ resource.mstyle.t_justify = CenterJustify;
+ }
- if (conf.getValue("menu.frame.justify", "Menu.Frame.Justify", s)) {
- if (0 == strncasecmp(s.c_str(), "right", s.length()))
- resource.mstyle.f_justify = BScreen::RightJustify;
- else if (0 == strncasecmp(s.c_str(), "center", s.length()))
- resource.mstyle.f_justify = BScreen::CenterJustify;
- else
- resource.mstyle.f_justify = BScreen::LeftJustify;
- } else
- resource.mstyle.f_justify = BScreen::LeftJustify;
+ resource.mstyle.f_justify = LeftJustify;
+ if (style.getValue("menu.frame.justify", s)) {
+ if (s == "right" || s == "Right")
+ resource.mstyle.f_justify = RightJustify;
+ else if (s == "center" || s == "Center")
+ resource.mstyle.f_justify = CenterJustify;
+ }
- if (conf.getValue("menu.bullet", "Menu.Bullet", s)) {
- if (0 == strncasecmp(s.c_str(), "empty", s.length()))
+ resource.mstyle.bullet = Basemenu::Triangle;
+ if (style.getValue("menu.bullet", s)) {
+ if (s == "empty" || s == "Empty")
resource.mstyle.bullet = Basemenu::Empty;
- else if (0 == strncasecmp(s.c_str(), "square", s.length()))
+ else if (s == "square" || s == "Square")
resource.mstyle.bullet = Basemenu::Square;
- else if (0 == strncasecmp(s.c_str(), "diamond", s.length()))
+ else if (s == "diamond" || s == "Diamond")
resource.mstyle.bullet = Basemenu::Diamond;
- else
- resource.mstyle.bullet = Basemenu::Triangle;
- } else
- resource.mstyle.bullet = Basemenu::Triangle;
+ }
- if (conf.getValue("menu.bullet.position", "Menu.Bullet.Position", s)) {
- if (0 == strncasecmp(s.c_str(), "right", s.length()))
+ resource.mstyle.bullet_pos = Basemenu::Left;
+ if (style.getValue("menu.bullet.position", s)) {
+ if (s == "right" || s == "Right")
resource.mstyle.bullet_pos = Basemenu::Right;
- else
- resource.mstyle.bullet_pos = Basemenu::Left;
- } else
- resource.mstyle.bullet_pos = Basemenu::Left;
+ }
- readDatabaseColor("borderColor", "BorderColor", &resource.border_color,
- BlackPixel(getBaseDisplay().getXDisplay(),
- getScreenNumber()));
+ // sanity checks
+ if (resource.mstyle.frame.texture() == BTexture::Parent_Relative) {
+ resource.mstyle.frame = BTexture("solid flat", getBaseDisplay(),
+ getScreenNumber(), image_control);
+ resource.mstyle.frame.setColor(BColor("black", getBaseDisplay(),
+ getScreenNumber()));
+ }
+
+ resource.border_color =
+ readDatabaseColor("borderColor", "black", style);
// load bevel, border and handle widths
- if (conf.getValue("handleWidth", "HandleWidth", l)) {
- if (l <= size().w() / 2 && l != 0)
- resource.handle_width = l;
- else
- resource.handle_width = 6;
- } else
+ if (! style.getValue("handleWidth", resource.handle_width) ||
+ resource.handle_width > (getWidth() / 2) || resource.handle_width == 0)
resource.handle_width = 6;
- if (conf.getValue("borderWidth", "BorderWidth", l))
- resource.border_width = l;
- else
+ if (! style.getValue("borderWidth", resource.border_width))
resource.border_width = 1;
- if (conf.getValue("bevelWidth", "BevelWidth", l)) {
- if (l <= size().w() / 2 && l != 0)
- resource.bevel_width = l;
- else
- resource.bevel_width = 3;
- } else
+ if (! style.getValue("bevelWidth", resource.bevel_width) ||
+ resource.bevel_width > (getWidth() / 2) || resource.bevel_width == 0)
resource.bevel_width = 3;
- if (conf.getValue("frameWidth", "FrameWidth", l)) {
- if (l <= size().w() / 2)
- resource.frame_width = l;
- else
- resource.frame_width = resource.bevel_width;
- } else
+ if (! style.getValue("frameWidth", resource.frame_width) ||
+ resource.frame_width > (getWidth() / 2))
resource.frame_width = resource.bevel_width;
- const char *cmd = resource.root_command;
- if (cmd != NULL || conf.getValue("rootCommand", "RootCommand", s)) {
- if (cmd == NULL)
- cmd = s.c_str(); // not specified by the screen, so use the one from the
- // style file
-#ifndef __EMX__
- char displaystring[MAXPATHLEN];
- sprintf(displaystring, "DISPLAY=%s",
- DisplayString(getBaseDisplay().getXDisplay()));
- sprintf(displaystring + strlen(displaystring) - 1, "%d",
- getScreenNumber());
-
- bexec(cmd, displaystring);
-#else // __EMX__
- spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", cmd, NULL);
-#endif // !__EMX__
- }
+ if (style.getValue("rootCommand", s))
+ bexec(s, displayString());
}
-void BScreen::addIcon(OpenboxWindow *w) {
+void BScreen::addIcon(BlackboxWindow *w) {
if (! w) return;
- w->setWorkspace(-1);
+ w->setWorkspace(BSENTINEL);
w->setWindowNumber(iconList.size());
iconList.push_back(w);
- iconmenu->insert((const char **) w->getIconTitle());
+ const char* title = w->getIconTitle();
+ iconmenu->insert(title);
iconmenu->update();
}
-void BScreen::removeIcon(OpenboxWindow *w) {
+void BScreen::removeIcon(BlackboxWindow *w) {
if (! w) return;
iconList.remove(w);
iconmenu->remove(w->getWindowNumber());
iconmenu->update();
- winList::iterator it = iconList.begin();
- for (int i = 0; it != iconList.end(); ++it, ++i)
- (*it)->setWindowNumber(i);
+ BlackboxWindowList::iterator it = iconList.begin(),
+ end = iconList.end();
+ for (int i = 0; it != end; ++it)
+ (*it)->setWindowNumber(i++);
}
-OpenboxWindow *BScreen::getIcon(int index) {
- if (index < 0 || index >= iconList.size())
- return (OpenboxWindow *) 0;
+BlackboxWindow *BScreen::getIcon(unsigned int index) {
+ if (index < iconList.size()) {
+ BlackboxWindowList::iterator it = iconList.begin();
+ while (index-- > 0) // increment to index
+ ++it;
+ return *it;
+ }
- winList::iterator it = iconList.begin();
- for (; index > 0; --index, ++it); // increment to index
- return *it;
+ return (BlackboxWindow *) 0;
}
-int BScreen::addWorkspace(void) {
- Workspace *wkspc = new Workspace(*this, workspacesList.size());
+unsigned int BScreen::addWorkspace(void) {
+ Workspace *wkspc = new Workspace(this, workspacesList.size());
workspacesList.push_back(wkspc);
- setWorkspaceCount(workspaceCount()+1);
+ saveWorkspaces(getWorkspaceCount());
saveWorkspaceNames();
- workspacemenu->insert(wkspc->getName(), wkspc->getMenu(),
- wkspc->getWorkspaceID() + 2);
+ workspacemenu->insertWorkspace(wkspc);
workspacemenu->update();
toolbar->reconfigure();
}
-int BScreen::removeLastWorkspace(void) {
+unsigned int BScreen::removeLastWorkspace(void) {
if (workspacesList.size() == 1)
- return 0;
+ return 1;
Workspace *wkspc = workspacesList.back();
- if (current_workspace->getWorkspaceID() == wkspc->getWorkspaceID())
- changeWorkspaceID(current_workspace->getWorkspaceID() - 1);
+ if (current_workspace->getID() == wkspc->getID())
+ changeWorkspaceID(current_workspace->getID() - 1);
wkspc->removeAll();
- workspacemenu->remove(wkspc->getWorkspaceID() + 2);
+ workspacemenu->removeWorkspace(wkspc);
workspacemenu->update();
workspacesList.pop_back();
delete wkspc;
-
- setWorkspaceCount(workspaceCount()-1);
+
+ saveWorkspaces(getWorkspaceCount());
saveWorkspaceNames();
toolbar->reconfigure();
}
-void BScreen::changeWorkspaceID(int id) {
- if (! current_workspace) return;
+void BScreen::changeWorkspaceID(unsigned int id) {
+ if (! current_workspace || id == current_workspace->getID()) return;
+
+ BlackboxWindow *focused = blackbox->getFocusedWindow();
+ if (focused && focused->getScreen() == this) {
+ assert(focused->isStuck() ||
+ focused->getWorkspaceNumber() == current_workspace->getID());
+
+ current_workspace->setLastFocusedWindow(focused);
+ } else {
+ // if no window had focus, no need to store a last focus
+ current_workspace->setLastFocusedWindow((BlackboxWindow *) 0);
+ }
+
+ // when we switch workspaces, unfocus whatever was focused
+ blackbox->setFocusedWindow((BlackboxWindow *) 0);
+
+ current_workspace->hideAll();
+ workspacemenu->setItemSelected(current_workspace->getID() + 2, False);
+
+ current_workspace = getWorkspace(id);
+
+ xatom->setValue(getRootWindow(), XAtom::net_current_desktop,
+ XAtom::cardinal, id);
+
+ workspacemenu->setItemSelected(current_workspace->getID() + 2, True);
+ toolbar->redrawWorkspaceLabel(True);
+
+ current_workspace->showAll();
+
+ if (resource.focus_last && current_workspace->getLastFocusedWindow()) {
+ XSync(blackbox->getXDisplay(), False);
+ current_workspace->getLastFocusedWindow()->setInputFocus();
+ }
+
+ updateNetizenCurrentWorkspace();
+}
+
+
+/*
+ * Set the _NET_CLIENT_LIST root window property.
+ */
+void BScreen::updateClientList(void) {
+ if (windowList.size() > 0) {
+ Window *windows = new Window[windowList.size()];
+ Window *win_it = windows;
+ BlackboxWindowList::iterator it = windowList.begin();
+ const BlackboxWindowList::iterator end = windowList.end();
+ for (; it != end; ++it, ++win_it)
+ *win_it = (*it)->getClientWindow();
+ xatom->setValue(getRootWindow(), XAtom::net_client_list, XAtom::window,
+ windows, windowList.size());
+ delete [] windows;
+ } else
+ xatom->setValue(getRootWindow(), XAtom::net_client_list, XAtom::window,
+ 0, 0);
+
+ updateStackingList();
+}
+
+
+/*
+ * Set the _NET_CLIENT_LIST_STACKING root window property.
+ */
+void BScreen::updateStackingList(void) {
+
+ BlackboxWindowList stack_order;
+
+ /*
+ * Get the stacking order from all of the workspaces.
+ * We start with the current workspace so that the sticky windows will be
+ * in the right order on the current workspace.
+ * XXX: Do we need to have sticky windows in the list once for each workspace?
+ */
+ getCurrentWorkspace()->appendStackOrder(stack_order);
+ for (unsigned int i = 0; i < getWorkspaceCount(); ++i)
+ if (i != getCurrentWorkspaceID())
+ getWorkspace(i)->appendStackOrder(stack_order);
+
+ if (stack_order.size() > 0) {
+ // set the client list atoms
+ Window *windows = new Window[stack_order.size()];
+ Window *win_it = windows;
+ BlackboxWindowList::iterator it = stack_order.begin(),
+ end = stack_order.end();
+ for (; it != end; ++it, ++win_it)
+ *win_it = (*it)->getClientWindow();
+ xatom->setValue(getRootWindow(), XAtom::net_client_list_stacking,
+ XAtom::window, windows, stack_order.size());
+ delete [] windows;
+ } else
+ xatom->setValue(getRootWindow(), XAtom::net_client_list_stacking,
+ XAtom::window, 0, 0);
+}
+
- if (id != current_workspace->getWorkspaceID()) {
- current_workspace->hideAll();
+void BScreen::addSystrayWindow(Window window) {
+ systrayWindowList.push_back(window);
+ xatom->setValue(getRootWindow(), XAtom::kde_net_system_tray_windows,
+ XAtom::window,
+ &systrayWindowList[0], systrayWindowList.size());
+ blackbox->saveSystrayWindowSearch(window, this);
+}
- workspacemenu->setItemSelected(current_workspace->getWorkspaceID() + 2,
- False);
- if (openbox.focusedWindow() &&
- openbox.focusedWindow()->getScreen() == this &&
- (! openbox.focusedWindow()->isStuck())) {
- current_workspace->setLastFocusedWindow(openbox.focusedWindow());
- openbox.focusWindow((OpenboxWindow *) 0);
+void BScreen::removeSystrayWindow(Window window) {
+ WindowList::iterator it = systrayWindowList.begin();
+ const WindowList::iterator end = systrayWindowList.end();
+ for (; it != end; ++it)
+ if (*it == window) {
+ systrayWindowList.erase(it);
+ xatom->setValue(getRootWindow(), XAtom::kde_net_system_tray_windows,
+ XAtom::window,
+ &systrayWindowList[0], systrayWindowList.size());
+ blackbox->removeSystrayWindowSearch(window);
+ break;
}
+}
- current_workspace = getWorkspace(id);
- workspacemenu->setItemSelected(current_workspace->getWorkspaceID() + 2,
- True);
- toolbar->redrawWorkspaceLabel(True);
+void BScreen::manageWindow(Window w) {
+ // is the window a KDE systray window?
+ Window systray;
+ if (xatom->getValue(w, XAtom::kde_net_wm_system_tray_window_for,
+ XAtom::window, systray) && systray) {
+ addSystrayWindow(w);
+ return;
+ }
+
+ // is the window a docking app
+ XWMHints *wmhint = XGetWMHints(blackbox->getXDisplay(), w);
+ if (wmhint && (wmhint->flags & StateHint) &&
+ wmhint->initial_state == WithdrawnState) {
+ slit->addClient(w);
+ return;
+ }
+
+ new BlackboxWindow(blackbox, w, this);
+
+ BlackboxWindow *win = blackbox->searchWindow(w);
+ if (! win)
+ return;
- current_workspace->showAll();
- if (resource.focus_last && current_workspace->getLastFocusedWindow()) {
- XSync(openbox.getXDisplay(), False);
- current_workspace->getLastFocusedWindow()->setInputFocus();
+ if (win->isNormal()) {
+ // don't list non-normal windows as managed windows
+ windowList.push_back(win);
+ updateClientList();
+
+ if (win->isTopmost())
+ specialWindowList.push_back(win->getFrameWindow());
+ } else if (win->isDesktop()) {
+ desktopWindowList.push_back(win->getFrameWindow());
+ }
+
+ XMapRequestEvent mre;
+ mre.window = w;
+ if (blackbox->isStartup() && win->isNormal()) win->restoreAttributes();
+ win->mapRequestEvent(&mre);
+}
+
+
+void BScreen::unmanageWindow(BlackboxWindow *w, bool remap) {
+ w->restore(remap);
+
+ // Remove the modality so that its parent won't try to re-focus the window
+ if (w->isModal()) w->setModal(False);
+
+ if (w->getWorkspaceNumber() != BSENTINEL &&
+ w->getWindowNumber() != BSENTINEL) {
+ getWorkspace(w->getWorkspaceNumber())->removeWindow(w);
+ if (w->isStuck()) {
+ for (unsigned int i = 0; i < getNumberOfWorkspaces(); ++i)
+ if (i != w->getWorkspaceNumber())
+ getWorkspace(i)->removeWindow(w, True);
+ }
+ } else if (w->isIconic())
+ removeIcon(w);
+
+ if (w->isNormal()) {
+ // we don't list non-normal windows as managed windows
+ windowList.remove(w);
+ updateClientList();
+
+ if (w->isTopmost()) {
+ WindowList::iterator it = specialWindowList.begin();
+ const WindowList::iterator end = specialWindowList.end();
+ for (; it != end; ++it)
+ if (*it == w->getFrameWindow()) {
+ specialWindowList.erase(it);
+ break;
+ }
+ assert(it != end); // the window wasnt a special window?
}
+ } else if (w->isDesktop()) {
+ WindowList::iterator it = desktopWindowList.begin();
+ const WindowList::iterator end = desktopWindowList.end();
+ for (; it != end; ++it)
+ if (*it == w->getFrameWindow()) {
+ desktopWindowList.erase(it);
+ break;
+ }
+ assert(it != end); // the window wasnt a desktop window?
}
- updateNetizenCurrentWorkspace();
+ if (blackbox->getFocusedWindow() == w)
+ blackbox->setFocusedWindow((BlackboxWindow *) 0);
+
+ removeNetizen(w->getClientWindow());
+
+ /*
+ some managed windows can also be window group controllers. when
+ unmanaging such windows, we should also delete the window group.
+ */
+ BWindowGroup *group = blackbox->searchGroup(w->getClientWindow());
+ delete group;
+
+ delete w;
}
n->sendWorkspaceCount();
n->sendCurrentWorkspace();
- wkspList::iterator it;
- for (it = workspacesList.begin(); it != workspacesList.end(); ++it) {
- for (int i = 0; i < (*it)->getCount(); i++)
- n->sendWindowAdd((*it)->getWindow(i)->getClientWindow(),
- (*it)->getWorkspaceID());
- }
+ WorkspaceList::iterator it = workspacesList.begin();
+ const WorkspaceList::iterator end = workspacesList.end();
+ for (; it != end; ++it)
+ (*it)->sendWindowList(*n);
- Window f = ((openbox.focusedWindow()) ?
- openbox.focusedWindow()->getClientWindow() : None);
+ Window f = ((blackbox->getFocusedWindow()) ?
+ blackbox->getFocusedWindow()->getClientWindow() : None);
n->sendWindowFocus(f);
}
void BScreen::removeNetizen(Window w) {
- netList::iterator it;
- int i = 0;
-
- for (it = netizenList.begin(); it != netizenList.end(); ++it)
+ NetizenList::iterator it = netizenList.begin();
+ for (; it != netizenList.end(); ++it) {
if ((*it)->getWindowID() == w) {
- Netizen *tmp = *it;
+ delete *it;
netizenList.erase(it);
- delete tmp;
break;
}
+ }
+}
+
+
+void BScreen::updateWorkArea(void) {
+ if (workspacesList.size() > 0) {
+ unsigned long *dims = new unsigned long[4 * workspacesList.size()];
+ for (unsigned int i = 0, m = workspacesList.size(); i < m; ++i) {
+ // XXX: this could be different for each workspace
+ const Rect &area = availableArea();
+ dims[(i * 4) + 0] = area.x();
+ dims[(i * 4) + 1] = area.y();
+ dims[(i * 4) + 2] = area.width();
+ dims[(i * 4) + 3] = area.height();
+ }
+ xatom->setValue(getRootWindow(), XAtom::net_workarea, XAtom::cardinal,
+ dims, 4 * workspacesList.size());
+ delete [] dims;
+ } else
+ xatom->setValue(getRootWindow(), XAtom::net_workarea, XAtom::cardinal,
+ 0, 0);
}
void BScreen::updateNetizenCurrentWorkspace(void) {
- netList::iterator it;
- for (it = netizenList.begin(); it != netizenList.end(); ++it)
- (*it)->sendCurrentWorkspace();
+ std::for_each(netizenList.begin(), netizenList.end(),
+ std::mem_fun(&Netizen::sendCurrentWorkspace));
}
void BScreen::updateNetizenWorkspaceCount(void) {
- netList::iterator it;
- for (it = netizenList.begin(); it != netizenList.end(); ++it)
- (*it)->sendWorkspaceCount();
+ xatom->setValue(getRootWindow(), XAtom::net_number_of_desktops,
+ XAtom::cardinal, workspacesList.size());
+
+ updateWorkArea();
+
+ std::for_each(netizenList.begin(), netizenList.end(),
+ std::mem_fun(&Netizen::sendWorkspaceCount));
}
void BScreen::updateNetizenWindowFocus(void) {
- Window f = ((openbox.focusedWindow()) ?
- openbox.focusedWindow()->getClientWindow() : None);
- netList::iterator it;
- for (it = netizenList.begin(); it != netizenList.end(); ++it)
+ Window f = ((blackbox->getFocusedWindow()) ?
+ blackbox->getFocusedWindow()->getClientWindow() : None);
+
+ xatom->setValue(getRootWindow(), XAtom::net_active_window,
+ XAtom::window, f);
+
+ NetizenList::iterator it = netizenList.begin();
+ for (; it != netizenList.end(); ++it)
(*it)->sendWindowFocus(f);
}
void BScreen::updateNetizenWindowAdd(Window w, unsigned long p) {
- netList::iterator it;
- for (it = netizenList.begin(); it != netizenList.end(); ++it)
+ NetizenList::iterator it = netizenList.begin();
+ for (; it != netizenList.end(); ++it) {
(*it)->sendWindowAdd(w, p);
+ }
}
void BScreen::updateNetizenWindowDel(Window w) {
- netList::iterator it;
- for (it = netizenList.begin(); it != netizenList.end(); ++it)
+ NetizenList::iterator it = netizenList.begin();
+ for (; it != netizenList.end(); ++it)
(*it)->sendWindowDel(w);
}
void BScreen::updateNetizenWindowRaise(Window w) {
- netList::iterator it;
- for (it = netizenList.begin(); it != netizenList.end(); ++it)
+ NetizenList::iterator it = netizenList.begin();
+ for (; it != netizenList.end(); ++it)
(*it)->sendWindowRaise(w);
}
void BScreen::updateNetizenWindowLower(Window w) {
- netList::iterator it;
- for (it = netizenList.begin(); it != netizenList.end(); ++it)
+ NetizenList::iterator it = netizenList.begin();
+ for (; it != netizenList.end(); ++it)
(*it)->sendWindowLower(w);
}
void BScreen::updateNetizenConfigNotify(XEvent *e) {
- netList::iterator it;
- for (it = netizenList.begin(); it != netizenList.end(); ++it)
+ NetizenList::iterator it = netizenList.begin();
+ for (; it != netizenList.end(); ++it)
(*it)->sendConfigNotify(e);
}
-void BScreen::raiseWindows(Window *workspace_stack, int num) {
+void BScreen::raiseWindows(Window *workspace_stack, unsigned int num) {
+ // the 13 represents the number of blackbox windows such as menus
+ int bbwins = 15;
+#ifdef XINERAMA
+ ++bbwins;
+#endif // XINERAMA
+
Window *session_stack = new
- Window[(num + workspacesList.size() + rootmenuList.size() + 13)];
- int i = 0, k = num;
+ Window[(num + workspacesList.size() + rootmenuList.size() +
+ specialWindowList.size() + bbwins)];
+ unsigned int i = 0, k = num;
- XRaiseWindow(getBaseDisplay().getXDisplay(), iconmenu->getWindowID());
+ XRaiseWindow(blackbox->getXDisplay(), iconmenu->getWindowID());
*(session_stack + i++) = iconmenu->getWindowID();
- wkspList::iterator it;
- for (it = workspacesList.begin(); it != workspacesList.end(); ++it)
- *(session_stack + i++) = (*it)->getMenu()->getWindowID();
+ WorkspaceList::iterator wit = workspacesList.begin();
+ const WorkspaceList::iterator w_end = workspacesList.end();
+ for (; wit != w_end; ++wit)
+ *(session_stack + i++) = (*wit)->getMenu()->getWindowID();
*(session_stack + i++) = workspacemenu->getWindowID();
*(session_stack + i++) = configmenu->getFocusmenu()->getWindowID();
*(session_stack + i++) = configmenu->getPlacementmenu()->getWindowID();
+ *(session_stack + i++) = configmenu->getWindowSnapmenu()->getWindowID();
+ *(session_stack + i++) = configmenu->getEdgeSnapmenu()->getWindowID();
+#ifdef XINERAMA
+ *(session_stack + i++) = configmenu->getXineramamenu()->getWindowID();
+#endif // XINERAMA
*(session_stack + i++) = configmenu->getWindowID();
-#ifdef SLIT
*(session_stack + i++) = slit->getMenu()->getDirectionmenu()->getWindowID();
*(session_stack + i++) = slit->getMenu()->getPlacementmenu()->getWindowID();
*(session_stack + i++) = slit->getMenu()->getWindowID();
-#endif // SLIT
*(session_stack + i++) =
toolbar->getMenu()->getPlacementmenu()->getWindowID();
*(session_stack + i++) = toolbar->getMenu()->getWindowID();
- menuList::iterator rit;
- for (rit = rootmenuList.begin(); rit != rootmenuList.end(); ++rit)
+ RootmenuList::iterator rit = rootmenuList.begin();
+ for (; rit != rootmenuList.end(); ++rit)
*(session_stack + i++) = (*rit)->getWindowID();
*(session_stack + i++) = rootmenu->getWindowID();
- if (toolbar->onTop())
+ if (toolbar->isOnTop())
*(session_stack + i++) = toolbar->getWindowID();
-#ifdef SLIT
- if (slit->onTop())
+ if (slit->isOnTop())
*(session_stack + i++) = slit->getWindowID();
-#endif // SLIT
+
+ WindowList::iterator sit, send = specialWindowList.end();
+ for (sit = specialWindowList.begin(); sit != send; ++sit)
+ *(session_stack + i++) = *sit;
while (k--)
*(session_stack + i++) = *(workspace_stack + k);
- XRestackWindows(getBaseDisplay().getXDisplay(), session_stack, i);
+ XRestackWindows(blackbox->getXDisplay(), session_stack, i);
delete [] session_stack;
+
+ updateStackingList();
}
-void BScreen::addWorkspaceName(const char *name) {
- workspaceNames.push_back(name);
-}
+void BScreen::lowerWindows(Window *workspace_stack, unsigned int num) {
+ assert(num > 0); // this would cause trouble in the XRaiseWindow call
+ Window *session_stack = new Window[(num + desktopWindowList.size())];
+ unsigned int i = 0, k = num;
-const char *BScreen::getNameOfWorkspace(int id) {
- if (id < 0 || id >= workspaceNames.size())
- return (const char *) 0;
- return workspaceNames[id].c_str();
+ XLowerWindow(blackbox->getXDisplay(), workspace_stack[0]);
+
+ while (k--)
+ *(session_stack + i++) = *(workspace_stack + k);
+
+ WindowList::iterator dit = desktopWindowList.begin();
+ const WindowList::iterator d_end = desktopWindowList.end();
+ for (; dit != d_end; ++dit)
+ *(session_stack + i++) = *dit;
+
+ XRestackWindows(blackbox->getXDisplay(), session_stack, i);
+
+ delete [] session_stack;
+
+ updateStackingList();
}
-void BScreen::reassociateWindow(OpenboxWindow *w, int wkspc_id, Bool ignore_sticky) {
+void BScreen::reassociateWindow(BlackboxWindow *w, unsigned int wkspc_id,
+ bool ignore_sticky) {
if (! w) return;
- if (wkspc_id == -1)
- wkspc_id = current_workspace->getWorkspaceID();
+ if (wkspc_id == BSENTINEL)
+ wkspc_id = current_workspace->getID();
if (w->getWorkspaceNumber() == wkspc_id)
return;
if (w->isIconic()) {
removeIcon(w);
getWorkspace(wkspc_id)->addWindow(w);
+ if (w->isStuck())
+ for (unsigned int i = 0; i < getNumberOfWorkspaces(); ++i)
+ if (i != w->getWorkspaceNumber())
+ getWorkspace(i)->addWindow(w, True);
} else if (ignore_sticky || ! w->isStuck()) {
+ if (w->isStuck())
+ w->stick();
getWorkspace(w->getWorkspaceNumber())->removeWindow(w);
getWorkspace(wkspc_id)->addWindow(w);
}
+ updateStackingList();
+}
+
+
+void BScreen::propagateWindowName(const BlackboxWindow *bw) {
+ if (bw->isIconic()) {
+ iconmenu->changeItemLabel(bw->getWindowNumber(), bw->getIconTitle());
+ iconmenu->update();
+ }
+ else {
+ Clientmenu *clientmenu = getWorkspace(bw->getWorkspaceNumber())->getMenu();
+ clientmenu->changeItemLabel(bw->getWindowNumber(), bw->getTitle());
+ clientmenu->update();
+
+ if (blackbox->getFocusedWindow() == bw)
+ toolbar->redrawWindowLabel(True);
+ }
}
void BScreen::nextFocus(void) {
- Bool have_focused = False;
- int focused_window_number = -1;
- OpenboxWindow *next;
-
- if (openbox.focusedWindow()) {
- if (openbox.focusedWindow()->getScreen()->getScreenNumber() ==
- getScreenNumber()) {
- have_focused = True;
- focused_window_number = openbox.focusedWindow()->getWindowNumber();
- }
+ BlackboxWindow *focused = blackbox->getFocusedWindow(),
+ *next = focused;
+
+ if (focused) {
+ // if window is not on this screen, ignore it
+ if (focused->getScreen()->getScreenNumber() != getScreenNumber())
+ focused = (BlackboxWindow*) 0;
}
- if ((getCurrentWorkspace()->getCount() > 1) && have_focused) {
- int next_window_number = focused_window_number;
+ if (focused && current_workspace->getCount() > 1) {
+ // next is the next window to recieve focus, current is a place holder
+ BlackboxWindow *current;
do {
- if ((++next_window_number) >= getCurrentWorkspace()->getCount())
- next_window_number = 0;
-
- next = getCurrentWorkspace()->getWindow(next_window_number);
- } while ((! next->setInputFocus()) && (next_window_number !=
- focused_window_number));
+ current = next;
+ next = current_workspace->getNextWindowInList(current);
+ } while(! next->setInputFocus() && next != focused);
- if (next_window_number != focused_window_number)
- getCurrentWorkspace()->raiseWindow(next);
- } else if (getCurrentWorkspace()->getCount() >= 1) {
- next = current_workspace->getWindow(0);
+ if (next != focused)
+ current_workspace->raiseWindow(next);
+ } else if (current_workspace->getCount() >= 1) {
+ next = current_workspace->getTopWindowOnStack();
current_workspace->raiseWindow(next);
next->setInputFocus();
void BScreen::prevFocus(void) {
- Bool have_focused = False;
- int focused_window_number = -1;
- OpenboxWindow *prev;
-
- if (openbox.focusedWindow()) {
- if (openbox.focusedWindow()->getScreen()->getScreenNumber() ==
- getScreenNumber()) {
- have_focused = True;
- focused_window_number = openbox.focusedWindow()->getWindowNumber();
- }
+ BlackboxWindow *focused = blackbox->getFocusedWindow(),
+ *next = focused;
+
+ if (focused) {
+ // if window is not on this screen, ignore it
+ if (focused->getScreen()->getScreenNumber() != getScreenNumber())
+ focused = (BlackboxWindow*) 0;
}
- if ((getCurrentWorkspace()->getCount() > 1) && have_focused) {
- int prev_window_number = focused_window_number;
+ if (focused && current_workspace->getCount() > 1) {
+ // next is the next window to recieve focus, current is a place holder
+ BlackboxWindow *current;
do {
- if ((--prev_window_number) < 0)
- prev_window_number = getCurrentWorkspace()->getCount() - 1;
-
- prev = getCurrentWorkspace()->getWindow(prev_window_number);
- } while ((! prev->setInputFocus()) && (prev_window_number !=
- focused_window_number));
+ current = next;
+ next = current_workspace->getPrevWindowInList(current);
+ } while(! next->setInputFocus() && next != focused);
- if (prev_window_number != focused_window_number)
- getCurrentWorkspace()->raiseWindow(prev);
- } else if (getCurrentWorkspace()->getCount() >= 1) {
- prev = current_workspace->getWindow(0);
+ if (next != focused)
+ current_workspace->raiseWindow(next);
+ } else if (current_workspace->getCount() >= 1) {
+ next = current_workspace->getTopWindowOnStack();
- current_workspace->raiseWindow(prev);
- prev->setInputFocus();
+ current_workspace->raiseWindow(next);
+ next->setInputFocus();
}
}
void BScreen::raiseFocus(void) {
- Bool have_focused = False;
- int focused_window_number = -1;
-
- if (openbox.focusedWindow()) {
- if (openbox.focusedWindow()->getScreen()->getScreenNumber() ==
- getScreenNumber()) {
- have_focused = True;
- focused_window_number = openbox.focusedWindow()->getWindowNumber();
- }
- }
+ BlackboxWindow *focused = blackbox->getFocusedWindow();
+ if (! focused)
+ return;
- if ((getCurrentWorkspace()->getCount() > 1) && have_focused)
- getWorkspace(openbox.focusedWindow()->getWorkspaceNumber())->
- raiseWindow(openbox.focusedWindow());
+ // if on this Screen, raise it
+ if (focused->getScreen()->getScreenNumber() == getScreenNumber()) {
+ Workspace *workspace = getWorkspace(focused->getWorkspaceNumber());
+ workspace->raiseWindow(focused);
+ }
}
void BScreen::InitMenu(void) {
if (rootmenu) {
rootmenuList.clear();
+
while (rootmenu->getCount())
rootmenu->remove(0);
} else {
- rootmenu = new Rootmenu(*this);
+ rootmenu = new Rootmenu(this);
}
- Bool defaultMenu = True;
+ bool defaultMenu = True;
+
+ FILE *menu_file = (FILE *) 0;
+ const char *menu_filename = blackbox->getMenuFilename();
+
+ if (menu_filename)
+ if (! (menu_file = fopen(menu_filename, "r")))
+ perror(menu_filename);
+ if (! menu_file) { // opening the menu file failed, try the default menu
+ menu_filename = DEFAULTMENU;
+ if (! (menu_file = fopen(menu_filename, "r")))
+ perror(menu_filename);
+ }
+
+ if (menu_file) {
+ if (feof(menu_file)) {
+ fprintf(stderr, i18n(ScreenSet, ScreenEmptyMenuFile,
+ "%s: Empty menu file"),
+ menu_filename);
+ } else {
+ char line[1024], label[1024];
+ memset(line, 0, 1024);
+ memset(label, 0, 1024);
+
+ while (fgets(line, 1024, menu_file) && ! feof(menu_file)) {
+ if (line[0] == '#')
+ continue;
+
+ int i, key = 0, index = -1, len = strlen(line);
+
+ for (i = 0; i < len; i++) {
+ if (line[i] == '[') index = 0;
+ else if (line[i] == ']') break;
+ else if (line[i] != ' ')
+ if (index++ >= 0)
+ key += tolower(line[i]);
+ }
+
+ if (key == 517) { // [begin]
+ index = -1;
+ for (i = index; i < len; i++) {
+ if (line[i] == '(') index = 0;
+ else if (line[i] == ')') break;
+ else if (index++ >= 0) {
+ if (line[i] == '\\' && i < len - 1) i++;
+ label[index - 1] = line[i];
+ }
+ }
- if (openbox.getMenuFilename()) {
- FILE *menu_file = fopen(openbox.getMenuFilename(), "r");
+ if (index == -1) index = 0;
+ label[index] = '\0';
- if (!menu_file) {
- perror(openbox.getMenuFilename());
- } else {
- if (feof(menu_file)) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenEmptyMenuFile,
- "%s: Empty menu file"),
- openbox.getMenuFilename());
- } else {
- char line[1024], label[1024];
- memset(line, 0, 1024);
- memset(label, 0, 1024);
-
- while (fgets(line, 1024, menu_file) && ! feof(menu_file)) {
- if (line[0] != '#') {
- int i, key = 0, index = -1, len = strlen(line);
-
- key = 0;
- for (i = 0; i < len; i++) {
- if (line[i] == '[') index = 0;
- else if (line[i] == ']') break;
- else if (line[i] != ' ')
- if (index++ >= 0)
- key += tolower(line[i]);
- }
-
- if (key == 517) {
- index = -1;
- for (i = index; i < len; i++) {
- if (line[i] == '(') index = 0;
- else if (line[i] == ')') break;
- else if (index++ >= 0) {
- if (line[i] == '\\' && i < len - 1) i++;
- label[index - 1] = line[i];
- }
- }
-
- if (index == -1) index = 0;
- label[index] = '\0';
-
- rootmenu->setLabel(label);
- defaultMenu = parseMenuFile(menu_file, rootmenu);
- break;
- }
- }
- }
+ rootmenu->setLabel(label);
+ defaultMenu = parseMenuFile(menu_file, rootmenu);
+ if (! defaultMenu)
+ blackbox->addMenuTimestamp(menu_filename);
+ break;
+ }
}
- fclose(menu_file);
}
+ fclose(menu_file);
}
if (defaultMenu) {
rootmenu->setInternalMenu();
- rootmenu->insert(i18n->getMessage(ScreenSet, Screenxterm, "xterm"),
- BScreen::Execute,
- i18n->getMessage(ScreenSet, Screenxterm, "xterm"));
- rootmenu->insert(i18n->getMessage(ScreenSet, ScreenRestart, "Restart"),
- BScreen::Restart);
- rootmenu->insert(i18n->getMessage(ScreenSet, ScreenExit, "Exit"),
- BScreen::Exit);
- } else {
- openbox.setMenuFilename(openbox.getMenuFilename());
+ rootmenu->insert(i18n(ScreenSet, Screenxterm, "xterm"),
+ BScreen::Execute,
+ i18n(ScreenSet, Screenxterm, "xterm"));
+ rootmenu->insert(i18n(ScreenSet, ScreenRestart, "Restart"),
+ BScreen::Restart);
+ rootmenu->insert(i18n(ScreenSet, ScreenExit, "Exit"),
+ BScreen::Exit);
+ rootmenu->setLabel(i18n(BasemenuSet, BasemenuBlackboxMenu,
+ "Openbox Menu"));
}
}
-Bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
- char line[1024], label[1024], command[1024];
+static
+size_t string_within(char begin, char end,
+ const char *input, size_t start_at, size_t length,
+ char *output) {
+ bool parse = False;
+ size_t index = 0;
+ size_t i = start_at;
+ for (; i < length; ++i) {
+ if (input[i] == begin) {
+ parse = True;
+ } else if (input[i] == end) {
+ break;
+ } else if (parse) {
+ if (input[i] == '\\' && i < length - 1) i++;
+ output[index++] = input[i];
+ }
+ }
+
+ if (parse)
+ output[index] = '\0';
+ else
+ output[0] = '\0';
+
+ return i;
+}
- while (! feof(file)) {
+
+bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
+ char line[1024], keyword[1024], label[1024], command[1024];
+ bool done = False;
+
+ while (! (done || feof(file))) {
memset(line, 0, 1024);
memset(label, 0, 1024);
memset(command, 0, 1024);
- if (fgets(line, 1024, file)) {
- if (line[0] != '#') {
- register int i, key = 0, parse = 0, index = -1,
- line_length = strlen(line),
- label_length = 0, command_length = 0;
-
- // determine the keyword
- key = 0;
- for (i = 0; i < line_length; i++) {
- if (line[i] == '[') parse = 1;
- else if (line[i] == ']') break;
- else if (line[i] != ' ')
- if (parse)
- key += tolower(line[i]);
- }
-
- // get the label enclosed in ()'s
- parse = 0;
-
- for (i = 0; i < line_length; i++) {
- if (line[i] == '(') {
- index = 0;
- parse = 1;
- } else if (line[i] == ')') break;
- else if (index++ >= 0) {
- if (line[i] == '\\' && i < line_length - 1) i++;
- label[index - 1] = line[i];
- }
- }
-
- if (parse) {
- label[index] = '\0';
- label_length = index;
- } else {
- label[0] = '\0';
- label_length = 0;
- }
-
- // get the command enclosed in {}'s
- parse = 0;
- index = -1;
- for (i = 0; i < line_length; i++) {
- if (line[i] == '{') {
- index = 0;
- parse = 1;
- } else if (line[i] == '}') break;
- else if (index++ >= 0) {
- if (line[i] == '\\' && i < line_length - 1) i++;
- command[index - 1] = line[i];
- }
- }
-
- if (parse) {
- command[index] = '\0';
- command_length = index;
- } else {
- command[0] = '\0';
- command_length = 0;
- }
-
- switch (key) {
- case 311: //end
- return ((menu->getCount() == 0) ? True : False);
+ if (! fgets(line, 1024, file))
+ continue;
- break;
+ if (line[0] == '#') // comment, skip it
+ continue;
- case 333: // nop
- menu->insert(label);
-
- break;
-
- case 421: // exec
- if ((! *label) && (! *command)) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenEXECError,
- "BScreen::parseMenuFile: [exec] error, "
- "no menu label and/or command defined\n"));
- continue;
- }
-
- menu->insert(label, BScreen::Execute, command);
-
- break;
-
- case 442: // exit
- if (! *label) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenEXITError,
- "BScreen::parseMenuFile: [exit] error, "
- "no menu label defined\n"));
- continue;
- }
-
- menu->insert(label, BScreen::Exit);
-
- break;
-
- case 561: // style
- {
- if ((! *label) || (! *command)) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenSTYLEError,
- "BScreen::parseMenuFile: [style] error, "
- "no menu label and/or filename defined\n"));
- continue;
- }
-
- char style[MAXPATHLEN];
-
- // perform shell style ~ home directory expansion
- char *homedir = 0;
- int homedir_len = 0;
- if (*command == '~' && *(command + 1) == '/') {
- homedir = getenv("HOME");
- homedir_len = strlen(homedir);
- }
-
- if (homedir && homedir_len != 0) {
- strncpy(style, homedir, homedir_len);
-
- strncpy(style + homedir_len, command + 1,
- command_length - 1);
- *(style + command_length + homedir_len - 1) = '\0';
- } else {
- strncpy(style, command, command_length);
- *(style + command_length) = '\0';
- }
-
- menu->insert(label, BScreen::SetStyle, style);
- }
-
- break;
-
- case 630: // config
- if (! *label) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenCONFIGError,
- "BScreen::parseMenufile: [config] error, "
- "no label defined"));
- continue;
- }
-
- menu->insert(label, configmenu);
-
- break;
-
- case 740: // include
- {
- if (! *label) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenINCLUDEError,
- "BScreen::parseMenuFile: [include] error, "
- "no filename defined\n"));
- continue;
- }
-
- char newfile[MAXPATHLEN];
-
- // perform shell style ~ home directory expansion
- char *homedir = 0;
- int homedir_len = 0;
- if (*label == '~' && *(label + 1) == '/') {
- homedir = getenv("HOME");
- homedir_len = strlen(homedir);
- }
-
- if (homedir && homedir_len != 0) {
- strncpy(newfile, homedir, homedir_len);
-
- strncpy(newfile + homedir_len, label + 1,
- label_length - 1);
- *(newfile + label_length + homedir_len - 1) = '\0';
- } else {
- strncpy(newfile, label, label_length);
- *(newfile + label_length) = '\0';
- }
-
- if (newfile) {
- FILE *submenufile = fopen(newfile, "r");
-
- if (submenufile) {
- struct stat buf;
- if (fstat(fileno(submenufile), &buf) ||
- (! S_ISREG(buf.st_mode))) {
- fprintf(stderr,
- i18n->getMessage(ScreenSet, ScreenINCLUDEErrorReg,
- "BScreen::parseMenuFile: [include] error: "
- "'%s' is not a regular file\n"), newfile);
- break;
- }
-
- if (! feof(submenufile)) {
- if (! parseMenuFile(submenufile, menu))
- openbox.setMenuFilename(newfile);
-
- fclose(submenufile);
- }
- } else
- perror(newfile);
- }
- }
-
- break;
-
- case 767: // submenu
- {
- if (! *label) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenSUBMENUError,
- "BScreen::parseMenuFile: [submenu] error, "
- "no menu label defined\n"));
- continue;
- }
-
- Rootmenu *submenu = new Rootmenu(*this);
-
- if (*command)
- submenu->setLabel(command);
- else
- submenu->setLabel(label);
-
- parseMenuFile(file, submenu);
- submenu->update();
- menu->insert(label, submenu);
- rootmenuList.push_back(submenu);
- }
-
- break;
-
- case 773: // restart
- {
- if (! *label) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenRESTARTError,
- "BScreen::parseMenuFile: [restart] error, "
- "no menu label defined\n"));
- continue;
- }
-
- if (*command)
- menu->insert(label, BScreen::RestartOther, command);
- else
- menu->insert(label, BScreen::Restart);
- }
-
- break;
-
- case 845: // reconfig
- {
- if (! *label) {
- fprintf(stderr, i18n->getMessage(ScreenSet, ScreenRECONFIGError,
- "BScreen::parseMenuFile: [reconfig] error, "
- "no menu label defined\n"));
- continue;
- }
-
- menu->insert(label, BScreen::Reconfigure);
- }
-
- break;
-
- case 995: // stylesdir
- case 1113: // stylesmenu
- {
- Bool newmenu = ((key == 1113) ? True : False);
-
- if ((! *label) || ((! *command) && newmenu)) {
- fprintf(stderr,
- i18n->getMessage(ScreenSet, ScreenSTYLESDIRError,
- "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
- " error, no directory defined\n"));
- continue;
- }
+ size_t line_length = strlen(line);
+ unsigned int key = 0;
- char stylesdir[MAXPATHLEN];
+ // get the keyword enclosed in []'s
+ size_t pos = string_within('[', ']', line, 0, line_length, keyword);
- char *directory = ((newmenu) ? command : label);
- int directory_length = ((newmenu) ? command_length : label_length);
+ if (keyword[0] == '\0') { // no keyword, no menu entry
+ continue;
+ } else {
+ size_t len = strlen(keyword);
+ for (size_t i = 0; i < len; ++i) {
+ if (keyword[i] != ' ')
+ key += tolower(keyword[i]);
+ }
+ }
- // perform shell style ~ home directory expansion
- char *homedir = 0;
- int homedir_len = 0;
+ // get the label enclosed in ()'s
+ pos = string_within('(', ')', line, pos, line_length, label);
- if (*directory == '~' && *(directory + 1) == '/') {
- homedir = getenv("HOME");
- homedir_len = strlen(homedir);
- }
+ // get the command enclosed in {}'s
+ pos = string_within('{', '}', line, pos, line_length, command);
- if (homedir && homedir_len != 0) {
- strncpy(stylesdir, homedir, homedir_len);
+ switch (key) {
+ case 311: // end
+ done = True;
- strncpy(stylesdir + homedir_len, directory + 1,
- directory_length - 1);
- *(stylesdir + directory_length + homedir_len - 1) = '\0';
- } else {
- strncpy(stylesdir, directory, directory_length);
- *(stylesdir + directory_length) = '\0';
- }
+ break;
- struct stat statbuf;
-
- if (! stat(stylesdir, &statbuf)) {
- if (S_ISDIR(statbuf.st_mode)) {
- Rootmenu *stylesmenu;
-
- if (newmenu)
- stylesmenu = new Rootmenu(*this);
- else
- stylesmenu = menu;
-
- DIR *d = opendir(stylesdir);
- int entries = 0;
- struct dirent *p;
-
- // get the total number of directory entries
- while ((p = readdir(d))) entries++;
- rewinddir(d);
-
- char **ls = new char* [entries];
- int index = 0;
- while ((p = readdir(d)))
- ls[index++] = bstrdup(p->d_name);
-
- closedir(d);
-
- std::sort(ls, ls + entries, dcmp());
-
- int n, slen = strlen(stylesdir);
- for (n = 0; n < entries; n++) {
- if (ls[n][strlen(ls[n])-1] != '~') {
- int nlen = strlen(ls[n]);
- char style[MAXPATHLEN + 1];
-
- strncpy(style, stylesdir, slen);
- *(style + slen) = '/';
- strncpy(style + slen + 1, ls[n], nlen + 1);
-
- if ((! stat(style, &statbuf)) && S_ISREG(statbuf.st_mode))
- stylesmenu->insert(ls[n], BScreen::SetStyle, style);
- }
-
- delete [] ls[n];
- }
-
- delete [] ls;
-
- stylesmenu->update();
-
- if (newmenu) {
- stylesmenu->setLabel(label);
- menu->insert(label, stylesmenu);
- rootmenuList.push_back(stylesmenu);
- }
-
- openbox.setMenuFilename(stylesdir);
- } else {
- fprintf(stderr, i18n->getMessage(ScreenSet,
- ScreenSTYLESDIRErrorNotDir,
- "BScreen::parseMenuFile:"
- " [stylesdir/stylesmenu] error, %s is not a"
- " directory\n"), stylesdir);
- }
- } else {
- fprintf(stderr,
- i18n->getMessage(ScreenSet, ScreenSTYLESDIRErrorNoExist,
- "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
- " error, %s does not exist\n"), stylesdir);
- }
+ case 333: // nop
+ if (! *label)
+ label[0] = '\0';
+ menu->insert(label);
- break;
- }
+ break;
+
+ case 421: // exec
+ if (! (*label && *command)) {
+ fprintf(stderr, i18n(ScreenSet, ScreenEXECError,
+ "BScreen::parseMenuFile: [exec] error, "
+ "no menu label and/or command defined\n"));
+ continue;
+ }
+
+ menu->insert(label, BScreen::Execute, command);
+
+ break;
+
+ case 442: // exit
+ if (! *label) {
+ fprintf(stderr, i18n(ScreenSet, ScreenEXITError,
+ "BScreen::parseMenuFile: [exit] error, "
+ "no menu label defined\n"));
+ continue;
+ }
+
+ menu->insert(label, BScreen::Exit);
+
+ break;
+
+ case 561: { // style
+ if (! (*label && *command)) {
+ fprintf(stderr,
+ i18n(ScreenSet, ScreenSTYLEError,
+ "BScreen::parseMenuFile: [style] error, "
+ "no menu label and/or filename defined\n"));
+ continue;
+ }
+
+ string style = expandTilde(command);
+
+ menu->insert(label, BScreen::SetStyle, style.c_str());
+ }
+ break;
+
+ case 630: // config
+ if (! *label) {
+ fprintf(stderr, i18n(ScreenSet, ScreenCONFIGError,
+ "BScreen::parseMenufile: [config] error, "
+ "no label defined"));
+ continue;
+ }
+
+ menu->insert(label, configmenu);
+
+ break;
- case 1090: // workspaces
- {
- if (! *label) {
- fprintf(stderr,
- i18n->getMessage(ScreenSet, ScreenWORKSPACESError,
- "BScreen:parseMenuFile: [workspaces] error, "
- "no menu label defined\n"));
- continue;
- }
-
- menu->insert(label, workspacemenu);
-
- break;
- }
- }
+ case 740: { // include
+ if (! *label) {
+ fprintf(stderr, i18n(ScreenSet, ScreenINCLUDEError,
+ "BScreen::parseMenuFile: [include] error, "
+ "no filename defined\n"));
+ continue;
+ }
+
+ string newfile = expandTilde(label);
+ FILE *submenufile = fopen(newfile.c_str(), "r");
+
+ if (! submenufile) {
+ perror(newfile.c_str());
+ continue;
+ }
+
+ struct stat buf;
+ if (fstat(fileno(submenufile), &buf) ||
+ ! S_ISREG(buf.st_mode)) {
+ fprintf(stderr,
+ i18n(ScreenSet, ScreenINCLUDEErrorReg,
+ "BScreen::parseMenuFile: [include] error: "
+ "'%s' is not a regular file\n"), newfile.c_str());
+ break;
}
+
+ if (! feof(submenufile)) {
+ if (! parseMenuFile(submenufile, menu))
+ blackbox->addMenuTimestamp(newfile);
+
+ fclose(submenufile);
+ }
+ }
+
+ break;
+
+ case 767: { // submenu
+ if (! *label) {
+ fprintf(stderr, i18n(ScreenSet, ScreenSUBMENUError,
+ "BScreen::parseMenuFile: [submenu] error, "
+ "no menu label defined\n"));
+ continue;
+ }
+
+ Rootmenu *submenu = new Rootmenu(this);
+
+ if (*command)
+ submenu->setLabel(command);
+ else
+ submenu->setLabel(label);
+
+ parseMenuFile(file, submenu);
+ submenu->update();
+ menu->insert(label, submenu);
+ rootmenuList.push_back(submenu);
+ }
+
+ break;
+
+ case 773: { // restart
+ if (! *label) {
+ fprintf(stderr, i18n(ScreenSet, ScreenRESTARTError,
+ "BScreen::parseMenuFile: [restart] error, "
+ "no menu label defined\n"));
+ continue;
+ }
+
+ if (*command)
+ menu->insert(label, BScreen::RestartOther, command);
+ else
+ menu->insert(label, BScreen::Restart);
+ }
+
+ break;
+
+ case 845: { // reconfig
+ if (! *label) {
+ fprintf(stderr,
+ i18n(ScreenSet, ScreenRECONFIGError,
+ "BScreen::parseMenuFile: [reconfig] error, "
+ "no menu label defined\n"));
+ continue;
+ }
+
+ menu->insert(label, BScreen::Reconfigure);
+ }
+
+ break;
+
+ case 995: // stylesdir
+ case 1113: { // stylesmenu
+ bool newmenu = ((key == 1113) ? True : False);
+
+ if (! *label || (! *command && newmenu)) {
+ fprintf(stderr,
+ i18n(ScreenSet, ScreenSTYLESDIRError,
+ "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
+ " error, no directory defined\n"));
+ continue;
+ }
+
+ char *directory = ((newmenu) ? command : label);
+
+ string stylesdir = expandTilde(directory);
+
+ struct stat statbuf;
+
+ if (stat(stylesdir.c_str(), &statbuf) == -1) {
+ fprintf(stderr,
+ i18n(ScreenSet, ScreenSTYLESDIRErrorNoExist,
+ "BScreen::parseMenuFile: [stylesdir/stylesmenu]"
+ " error, %s does not exist\n"), stylesdir.c_str());
+ continue;
+ }
+ if (! S_ISDIR(statbuf.st_mode)) {
+ fprintf(stderr,
+ i18n(ScreenSet, ScreenSTYLESDIRErrorNotDir,
+ "BScreen::parseMenuFile:"
+ " [stylesdir/stylesmenu] error, %s is not a"
+ " directory\n"), stylesdir.c_str());
+ continue;
+ }
+
+ Rootmenu *stylesmenu;
+
+ if (newmenu)
+ stylesmenu = new Rootmenu(this);
+ else
+ stylesmenu = menu;
+
+ DIR *d = opendir(stylesdir.c_str());
+ struct dirent *p;
+ std::vector<string> ls;
+
+ while((p = readdir(d)))
+ ls.push_back(p->d_name);
+
+ closedir(d);
+
+ std::sort(ls.begin(), ls.end());
+
+ std::vector<string>::iterator it = ls.begin(),
+ end = ls.end();
+ for (; it != end; ++it) {
+ const string& fname = *it;
+
+ if (fname[fname.size()-1] == '~')
+ continue;
+
+ string style = stylesdir;
+ style += '/';
+ style += fname;
+
+ if (! stat(style.c_str(), &statbuf) && S_ISREG(statbuf.st_mode))
+ stylesmenu->insert(fname, BScreen::SetStyle, style);
+ }
+
+ stylesmenu->update();
+
+ if (newmenu) {
+ stylesmenu->setLabel(label);
+ menu->insert(label, stylesmenu);
+ rootmenuList.push_back(stylesmenu);
+ }
+
+ blackbox->addMenuTimestamp(stylesdir);
+ }
+ break;
+
+ case 1090: { // workspaces
+ if (! *label) {
+ fprintf(stderr,
+ i18n(ScreenSet, ScreenWORKSPACESError,
+ "BScreen:parseMenuFile: [workspaces] error, "
+ "no menu label defined\n"));
+ continue;
+ }
+
+ menu->insert(label, workspacemenu);
+ }
+ break;
}
}
void BScreen::shutdown(void) {
- openbox.grab();
-
- XSelectInput(getBaseDisplay().getXDisplay(), getRootWindow(), NoEventMask);
- XSync(getBaseDisplay().getXDisplay(), False);
+ XSelectInput(blackbox->getXDisplay(), getRootWindow(), NoEventMask);
+ XSync(blackbox->getXDisplay(), False);
- std::for_each(workspacesList.begin(), workspacesList.end(),
- std::mem_fun(&Workspace::shutdown));
-
- while (!iconList.empty())
- iconList.front()->restore();
+ while(! windowList.empty())
+ unmanageWindow(windowList.front(), True);
-#ifdef SLIT
slit->shutdown();
-#endif // SLIT
-
- openbox.ungrab();
}
void BScreen::showPosition(int x, int y) {
if (! geom_visible) {
- XMoveResizeWindow(getBaseDisplay().getXDisplay(), geom_window,
- (size().w() - geom_w) / 2,
- (size().h() - geom_h) / 2, geom_w, geom_h);
- XMapWindow(getBaseDisplay().getXDisplay(), geom_window);
- XRaiseWindow(getBaseDisplay().getXDisplay(), geom_window);
+ XMoveResizeWindow(blackbox->getXDisplay(), geom_window,
+ (getWidth() - geom_w) / 2,
+ (getHeight() - geom_h) / 2, geom_w, geom_h);
+ XMapWindow(blackbox->getXDisplay(), geom_window);
+ XRaiseWindow(blackbox->getXDisplay(), geom_window);
geom_visible = True;
}
char label[1024];
- sprintf(label, i18n->getMessage(ScreenSet, ScreenPositionFormat,
- "X: %4d x Y: %4d"), x, y);
+ sprintf(label, i18n(ScreenSet, ScreenPositionFormat,
+ "X: %4d x Y: %4d"), x, y);
- XClearWindow(getBaseDisplay().getXDisplay(), geom_window);
+ XClearWindow(blackbox->getXDisplay(), geom_window);
- if (i18n->multibyte()) {
- XmbDrawString(getBaseDisplay().getXDisplay(), geom_window,
- resource.wstyle.fontset, resource.wstyle.l_text_focus_gc,
- resource.bevel_width, resource.bevel_width -
- resource.wstyle.fontset_extents->max_ink_extent.y,
- label, strlen(label));
- } else {
- XDrawString(getBaseDisplay().getXDisplay(), geom_window,
- resource.wstyle.l_text_focus_gc,
- resource.bevel_width,
- resource.wstyle.font->ascent +
- resource.bevel_width, label, strlen(label));
- }
+ resource.wstyle.font->drawString(geom_window,
+ resource.bevel_width, resource.bevel_width,
+ resource.wstyle.l_text_focus,
+ label);
}
void BScreen::showGeometry(unsigned int gx, unsigned int gy) {
if (! geom_visible) {
- XMoveResizeWindow(getBaseDisplay().getXDisplay(), geom_window,
- (size().w() - geom_w) / 2,
- (size().h() - geom_h) / 2, geom_w, geom_h);
- XMapWindow(getBaseDisplay().getXDisplay(), geom_window);
- XRaiseWindow(getBaseDisplay().getXDisplay(), geom_window);
+ XMoveResizeWindow(blackbox->getXDisplay(), geom_window,
+ (getWidth() - geom_w) / 2,
+ (getHeight() - geom_h) / 2, geom_w, geom_h);
+ XMapWindow(blackbox->getXDisplay(), geom_window);
+ XRaiseWindow(blackbox->getXDisplay(), geom_window);
geom_visible = True;
}
char label[1024];
- sprintf(label, i18n->getMessage(ScreenSet, ScreenGeometryFormat,
- "W: %4d x H: %4d"), gx, gy);
+ sprintf(label, i18n(ScreenSet, ScreenGeometryFormat,
+ "W: %4d x H: %4d"), gx, gy);
- XClearWindow(getBaseDisplay().getXDisplay(), geom_window);
+ XClearWindow(blackbox->getXDisplay(), geom_window);
- if (i18n->multibyte()) {
- XmbDrawString(getBaseDisplay().getXDisplay(), geom_window,
- resource.wstyle.fontset, resource.wstyle.l_text_focus_gc,
- resource.bevel_width, resource.bevel_width -
- resource.wstyle.fontset_extents->max_ink_extent.y,
- label, strlen(label));
- } else {
- XDrawString(getBaseDisplay().getXDisplay(), geom_window,
- resource.wstyle.l_text_focus_gc,
- resource.bevel_width,
- resource.wstyle.font->ascent +
- resource.bevel_width, label, strlen(label));
- }
+ resource.wstyle.font->drawString(geom_window,
+ resource.bevel_width, resource.bevel_width,
+ resource.wstyle.l_text_focus,
+ label);
}
+
void BScreen::hideGeometry(void) {
if (geom_visible) {
- XUnmapWindow(getBaseDisplay().getXDisplay(), geom_window);
+ XUnmapWindow(blackbox->getXDisplay(), geom_window);
geom_visible = False;
}
}
+
+
+void BScreen::addStrut(Strut *strut) {
+ strutList.push_back(strut);
+}
+
+
+void BScreen::removeStrut(Strut *strut) {
+ strutList.remove(strut);
+}
+
+
+const Rect& BScreen::availableArea(void) const {
+ if (doFullMax())
+ return getRect(); // return the full screen
+ return usableArea;
+}
+
+
+#ifdef XINERAMA
+const RectList& BScreen::allAvailableAreas(void) const {
+ assert(isXineramaActive());
+ assert(xineramaUsableArea.size() > 0);
+ fprintf(stderr, "1found x %d y %d w %d h %d\n",
+ xineramaUsableArea[0].x(), xineramaUsableArea[0].y(),
+ xineramaUsableArea[0].width(), xineramaUsableArea[0].height());
+ return xineramaUsableArea;
+}
+#endif // XINERAMA
+
+
+void BScreen::updateAvailableArea(void) {
+ Rect old_area = usableArea;
+ usableArea = getRect(); // reset to full screen
+
+#ifdef XINERAMA
+ // reset to the full areas
+ if (isXineramaActive())
+ xineramaUsableArea = getXineramaAreas();
+#endif // XINERAMA
+
+ /* these values represent offsets from the screen edge
+ * we look for the biggest offset on each edge and then apply them
+ * all at once
+ * do not be confused by the similarity to the names of Rect's members
+ */
+ unsigned int current_left = 0, current_right = 0, current_top = 0,
+ current_bottom = 0;
+
+ StrutList::const_iterator it = strutList.begin(), end = strutList.end();
+
+ for(; it != end; ++it) {
+ Strut *strut = *it;
+ if (strut->left > current_left)
+ current_left = strut->left;
+ if (strut->top > current_top)
+ current_top = strut->top;
+ if (strut->right > current_right)
+ current_right = strut->right;
+ if (strut->bottom > current_bottom)
+ current_bottom = strut->bottom;
+ }
+
+ usableArea.setPos(current_left, current_top);
+ usableArea.setSize(usableArea.width() - (current_left + current_right),
+ usableArea.height() - (current_top + current_bottom));
+
+#ifdef XINERAMA
+ if (isXineramaActive()) {
+ // keep each of the ximerama-defined areas inside the strut
+ RectList::iterator xit, xend = xineramaUsableArea.end();
+ for (xit = xineramaUsableArea.begin(); xit != xend; ++xit) {
+ if (xit->x() < usableArea.x()) {
+ xit->setX(usableArea.x());
+ xit->setWidth(xit->width() - usableArea.x());
+ }
+ if (xit->y() < usableArea.y()) {
+ xit->setY(usableArea.y());
+ xit->setHeight(xit->height() - usableArea.y());
+ }
+ if (xit->x() + xit->width() > usableArea.width())
+ xit->setWidth(usableArea.width() - xit->x());
+ if (xit->y() + xit->height() > usableArea.height())
+ xit->setHeight(usableArea.height() - xit->y());
+ }
+ }
+#endif // XINERAMA
+
+ if (old_area != usableArea) {
+ BlackboxWindowList::iterator it = windowList.begin(),
+ end = windowList.end();
+ for (; it != end; ++it)
+ if ((*it)->isMaximized()) (*it)->remaximize();
+ }
+
+ updateWorkArea();
+}
+
+
+Workspace* BScreen::getWorkspace(unsigned int index) {
+ assert(index < workspacesList.size());
+ return workspacesList[index];
+}
+
+
+void BScreen::buttonPressEvent(const XButtonEvent *xbutton) {
+ if (xbutton->button == 1) {
+ if (! isRootColormapInstalled())
+ image_control->installRootColormap();
+
+ if (workspacemenu->isVisible())
+ workspacemenu->hide();
+
+ if (rootmenu->isVisible())
+ rootmenu->hide();
+ } else if (xbutton->button == 2) {
+ showWorkspaceMenu(xbutton->x_root, xbutton->y_root);
+ } else if (xbutton->button == 3) {
+ showRootMenu(xbutton->x_root, xbutton->y_root);
+ // mouse wheel up
+ } else if ((xbutton->button == 4 && resource.root_scroll == NormalScroll) ||
+ (xbutton->button == 5 && resource.root_scroll == ReverseScroll)) {
+ if (getCurrentWorkspaceID() >= getWorkspaceCount() - 1)
+ changeWorkspaceID(0);
+ else
+ changeWorkspaceID(getCurrentWorkspaceID() + 1);
+ // mouse wheel down
+ } else if ((xbutton->button == 5 && resource.root_scroll == NormalScroll) ||
+ (xbutton->button == 4 && resource.root_scroll == ReverseScroll)) {
+ if (getCurrentWorkspaceID() == 0)
+ changeWorkspaceID(getWorkspaceCount() - 1);
+ else
+ changeWorkspaceID(getCurrentWorkspaceID() - 1);
+ }
+}
+
+
+void BScreen::showWorkspaceMenu(int x, int y) {
+ int mx = x - (workspacemenu->getWidth() / 2);
+ int my = y - (workspacemenu->getTitleHeight() / 2);
+
+ if (mx < 0) mx = 0;
+ if (my < 0) my = 0;
+
+ if (mx + workspacemenu->getWidth() > getWidth())
+ mx = getWidth() - workspacemenu->getWidth() - getBorderWidth();
+
+ if (my + workspacemenu->getHeight() > getHeight())
+ my = getHeight() - workspacemenu->getHeight() - getBorderWidth();
+
+ workspacemenu->move(mx, my);
+
+ if (! workspacemenu->isVisible()) {
+ workspacemenu->removeParent();
+ workspacemenu->show();
+ }
+}
+
+
+void BScreen::showRootMenu(int x, int y) {
+ int mx = x - (rootmenu->getWidth() / 2);
+ int my = y - (rootmenu->getTitleHeight() / 2);
+
+ if (mx < 0) mx = 0;
+ if (my < 0) my = 0;
+
+ if (mx + rootmenu->getWidth() > getWidth())
+ mx = getWidth() - rootmenu->getWidth() - getBorderWidth();
+
+ if (my + rootmenu->getHeight() > getHeight())
+ my = getHeight() - rootmenu->getHeight() - getBorderWidth();
+
+ rootmenu->move(mx, my);
+
+ if (! rootmenu->isVisible()) {
+ blackbox->checkMenu();
+ rootmenu->show();
+ }
+}
+
+
+void BScreen::propertyNotifyEvent(const XPropertyEvent *pe) {
+ if (pe->atom == xatom->getAtom(XAtom::net_desktop_names)) {
+ // _NET_WM_DESKTOP_NAMES
+ WorkspaceList::iterator it = workspacesList.begin();
+ const WorkspaceList::iterator end = workspacesList.end();
+ for (; it != end; ++it) {
+ (*it)->readName(); // re-read its name from the window property
+ workspacemenu->changeWorkspaceLabel((*it)->getID(), (*it)->getName());
+ }
+ workspacemenu->update();
+ toolbar->reconfigure();
+ saveWorkspaceNames();
+ }
+}
+
+
+void BScreen::toggleFocusModel(FocusModel model) {
+ std::for_each(windowList.begin(), windowList.end(),
+ std::mem_fun(&BlackboxWindow::ungrabButtons));
+
+ if (model == SloppyFocus) {
+ saveSloppyFocus(True);
+ } else {
+ // we're cheating here to save writing the config file 3 times
+ resource.auto_raise = False;
+ resource.click_raise = False;
+ saveSloppyFocus(False);
+ }
+
+ std::for_each(windowList.begin(), windowList.end(),
+ std::mem_fun(&BlackboxWindow::grabButtons));
+}
+
+
+BTexture BScreen::readDatabaseTexture(const string &rname,
+ const string &default_color,
+ const Configuration &style) {
+ BTexture texture;
+ string s;
+
+ if (style.getValue(rname, s))
+ texture = BTexture(s);
+ else
+ texture.setTexture(BTexture::Solid | BTexture::Flat);
+
+ // associate this texture with this screen
+ texture.setDisplay(getBaseDisplay(), getScreenNumber());
+ texture.setImageControl(image_control);
+
+ texture.setColor(readDatabaseColor(rname + ".color", default_color, style));
+ texture.setColorTo(readDatabaseColor(rname + ".colorTo", default_color,
+ style));
+
+ return texture;
+}
+
+
+BColor BScreen::readDatabaseColor(const string &rname,
+ const string &default_color,
+ const Configuration &style) {
+ BColor color;
+ string s;
+ if (style.getValue(rname, s))
+ color = BColor(s, getBaseDisplay(), getScreenNumber());
+ else
+ color = BColor(default_color, getBaseDisplay(), getScreenNumber());
+ return color;
+}
+
+
+BFont *BScreen::readDatabaseFont(const string &rbasename,
+ const Configuration &style) {
+ string fontname;
+
+ string s;
+
+#ifdef XFT
+ int i;
+ if (style.getValue(rbasename + "xft.font", s) &&
+ style.getValue(rbasename + "xft.size", i)) {
+ string family = s;
+ bool bold = False;
+ bool italic = False;
+ if (style.getValue(rbasename + "xft.flags", s)) {
+ if (s.find("bold") != string::npos)
+ bold = True;
+ if (s.find("italic") != string::npos)
+ italic = True;
+ }
+
+ BFont *b = new BFont(blackbox->getXDisplay(), this, family, i, bold,
+ italic, resource.aa_fonts);
+ if (b->valid())
+ return b;
+ else
+ delete b; // fall back to the normal X font stuff
+ }
+#endif // XFT
+
+ style.getValue(rbasename + "font", s);
+ // if this fails, a blank string will be used, which will cause the fallback
+ // font to load.
+
+ BFont *b = new BFont(blackbox->getXDisplay(), this, s);
+ if (! b->valid())
+ exit(2); // can't continue without a font
+ return b;
+}
projects / chaz / openbox / blobdiff