aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-10 22:59:32 (GMT)
committerfluxgen <fluxgen>2003-05-10 22:59:32 (GMT)
commit3e1ac648d0f9dfe060091dc1f0c6e654064f4f7f (patch)
treeb3fbb3a9de1053ad69a8ba3a1a4ed262a27b4719
parent03c52ee0c4836eb6b9669975e8fd2cc0ee86f3b1 (diff)
downloadfluxbox-3e1ac648d0f9dfe060091dc1f0c6e654064f4f7f.zip
fluxbox-3e1ac648d0f9dfe060091dc1f0c6e654064f4f7f.tar.bz2
using FbRootWindow
-rw-r--r--src/Ewmh.cc16
-rw-r--r--src/Gnome.cc16
-rw-r--r--src/IconBar.cc9
-rw-r--r--src/Screen.cc30
-rw-r--r--src/Slit.cc10
-rw-r--r--src/WinClient.cc4
6 files changed, 42 insertions, 43 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 2349d8a..c4349b9 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Ewmh.cc,v 1.20 2003/05/10 13:21:36 fluxgen Exp $ 22// $Id: Ewmh.cc,v 1.21 2003/05/10 22:56:48 fluxgen Exp $
23 23
24#include "Ewmh.hh" 24#include "Ewmh.hh"
25 25
@@ -50,13 +50,13 @@ void Ewmh::initForScreen(BScreen &screen) {
50 50
51 51
52 Window wincheck = XCreateSimpleWindow(disp, 52 Window wincheck = XCreateSimpleWindow(disp,
53 screen.getRootWindow(), 53 screen.rootWindow().window(),
54 0, 0, 5, 5, 0, 0, 0); 54 0, 0, 5, 5, 0, 0, 0);
55 55
56 if (wincheck != None) { 56 if (wincheck != None) {
57 m_windows.push_back(wincheck); 57 m_windows.push_back(wincheck);
58 58
59 XChangeProperty(disp, screen.getRootWindow(), m_net_supporting_wm_check, XA_WINDOW, 32, 59 XChangeProperty(disp, screen.rootWindow().window(), m_net_supporting_wm_check, XA_WINDOW, 32,
60 PropModeReplace, (unsigned char *) &wincheck, 1); 60 PropModeReplace, (unsigned char *) &wincheck, 1);
61 XChangeProperty(disp, wincheck, m_net_supporting_wm_check, XA_WINDOW, 32, 61 XChangeProperty(disp, wincheck, m_net_supporting_wm_check, XA_WINDOW, 32,
62 PropModeReplace, (unsigned char *) &wincheck, 1); 62 PropModeReplace, (unsigned char *) &wincheck, 1);
@@ -86,7 +86,7 @@ void Ewmh::initForScreen(BScreen &screen) {
86 m_net_supporting_wm_check 86 m_net_supporting_wm_check
87 }; 87 };
88 88
89 XChangeProperty(disp, screen.getRootWindow(), 89 XChangeProperty(disp, screen.rootWindow().window(),
90 m_net_supported, XA_ATOM, 32, 90 m_net_supported, XA_ATOM, 32,
91 PropModeReplace, 91 PropModeReplace,
92 (unsigned char *) &atomsupported, 92 (unsigned char *) &atomsupported,
@@ -193,7 +193,7 @@ void Ewmh::updateClientList(BScreen &screen) {
193 //number of windows to show in client list 193 //number of windows to show in client list
194 num = win; 194 num = win;
195 XChangeProperty(FbTk::App::instance()->display(), 195 XChangeProperty(FbTk::App::instance()->display(),
196 screen.getRootWindow(), 196 screen.rootWindow().window(),
197 m_net_client_list, 197 m_net_client_list,
198 XA_CARDINAL, 32, 198 XA_CARDINAL, 32,
199 PropModeReplace, (unsigned char *)wl, num); 199 PropModeReplace, (unsigned char *)wl, num);
@@ -213,7 +213,7 @@ void Ewmh::updateWorkspaceNames(BScreen &screen) {
213 } 213 }
214 214
215 if (XStringListToTextProperty(names, number_of_desks, &text)) { 215 if (XStringListToTextProperty(names, number_of_desks, &text)) {
216 XSetTextProperty(FbTk::App::instance()->display(), screen.getRootWindow(), 216 XSetTextProperty(FbTk::App::instance()->display(), screen.rootWindow().window(),
217 &text, m_net_desktop_names); 217 &text, m_net_desktop_names);
218 XFree(text.value); 218 XFree(text.value);
219 } 219 }
@@ -225,7 +225,7 @@ void Ewmh::updateWorkspaceNames(BScreen &screen) {
225void Ewmh::updateCurrentWorkspace(BScreen &screen) { 225void Ewmh::updateCurrentWorkspace(BScreen &screen) {
226 size_t workspace = screen.getCurrentWorkspaceID(); 226 size_t workspace = screen.getCurrentWorkspaceID();
227 XChangeProperty(FbTk::App::instance()->display(), 227 XChangeProperty(FbTk::App::instance()->display(),
228 screen.getRootWindow(), 228 screen.rootWindow().window(),
229 m_net_current_desktop, XA_CARDINAL, 32, PropModeReplace, 229 m_net_current_desktop, XA_CARDINAL, 32, PropModeReplace,
230 (unsigned char *)&workspace, 1); 230 (unsigned char *)&workspace, 1);
231 231
@@ -233,7 +233,7 @@ void Ewmh::updateCurrentWorkspace(BScreen &screen) {
233 233
234void Ewmh::updateWorkspaceCount(BScreen &screen) { 234void Ewmh::updateWorkspaceCount(BScreen &screen) {
235 size_t numworkspaces = screen.getCount(); 235 size_t numworkspaces = screen.getCount();
236 XChangeProperty(FbTk::App::instance()->display(), screen.getRootWindow(), 236 XChangeProperty(FbTk::App::instance()->display(), screen.rootWindow().window(),
237 m_net_number_of_desktops, XA_CARDINAL, 32, PropModeReplace, 237 m_net_number_of_desktops, XA_CARDINAL, 32, PropModeReplace,
238 (unsigned char *)&numworkspaces, 1); 238 (unsigned char *)&numworkspaces, 1);
239} 239}
diff --git a/src/Gnome.cc b/src/Gnome.cc
index f90fa9e..11cce0d 100644
--- a/src/Gnome.cc
+++ b/src/Gnome.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Gnome.cc,v 1.19 2003/05/08 02:50:38 rathnor Exp $ 22// $Id: Gnome.cc,v 1.20 2003/05/10 22:57:37 fluxgen Exp $
23 23
24#include "Gnome.hh" 24#include "Gnome.hh"
25 25
@@ -51,9 +51,9 @@ void Gnome::initForScreen(BScreen &screen) {
51 Display *disp = FbTk::App::instance()->display(); 51 Display *disp = FbTk::App::instance()->display();
52 // create the GNOME window 52 // create the GNOME window
53 Window gnome_win = XCreateSimpleWindow(disp, 53 Window gnome_win = XCreateSimpleWindow(disp,
54 screen.getRootWindow(), 0, 0, 5, 5, 0, 0, 0); 54 screen.rootWindow().window(), 0, 0, 5, 5, 0, 0, 0);
55 // supported WM check 55 // supported WM check
56 XChangeProperty(disp, screen.getRootWindow(), 56 XChangeProperty(disp, screen.rootWindow().window(),
57 m_gnome_wm_supporting_wm_check, 57 m_gnome_wm_supporting_wm_check,
58 XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &gnome_win, 1); 58 XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &gnome_win, 1);
59 59
@@ -71,7 +71,7 @@ void Gnome::initForScreen(BScreen &screen) {
71 }; 71 };
72 72
73 //list atoms that we support 73 //list atoms that we support
74 XChangeProperty(disp, screen.getRootWindow(), 74 XChangeProperty(disp, screen.rootWindow().window(),
75 m_gnome_wm_prot, XA_ATOM, 32, PropModeReplace, 75 m_gnome_wm_prot, XA_ATOM, 32, PropModeReplace,
76 (unsigned char *)gnomeatomlist, (sizeof gnomeatomlist)/sizeof gnomeatomlist[0]); 76 (unsigned char *)gnomeatomlist, (sizeof gnomeatomlist)/sizeof gnomeatomlist[0]);
77 77
@@ -173,7 +173,7 @@ void Gnome::updateClientList(BScreen &screen) {
173 //number of windows to show in client list 173 //number of windows to show in client list
174 num = win; 174 num = win;
175 XChangeProperty(FbTk::App::instance()->display(), 175 XChangeProperty(FbTk::App::instance()->display(),
176 screen.getRootWindow(), 176 screen.rootWindow().window(),
177 m_gnome_wm_win_client_list, 177 m_gnome_wm_win_client_list,
178 XA_CARDINAL, 32, 178 XA_CARDINAL, 32,
179 PropModeReplace, (unsigned char *)wl, num); 179 PropModeReplace, (unsigned char *)wl, num);
@@ -195,7 +195,7 @@ void Gnome::updateWorkspaceNames(BScreen &screen) {
195 } 195 }
196 196
197 if (XStringListToTextProperty(names, number_of_desks, &text)) { 197 if (XStringListToTextProperty(names, number_of_desks, &text)) {
198 XSetTextProperty(FbTk::App::instance()->display(), screen.getRootWindow(), 198 XSetTextProperty(FbTk::App::instance()->display(), screen.rootWindow().window(),
199 &text, m_gnome_wm_win_workspace_names); 199 &text, m_gnome_wm_win_workspace_names);
200 XFree(text.value); 200 XFree(text.value);
201 } 201 }
@@ -207,7 +207,7 @@ void Gnome::updateWorkspaceNames(BScreen &screen) {
207void Gnome::updateCurrentWorkspace(BScreen &screen) { 207void Gnome::updateCurrentWorkspace(BScreen &screen) {
208 int workspace = screen.getCurrentWorkspaceID(); 208 int workspace = screen.getCurrentWorkspaceID();
209 XChangeProperty(FbTk::App::instance()->display(), 209 XChangeProperty(FbTk::App::instance()->display(),
210 screen.getRootWindow(), 210 screen.rootWindow().window(),
211 m_gnome_wm_win_workspace, XA_CARDINAL, 32, PropModeReplace, 211 m_gnome_wm_win_workspace, XA_CARDINAL, 32, PropModeReplace,
212 (unsigned char *)&workspace, 1); 212 (unsigned char *)&workspace, 1);
213 213
@@ -216,7 +216,7 @@ void Gnome::updateCurrentWorkspace(BScreen &screen) {
216 216
217void Gnome::updateWorkspaceCount(BScreen &screen) { 217void Gnome::updateWorkspaceCount(BScreen &screen) {
218 int numworkspaces = screen.getCount(); 218 int numworkspaces = screen.getCount();
219 XChangeProperty(FbTk::App::instance()->display(), screen.getRootWindow(), 219 XChangeProperty(FbTk::App::instance()->display(), screen.rootWindow().window(),
220 m_gnome_wm_win_workspace_count, XA_CARDINAL, 32, PropModeReplace, 220 m_gnome_wm_win_workspace_count, XA_CARDINAL, 32, PropModeReplace,
221 (unsigned char *)&numworkspaces, 1); 221 (unsigned char *)&numworkspaces, 1);
222} 222}
diff --git a/src/IconBar.cc b/src/IconBar.cc
index 8e28f2a..d6e6d88 100644
--- a/src/IconBar.cc
+++ b/src/IconBar.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: IconBar.cc,v 1.32 2003/04/28 16:48:22 rathnor Exp $ 22// $Id: IconBar.cc,v 1.33 2003/05/10 22:55:10 fluxgen Exp $
23 23
24#include "IconBar.hh" 24#include "IconBar.hh"
25 25
@@ -294,15 +294,16 @@ Window IconBar::createIconWindow(FluxboxWindow *fluxboxwin, Window parent) {
294 attrib.background_pixel = attrib.border_pixel = 294 attrib.background_pixel = attrib.border_pixel =
295 BlackPixel(m_display, 295 BlackPixel(m_display,
296 screen().getScreenNumber()); 296 screen().getScreenNumber());
297 // fluxboxwin->getScreen().getWindowStyle()->tab.border_color.pixel(); 297 // fluxboxwin->screen().getWindowStyle()->tab.border_color.pixel();
298 attrib.colormap = fluxboxwin->getScreen().colormap(); 298 attrib.colormap = fluxboxwin->screen().rootWindow().colormap();
299 attrib.override_redirect = True; 299 attrib.override_redirect = True;
300 attrib.event_mask = ButtonPressMask | ButtonReleaseMask | 300 attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
301 ButtonMotionMask | ExposureMask | EnterWindowMask; 301 ButtonMotionMask | ExposureMask | EnterWindowMask;
302 302
303 //create iconwindow 303 //create iconwindow
304 Window iconwin = XCreateWindow(m_display, parent, 0, 0, 1, 1, 0, 304 Window iconwin = XCreateWindow(m_display, parent, 0, 0, 1, 1, 0,
305 fluxboxwin->getScreen().getDepth(), InputOutput, fluxboxwin->getScreen().getVisual(), 305 fluxboxwin->screen().rootWindow().depth(),
306 InputOutput, fluxboxwin->screen().rootWindow().visual(),
306 attrib_mask, &attrib); 307 attrib_mask, &attrib);
307 308
308 return iconwin; 309 return iconwin;
diff --git a/src/Screen.cc b/src/Screen.cc
index b85c3b4..1b27ff3 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.151 2003/05/10 18:15:23 fluxgen Exp $ 25// $Id: Screen.cc,v 1.152 2003/05/10 22:52:44 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -512,6 +512,7 @@ BScreen::BScreen(ResourceManager &rm,
512 m_root_theme(new 512 m_root_theme(new
513 RootTheme(scrn, 513 RootTheme(scrn,
514 *resource.rootcommand)), 514 *resource.rootcommand)),
515 m_root_window(scrn),
515 resource(rm, screenname, altscreenname), 516 resource(rm, screenname, altscreenname),
516 m_toolbarhandler(0) { 517 m_toolbarhandler(0) {
517 518
@@ -523,7 +524,7 @@ BScreen::BScreen(ResourceManager &rm,
523 ButtonPressMask | ButtonReleaseMask| SubstructureNotifyMask; 524 ButtonPressMask | ButtonReleaseMask| SubstructureNotifyMask;
524 525
525 XErrorHandler old = XSetErrorHandler((XErrorHandler) anotherWMRunning); 526 XErrorHandler old = XSetErrorHandler((XErrorHandler) anotherWMRunning);
526 XSelectInput(disp, getRootWindow(), event_mask); 527 rootWindow().setEventMask(event_mask);
527 XSync(disp, False); 528 XSync(disp, False);
528 XSetErrorHandler((XErrorHandler) old); 529 XSetErrorHandler((XErrorHandler) old);
529 530
@@ -539,14 +540,14 @@ BScreen::BScreen(ResourceManager &rm,
539 FBNLS::ScreenSet, FBNLS::ScreenManagingScreen, 540 FBNLS::ScreenSet, FBNLS::ScreenManagingScreen,
540 "BScreen::BScreen: managing screen %d " 541 "BScreen::BScreen: managing screen %d "
541 "using visual 0x%lx, depth %d\n"), 542 "using visual 0x%lx, depth %d\n"),
542 getScreenNumber(), XVisualIDFromVisual(getVisual()), 543 getScreenNumber(), XVisualIDFromVisual(rootWindow().visual()),
543 getDepth()); 544 rootWindow().depth());
544 545
545 Fluxbox * const fluxbox = Fluxbox::instance(); 546 Fluxbox * const fluxbox = Fluxbox::instance();
546#ifdef HAVE_GETPID 547#ifdef HAVE_GETPID
547 pid_t bpid = getpid(); 548 pid_t bpid = getpid();
548 549
549 XChangeProperty(disp, getRootWindow(), 550 XChangeProperty(disp, rootWindow().window(),
550 Fluxbox::instance()->getFluxboxPidAtom(), XA_CARDINAL, 551 Fluxbox::instance()->getFluxboxPidAtom(), XA_CARDINAL,
551 sizeof(pid_t) * 8, PropModeReplace, 552 sizeof(pid_t) * 8, PropModeReplace,
552 (unsigned char *) &bpid, 1); 553 (unsigned char *) &bpid, 1);
@@ -555,7 +556,7 @@ BScreen::BScreen(ResourceManager &rm,
555 556
556 cycling_window = focused_list.end(); 557 cycling_window = focused_list.end();
557 558
558 XDefineCursor(disp, getRootWindow(), fluxbox->getSessionCursor()); 559 XDefineCursor(disp, rootWindow().window(), fluxbox->getSessionCursor());
559 560
560 image_control = 561 image_control =
561 new FbTk::ImageControl(scrn, true, fluxbox->colorsPerChannel(), 562 new FbTk::ImageControl(scrn, true, fluxbox->colorsPerChannel(),
@@ -591,13 +592,13 @@ BScreen::BScreen(ResourceManager &rm,
591 XSetWindowAttributes attrib; 592 XSetWindowAttributes attrib;
592 unsigned long mask = CWBorderPixel | CWColormap | CWSaveUnder; 593 unsigned long mask = CWBorderPixel | CWColormap | CWSaveUnder;
593 attrib.border_pixel = m_root_theme->borderColor().pixel(); 594 attrib.border_pixel = m_root_theme->borderColor().pixel();
594 attrib.colormap = colormap(); 595 attrib.colormap = rootWindow().colormap();
595 attrib.save_under = true; 596 attrib.save_under = true;
596 597
597 geom_window = 598 geom_window =
598 XCreateWindow(disp, getRootWindow(), 599 XCreateWindow(disp, rootWindow().window(),
599 0, 0, geom_w, geom_h, rootTheme().borderWidth(), getDepth(), 600 0, 0, geom_w, geom_h, rootTheme().borderWidth(), rootWindow().depth(),
600 InputOutput, getVisual(), mask, &attrib); 601 InputOutput, rootWindow().visual(), mask, &attrib);
601 geom_visible = false; 602 geom_visible = false;
602 603
603 if (winFrameTheme().labelFocusTexture().type() & FbTk::Texture::PARENTRELATIVE) { 604 if (winFrameTheme().labelFocusTexture().type() & FbTk::Texture::PARENTRELATIVE) {
@@ -675,7 +676,7 @@ BScreen::BScreen(ResourceManager &rm,
675 int i; 676 int i;
676 unsigned int nchild; 677 unsigned int nchild;
677 Window r, p, *children; 678 Window r, p, *children;
678 XQueryTree(disp, getRootWindow(), &r, &p, &children, &nchild); 679 XQueryTree(disp, rootWindow().window(), &r, &p, &children, &nchild);
679 680
680 // preen the window list of all icon windows... for better dockapp support 681 // preen the window list of all icon windows... for better dockapp support
681 for (i = 0; i < (int) nchild; i++) { 682 for (i = 0; i < (int) nchild; i++) {
@@ -787,7 +788,7 @@ Pixmap BScreen::rootPixmap() const {
787 int real_format; 788 int real_format;
788 unsigned long items_read, items_left; 789 unsigned long items_read, items_left;
789 unsigned int *data; 790 unsigned int *data;
790 if (XGetWindowProperty(disp, getRootWindow(), 791 if (XGetWindowProperty(disp, rootWindow().window(),
791 XInternAtom(disp, "_XROOTPMAP_ID", false), 792 XInternAtom(disp, "_XROOTPMAP_ID", false),
792 0L, 1L, 793 0L, 1L,
793 false, XA_PIXMAP, &real_type, 794 false, XA_PIXMAP, &real_type,
@@ -2270,16 +2271,13 @@ void BScreen::createStyleMenu(FbTk::Menu &menu,
2270 2271
2271void BScreen::shutdown() { 2272void BScreen::shutdown() {
2272 Display *disp = FbTk::App::instance()->display(); 2273 Display *disp = FbTk::App::instance()->display();
2273 XSelectInput(disp, getRootWindow(), NoEventMask); 2274 rootWindow().setEventMask(NoEventMask);
2274 XSync(disp, False); 2275 XSync(disp, False);
2275 2276
2276 for_each(workspacesList.begin(), 2277 for_each(workspacesList.begin(),
2277 workspacesList.end(), 2278 workspacesList.end(),
2278 mem_fun(&Workspace::shutdown)); 2279 mem_fun(&Workspace::shutdown));
2279 2280
2280
2281
2282
2283#ifdef SLIT 2281#ifdef SLIT
2284 if (m_slit.get()) 2282 if (m_slit.get())
2285 m_slit->shutdown(); 2283 m_slit->shutdown();
diff --git a/src/Slit.cc b/src/Slit.cc
index 86648af..1f4e4cc 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.47 2003/05/07 22:52:36 fluxgen Exp $ 25// $Id: Slit.cc,v 1.48 2003/05/10 22:53:57 fluxgen Exp $
26 26
27#include "Slit.hh" 27#include "Slit.hh"
28 28
@@ -297,7 +297,7 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
297 attrib.background_pixmap = None; 297 attrib.background_pixmap = None;
298 attrib.background_pixel = attrib.border_pixel = 298 attrib.background_pixel = attrib.border_pixel =
299 screen().rootTheme().borderColor().pixel(); 299 screen().rootTheme().borderColor().pixel();
300 attrib.colormap = screen().colormap(); 300 attrib.colormap = screen().rootWindow().colormap();
301 attrib.override_redirect = True; 301 attrib.override_redirect = True;
302 attrib.event_mask = SubstructureRedirectMask | ButtonPressMask | 302 attrib.event_mask = SubstructureRedirectMask | ButtonPressMask |
303 EnterWindowMask | LeaveWindowMask; 303 EnterWindowMask | LeaveWindowMask;
@@ -306,9 +306,9 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
306 frame.width = frame.height = 1; 306 frame.width = frame.height = 1;
307 Display *disp = FbTk::App::instance()->display(); 307 Display *disp = FbTk::App::instance()->display();
308 frame.window = 308 frame.window =
309 XCreateWindow(disp, screen().getRootWindow(), frame.x, frame.y, 309 XCreateWindow(disp, screen().rootWindow().window(), frame.x, frame.y,
310 frame.width, frame.height, screen().rootTheme().borderWidth(), 310 frame.width, frame.height, screen().rootTheme().borderWidth(),
311 screen().getDepth(), InputOutput, screen().getVisual(), 311 screen().rootWindow().depth(), InputOutput, screen().rootWindow().visual(),
312 create_mask, &attrib); 312 create_mask, &attrib);
313 313
314 FbTk::EventManager::instance()->add(*this, frame.window); 314 FbTk::EventManager::instance()->add(*this, frame.window);
@@ -518,7 +518,7 @@ void Slit::removeClient(SlitClient *client, bool remap, bool destroy) {
518 client->disableEvents(); 518 client->disableEvents();
519 // stop events to frame.window temporarly 519 // stop events to frame.window temporarly
520 frame.window.setEventMask(NoEventMask); 520 frame.window.setEventMask(NoEventMask);
521 XReparentWindow(disp, client->window, screen().getRootWindow(), 521 XReparentWindow(disp, client->window, screen().rootWindow().window(),
522 client->x, client->y); 522 client->x, client->y);
523 XChangeSaveSet(disp, client->window, SetModeDelete); 523 XChangeSaveSet(disp, client->window, SetModeDelete);
524 // reactivate events to frame.window 524 // reactivate events to frame.window
diff --git a/src/WinClient.cc b/src/WinClient.cc
index 1b468d1..77cc31f 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: WinClient.cc,v 1.7 2003/05/07 16:21:26 rathnor Exp $ 22// $Id: WinClient.cc,v 1.8 2003/05/10 22:59:32 fluxgen Exp $
23 23
24#include "WinClient.hh" 24#include "WinClient.hh"
25 25
@@ -194,7 +194,7 @@ void WinClient::updateTransientInfo() {
194 if (win == window()) 194 if (win == window())
195 return; 195 return;
196 196
197 if (win != None && m_win->getScreen().getRootWindow() == win) { 197 if (win != None && m_win->screen().rootWindow() == win) {
198 modal = true; 198 modal = true;
199 return; // transient for root window... 199 return; // transient for root window...
200 } 200 }