diff options
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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 |