int hx, hy; //ignored
int ret = BitmapOpenFailed; //default to failure.
- if (style.getValue(rname, s))
- {
- if (s[0] != '/' && s[0] != '~')
- {
+ if (style.getValue(rname, s)) {
+ if (s[0] != '/' && s[0] != '~') {
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,