summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2001-12-13 20:44:57 (GMT)
committerfluxgen <fluxgen>2001-12-13 20:44:57 (GMT)
commitd88da3657cbf66b85dcc6ca953850ccafded10f1 (patch)
tree3b2811f2cd594487194848a302e391759bb59e67
parentbabce4da5ece32f9d9d9c160761391e4b31d556b (diff)
downloadfluxbox_lack-d88da3657cbf66b85dcc6ca953850ccafded10f1.zip
fluxbox_lack-d88da3657cbf66b85dcc6ca953850ccafded10f1.tar.bz2
Changed getWindowStyle()-> to getWindowStyle().
-rw-r--r--src/Screen.cc72
1 files changed, 36 insertions, 36 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 4a7c515..d0e0dab 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -218,15 +218,15 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) {
218 218
219 if (i18n->multibyte()) { 219 if (i18n->multibyte()) {
220 XRectangle ink, logical; 220 XRectangle ink, logical;
221 XmbTextExtents(theme->getWindowStyle()->font.set, s, l, &ink, &logical); 221 XmbTextExtents(theme->getWindowStyle().font.set, s, l, &ink, &logical);
222 geom_w = logical.width; 222 geom_w = logical.width;
223 223
224 geom_h = theme->getWindowStyle()->font.set_extents->max_ink_extent.height; 224 geom_h = theme->getWindowStyle().font.set_extents->max_ink_extent.height;
225 } else { 225 } else {
226 geom_h = theme->getWindowStyle()->font.fontstruct->ascent + 226 geom_h = theme->getWindowStyle().font.fontstruct->ascent +
227 theme->getWindowStyle()->font.fontstruct->descent; 227 theme->getWindowStyle().font.fontstruct->descent;
228 228
229 geom_w = XTextWidth(theme->getWindowStyle()->font.fontstruct, s, l); 229 geom_w = XTextWidth(theme->getWindowStyle().font.fontstruct, s, l);
230 } 230 }
231 231
232 geom_w += getBevelWidth()*2; 232 geom_w += getBevelWidth()*2;
@@ -244,27 +244,27 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) {
244 InputOutput, getVisual(), mask, &attrib); 244 InputOutput, getVisual(), mask, &attrib);
245 geom_visible = False; 245 geom_visible = False;
246 246
247 if (theme->getWindowStyle()->l_focus.getTexture() & BImage_ParentRelative) { 247 if (theme->getWindowStyle().l_focus.getTexture() & BImage_ParentRelative) {
248 if (theme->getWindowStyle()->t_focus.getTexture() == 248 if (theme->getWindowStyle().t_focus.getTexture() ==
249 (BImage_Flat | BImage_Solid)) { 249 (BImage_Flat | BImage_Solid)) {
250 geom_pixmap = None; 250 geom_pixmap = None;
251 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 251 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
252 theme->getWindowStyle()->t_focus.getColor()->getPixel()); 252 theme->getWindowStyle().t_focus.getColor()->getPixel());
253 } else { 253 } else {
254 geom_pixmap = image_control->renderImage(geom_w, geom_h, 254 geom_pixmap = image_control->renderImage(geom_w, geom_h,
255 &theme->getWindowStyle()->t_focus); 255 &theme->getWindowStyle().t_focus);
256 XSetWindowBackgroundPixmap(getBaseDisplay()->getXDisplay(), 256 XSetWindowBackgroundPixmap(getBaseDisplay()->getXDisplay(),
257 geom_window, geom_pixmap); 257 geom_window, geom_pixmap);
258 } 258 }
259 } else { 259 } else {
260 if (theme->getWindowStyle()->l_focus.getTexture() == 260 if (theme->getWindowStyle().l_focus.getTexture() ==
261 (BImage_Flat | BImage_Solid)) { 261 (BImage_Flat | BImage_Solid)) {
262 geom_pixmap = None; 262 geom_pixmap = None;
263 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 263 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
264 theme->getWindowStyle()->l_focus.getColor()->getPixel()); 264 theme->getWindowStyle().l_focus.getColor()->getPixel());
265 } else { 265 } else {
266 geom_pixmap = image_control->renderImage(geom_w, geom_h, 266 geom_pixmap = image_control->renderImage(geom_w, geom_h,
267 &theme->getWindowStyle()->l_focus); 267 &theme->getWindowStyle().l_focus);
268 XSetWindowBackgroundPixmap(getBaseDisplay()->getXDisplay(), 268 XSetWindowBackgroundPixmap(getBaseDisplay()->getXDisplay(),
269 geom_window, geom_pixmap); 269 geom_window, geom_pixmap);
270 } 270 }
@@ -443,42 +443,42 @@ void BScreen::reconfigure(void) {
443 443
444 if (i18n->multibyte()) { 444 if (i18n->multibyte()) {
445 XRectangle ink, logical; 445 XRectangle ink, logical;
446 XmbTextExtents(theme->getWindowStyle()->font.set, s, l, &ink, &logical); 446 XmbTextExtents(theme->getWindowStyle().font.set, s, l, &ink, &logical);
447 geom_w = logical.width; 447 geom_w = logical.width;
448 448
449 geom_h = theme->getWindowStyle()->font.set_extents->max_ink_extent.height; 449 geom_h = theme->getWindowStyle().font.set_extents->max_ink_extent.height;
450 } else { 450 } else {
451 geom_w = XTextWidth(theme->getWindowStyle()->font.fontstruct, s, l); 451 geom_w = XTextWidth(theme->getWindowStyle().font.fontstruct, s, l);
452 452
453 geom_h = theme->getWindowStyle()->font.fontstruct->ascent + 453 geom_h = theme->getWindowStyle().font.fontstruct->ascent +
454 theme->getWindowStyle()->font.fontstruct->descent; 454 theme->getWindowStyle().font.fontstruct->descent;
455 } 455 }
456 456
457 geom_w += getBevelWidth()*2; 457 geom_w += getBevelWidth()*2;
458 geom_h += getBevelWidth()*2; 458 geom_h += getBevelWidth()*2;
459 459
460 Pixmap tmp = geom_pixmap; 460 Pixmap tmp = geom_pixmap;
461 if (theme->getWindowStyle()->l_focus.getTexture() & BImage_ParentRelative) { 461 if (theme->getWindowStyle().l_focus.getTexture() & BImage_ParentRelative) {
462 if (theme->getWindowStyle()->t_focus.getTexture() == 462 if (theme->getWindowStyle().t_focus.getTexture() ==
463 (BImage_Flat | BImage_Solid)) { 463 (BImage_Flat | BImage_Solid)) {
464 geom_pixmap = None; 464 geom_pixmap = None;
465 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 465 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
466 theme->getWindowStyle()->t_focus.getColor()->getPixel()); 466 theme->getWindowStyle().t_focus.getColor()->getPixel());
467 } else { 467 } else {
468 geom_pixmap = image_control->renderImage(geom_w, geom_h, 468 geom_pixmap = image_control->renderImage(geom_w, geom_h,
469 &theme->getWindowStyle()->t_focus); 469 &theme->getWindowStyle().t_focus);
470 XSetWindowBackgroundPixmap(getBaseDisplay()->getXDisplay(), 470 XSetWindowBackgroundPixmap(getBaseDisplay()->getXDisplay(),
471 geom_window, geom_pixmap); 471 geom_window, geom_pixmap);
472 } 472 }
473 } else { 473 } else {
474 if (theme->getWindowStyle()->l_focus.getTexture() == 474 if (theme->getWindowStyle().l_focus.getTexture() ==
475 (BImage_Flat | BImage_Solid)) { 475 (BImage_Flat | BImage_Solid)) {
476 geom_pixmap = None; 476 geom_pixmap = None;
477 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 477 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
478 theme->getWindowStyle()->l_focus.getColor()->getPixel()); 478 theme->getWindowStyle().l_focus.getColor()->getPixel());
479 } else { 479 } else {
480 geom_pixmap = image_control->renderImage(geom_w, geom_h, 480 geom_pixmap = image_control->renderImage(geom_w, geom_h,
481 &theme->getWindowStyle()->l_focus); 481 &theme->getWindowStyle().l_focus);
482 XSetWindowBackgroundPixmap(getBaseDisplay()->getXDisplay(), 482 XSetWindowBackgroundPixmap(getBaseDisplay()->getXDisplay(),
483 geom_window, geom_pixmap); 483 geom_window, geom_pixmap);
484 } 484 }
@@ -831,13 +831,13 @@ void BScreen::saveStrftimeFormat(char *format) {
831 if (resource.strftime_format) 831 if (resource.strftime_format)
832 delete [] resource.strftime_format; 832 delete [] resource.strftime_format;
833 833
834 resource.strftime_format = bstrdup(format); 834 resource.strftime_format = Misc::strdup(format);
835} 835}
836#endif // HAVE_STRFTIME 836#endif // HAVE_STRFTIME
837 837
838 838
839void BScreen::addWorkspaceName(char *name) { 839void BScreen::addWorkspaceName(char *name) {
840 workspaceNames->insert(bstrdup(name)); 840 workspaceNames->insert(Misc::strdup(name));
841 841
842} 842}
843 843
@@ -847,7 +847,7 @@ void BScreen::getNameOfWorkspace(int id, char **name) {
847 char *wkspc_name = workspaceNames->find(id); 847 char *wkspc_name = workspaceNames->find(id);
848 848
849 if (wkspc_name) 849 if (wkspc_name)
850 *name = bstrdup(wkspc_name); 850 *name = Misc::strdup(wkspc_name);
851 } else 851 } else
852 *name = 0; 852 *name = 0;
853} 853}
@@ -1460,7 +1460,7 @@ Bool BScreen::parseMenuFile(FILE *file, Rootmenu *menu) {
1460 char **ls = new char* [entries]; 1460 char **ls = new char* [entries];
1461 int index = 0; 1461 int index = 0;
1462 while ((p = readdir(d))) 1462 while ((p = readdir(d)))
1463 ls[index++] = bstrdup(p->d_name); 1463 ls[index++] = Misc::strdup(p->d_name);
1464 1464
1465 qsort(ls, entries, sizeof(char *), dcmp); 1465 qsort(ls, entries, sizeof(char *), dcmp);
1466 1466
@@ -1596,15 +1596,15 @@ void BScreen::showPosition(int x, int y) {
1596 1596
1597 if (I18n::instance()->multibyte()) 1597 if (I18n::instance()->multibyte())
1598 XmbDrawString(getBaseDisplay()->getXDisplay(), geom_window, 1598 XmbDrawString(getBaseDisplay()->getXDisplay(), geom_window,
1599 theme->getWindowStyle()->font.set, theme->getWindowStyle()->l_text_focus_gc, 1599 theme->getWindowStyle().font.set, theme->getWindowStyle().l_text_focus_gc,
1600 theme->getBevelWidth(), theme->getBevelWidth() - 1600 theme->getBevelWidth(), theme->getBevelWidth() -
1601 theme->getWindowStyle()->font.set_extents->max_ink_extent.y, 1601 theme->getWindowStyle().font.set_extents->max_ink_extent.y,
1602 label, strlen(label)); 1602 label, strlen(label));
1603 else 1603 else
1604 XDrawString(getBaseDisplay()->getXDisplay(), geom_window, 1604 XDrawString(getBaseDisplay()->getXDisplay(), geom_window,
1605 theme->getWindowStyle()->l_text_focus_gc, 1605 theme->getWindowStyle().l_text_focus_gc,
1606 theme->getBevelWidth(), 1606 theme->getBevelWidth(),
1607 theme->getWindowStyle()->font.fontstruct->ascent + 1607 theme->getWindowStyle().font.fontstruct->ascent +
1608 theme->getBevelWidth(), label, strlen(label)); 1608 theme->getBevelWidth(), label, strlen(label));
1609 1609
1610} 1610}
@@ -1636,15 +1636,15 @@ void BScreen::showGeometry(unsigned int gx, unsigned int gy) {
1636 1636
1637 if (I18n::instance()->multibyte()) 1637 if (I18n::instance()->multibyte())
1638 XmbDrawString(getBaseDisplay()->getXDisplay(), geom_window, 1638 XmbDrawString(getBaseDisplay()->getXDisplay(), geom_window,
1639 theme->getWindowStyle()->font.set, theme->getWindowStyle()->l_text_focus_gc, 1639 theme->getWindowStyle().font.set, theme->getWindowStyle().l_text_focus_gc,
1640 theme->getBevelWidth(), theme->getBevelWidth() - 1640 theme->getBevelWidth(), theme->getBevelWidth() -
1641 theme->getWindowStyle()->font.set_extents->max_ink_extent.y, 1641 theme->getWindowStyle().font.set_extents->max_ink_extent.y,
1642 label, strlen(label)); 1642 label, strlen(label));
1643 else 1643 else
1644 XDrawString(getBaseDisplay()->getXDisplay(), geom_window, 1644 XDrawString(getBaseDisplay()->getXDisplay(), geom_window,
1645 theme->getWindowStyle()->l_text_focus_gc, 1645 theme->getWindowStyle().l_text_focus_gc,
1646 theme->getBevelWidth(), 1646 theme->getBevelWidth(),
1647 theme->getWindowStyle()->font.fontstruct->ascent + 1647 theme->getWindowStyle().font.fontstruct->ascent +
1648 theme->getBevelWidth(), label, strlen(label)); 1648 theme->getBevelWidth(), label, strlen(label));
1649} 1649}
1650 1650