nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added screen resources

Browse source
This commit is contained in:
fluxgen 2002-01-20 02:19:16 +00:00
parent ab328564e5
commit 618c8bd6de
1 changed files with 172 additions and 412 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

470
src/fluxbox.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.22 2002/01/18 18:28:17 pekdon Exp $ // $Id: fluxbox.cc,v 1.23 2002/01/20 02:19:16 fluxgen Exp $
// stupid macros needed to access some functions in version 2 of the GNU C // stupid macros needed to access some functions in version 2 of the GNU C
// library // library
@ -51,6 +51,7 @@
#include "Workspacemenu.hh" #include "Workspacemenu.hh"
#include "StringUtil.hh" #include "StringUtil.hh"
#include "Resource.hh" #include "Resource.hh"
#include "XrmDatabaseHelper.hh"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
@ -121,6 +122,7 @@
#include <string> #include <string>
#include <strstream> #include <strstream>
#include <memory> #include <memory>
using namespace std; using namespace std;
#ifndef HAVE_BASENAME #ifndef HAVE_BASENAME
@ -291,7 +293,7 @@ Fluxbox *Fluxbox::instance(int m_argc, char **m_argv, char *dpy_name, char *rc)
Fluxbox::Fluxbox(int m_argc, char **m_argv, char *dpy_name, char *rc) Fluxbox::Fluxbox(int m_argc, char **m_argv, char *dpy_name, char *rc)
: BaseDisplay(m_argv[0], dpy_name), : BaseDisplay(m_argv[0], dpy_name),
m_resourcemanager(), m_resourcemanager(), m_screen_rm(),
m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"), m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"),
m_rc_iconbar(m_resourcemanager, true, "session.iconbar", "Session.Iconbar"), m_rc_iconbar(m_resourcemanager, true, "session.iconbar", "Session.Iconbar"),
m_rc_colors_per_channel(m_resourcemanager, 4, "session.colorsPerChannel", "Session.ColorsPerChannel"), m_rc_colors_per_channel(m_resourcemanager, 4, "session.colorsPerChannel", "Session.ColorsPerChannel"),
@ -304,14 +306,16 @@ m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"),
m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"),
focused_window(0), focused_window(0),
masked_window(0), masked_window(0),
no_focus(0), no_focus(False),
rc_file(rc) rc_file(rc),
argv(m_argv), argc(m_argc),
key(0)
{ {
//singleton pointer //singleton pointer
singleton = this; singleton = this;
grab(); BaseDisplay::GrabGuard gg(*this);
gg.grab();
if (! XSupportsLocale()) if (! XSupportsLocale())
fprintf(stderr, "X server does not support locale\n"); fprintf(stderr, "X server does not support locale\n");
@ -321,16 +325,8 @@ rc_file(rc)
// Set default values to member variables // Set default values to member variables
argc = m_argc;
argv = m_argv;
key=0;
no_focus = False;
// resource.titlebar_file = resource.keys_file = 0;
resource.auto_raise_delay.tv_sec = resource.auto_raise_delay.tv_usec = 0; resource.auto_raise_delay.tv_sec = resource.auto_raise_delay.tv_usec = 0;
masked = None; masked = None;
windowSearchList = new LinkedList<WindowSearch>; windowSearchList = new LinkedList<WindowSearch>;
@ -352,7 +348,6 @@ rc_file(rc)
menuTimestamps = new LinkedList<MenuTimestamp>; menuTimestamps = new LinkedList<MenuTimestamp>;
load_rc();
#ifdef HAVE_GETPID #ifdef HAVE_GETPID
fluxbox_pid = XInternAtom(getXDisplay(), "_BLACKBOX_PID", False); fluxbox_pid = XInternAtom(getXDisplay(), "_BLACKBOX_PID", False);
@ -360,10 +355,13 @@ rc_file(rc)
screenList = new LinkedList<BScreen>; screenList = new LinkedList<BScreen>;
int i; int i;
load_rc();
//allocate screens //allocate screens
for (i = 0; i < getNumberOfScreens(); i++) { for (i = 0; i < getNumberOfScreens(); i++) {
BScreen *screen = new BScreen(this, i); char scrname[128], altscrname[128];
sprintf(scrname, "session.screen%d", i);
sprintf(altscrname, "session.Screen%d", i);
BScreen *screen = new BScreen(m_screen_rm, this, scrname, altscrname, i);
if (! screen->isScreenManaged()) { if (! screen->isScreenManaged()) {
delete screen; delete screen;
@ -372,6 +370,7 @@ rc_file(rc)
screenList->insert(screen); screenList->insert(screen);
} }
I18n *i18n = I18n::instance(); I18n *i18n = I18n::instance();
if (! screenList->count()) { if (! screenList->count()) {
fprintf(stderr, fprintf(stderr,
@ -741,7 +740,10 @@ void Fluxbox::process_event(XEvent *e) {
#endif // SLIT #endif // SLIT
if ((win = searchWindow(e->xdestroywindow.window))) { if ((win = searchWindow(e->xdestroywindow.window))) {
win->destroyNotifyEvent(&e->xdestroywindow); if (win->destroyNotifyEvent(&e->xdestroywindow)) {
delete win;
win = 0;
}
#ifdef SLIT #ifdef SLIT
} else if ((slit = searchSlit(e->xdestroywindow.window))) { } else if ((slit = searchSlit(e->xdestroywindow.window))) {
slit->removeClient(e->xdestroywindow.window, False); slit->removeClient(e->xdestroywindow.window, False);
@ -1321,12 +1323,13 @@ BScreen *Fluxbox::searchScreen(Window window) {
LinkedListIterator<BScreen> it(screenList); LinkedListIterator<BScreen> it(screenList);
for (; it.current(); it++) { for (; it.current(); it++) {
if (it.current()) if (it.current()) {
if (it.current()->getRootWindow() == window) { if (it.current()->getRootWindow() == window) {
screen = it.current(); screen = it.current();
return screen; return screen;
} }
} }
}
return (BScreen *) 0; return (BScreen *) 0;
} }
@ -1351,13 +1354,14 @@ FluxboxWindow *Fluxbox::searchGroup(Window window, FluxboxWindow *win) {
for (; it.current(); it++) { for (; it.current(); it++) {
WindowSearch *tmp = it.current(); WindowSearch *tmp = it.current();
if (tmp) if (tmp) {
if (tmp->getWindow() == window) { if (tmp->getWindow() == window) {
w = tmp->getData(); w = tmp->getData();
if (w->getClientWindow() != win->getClientWindow()) if (w->getClientWindow() != win->getClientWindow())
return win; return win;
} }
} }
}
return (FluxboxWindow *) 0; return (FluxboxWindow *) 0;
} }
@ -1370,12 +1374,13 @@ Basemenu *Fluxbox::searchMenu(Window window) {
for (; it.current(); it++) { for (; it.current(); it++) {
MenuSearch *tmp = it.current(); MenuSearch *tmp = it.current();
if (tmp) if (tmp) {
if (tmp->getWindow() == window) { if (tmp->getWindow() == window) {
menu = tmp->getData(); menu = tmp->getData();
return menu; return menu;
} }
} }
}
return (Basemenu *) 0; return (Basemenu *) 0;
} }
@ -1388,12 +1393,13 @@ Toolbar *Fluxbox::searchToolbar(Window window) {
for (; it.current(); it++) { for (; it.current(); it++) {
ToolbarSearch *tmp = it.current(); ToolbarSearch *tmp = it.current();
if (tmp) if (tmp) {
if (tmp->getWindow() == window) { if (tmp->getWindow() == window) {
tbar = tmp->getData(); tbar = tmp->getData();
return tbar; return tbar;
} }
} }
}
return (Toolbar *) 0; return (Toolbar *) 0;
} }
@ -1419,12 +1425,13 @@ Slit *Fluxbox::searchSlit(Window window) {
for (; it.current(); it++) { for (; it.current(); it++) {
SlitSearch *tmp = it.current(); SlitSearch *tmp = it.current();
if (tmp) if (tmp) {
if (tmp->getWindow() == window) { if (tmp->getWindow() == window) {
s = tmp->getData(); s = tmp->getData();
return s; return s;
} }
} }
}
return (Slit *) 0; return (Slit *) 0;
} }
@ -1467,7 +1474,7 @@ void Fluxbox::removeWindowSearch(Window window) {
for (; it.current(); it++) { for (; it.current(); it++) {
WindowSearch *tmp = it.current(); WindowSearch *tmp = it.current();
if (tmp) if (tmp) {
if (tmp->getWindow() == window) { if (tmp->getWindow() == window) {
windowSearchList->remove(tmp); windowSearchList->remove(tmp);
delete tmp; delete tmp;
@ -1475,6 +1482,7 @@ void Fluxbox::removeWindowSearch(Window window) {
} }
} }
} }
}
void Fluxbox::removeGroupSearch(Window window) { void Fluxbox::removeGroupSearch(Window window) {
@ -1482,7 +1490,7 @@ void Fluxbox::removeGroupSearch(Window window) {
for (; it.current(); it++) { for (; it.current(); it++) {
WindowSearch *tmp = it.current(); WindowSearch *tmp = it.current();
if (tmp) if (tmp) {
if (tmp->getWindow() == window) { if (tmp->getWindow() == window) {
groupSearchList->remove(tmp); groupSearchList->remove(tmp);
delete tmp; delete tmp;
@ -1490,6 +1498,7 @@ void Fluxbox::removeGroupSearch(Window window) {
} }
} }
} }
}
void Fluxbox::removeMenuSearch(Window window) { void Fluxbox::removeMenuSearch(Window window) {
@ -1497,7 +1506,7 @@ void Fluxbox::removeMenuSearch(Window window) {
for (; it.current(); it++) { for (; it.current(); it++) {
MenuSearch *tmp = it.current(); MenuSearch *tmp = it.current();
if (tmp) if (tmp) {
if (tmp->getWindow() == window) { if (tmp->getWindow() == window) {
menuSearchList->remove(tmp); menuSearchList->remove(tmp);
delete tmp; delete tmp;
@ -1505,13 +1514,14 @@ void Fluxbox::removeMenuSearch(Window window) {
} }
} }
} }
}
void Fluxbox::removeToolbarSearch(Window window) { void Fluxbox::removeToolbarSearch(Window window) {
LinkedListIterator<ToolbarSearch> it(toolbarSearchList); LinkedListIterator<ToolbarSearch> it(toolbarSearchList);
for (; it.current(); it++) { for (; it.current(); it++) {
ToolbarSearch *tmp = it.current(); ToolbarSearch *tmp = it.current();
if (tmp) if (tmp) {
if (tmp->getWindow() == window) { if (tmp->getWindow() == window) {
toolbarSearchList->remove(tmp); toolbarSearchList->remove(tmp);
delete tmp; delete tmp;
@ -1519,6 +1529,7 @@ void Fluxbox::removeToolbarSearch(Window window) {
} }
} }
} }
}
void Fluxbox::removeTabSearch(Window window) { void Fluxbox::removeTabSearch(Window window) {
@ -1539,7 +1550,7 @@ void Fluxbox::removeSlitSearch(Window window) {
for (; it.current(); it++) { for (; it.current(); it++) {
SlitSearch *tmp = it.current(); SlitSearch *tmp = it.current();
if (tmp) if (tmp) {
if (tmp->getWindow() == window) { if (tmp->getWindow() == window) {
slitSearchList->remove(tmp); slitSearchList->remove(tmp);
delete tmp; delete tmp;
@ -1547,6 +1558,7 @@ void Fluxbox::removeSlitSearch(Window window) {
} }
} }
} }
}
#endif // SLIT #endif // SLIT
@ -1583,7 +1595,8 @@ void Fluxbox::shutdown(void) {
//---------------------- //----------------------
void Fluxbox::save_rc(void) { void Fluxbox::save_rc(void) {
XrmDatabase new_blackboxrc = (XrmDatabase) 0; XrmDatabase new_blackboxrc = 0;
char rc_string[1024]; char rc_string[1024];
auto_ptr<char> dbfile(getRcFilename()); auto_ptr<char> dbfile(getRcFilename());
@ -1591,11 +1604,20 @@ void Fluxbox::save_rc(void) {
// load_rc(); // load_rc();
// This overwrites configs made while running, for example // This overwrites configs made while running, for example
// usage of iconbar and tabs // usage of iconbar and tabs
if (*dbfile) #ifndef DEBUG
cerr<<__FILE__<<"("<<__LINE__<<"): Here"<<endl;
#endif
if (*dbfile) {
m_resourcemanager.save(dbfile.get(), dbfile.get()); m_resourcemanager.save(dbfile.get(), dbfile.get());
else #ifdef DEBUG
cerr<<"Saving resource"<<endl;
#endif
m_screen_rm.save(dbfile.get(), dbfile.get());
} else
cerr<<"database filename is invalid!"<<endl; cerr<<"database filename is invalid!"<<endl;
sprintf(rc_string, "session.doubleClickInterval: %lu", sprintf(rc_string, "session.doubleClickInterval: %lu",
resource.double_click_interval); resource.double_click_interval);
XrmPutLineResource(&new_blackboxrc, rc_string); XrmPutLineResource(&new_blackboxrc, rc_string);
@ -1606,6 +1628,7 @@ void Fluxbox::save_rc(void) {
XrmPutLineResource(&new_blackboxrc, rc_string); XrmPutLineResource(&new_blackboxrc, rc_string);
LinkedListIterator<BScreen> it(screenList); LinkedListIterator<BScreen> it(screenList);
for (; it.current(); it++) { for (; it.current(); it++) {
BScreen *screen = it.current(); BScreen *screen = it.current();
int screen_number = screen->getScreenNumber(); int screen_number = screen->getScreenNumber();
@ -1642,23 +1665,6 @@ void Fluxbox::save_rc(void) {
XrmPutLineResource(&new_blackboxrc, rc_string); XrmPutLineResource(&new_blackboxrc, rc_string);
#endif // SLIT #endif // SLIT
sprintf(rc_string, "session.opaqueMove: %s",
((screen->doOpaqueMove()) ? "True" : "False"));
XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.imageDither: %s",
((screen->getImageControl()->doDither()) ? "True" : "False"));
XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.screen%d.fullMaximization: %s", screen_number,
((screen->doFullMax()) ? "True" : "False"));
XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.screen%d.rootCommand: %s", screen_number,
screen->getRootCommand().c_str());
XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.screen%d.focusNewWindows: %s", screen_number, sprintf(rc_string, "session.screen%d.focusNewWindows: %s", screen_number,
((screen->doFocusNew()) ? "True" : "False")); ((screen->doFocusNew()) ? "True" : "False"));
XrmPutLineResource(&new_blackboxrc, rc_string); XrmPutLineResource(&new_blackboxrc, rc_string);
@ -1677,11 +1683,8 @@ void Fluxbox::save_rc(void) {
"TopToBottom" : "BottomToTop")); "TopToBottom" : "BottomToTop"));
XrmPutLineResource(&new_blackboxrc, rc_string); XrmPutLineResource(&new_blackboxrc, rc_string);
char *placement = (char *) 0; std::string placement;
sprintf(rc_string, "session.screen%d.maxOverSlit: %s", screen_number,
((screen->doMaxOverSlit()) ? "True" : "False"));
XrmPutLineResource(&new_blackboxrc, rc_string);
switch (screen->getPlacementPolicy()) { switch (screen->getPlacementPolicy()) {
case BScreen::CASCADEPLACEMENT: case BScreen::CASCADEPLACEMENT:
placement = "CascadePlacement"; placement = "CascadePlacement";
@ -1697,9 +1700,9 @@ void Fluxbox::save_rc(void) {
break; break;
} }
sprintf(rc_string, "session.screen%d.windowPlacement: %s", screen_number, sprintf(rc_string, "session.screen%d.windowPlacement: %s", screen_number,
placement); placement.c_str());
XrmPutLineResource(&new_blackboxrc, rc_string); XrmPutLineResource(&new_blackboxrc, rc_string);
//TODO: This isn't pretty!
char *focus_mode = 0; char *focus_mode = 0;
if (screen->isSloppyFocus() && screen->doAutoRaise()) if (screen->isSloppyFocus() && screen->doAutoRaise())
focus_mode = "AutoRaiseSloppyFocus"; focus_mode = "AutoRaiseSloppyFocus";
@ -1717,50 +1720,6 @@ void Fluxbox::save_rc(void) {
XrmPutLineResource(&new_blackboxrc, rc_string); XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.screen%d.workspaces: %d", screen_number,
screen->getCount());
XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.screen%d.toolbar.onTop: %s", screen_number,
((screen->getToolbar()->isOnTop()) ? "True" : "False"));
XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.screen%d.toolbar.autoHide: %s", screen_number,
((screen->getToolbar()->doAutoHide()) ? "True" : "False"));
XrmPutLineResource(&new_blackboxrc, rc_string);
char *toolbar_placement = (char *) 0;
switch (screen->getToolbarPlacement()) {
case Toolbar::TOPLEFT: toolbar_placement = "TopLeft"; break;
case Toolbar::BOTTOMLEFT: toolbar_placement = "BottomLeft"; break;
case Toolbar::TOPCENTER: toolbar_placement = "TopCenter"; break;
case Toolbar::TOPRIGHT: toolbar_placement = "TopRight"; break;
case Toolbar::BOTTOMRIGHT: toolbar_placement = "BottomRight"; break;
case Toolbar::BOTTOMCENTER: default:
toolbar_placement = "BottomCenter"; break;
}
sprintf(rc_string, "session.screen%d.toolbar.placement: %s", screen_number,
toolbar_placement);
XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.screen%d.tab.placement: %s", screen_number,
Tab::getTabPlacementString(screen->getTabPlacement()));
XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.screen%d.tab.alignment: %s", screen_number,
Tab::getTabAlignmentString(screen->getTabAlignment()));
XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.screen%d.tab.rotatevertical: %s", screen_number,
((screen->isTabRotateVertical()) ? "True" : "False"));
XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.screen%d.sloppywindowgrouping: %s", screen_number,
((screen->isSloppyWindowGrouping()) ? "True" : "False"));
XrmPutLineResource(&new_blackboxrc, rc_string);
load_rc(screen); load_rc(screen);
// these are static, but may not be saved in the users resource file, // these are static, but may not be saved in the users resource file,
@ -1787,42 +1746,23 @@ void Fluxbox::save_rc(void) {
screen->getEdgeSnapThreshold()); screen->getEdgeSnapThreshold());
XrmPutLineResource(&new_blackboxrc, rc_string); XrmPutLineResource(&new_blackboxrc, rc_string);
sprintf(rc_string, "session.screen%d.toolbar.widthPercent: %d",
screen_number, screen->getToolbarWidthPercent());
XrmPutLineResource(&new_blackboxrc, rc_string);
// write out the users workspace names // write out the users workspace names
int i, len = 0;
for (i = 0; i < screen->getCount(); i++)
len += strlen((screen->getWorkspace(i)->getName()) ?
screen->getWorkspace(i)->getName() : "Null") + 1;
char *resource_string = new char[len + 1024], sprintf(rc_string, "session.screen%d.workspaceNames: ", screen_number);
*save_string = new char[len], *save_string_pos = save_string, string workspaces_string(rc_string);
*name_string_pos; #ifndef DEBUG
cerr<<__FILE__<<"("<<__LINE__<<"): workspaces="<<screen->getCount()<<endl;
if (save_string) { #endif
for (i = 0; i < screen->getCount(); i++) { for (int workspace=0; workspace < screen->getCount(); workspace++) {
len = strlen((screen->getWorkspace(i)->getName()) ? if (screen->getWorkspace(workspace)->getName()!=0)
screen->getWorkspace(i)->getName() : "Null") + 1; workspaces_string.append(screen->getWorkspace(workspace)->getName());
name_string_pos = else
(char *) ((screen->getWorkspace(i)->getName()) ? workspaces_string.append("Null");
screen->getWorkspace(i)->getName() : "Null"); workspaces_string.append(", ");
while (--len)
*(save_string_pos++) = *(name_string_pos++);
*(save_string_pos++) = ',';
}
} }
*(--save_string_pos) = '\0'; XrmPutLineResource(&new_blackboxrc, workspaces_string.c_str());
sprintf(resource_string, "session.screen%d.workspaceNames: %s",
screen_number, save_string);
XrmPutLineResource(&new_blackboxrc, resource_string);
delete [] resource_string;
delete [] save_string;
} }
XrmDatabase old_blackboxrc = XrmGetFileDatabase(dbfile.get()); XrmDatabase old_blackboxrc = XrmGetFileDatabase(dbfile.get());
@ -1830,7 +1770,6 @@ void Fluxbox::save_rc(void) {
XrmMergeDatabases(new_blackboxrc, &old_blackboxrc); //merge database together XrmMergeDatabases(new_blackboxrc, &old_blackboxrc); //merge database together
XrmPutFileDatabase(old_blackboxrc, dbfile.get()); XrmPutFileDatabase(old_blackboxrc, dbfile.get());
XrmDestroyDatabase(old_blackboxrc); XrmDestroyDatabase(old_blackboxrc);
// XrmDestroyDatabase(new_blackboxrc);
} }
@ -1851,7 +1790,7 @@ char *Fluxbox::getRcFilename() {
} }
void Fluxbox::load_rc(void) { void Fluxbox::load_rc(void) {
XrmDatabase database = (XrmDatabase) 0; XrmDatabaseHelper database;
//get resource filename //get resource filename
auto_ptr<char> dbfile(getRcFilename()); auto_ptr<char> dbfile(getRcFilename());
@ -1897,21 +1836,21 @@ void Fluxbox::load_rc(void) {
//load file //load file
database = XrmGetFileDatabase(dbfile.get()); database = XrmGetFileDatabase(dbfile.get());
if (!database) { if (database==0) {
cerr<<"Fluxbox: Cant open "<<dbfile.get()<<" !"<<endl; cerr<<"Fluxbox: Cant open "<<dbfile.get()<<" !"<<endl;
cerr<<"Using: "<<DEFAULT_INITFILE<<endl; cerr<<"Using: "<<DEFAULT_INITFILE<<endl;
database = XrmGetFileDatabase(DEFAULT_INITFILE); database = XrmGetFileDatabase(DEFAULT_INITFILE);
} }
if (XrmGetResource(database, "session.doubleClickInterval", if (XrmGetResource(*database, "session.doubleClickInterval",
"Session.DoubleClickInterval", &value_type, &value)) { "Session.DoubleClickInterval", &value_type, &value)) {
if (sscanf(value.addr, "%lu", &resource.double_click_interval) != 1) if (sscanf(value.addr, "%lu", &resource.double_click_interval) != 1)
resource.double_click_interval = 250; resource.double_click_interval = 250;
} else } else
resource.double_click_interval = 250; resource.double_click_interval = 250;
if (XrmGetResource(database, "session.autoRaiseDelay", if (XrmGetResource(*database, "session.autoRaiseDelay", "Session.AutoRaiseDelay",
"Session.AutoRaiseDelay", &value_type, &value)) { &value_type, &value)) {
if (sscanf(value.addr, "%lu", &resource.auto_raise_delay.tv_usec) != 1) if (sscanf(value.addr, "%lu", &resource.auto_raise_delay.tv_usec) != 1)
resource.auto_raise_delay.tv_usec = 250; resource.auto_raise_delay.tv_usec = 250;
} else } else
@ -1922,45 +1861,40 @@ void Fluxbox::load_rc(void) {
(resource.auto_raise_delay.tv_sec * 1000); (resource.auto_raise_delay.tv_sec * 1000);
resource.auto_raise_delay.tv_usec *= 1000; resource.auto_raise_delay.tv_usec *= 1000;
XrmDestroyDatabase(database);
} }
void Fluxbox::load_rc(BScreen *screen) { void Fluxbox::load_rc(BScreen *screen) {
XrmDatabase database = (XrmDatabase) 0;
//get resource filename
auto_ptr<char> dbfile(getRcFilename()); auto_ptr<char> dbfile(getRcFilename());
#ifdef DEBUG
cerr<<__FILE__<<"("<<__LINE__<<"): dbfile="<<dbfile.get()<<endl;
#endif
if (dbfile.get()) {
if (!m_screen_rm.load(dbfile.get())) {
cerr<<"Faild to load database:"<<dbfile.get()<<endl;
cerr<<"Trying with: "<<DEFAULT_INITFILE<<endl;
if (!m_screen_rm.load(DEFAULT_INITFILE))
cerr<<"Faild to load database: "<<DEFAULT_INITFILE<<endl;
}
} else {
if (!m_screen_rm.load(DEFAULT_INITFILE))
cerr<<"Faild to load database: "<<DEFAULT_INITFILE<<endl;
}
XrmDatabaseHelper database;
database = XrmGetFileDatabase(dbfile.get()); database = XrmGetFileDatabase(dbfile.get());
if (!database) if (database==0)
database = XrmGetFileDatabase(DEFAULT_INITFILE); database = XrmGetFileDatabase(DEFAULT_INITFILE);
XrmValue value; XrmValue value;
char *value_type, name_lookup[1024], class_lookup[1024]; char *value_type, name_lookup[1024], class_lookup[1024];
int screen_number = screen->getScreenNumber(); int screen_number = screen->getScreenNumber();
sprintf(name_lookup, "session.screen%d.fullMaximization", screen_number);
sprintf(class_lookup, "Session.Screen%d.FullMaximization", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
&value)) {
if (! strncasecmp(value.addr, "true", value.size))
screen->saveFullMax(True);
else
screen->saveFullMax(False);
} else
screen->saveFullMax(False);
sprintf(name_lookup, "session.screen%d.rootCommand", screen_number);
sprintf(class_lookup, "Session.Screen%d.RootCommand", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
&value)) {
screen->saveRootCommand(value.addr==0 ? "": value.addr);
} else
screen->saveRootCommand("");
sprintf(name_lookup, "session.screen%d.focusNewWindows", screen_number); sprintf(name_lookup, "session.screen%d.focusNewWindows", screen_number);
sprintf(class_lookup, "Session.Screen%d.FocusNewWindows", screen_number); sprintf(class_lookup, "Session.Screen%d.FocusNewWindows", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) { &value)) {
if (! strncasecmp(value.addr, "true", value.size)) if (! strncasecmp(value.addr, "true", value.size))
screen->saveFocusNew(True); screen->saveFocusNew(True);
@ -1971,7 +1905,7 @@ void Fluxbox::load_rc(BScreen *screen) {
sprintf(name_lookup, "session.screen%d.focusLastWindow", screen_number); sprintf(name_lookup, "session.screen%d.focusLastWindow", screen_number);
sprintf(class_lookup, "Session.Screen%d.focusLastWindow", screen_number); sprintf(class_lookup, "Session.Screen%d.focusLastWindow", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) { &value)) {
if (! strncasecmp(value.addr, "true", value.size)) if (! strncasecmp(value.addr, "true", value.size))
screen->saveFocusLast(True); screen->saveFocusLast(True);
@ -1982,29 +1916,18 @@ void Fluxbox::load_rc(BScreen *screen) {
sprintf(name_lookup, "session.screen%d.rowPlacementDirection", screen_number); sprintf(name_lookup, "session.screen%d.rowPlacementDirection", screen_number);
sprintf(class_lookup, "Session.Screen%d.RowPlacementDirection", screen_number); sprintf(class_lookup, "Session.Screen%d.RowPlacementDirection", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) { &value)) {
if (! strncasecmp(value.addr, "righttoleft", value.size)) if (! strncasecmp(value.addr, "righttoleft", value.size))
screen->saveRowPlacementDirection(BScreen::RIGHTLEFT); screen->saveRowPlacementDirection(BScreen::RIGHTLEFT);
else else
sprintf(name_lookup, "session.screen%d.maxOverSlit", screen_number);
sprintf(class_lookup, "Session.Screen%d.MaxOverSlit", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
&value)) {
if (! strncasecmp(value.addr, "true", value.size))
screen->saveMaxOverSlit(True);
else
screen->saveMaxOverSlit(False);
} else
screen->saveMaxOverSlit(False);
screen->saveRowPlacementDirection(BScreen::LEFTRIGHT); screen->saveRowPlacementDirection(BScreen::LEFTRIGHT);
} else } else
screen->saveRowPlacementDirection(BScreen::LEFTRIGHT); screen->saveRowPlacementDirection(BScreen::LEFTRIGHT);
sprintf(name_lookup, "session.screen%d.colPlacementDirection", screen_number); sprintf(name_lookup, "session.screen%d.colPlacementDirection", screen_number);
sprintf(class_lookup, "Session.Screen%d.ColPlacementDirection", screen_number); sprintf(class_lookup, "Session.Screen%d.ColPlacementDirection", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) { &value)) {
if (! strncasecmp(value.addr, "bottomtotop", value.size)) if (! strncasecmp(value.addr, "bottomtotop", value.size))
screen->saveColPlacementDirection(BScreen::BOTTOMTOP); screen->saveColPlacementDirection(BScreen::BOTTOMTOP);
@ -2013,56 +1936,16 @@ void Fluxbox::load_rc(BScreen *screen) {
} else } else
screen->saveColPlacementDirection(BScreen::TOPBOTTOM); screen->saveColPlacementDirection(BScreen::TOPBOTTOM);
sprintf(name_lookup, "session.screen%d.workspaces", screen_number); //check size on toolbarwidth percent
sprintf(class_lookup, "Session.Screen%d.Workspaces", screen_number); if (screen->getToolbarWidthPercent() <= 0 ||
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, screen->getToolbarWidthPercent() > 100)
&value)) {
int i;
if (sscanf(value.addr, "%d", &i) != 1) i = 1;
screen->saveWorkspaces(i);
} else
screen->saveWorkspaces(1);
sprintf(name_lookup, "session.screen%d.toolbar.widthPercent",
screen_number);
sprintf(class_lookup, "Session.Screen%d.Toolbar.WidthPercent",
screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
&value)) {
int i;
if (sscanf(value.addr, "%d", &i) != 1) i = 66;
if (i <= 0 || i > 100)
i = 66;
screen->saveToolbarWidthPercent(i);
} else
screen->saveToolbarWidthPercent(66); screen->saveToolbarWidthPercent(66);
sprintf(name_lookup, "session.screen%d.toolbar.placement", screen_number);
sprintf(class_lookup, "Session.Screen%d.Toolbar.Placement", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
&value)) {
if (! strncasecmp(value.addr, "TopLeft", value.size))
screen->saveToolbarPlacement(Toolbar::TOPLEFT);
else if (! strncasecmp(value.addr, "BottomLeft", value.size))
screen->saveToolbarPlacement(Toolbar::BOTTOMLEFT);
else if (! strncasecmp(value.addr, "TopCenter", value.size))
screen->saveToolbarPlacement(Toolbar::TOPCENTER);
else if (! strncasecmp(value.addr, "TopRight", value.size))
screen->saveToolbarPlacement(Toolbar::TOPRIGHT);
else if (! strncasecmp(value.addr, "BottomRight", value.size))
screen->saveToolbarPlacement(Toolbar::BOTTOMRIGHT);
else
screen->saveToolbarPlacement(Toolbar::BOTTOMCENTER);
} else
screen->saveToolbarPlacement(Toolbar::BOTTOMCENTER);
screen->removeWorkspaceNames(); screen->removeWorkspaceNames();
sprintf(name_lookup, "session.screen%d.workspaceNames", screen_number); sprintf(name_lookup, "session.screen%d.workspaceNames", screen_number);
sprintf(class_lookup, "Session.Screen%d.WorkspaceNames", screen_number); sprintf(class_lookup, "Session.Screen%d.WorkspaceNames", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) { &value)) {
char *search = StringUtil::strdup(value.addr); char *search = StringUtil::strdup(value.addr);
@ -2082,32 +1965,9 @@ void Fluxbox::load_rc(BScreen *screen) {
delete [] search; delete [] search;
} }
sprintf(name_lookup, "session.screen%d.toolbar.onTop", screen_number);
sprintf(class_lookup, "Session.Screen%d.Toolbar.OnTop", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
&value)) {
if (! strncasecmp(value.addr, "true", value.size))
screen->saveToolbarOnTop(True);
else
screen->saveToolbarOnTop(False);
} else
screen->saveToolbarOnTop(False);
sprintf(name_lookup, "session.screen%d.toolbar.autoHide", screen_number);
sprintf(class_lookup, "Session.Screen%d.Toolbar.autoHide", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
&value)) {
if (! strncasecmp(value.addr, "true", value.size))
screen->saveToolbarAutoHide(True);
else
screen->saveToolbarAutoHide(False);
} else
screen->saveToolbarAutoHide(False);
//TODO: make this nicer?
sprintf(name_lookup, "session.screen%d.focusModel", screen_number); sprintf(name_lookup, "session.screen%d.focusModel", screen_number);
sprintf(class_lookup, "Session.Screen%d.FocusModel", screen_number); sprintf(class_lookup, "Session.Screen%d.FocusModel", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) { &value)) {
if (! strncasecmp(value.addr, "clicktofocus", value.size)) { if (! strncasecmp(value.addr, "clicktofocus", value.size)) {
screen->saveAutoRaise(False); screen->saveAutoRaise(False);
@ -2142,7 +2002,7 @@ void Fluxbox::load_rc(BScreen *screen) {
sprintf(name_lookup, "session.screen%d.windowPlacement", screen_number); sprintf(name_lookup, "session.screen%d.windowPlacement", screen_number);
sprintf(class_lookup, "Session.Screen%d.WindowPlacement", screen_number); sprintf(class_lookup, "Session.Screen%d.WindowPlacement", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) &value))
if (! strncasecmp(value.addr, "RowSmartPlacement", value.size)) if (! strncasecmp(value.addr, "RowSmartPlacement", value.size))
screen->savePlacementPolicy(BScreen::ROWSMARTPLACEMENT); screen->savePlacementPolicy(BScreen::ROWSMARTPLACEMENT);
@ -2156,7 +2016,7 @@ void Fluxbox::load_rc(BScreen *screen) {
#ifdef SLIT #ifdef SLIT
sprintf(name_lookup, "session.screen%d.slit.placement", screen_number); sprintf(name_lookup, "session.screen%d.slit.placement", screen_number);
sprintf(class_lookup, "Session.Screen%d.Slit.Placement", screen_number); sprintf(class_lookup, "Session.Screen%d.Slit.Placement", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) &value))
if (! strncasecmp(value.addr, "TopLeft", value.size)) if (! strncasecmp(value.addr, "TopLeft", value.size))
screen->saveSlitPlacement(Slit::TOPLEFT); screen->saveSlitPlacement(Slit::TOPLEFT);
@ -2179,7 +2039,7 @@ void Fluxbox::load_rc(BScreen *screen) {
sprintf(name_lookup, "session.screen%d.slit.direction", screen_number); sprintf(name_lookup, "session.screen%d.slit.direction", screen_number);
sprintf(class_lookup, "Session.Screen%d.Slit.Direction", screen_number); sprintf(class_lookup, "Session.Screen%d.Slit.Direction", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) &value))
if (! strncasecmp(value.addr, "Horizontal", value.size)) if (! strncasecmp(value.addr, "Horizontal", value.size))
screen->saveSlitDirection(Slit::HORIZONTAL); screen->saveSlitDirection(Slit::HORIZONTAL);
@ -2190,7 +2050,7 @@ void Fluxbox::load_rc(BScreen *screen) {
sprintf(name_lookup, "session.screen%d.slit.onTop", screen_number); sprintf(name_lookup, "session.screen%d.slit.onTop", screen_number);
sprintf(class_lookup, "Session.Screen%d.Slit.OnTop", screen_number); sprintf(class_lookup, "Session.Screen%d.Slit.OnTop", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) &value))
if (! strncasecmp(value.addr, "True", value.size)) if (! strncasecmp(value.addr, "True", value.size))
screen->saveSlitOnTop(True); screen->saveSlitOnTop(True);
@ -2201,7 +2061,7 @@ void Fluxbox::load_rc(BScreen *screen) {
sprintf(name_lookup, "session.screen%d.slit.autoHide", screen_number); sprintf(name_lookup, "session.screen%d.slit.autoHide", screen_number);
sprintf(class_lookup, "Session.Screen%d.Slit.AutoHide", screen_number); sprintf(class_lookup, "Session.Screen%d.Slit.AutoHide", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) &value))
if (! strncasecmp(value.addr, "True", value.size)) if (! strncasecmp(value.addr, "True", value.size))
screen->saveSlitAutoHide(True); screen->saveSlitAutoHide(True);
@ -2214,7 +2074,7 @@ void Fluxbox::load_rc(BScreen *screen) {
#ifdef HAVE_STRFTIME #ifdef HAVE_STRFTIME
sprintf(name_lookup, "session.screen%d.strftimeFormat", screen_number); sprintf(name_lookup, "session.screen%d.strftimeFormat", screen_number);
sprintf(class_lookup, "Session.Screen%d.StrftimeFormat", screen_number); sprintf(class_lookup, "Session.Screen%d.StrftimeFormat", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) &value))
screen->saveStrftimeFormat(value.addr); screen->saveStrftimeFormat(value.addr);
else else
@ -2223,7 +2083,7 @@ void Fluxbox::load_rc(BScreen *screen) {
sprintf(name_lookup, "session.screen%d.dateFormat", screen_number); sprintf(name_lookup, "session.screen%d.dateFormat", screen_number);
sprintf(class_lookup, "Session.Screen%d.DateFormat", screen_number); sprintf(class_lookup, "Session.Screen%d.DateFormat", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) { &value)) {
if (strncasecmp(value.addr, "european", value.size)) if (strncasecmp(value.addr, "european", value.size))
screen->saveDateFormat(B_AmericanDate); screen->saveDateFormat(B_AmericanDate);
@ -2234,7 +2094,7 @@ void Fluxbox::load_rc(BScreen *screen) {
sprintf(name_lookup, "session.screen%d.clockFormat", screen_number); sprintf(name_lookup, "session.screen%d.clockFormat", screen_number);
sprintf(class_lookup, "Session.Screen%d.ClockFormat", screen_number); sprintf(class_lookup, "Session.Screen%d.ClockFormat", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type, if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
&value)) { &value)) {
int clock; int clock;
if (sscanf(value.addr, "%d", &clock) != 1) screen->saveClock24Hour(False); if (sscanf(value.addr, "%d", &clock) != 1) screen->saveClock24Hour(False);
@ -2244,115 +2104,15 @@ void Fluxbox::load_rc(BScreen *screen) {
screen->saveClock24Hour(False); screen->saveClock24Hour(False);
#endif // HAVE_STRFTIME #endif // HAVE_STRFTIME
sprintf(name_lookup, "session.screen%d.edgeSnapThreshold", screen_number); if (screen->getTabWidth()>512)
sprintf(class_lookup, "Session.Screen%d.EdgeSnapThreshold", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
&value)) {
int threshold;
if (sscanf(value.addr, "%d", &threshold) != 1)
screen->saveEdgeSnapThreshold(0);
else
screen->saveEdgeSnapThreshold(threshold);
} else
screen->saveEdgeSnapThreshold(0);
sprintf(name_lookup, "session.screen%d.imageDither", screen_number);
sprintf(class_lookup, "Session.Screen%d.ImageDither", screen_number);
if (XrmGetResource(database, "session.imageDither", "Session.ImageDither",
&value_type, &value)) {
if (! strncasecmp("true", value.addr, value.size))
screen->saveImageDither(True);
else
screen->saveImageDither(False);
} else
screen->saveImageDither(True);
if (XrmGetResource(database, "session.opaqueMove", "Session.OpaqueMove",
&value_type, &value)) {
if (! strncasecmp("true", value.addr, value.size))
screen->saveOpaqueMove(True);
else
screen->saveOpaqueMove(False);
} else
screen->saveOpaqueMove(False);
sprintf(name_lookup, "session.screen%d.tab.width", screen_number);
sprintf(class_lookup, "Session.Screen%d.Tab.Width", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup,
&value_type, &value)) {
unsigned int tmp_val;
if (sscanf(value.addr, "%d", &tmp_val) != 1)
screen->saveTabWidth(64); // default tab width
else {
//TODO: should we remove checks for max/min?
if (tmp_val > 512)
screen->saveTabWidth(512); screen->saveTabWidth(512);
else if (tmp_val < 5) else if (screen->getTabWidth()<0)
screen->saveTabWidth(5); screen->saveTabWidth(64);
else
screen->saveTabWidth(tmp_val);
}
} else
screen->saveTabWidth(64); // default tab width
sprintf(name_lookup, "session.screen%d.tab.height", screen_number); if (screen->getTabHeight()>512)
sprintf(class_lookup, "Session.Screen%d.Tab.Height", screen_number); screen->saveTabHeight(512);
if (XrmGetResource(database, name_lookup, class_lookup, else if (screen->getTabHeight()<0)
&value_type, &value)) {
unsigned int tmp_val;
if (sscanf(value.addr, "%d", &tmp_val) != 1)
screen->saveTabHeight(16); // default tab height
else {
//TODO: should we remove checks for max/min?
if (tmp_val > 50)
screen->saveTabHeight(50);
else if (tmp_val < 5)
screen->saveTabHeight(5); screen->saveTabHeight(5);
else
screen->saveTabHeight(tmp_val);
}
} else
screen->saveTabHeight(16); // default tab height
sprintf(name_lookup, "session.screen%d.tab.placement", screen_number);
sprintf(class_lookup, "Session.Screen%d.Tab.Placement", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup,
&value_type, &value)) {
screen->saveTabPlacement(Tab::getTabPlacementNum(value.addr));
} else
screen->saveTabPlacement(Tab::PTOP);
sprintf(name_lookup, "session.screen%d.tab.alignment", screen_number);
sprintf(class_lookup, "Session.Screen%d.Tab.Alignment", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup,
&value_type, &value)) {
screen->saveTabAlignment(Tab::getTabAlignmentNum(value.addr));
} else
screen->saveTabAlignment(Tab::ALEFT);
sprintf(name_lookup, "session.screen%d.tab.rotatevertical", screen_number);
sprintf(class_lookup, "Session.Screen%d.Tab.RotateVertical", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup,
&value_type, &value)) {
if (! strncasecmp("true", value.addr, value.size))
screen->saveTabRotateVertical(True);
else
screen->saveTabRotateVertical(False);
} else
screen->saveTabRotateVertical(False);
sprintf(name_lookup, "session.screen%d.sloppywindowgrouping", screen_number);
sprintf(class_lookup, "Session.Screen%d.SloppyWindowGrouping", screen_number);
if (XrmGetResource(database, name_lookup, class_lookup,
&value_type, &value)) {
if (! strncasecmp("true", value.addr, value.size))
screen->saveSloppyWindowGrouping(True);
else
screen->saveSloppyWindowGrouping(False);
} else
screen->saveSloppyWindowGrouping(False);
} }