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

fixed gradient bug, cleaning, version bump

Browse source
This commit is contained in:
fluxgen 2004-10-06 06:51:21 +00:00
parent 662d1a459c
commit fa8c8699d4
1 changed files with 46 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
util/bsetroot.cc
View file

@ -18,12 +18,13 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// 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
// $Id: bsetroot.cc,v 1.22 2004/08/31 15:26:40 rathnor Exp $ // $Id: bsetroot.cc,v 1.23 2004/10/06 06:51:21 fluxgen Exp $
#include "bsetroot.hh" #include "bsetroot.hh"
#include "../src/FbTk/I18n.hh" #include "../src/FbTk/I18n.hh"
#include "../src/FbTk/ImageControl.hh" #include "../src/FbTk/ImageControl.hh"
#include "../src/FbTk/GContext.hh"
#include "../src/FbRootWindow.hh" #include "../src/FbRootWindow.hh"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -151,8 +152,7 @@ bsetroot::~bsetroot() {
} }
if (img_ctrl != 0) { if (img_ctrl != 0) {
int i = 0; for (int i=0; i < num_screens; i++)
for (; i < num_screens; i++)
delete img_ctrl[i]; delete img_ctrl[i];
delete [] img_ctrl; delete [] img_ctrl;
@ -176,15 +176,12 @@ void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
// doing this to clean up after old background // doing this to clean up after old background
if (atom_root != None && atom_eroot != None) { if (atom_root != None && atom_eroot != None) {
root.property(atom_root, 0L, 1L, false, AnyPropertyType,
XGetWindowProperty(display(), root.window(), &type, &format, &length, &after, &data_root);
atom_root, 0L, 1L, false, AnyPropertyType,
&type, &format, &length, &after, &data_root);
if (type == XA_PIXMAP) { if (type == XA_PIXMAP) {
XGetWindowProperty(display(), root.window(), root.property(atom_eroot, 0L, 1L, False, AnyPropertyType,
atom_eroot, 0L, 1L, False, AnyPropertyType, &type, &format, &length, &after, &data_eroot);
&type, &format, &length, &after, &data_eroot);
if (data_root && data_eroot && type == XA_PIXMAP && if (data_root && data_eroot && type == XA_PIXMAP &&
*((Pixmap *) data_root) == *((Pixmap *) data_eroot)) { *((Pixmap *) data_root) == *((Pixmap *) data_eroot)) {
@ -204,10 +201,8 @@ void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
} }
// setting new background atoms // setting new background atoms
XChangeProperty(display(), root.window(), root.changeProperty(atom_root, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &pixmap, 1);
atom_root, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &pixmap, 1); root.changeProperty(atom_eroot, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &pixmap, 1);
XChangeProperty(display(), root.window(),
atom_eroot, XA_PIXMAP, 32, PropModeReplace, (unsigned char *) &pixmap, 1);
} }
@ -220,38 +215,28 @@ void bsetroot::solid() {
pixmaps = new Pixmap[ScreenCount(display())]; pixmaps = new Pixmap[ScreenCount(display())];
for (; screen < ScreenCount(display()); screen++) { for (; screen < ScreenCount(display()); screen++) {
FbTk::Color c;
if (!c.setFromString(fore, screen)) // just report error
continue;
FbRootWindow root(screen);
GC gc;
XGCValues gcv;
FbTk::Color c(fore, screen);
if (! c.isAllocated()) if (! c.isAllocated())
c.setPixel(BlackPixel(display(), screen)); c.setPixel(BlackPixel(display(), screen));
gcv.foreground = c.pixel(); FbRootWindow root(screen);
gc = XCreateGC(display(), root.window(),
GCForeground , &gcv); FbTk::GContext gc(screen);
gc.setForeground(c);
pixmaps[screen] = XCreatePixmap(display(), pixmaps[screen] = XCreatePixmap(display(),
root.window(), root.window(),
root.width(), root.height(), root.width(), root.height(),
root.depth()); root.depth());
XFillRectangle(display(), pixmaps[screen], gc, 0, 0, XFillRectangle(display(), pixmaps[screen], gc.gc(), 0, 0,
root.width(), root.height()); root.width(), root.height());
setRootAtoms(pixmaps[screen], screen); setRootAtoms(pixmaps[screen], screen);
XSetWindowBackgroundPixmap(display(), root.setBackgroundPixmap(pixmaps[screen]);
root.window(), pixmaps[screen]); root.clear();
XClearWindow(display(), root.window());
XFreeGC(display(), gc);
} }
} }
@ -286,10 +271,9 @@ void bsetroot::modula(int x, int y) {
} }
} }
FbTk::Color f, b;
GC gc;
Pixmap bitmap, r_bitmap; Pixmap bitmap, r_bitmap;
XGCValues gcv;
bitmap = XCreateBitmapFromData(display(), bitmap = XCreateBitmapFromData(display(),
root.window(), data, 16, 16); root.window(), data, 16, 16);
@ -299,43 +283,37 @@ void bsetroot::modula(int x, int y) {
root.window(), 16, 16, root.window(), 16, 16,
root.depth()); root.depth());
f.setFromString(fore, screen); FbTk::Color f(fore, screen), b(back, screen);
b.setFromString(back, screen);
if (! f.isAllocated()) if (! f.isAllocated())
f.setPixel(WhitePixel(display(), screen)); f.setPixel(WhitePixel(display(), screen));
if (! b.isAllocated()) if (! b.isAllocated())
b.setPixel(BlackPixel(display(), screen)); b.setPixel(BlackPixel(display(), screen));
gcv.foreground = f.pixel(); FbTk::GContext gc(screen);
gcv.background = b.pixel();
gc = XCreateGC(display(), root.window(), gc.setForeground(f);
GCForeground | GCBackground, &gcv); gc.setBackground(b);
// copying bitmap to the one going to be used as tile // copying bitmap to the one going to be used as tile
XCopyPlane(display(), bitmap, r_bitmap, gc, XCopyPlane(display(), bitmap, r_bitmap, gc.gc(),
0, 0, 16, 16, 0, 0, 1l); 0, 0, 16, 16, 0, 0, 1l);
XSetTile(display(), gc, r_bitmap); gc.setTile(r_bitmap);
XSetFillStyle(display(), gc, FillTiled); gc.setFillStyle(FillTiled);
pixmaps[screen] = XCreatePixmap(display(), pixmaps[screen] = XCreatePixmap(display(),
root.window(), root.window(),
root.width(), root.height(), root.width(), root.height(),
root.depth()); root.depth());
XFillRectangle(display(), pixmaps[screen], gc, 0, 0, XFillRectangle(display(), pixmaps[screen], gc.gc(), 0, 0,
root.width(), root.height()); root.width(), root.height());
setRootAtoms(pixmaps[screen], screen); setRootAtoms(pixmaps[screen], screen);
root.setBackgroundPixmap(pixmaps[screen]);
root.clear();
XSetWindowBackgroundPixmap(display(),
root.window(), pixmaps[screen]);
XClearWindow(display(), root.window());
XFreeGC(display(), gc);
XFreePixmap(display(), bitmap); XFreePixmap(display(), bitmap);
XFreePixmap(display(), r_bitmap); XFreePixmap(display(), r_bitmap);
} }
@ -350,51 +328,50 @@ void bsetroot::gradient() {
// as the pixmap has been destroyed // as the pixmap has been destroyed
Pixmap tmp; Pixmap tmp;
pixmaps = new Pixmap[ScreenCount(display())]; pixmaps = new Pixmap[ScreenCount(display())];
// we must insert gradient text
string texture_value = grad ? grad : "solid";
texture_value.insert(0, "gradient ");
FbTk::Texture texture;
texture.setFromString(texture_value.c_str());
for (int screen = 0; screen < ScreenCount(display()); screen++) { for (int screen = 0; screen < ScreenCount(display()); screen++) {
FbRootWindow root(screen); FbRootWindow root(screen);
FbTk::Texture texture;
GC gc;
XGCValues gcv;
texture.setFromString(grad); FbTk::GContext gc(root);
texture.color().setFromString(fore, screen); texture.color().setFromString(fore, screen);
texture.colorTo().setFromString(back, screen); texture.colorTo().setFromString(back, screen);
if (! texture.color().isAllocated()) if (! texture.color().isAllocated())
texture.color().setPixel(WhitePixel(display(), screen)); texture.color().setPixel(WhitePixel(display(), screen));
if (! texture.colorTo().isAllocated()) if (! texture.colorTo().isAllocated())
texture.colorTo().setPixel(BlackPixel(display(), screen)); texture.colorTo().setPixel(BlackPixel(display(), screen));
tmp = img_ctrl[screen]->renderImage(root.width(), tmp = img_ctrl[screen]->renderImage(root.width(), root.height(),
root.height(), texture); texture);
pixmaps[screen] = XCreatePixmap(display(), pixmaps[screen] = XCreatePixmap(display(),
root.window(), root.window(),
root.width(), root.height(), root.width(), root.height(),
root.depth()); root.depth());
gc = XCreateGC(display(), root.window(),
GCForeground , &gcv); XCopyArea(display(), tmp, pixmaps[screen], gc.gc(), 0, 0,
XCopyArea(display(), tmp, pixmaps[screen], gc, 0, 0,
root.width(), root.height(), root.width(), root.height(),
0, 0); 0, 0);
setRootAtoms(pixmaps[screen], screen); setRootAtoms(pixmaps[screen], screen);
XSetWindowBackgroundPixmap(display(), root.setBackgroundPixmap(pixmaps[screen]);
root.window(), pixmaps[screen]); root.clear();
XClearWindow(display(), root.window());
if (! (root.visual()->c_class & 1)) { if (! (root.visual()->c_class & 1)) {
img_ctrl[screen]->removeImage(tmp); img_ctrl[screen]->removeImage(tmp);
img_ctrl[screen]->cleanCache(); img_ctrl[screen]->cleanCache();
} }
XFreeGC(display(), gc);
} }
} }
@ -403,7 +380,7 @@ void bsetroot::gradient() {
*/ */
void bsetroot::usage(int exit_code) { void bsetroot::usage(int exit_code) {
_FB_USES_NLS; _FB_USES_NLS;
cerr<<m_app_name<<" 2.2 : (c) 2003 Fluxbox Development Team"<<endl; cerr<<m_app_name<<" 2.3 : (c) 2003-2004 Fluxbox Development Team"<<endl;
cerr<<m_app_name<<" 2.1 : (c) 2002 Claes Nasten"<<endl; cerr<<m_app_name<<" 2.1 : (c) 2002 Claes Nasten"<<endl;
cerr<<m_app_name<<" 2.0 : (c) 1997-2000 Brad Hughes\n"<<endl; cerr<<m_app_name<<" 2.0 : (c) 1997-2000 Brad Hughes\n"<<endl;
cerr<<_FBTEXT(bsetroot, Usage, cerr<<_FBTEXT(bsetroot, Usage,