X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FScreen.cc;h=1b3860f46166ea02062e74f5ad86b4db340863e4;hb=b21cf8b33520e44611657e2876131b67dc0472d6;hp=b294dbf583b4df1843551939bbe76e0ce759a97a;hpb=1618ecc845e9191a383ea9ffd1e6ab7e31caec15;p=chaz%2Fopenbox

diff --git a/src/Screen.cc b/src/Screen.cc
index b294dbf5..1b3860f4 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -240,7 +240,7 @@ BScreen::BScreen(Blackbox *bb, unsigned int scrn) : ScreenInfo(bb, scrn) {
   raiseWindows(0, 0);     // this also initializes the empty stacking list
   rootmenu->update();
 
-  updateClientList();     // initialize the client list, which will be empty
+  updateClientList();     // initialize the client lists, which will be empty
   updateAvailableArea();
 
   changeWorkspaceID(0);
@@ -388,6 +388,13 @@ void BScreen::saveFocusLast(bool f) {
 }
 
 
+void BScreen::saveAAFonts(bool f) {
+  resource.aa_fonts = f;
+  reconfigure();
+  config->setValue(screenstr + "antialiasFonts", resource.aa_fonts);
+}
+
+
 void BScreen::saveHideToolbar(bool h) {
   resource.hide_toolbar = h;
   if (resource.hide_toolbar)
@@ -405,6 +412,12 @@ void BScreen::saveWindowToWindowSnap(bool s) {
 }
 
 
+void BScreen::saveResizeZones(unsigned int z) {
+  resource.resize_zones = z;
+  config->setValue(screenstr + "resizeZones", resource.resize_zones);
+}
+
+
 void BScreen::saveWindowCornerSnap(bool s) {
   resource.window_corner_snap = s;
   config->setValue(screenstr + "windowCornerSnap",
@@ -497,6 +510,8 @@ 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);
@@ -540,6 +555,14 @@ void BScreen::load_rc(void) {
   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;
 
@@ -1050,6 +1073,8 @@ void BScreen::updateClientList(void) {
   } else
     xatom->setValue(getRootWindow(), XAtom::net_client_list, XAtom::window,
                     0, 0);
+
+  updateStackingList();
 }
 
 
@@ -1061,7 +1086,7 @@ void BScreen::updateStackingList(void) {
   BlackboxWindowList stack_order;
 
   /*
-   * Get the atacking order from all of the workspaces.
+   * 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?
@@ -1070,13 +1095,13 @@ void BScreen::updateStackingList(void) {
   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();
-    const BlackboxWindowList::iterator end = stack_order.end();
+    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,
@@ -1379,6 +1404,7 @@ void BScreen::reassociateWindow(BlackboxWindow *w, unsigned int wkspc_id,
     getWorkspace(w->getWorkspaceNumber())->removeWindow(w);
     getWorkspace(wkspc_id)->addWindow(w);
   }
+  updateStackingList();
 }
 
 
@@ -2158,7 +2184,7 @@ BFont *BScreen::readDatabaseFont(const string &rbasename,
     }
     
     BFont *b = new BFont(blackbox->getXDisplay(), this, family, i, bold,
-                         italic);
+                         italic, resource.aa_fonts);
     if (b->valid())
       return b;
     else