aboutsummaryrefslogtreecommitdiff
path: root/src/Slit.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-15 12:00:46 (GMT)
committerfluxgen <fluxgen>2003-05-15 12:00:46 (GMT)
commit988392b1eb89deaddfddfcb37a15e8f55d58bb70 (patch)
tree493d69abd418722498d1b53982653eae1d4a37e6 /src/Slit.cc
parentcbce8634dde14fd7000fde92e86f4bd4bf3525c2 (diff)
downloadfluxbox_pavel-988392b1eb89deaddfddfcb37a15e8f55d58bb70.zip
fluxbox_pavel-988392b1eb89deaddfddfcb37a15e8f55d58bb70.tar.bz2
minor cleaning in BScreen interface
Diffstat (limited to 'src/Slit.cc')
-rw-r--r--src/Slit.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index 936815d..bcd59b3 100644
--- a/src/Slit.cc
+++ b/src/Slit.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: Slit.cc,v 1.52 2003/05/13 21:09:43 fluxgen Exp $ 25// $Id: Slit.cc,v 1.53 2003/05/15 12:00:45 fluxgen Exp $
26 26
27#include "Slit.hh" 27#include "Slit.hh"
28 28
@@ -245,7 +245,7 @@ private:
245 245
246class SlitTheme:public FbTk::Theme { 246class SlitTheme:public FbTk::Theme {
247public: 247public:
248 explicit SlitTheme(Slit &slit):FbTk::Theme(slit.screen().getScreenNumber()), 248 explicit SlitTheme(Slit &slit):FbTk::Theme(slit.screen().screenNumber()),
249 m_slit(slit), 249 m_slit(slit),
250 m_texture(*this, "slit", "Slit") { 250 m_texture(*this, "slit", "Slit") {
251 // default texture type 251 // default texture type
@@ -263,19 +263,19 @@ private:
263Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename) 263Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
264 : m_screen(scr), m_timer(this), 264 : m_screen(scr), m_timer(this),
265 m_slitmenu(*scr.menuTheme(), 265 m_slitmenu(*scr.menuTheme(),
266 scr.getScreenNumber(), 266 scr.screenNumber(),
267 *scr.getImageControl(), 267 *scr.getImageControl(),
268 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), 268 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
269 m_placement_menu(*scr.menuTheme(), 269 m_placement_menu(*scr.menuTheme(),
270 scr.getScreenNumber(), 270 scr.screenNumber(),
271 *scr.getImageControl(), 271 *scr.getImageControl(),
272 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), 272 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
273 m_clientlist_menu(*scr.menuTheme(), 273 m_clientlist_menu(*scr.menuTheme(),
274 scr.getScreenNumber(), 274 scr.screenNumber(),
275 *scr.getImageControl(), 275 *scr.getImageControl(),
276 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), 276 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
277 m_layermenu(new LayerMenu<Slit>(*scr.menuTheme(), 277 m_layermenu(new LayerMenu<Slit>(*scr.menuTheme(),
278 scr.getScreenNumber(), 278 scr.screenNumber(),
279 *scr.getImageControl(), 279 *scr.getImageControl(),
280 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), 280 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()),
281 this, 281 this,
@@ -322,7 +322,7 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
322 FbTk::EventManager::instance()->add(*this, frame.window); 322 FbTk::EventManager::instance()->add(*this, frame.window);
323 m_transp.reset(new FbTk::Transparent(screen().rootPixmap(), frame.window.drawable(), 323 m_transp.reset(new FbTk::Transparent(screen().rootPixmap(), frame.window.drawable(),
324 *screen().slitAlphaResource(), 324 *screen().slitAlphaResource(),
325 screen().getScreenNumber())); 325 screen().screenNumber()));
326 326
327 m_layeritem.reset(new FbTk::XLayerItem(frame.window, layer)); 327 m_layeritem.reset(new FbTk::XLayerItem(frame.window, layer));
328 328
@@ -387,8 +387,8 @@ void Slit::addClient(Window w) {
387 if (wmhints != 0) { 387 if (wmhints != 0) {
388 if ((wmhints->flags & IconWindowHint) && 388 if ((wmhints->flags & IconWindowHint) &&
389 (wmhints->icon_window != None)) { 389 (wmhints->icon_window != None)) {
390 XMoveWindow(disp, client->client_window, screen().getWidth() + 10, 390 XMoveWindow(disp, client->client_window, screen().width() + 10,
391 screen().getHeight() + 10); 391 screen().height() + 10);
392 XMapWindow(disp, client->client_window); 392 XMapWindow(disp, client->client_window);
393 client->icon_window = wmhints->icon_window; 393 client->icon_window = wmhints->icon_window;
394 client->window = client->icon_window; 394 client->window = client->icon_window;
@@ -790,8 +790,8 @@ void Slit::reposition() {
790 head_w, 790 head_w,
791 head_h; 791 head_h;
792 792
793 head_w = screen().getWidth(); 793 head_w = screen().width();
794 head_h = screen().getHeight(); 794 head_h = screen().height();
795 int border_width = screen().rootTheme().borderWidth(); 795 int border_width = screen().rootTheme().borderWidth();
796 int bevel_width = screen().rootTheme().bevelWidth(); 796 int bevel_width = screen().rootTheme().bevelWidth();
797 797
@@ -985,13 +985,13 @@ void Slit::buttonPressEvent(XButtonEvent &e) {
985 985
986 if (x < 0) 986 if (x < 0)
987 x = 0; 987 x = 0;
988 else if (x + m_slitmenu.width() > screen().getWidth()) 988 else if (x + m_slitmenu.width() > screen().width())
989 x = screen().getWidth() - m_slitmenu.width(); 989 x = screen().width() - m_slitmenu.width();
990 990
991 if (y < 0) 991 if (y < 0)
992 y = 0; 992 y = 0;
993 else if (y + m_slitmenu.height() > screen().getHeight()) 993 else if (y + m_slitmenu.height() > screen().height())
994 y = screen().getHeight() - m_slitmenu.height(); 994 y = screen().height() - m_slitmenu.height();
995 995
996 m_slitmenu.move(x, y); 996 m_slitmenu.move(x, y);
997 m_slitmenu.show(); 997 m_slitmenu.show();
@@ -1077,7 +1077,7 @@ void Slit::clearWindow() {
1077 frame.window.clear(); 1077 frame.window.clear();
1078 if (frame.pixmap != 0) { 1078 if (frame.pixmap != 0) {
1079 if (screen().rootPixmap() != m_transp->source()) 1079 if (screen().rootPixmap() != m_transp->source())
1080 m_transp->setSource(screen().rootPixmap(), screen().getScreenNumber()); 1080 m_transp->setSource(screen().rootPixmap(), screen().screenNumber());
1081 1081
1082 m_transp->render(frame.window.x(), frame.window.y(), 1082 m_transp->render(frame.window.x(), frame.window.y(),
1083 0, 0, 1083 0, 0,