all repos — openbox @ 6c4711cbaa36ba16c942af9907fa51489373ec63

openbox fork - make it a bit more like ryudo 

load buttons from the global dir if they arent found in the user dir
Dana Jansens danakj@orodu.net
commit

6c4711cbaa36ba16c942af9907fa51489373ec63

parent

151b6d413174dc3768de48b13efa78c1edcd5721

1 files changed, 6 insertions(+), 0 deletions(-)

jump to
M otk/style.cc → otk/style.cc 
@@ -179,6 +179,12 @@ std::string xbmFile = std::string("~/.openbox/buttons/") + s;
       ret = XReadBitmapFile(OBDisplay::display, root_window,
                             expandTilde(xbmFile).c_str(), &pixmapMask.w,
                             &pixmapMask.h, &pixmapMask.mask, &hx, &hy);
+      if (ret != BitmapSuccess) {
+        xbmFile = std::string(BUTTONSDIR) + "/" + s;
+        ret = XReadBitmapFile(OBDisplay::display, root_window,
+                              xbmFile.c_str(), &pixmapMask.w,
+                              &pixmapMask.h, &pixmapMask.mask, &hx, &hy);
+      }
     } else
       ret = XReadBitmapFile(OBDisplay::display, root_window,
                             expandTilde(s).c_str(), &pixmapMask.w,