using FbRootWindow

This commit is contained in:
fluxgen 2003-05-10 23:07:42 +00:00
parent b0641a8cbd
commit 39425a6762
2 changed files with 7 additions and 7 deletions

View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: Workspace.cc,v 1.59 2003/05/07 16:21:26 rathnor Exp $
// $Id: Workspace.cc,v 1.60 2003/05/10 23:07:04 fluxgen Exp $
#include "Workspace.hh"
@ -514,7 +514,7 @@ void Workspace::placeWindow(FluxboxWindow &win) {
Window ignore_w;
XQueryPointer(FbTk::App::instance()->display(),
screen.getRootWindow(), &ignore_w,
screen.rootWindow().window(), &ignore_w,
&ignore_w, &root_x, &root_y,
&ignore_i, &ignore_i, &ignore_ui);

View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.133 2003/05/10 15:22:28 fluxgen Exp $
// $Id: fluxbox.cc,v 1.134 2003/05/10 23:07:42 fluxgen Exp $
#include "fluxbox.hh"
@ -1631,7 +1631,7 @@ BScreen *Fluxbox::searchScreen(Window window) {
for (; it != it_end; ++it) {
if (*it) {
if ((*it)->getRootWindow() == window) {
if ((*it)->rootWindow() == window) {
screen = (*it);
return screen;
}
@ -2375,7 +2375,7 @@ void Fluxbox::revertFocus(BScreen *screen) {
int ignored;
BScreen *tempscr = m_screen_list.front();
XQueryPointer(FbTk::App::instance()->display(),
tempscr->getRootWindow(), &root, &ignorew, &ignored,
tempscr->rootWindow().window(), &root, &ignorew, &ignored,
&ignored, &ignored, &ignored, (unsigned int *)&ignored);
screen = searchScreen(root);
if (screen == 0) {
@ -2402,7 +2402,7 @@ void Fluxbox::revertFocus(BScreen *screen) {
break;
case CLICKTOFOCUS:
XSetInputFocus(FbTk::App::instance()->display(),
screen->getRootWindow(),
screen->rootWindow().window(),
RevertToPointerRoot, CurrentTime);
break;
}
@ -2419,6 +2419,6 @@ void Fluxbox::watchKeyRelease(BScreen &screen, unsigned int mods) {
m_watching_screen = &screen;
m_watch_keyrelease = mods;
XGrabKeyboard(FbTk::App::instance()->display(),
screen.getRootWindow(), True,
screen.rootWindow().window(), True,
GrabModeAsync, GrabModeAsync, CurrentTime);
}