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

minor update

Browse source
This commit is contained in:
fluxgen 2002-07-20 09:35:01 +00:00
parent 5c4fe96fc1
commit eae52404ec
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Screen.cc
View file

@ -22,7 +22,7 @@
// 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
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.55 2002/07/10 14:51:32 fluxgen Exp $ // $Id: Screen.cc,v 1.56 2002/07/20 09:32:34 fluxgen Exp $
//use GNU extensions //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -268,7 +268,7 @@ resource(rm, screenname, altscreenname)
fluxbox->getSessionCursor()); fluxbox->getSessionCursor());
image_control = image_control =
new BImageControl(fluxbox, this, true, fluxbox->getColorsPerChannel(), new BImageControl(fluxbox, this, true, fluxbox->colorsPerChannel(),
fluxbox->getCacheLife(), fluxbox->getCacheMax()); fluxbox->getCacheLife(), fluxbox->getCacheMax());
image_control->installRootColormap(); image_control->installRootColormap();
root_colormap_installed = true; root_colormap_installed = true;
@ -276,7 +276,7 @@ resource(rm, screenname, altscreenname)
fluxbox->load_rc(this); fluxbox->load_rc(this);
image_control->setDither(*resource.image_dither); image_control->setDither(*resource.image_dither);
theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), getColormap(), getScreenNumber(), theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), colormap(), getScreenNumber(),
image_control, fluxbox->getStyleFilename(), getRootCommand().c_str()); image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
#ifdef GNOME #ifdef GNOME
@ -320,8 +320,8 @@ resource(rm, screenname, altscreenname)
XSetWindowAttributes attrib; XSetWindowAttributes attrib;
unsigned long mask = CWBorderPixel | CWColormap | CWSaveUnder; unsigned long mask = CWBorderPixel | CWColormap | CWSaveUnder;
attrib.border_pixel = getBorderColor()->getPixel(); attrib.border_pixel = getBorderColor()->pixel();
attrib.colormap = getColormap(); attrib.colormap = colormap();
attrib.save_under = true; attrib.save_under = true;
geom_window = geom_window =
@ -335,7 +335,7 @@ resource(rm, screenname, altscreenname)
(BImage::FLAT | BImage::SOLID)) { (BImage::FLAT | BImage::SOLID)) {
geom_pixmap = None; geom_pixmap = None;
XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
theme->getWindowStyle().t_focus.getColor()->getPixel()); theme->getWindowStyle().t_focus.color().pixel());
} else { } else {
geom_pixmap = image_control->renderImage(geom_w, geom_h, geom_pixmap = image_control->renderImage(geom_w, geom_h,
&theme->getWindowStyle().t_focus); &theme->getWindowStyle().t_focus);
@ -347,7 +347,7 @@ resource(rm, screenname, altscreenname)
(BImage::FLAT | BImage::SOLID)) { (BImage::FLAT | BImage::SOLID)) {
geom_pixmap = None; geom_pixmap = None;
XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
theme->getWindowStyle().l_focus.getColor()->getPixel()); theme->getWindowStyle().l_focus.color().pixel());
} else { } else {
geom_pixmap = image_control->renderImage(geom_w, geom_h, geom_pixmap = image_control->renderImage(geom_w, geom_h,
&theme->getWindowStyle().l_focus); &theme->getWindowStyle().l_focus);
@ -586,7 +586,7 @@ void BScreen::reconfigure(void) {
(BImage::FLAT | BImage::SOLID)) { (BImage::FLAT | BImage::SOLID)) {
geom_pixmap = None; geom_pixmap = None;
XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
theme->getWindowStyle().t_focus.getColor()->getPixel()); theme->getWindowStyle().t_focus.color().pixel());
} else { } else {
geom_pixmap = image_control->renderImage(geom_w, geom_h, geom_pixmap = image_control->renderImage(geom_w, geom_h,
&theme->getWindowStyle().t_focus); &theme->getWindowStyle().t_focus);
@ -598,7 +598,7 @@ void BScreen::reconfigure(void) {
(BImage::FLAT | BImage::SOLID)) { (BImage::FLAT | BImage::SOLID)) {
geom_pixmap = None; geom_pixmap = None;
XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
theme->getWindowStyle().l_focus.getColor()->getPixel()); theme->getWindowStyle().l_focus.color().pixel());
} else { } else {
geom_pixmap = image_control->renderImage(geom_w, geom_h, geom_pixmap = image_control->renderImage(geom_w, geom_h,
&theme->getWindowStyle().l_focus); &theme->getWindowStyle().l_focus);
@ -611,7 +611,7 @@ void BScreen::reconfigure(void) {
XSetWindowBorderWidth(getBaseDisplay()->getXDisplay(), geom_window, XSetWindowBorderWidth(getBaseDisplay()->getXDisplay(), geom_window,
theme->getBorderWidth()); theme->getBorderWidth());
XSetWindowBorder(getBaseDisplay()->getXDisplay(), geom_window, XSetWindowBorder(getBaseDisplay()->getXDisplay(), geom_window,
theme->getBorderColor().getPixel()); theme->getBorderColor().pixel());
//reconfigure menus //reconfigure menus
workspacemenu->reconfigure(); workspacemenu->reconfigure();

10
src/Slit.cc
View file

@ -19,7 +19,7 @@
// 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
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Slit.cc,v 1.16 2002/07/19 16:10:18 fluxgen Exp $ // $Id: Slit.cc,v 1.17 2002/07/20 09:35:01 fluxgen Exp $
//use GNU extensions //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -112,8 +112,8 @@ Slit::Slit(BScreen *scr):screen(scr), timer(this), slitmenu(*this) {
CWColormap | CWOverrideRedirect | CWEventMask; CWColormap | CWOverrideRedirect | CWEventMask;
attrib.background_pixmap = None; attrib.background_pixmap = None;
attrib.background_pixel = attrib.border_pixel = attrib.background_pixel = attrib.border_pixel =
screen->getBorderColor()->getPixel(); screen->getBorderColor()->pixel();
attrib.colormap = screen->getColormap(); attrib.colormap = screen->colormap();
attrib.override_redirect = True; attrib.override_redirect = True;
attrib.event_mask = SubstructureRedirectMask | ButtonPressMask | attrib.event_mask = SubstructureRedirectMask | ButtonPressMask |
EnterWindowMask | LeaveWindowMask; EnterWindowMask | LeaveWindowMask;
@ -398,7 +398,7 @@ void Slit::reconfigure(void) {
XSetWindowBorderWidth(display ,frame.window, screen->getBorderWidth()); XSetWindowBorderWidth(display ,frame.window, screen->getBorderWidth());
XSetWindowBorder(display, frame.window, XSetWindowBorder(display, frame.window,
screen->getBorderColor()->getPixel()); screen->getBorderColor()->pixel());
//did we actually use slit slots //did we actually use slit slots
if (num_windows == 0) if (num_windows == 0)
@ -412,7 +412,7 @@ void Slit::reconfigure(void) {
if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
frame.pixmap = None; frame.pixmap = None;
XSetWindowBackground(display, frame.window, XSetWindowBackground(display, frame.window,
texture->getColor()->getPixel()); texture->color().pixel());
} else { } else {
frame.pixmap = image_ctrl->renderImage(frame.width, frame.height, frame.pixmap = image_ctrl->renderImage(frame.width, frame.height,
texture); texture);