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

Updated copyright date and fixed auto_ptr

Browse source
This commit is contained in:
fluxgen 2002-01-09 14:07:09 +00:00
parent bf4c00fc6a
commit a7e1cc466a
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/fluxbox.cc
View file

@ -1,5 +1,5 @@
// fluxbox.cc for Fluxbox. // fluxbox.cc for Fluxbox Window Manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// blackbox.cc for blackbox - an X11 Window manager // blackbox.cc for blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
@ -22,6 +22,8 @@
// 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.16 2002/01/09 14:07:09 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
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -1427,7 +1429,7 @@ void Fluxbox::save_rc(void) {
XrmDatabase new_blackboxrc = (XrmDatabase) 0; XrmDatabase new_blackboxrc = (XrmDatabase) 0;
char rc_string[1024]; char rc_string[1024];
char *dbfile = getRcFilename(); //note: dbfile memory will be release @ end of function auto_ptr<char> dbfile(getRcFilename());
// load_rc(); This overwrites configs made while running, for example // load_rc(); This overwrites configs made while running, for example
// usage of iconbar and tabs // usage of iconbar and tabs
@ -1680,15 +1682,13 @@ void Fluxbox::save_rc(void) {
delete [] save_string; delete [] save_string;
} }
XrmDatabase old_blackboxrc = XrmGetFileDatabase(dbfile); XrmDatabase old_blackboxrc = XrmGetFileDatabase(dbfile.get());
XrmMergeDatabases(new_blackboxrc, &old_blackboxrc); //merge database together XrmMergeDatabases(new_blackboxrc, &old_blackboxrc); //merge database together
XrmPutFileDatabase(old_blackboxrc, dbfile); XrmPutFileDatabase(old_blackboxrc, dbfile.get());
XrmDestroyDatabase(old_blackboxrc); XrmDestroyDatabase(old_blackboxrc);
// XrmDestroyDatabase(new_blackboxrc); // XrmDestroyDatabase(new_blackboxrc);
//finaly release filename memory
delete [] dbfile;
} }
//-------- getRcFilename ------------- //-------- getRcFilename -------------
@ -1716,17 +1716,15 @@ void Fluxbox::load_rc(void) {
XrmDatabase database = (XrmDatabase) 0; XrmDatabase database = (XrmDatabase) 0;
//get resource filename //get resource filename
char *dbfile = getRcFilename(); //note: dont forget to free memory auto_ptr<char> dbfile(getRcFilename());
//load file //load file
database = XrmGetFileDatabase(dbfile); database = XrmGetFileDatabase(dbfile.get());
if (!database) { if (!database) {
cerr<<"Fluxbox: Cant open "<<dbfile<<" !"<<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);
} }
//destroy dbfile (created by getRcFilename)
delete [] dbfile;
XrmValue value; XrmValue value;
char *value_type; char *value_type;
@ -1937,14 +1935,12 @@ void Fluxbox::loadTitlebar() {
void Fluxbox::load_rc(BScreen *screen) { void Fluxbox::load_rc(BScreen *screen) {
XrmDatabase database = (XrmDatabase) 0; XrmDatabase database = (XrmDatabase) 0;
char *dbfile = getRcFilename(); auto_ptr<char> dbfile(getRcFilename());
database = XrmGetFileDatabase(dbfile); database = XrmGetFileDatabase(dbfile.get());
if (!database) if (!database)
database = XrmGetFileDatabase(DEFAULT_INITFILE); database = XrmGetFileDatabase(DEFAULT_INITFILE);
delete [] dbfile;
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();
@ -2398,21 +2394,19 @@ void Fluxbox::real_reconfigure(void) {
XrmDatabase new_blackboxrc = (XrmDatabase) 0; XrmDatabase new_blackboxrc = (XrmDatabase) 0;
char style[MAXPATHLEN + 64]; char style[MAXPATHLEN + 64];
char *dbfile = getRcFilename(); auto_ptr<char> dbfile(getRcFilename());
sprintf(style, "session.styleFile: %s", resource.style_file); sprintf(style, "session.styleFile: %s", resource.style_file);
XrmPutLineResource(&new_blackboxrc, style); XrmPutLineResource(&new_blackboxrc, style);
XrmDatabase old_blackboxrc = XrmGetFileDatabase(dbfile); XrmDatabase old_blackboxrc = XrmGetFileDatabase(dbfile.get());
XrmMergeDatabases(new_blackboxrc, &old_blackboxrc); XrmMergeDatabases(new_blackboxrc, &old_blackboxrc);
XrmPutFileDatabase(old_blackboxrc, dbfile); XrmPutFileDatabase(old_blackboxrc, dbfile.get());
if (old_blackboxrc) if (old_blackboxrc)
XrmDestroyDatabase(old_blackboxrc); XrmDestroyDatabase(old_blackboxrc);
delete [] dbfile;
for (int i = 0, n = menuTimestamps->count(); i < n; i++) { for (int i = 0, n = menuTimestamps->count(); i < n; i++) {
MenuTimestamp *ts = menuTimestamps->remove(0); MenuTimestamp *ts = menuTimestamps->remove(0);