aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
committerfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
commit35c55cdc8dc0771a07c2276d3190782b89d8a715 (patch)
tree4d0ccaaaf6165453bfe46af0bcc20ed82846041b /src/Screen.cc
parent8b560ddf76a0b0256a1c2ffd0cb97d91153e8192 (diff)
downloadfluxbox_pavel-35c55cdc8dc0771a07c2276d3190782b89d8a715.zip
fluxbox_pavel-35c55cdc8dc0771a07c2276d3190782b89d8a715.tar.bz2
moved Texture and Color into new files, fixed some const and pointers
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 3a31a8f..6a2485e 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.57 2002/07/23 13:47:05 fluxgen Exp $ 25// $Id: Screen.cc,v 1.58 2002/07/23 17:11:59 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -330,9 +330,9 @@ resource(rm, screenname, altscreenname)
330 InputOutput, getVisual(), mask, &attrib); 330 InputOutput, getVisual(), mask, &attrib);
331 geom_visible = false; 331 geom_visible = false;
332 332
333 if (theme->getWindowStyle().l_focus.getTexture() & BImage::PARENTRELATIVE) { 333 if (theme->getWindowStyle().l_focus.type() & FbTk::Texture::PARENTRELATIVE) {
334 if (theme->getWindowStyle().t_focus.getTexture() == 334 if (theme->getWindowStyle().t_focus.type() ==
335 (BImage::FLAT | BImage::SOLID)) { 335 (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
336 geom_pixmap = None; 336 geom_pixmap = None;
337 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 337 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
338 theme->getWindowStyle().t_focus.color().pixel()); 338 theme->getWindowStyle().t_focus.color().pixel());
@@ -343,8 +343,8 @@ resource(rm, screenname, altscreenname)
343 geom_window, geom_pixmap); 343 geom_window, geom_pixmap);
344 } 344 }
345 } else { 345 } else {
346 if (theme->getWindowStyle().l_focus.getTexture() == 346 if (theme->getWindowStyle().l_focus.type() ==
347 (BImage::FLAT | BImage::SOLID)) { 347 (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
348 geom_pixmap = None; 348 geom_pixmap = None;
349 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 349 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
350 theme->getWindowStyle().l_focus.color().pixel()); 350 theme->getWindowStyle().l_focus.color().pixel());
@@ -581,9 +581,9 @@ void BScreen::reconfigure(void) {
581 geom_h += getBevelWidth()*2; 581 geom_h += getBevelWidth()*2;
582 582
583 Pixmap tmp = geom_pixmap; 583 Pixmap tmp = geom_pixmap;
584 if (theme->getWindowStyle().l_focus.getTexture() & BImage::PARENTRELATIVE) { 584 if (theme->getWindowStyle().l_focus.type() & FbTk::Texture::PARENTRELATIVE) {
585 if (theme->getWindowStyle().t_focus.getTexture() == 585 if (theme->getWindowStyle().t_focus.type() ==
586 (BImage::FLAT | BImage::SOLID)) { 586 (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
587 geom_pixmap = None; 587 geom_pixmap = None;
588 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 588 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
589 theme->getWindowStyle().t_focus.color().pixel()); 589 theme->getWindowStyle().t_focus.color().pixel());
@@ -594,8 +594,8 @@ void BScreen::reconfigure(void) {
594 geom_window, geom_pixmap); 594 geom_window, geom_pixmap);
595 } 595 }
596 } else { 596 } else {
597 if (theme->getWindowStyle().l_focus.getTexture() == 597 if (theme->getWindowStyle().l_focus.type() ==
598 (BImage::FLAT | BImage::SOLID)) { 598 (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
599 geom_pixmap = None; 599 geom_pixmap = None;
600 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 600 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
601 theme->getWindowStyle().l_focus.color().pixel()); 601 theme->getWindowStyle().l_focus.color().pixel());
@@ -1076,9 +1076,8 @@ void BScreen::saveStrftimeFormat(const char *format) {
1076#endif // HAVE_STRFTIME 1076#endif // HAVE_STRFTIME
1077 1077
1078 1078
1079void BScreen::addWorkspaceName(char *name) { 1079void BScreen::addWorkspaceName(const char *name) {
1080 workspaceNames.push_back(name); 1080 workspaceNames.push_back(name);
1081
1082} 1081}
1083 1082
1084 1083