summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Screen.cc26
1 files changed, 10 insertions, 16 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 593dd69..dbcff14 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.213 2003/08/10 12:50:04 rathnor Exp $ 25// $Id: Screen.cc,v 1.214 2003/08/11 16:27:23 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -356,9 +356,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
356 menuTheme()->titleFont().setAntialias(*resource.antialias); 356 menuTheme()->titleFont().setAntialias(*resource.antialias);
357 menuTheme()->frameFont().setAntialias(*resource.antialias); 357 menuTheme()->frameFont().setAntialias(*resource.antialias);
358 358
359 // load database for theme engine
360 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename().c_str());
361
362 359
363 // create geometry window 360 // create geometry window
364 361
@@ -435,8 +432,8 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
435 m_configmenu->update(); 432 m_configmenu->update();
436 433
437#ifdef SLIT 434#ifdef SLIT
438 if (slit()) // this will load theme and reconfigure slit 435 // if (slit()) // this will load theme and reconfigure slit
439 FbTk::ThemeManager::instance().loadTheme(slit()->theme()); 436 // FbTk::ThemeManager::instance().loadTheme(slit()->theme());
440#endif // SLIT 437#endif // SLIT
441 438
442 // start with workspace 0 439 // start with workspace 0
@@ -495,6 +492,9 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
495 rm.unlock(); 492 rm.unlock();
496 493
497 XFree(children); 494 XFree(children);
495
496 FbTk::ThemeManager::instance().load(fluxbox->getStyleFilename().c_str());
497
498 XFlush(disp); 498 XFlush(disp);
499} 499}
500 500
@@ -505,7 +505,6 @@ BScreen::~BScreen() {
505 if (geom_pixmap != None) 505 if (geom_pixmap != None)
506 imageControl().removeImage(geom_pixmap); 506 imageControl().removeImage(geom_pixmap);
507 507
508
509 removeWorkspaceNames(); 508 removeWorkspaceNames();
510 509
511 Workspaces::iterator w_it = m_workspaces_list.begin(); 510 Workspaces::iterator w_it = m_workspaces_list.begin();
@@ -614,8 +613,8 @@ void BScreen::reconfigure() {
614 m_menutheme->frameFont().setAntialias(*resource.antialias); 613 m_menutheme->frameFont().setAntialias(*resource.antialias);
615 614
616 // load theme 615 // load theme
617 std::string theme_filename(Fluxbox::instance()->getStyleFilename()); 616 // std::string theme_filename(Fluxbox::instance()->getStyleFilename());
618 FbTk::ThemeManager::instance().load(theme_filename.c_str()); 617 // FbTk::ThemeManager::instance().load(theme_filename.c_str());
619 618
620 I18n *i18n = I18n::instance(); 619 I18n *i18n = I18n::instance();
621 620
@@ -697,7 +696,7 @@ void BScreen::reconfigure() {
697 m_icon_list.end(), 696 m_icon_list.end(),
698 mem_fun(&FluxboxWindow::reconfigure)); 697 mem_fun(&FluxboxWindow::reconfigure));
699 698
700 imageControl().timeout(); 699 imageControl().cleanCache();
701 // notify objects that the screen is reconfigured 700 // notify objects that the screen is reconfigured
702 m_reconfigure_sig.notify(); 701 m_reconfigure_sig.notify();
703} 702}
@@ -865,6 +864,7 @@ void BScreen::changeWorkspaceID(unsigned int id) {
865 focused = focused_client->fbwindow(); 864 focused = focused_client->fbwindow();
866 865
867#ifdef DEBUG 866#ifdef DEBUG
867 cerr<<__FILE__<<"("<<__FUNCTION__<<"): "<<focused_client<<endl;
868 cerr<<__FILE__<<"("<<__FUNCTION__<<"): focused = "<<focused<<endl; 868 cerr<<__FILE__<<"("<<__FUNCTION__<<"): focused = "<<focused<<endl;
869#endif // DEBUG 869#endif // DEBUG
870 870
@@ -1248,12 +1248,6 @@ void BScreen::updateAvailableWorkspaceArea() {
1248 MaxArea(*m_available_workspace_area.get())); 1248 MaxArea(*m_available_workspace_area.get()));
1249} 1249}
1250 1250
1251void BScreen::saveStrftimeFormat(const char *format) {
1252 //make sure std::string don't get 0 string
1253 resource.strftime_format = (format ? format : "");
1254}
1255
1256
1257void BScreen::addWorkspaceName(const char *name) { 1251void BScreen::addWorkspaceName(const char *name) {
1258 m_workspace_names.push_back(name); 1252 m_workspace_names.push_back(name);
1259} 1253}