diff options
author | mathias <mathias> | 2005-01-31 16:55:38 (GMT) |
---|---|---|
committer | mathias <mathias> | 2005-01-31 16:55:38 (GMT) |
commit | 67098a21ea9104fda0933ee14278819565f1cbc0 (patch) | |
tree | efd3fa13eb486c7c5a6c0188f0e0e8e091da9596 /src/Ewmh.cc | |
parent | f4d3d79d385044701cec897d32b09c861b600993 (diff) | |
download | fluxbox_pavel-67098a21ea9104fda0933ee14278819565f1cbc0.zip fluxbox_pavel-67098a21ea9104fda0933ee14278819565f1cbc0.tar.bz2 |
closes #1107213, 64bit issues with XChangeProperty
submitted by Matthieu Herrb <matthieu.herrb@laas.fr>
Diffstat (limited to 'src/Ewmh.cc')
-rw-r--r-- | src/Ewmh.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Ewmh.cc b/src/Ewmh.cc index 6e980dd..34c166c 100644 --- a/src/Ewmh.cc +++ b/src/Ewmh.cc | |||
@@ -415,7 +415,7 @@ void Ewmh::updateCurrentWorkspace(BScreen &screen) { | |||
415 | * This MUST be set and updated by the Window Manager. | 415 | * This MUST be set and updated by the Window Manager. |
416 | * | 416 | * |
417 | */ | 417 | */ |
418 | unsigned int workspace = screen.currentWorkspaceID(); | 418 | unsigned long workspace = screen.currentWorkspaceID(); |
419 | screen.rootWindow().changeProperty(m_net_current_desktop, | 419 | screen.rootWindow().changeProperty(m_net_current_desktop, |
420 | XA_CARDINAL, 32, | 420 | XA_CARDINAL, 32, |
421 | PropModeReplace, | 421 | PropModeReplace, |
@@ -432,7 +432,7 @@ void Ewmh::updateWorkspaceCount(BScreen &screen) { | |||
432 | * Window Manager to indicate the number of virtual | 432 | * Window Manager to indicate the number of virtual |
433 | * desktops. | 433 | * desktops. |
434 | */ | 434 | */ |
435 | unsigned int numworkspaces = screen.getCount(); | 435 | unsigned long numworkspaces = screen.getCount(); |
436 | screen.rootWindow().changeProperty(m_net_number_of_desktops, | 436 | screen.rootWindow().changeProperty(m_net_number_of_desktops, |
437 | XA_CARDINAL, 32, | 437 | XA_CARDINAL, 32, |
438 | PropModeReplace, | 438 | PropModeReplace, |
@@ -450,7 +450,7 @@ void Ewmh::updateViewPort(BScreen &screen) { | |||
450 | * desktops, this MUST always be set to (0,0). | 450 | * desktops, this MUST always be set to (0,0). |
451 | * | 451 | * |
452 | */ | 452 | */ |
453 | int value[2] = {0, 0}; // we dont support large desktops | 453 | long value[2] = {0, 0}; // we dont support large desktops |
454 | screen.rootWindow().changeProperty(m_net_desktop_viewport, | 454 | screen.rootWindow().changeProperty(m_net_desktop_viewport, |
455 | XA_CARDINAL, 32, | 455 | XA_CARDINAL, 32, |
456 | PropModeReplace, | 456 | PropModeReplace, |
@@ -470,7 +470,7 @@ void Ewmh::updateGeometry(BScreen &screen) { | |||
470 | * Window Manager. | 470 | * Window Manager. |
471 | * | 471 | * |
472 | */ | 472 | */ |
473 | int value[2] = {screen.width(), screen.height()}; | 473 | long value[2] = {screen.width(), screen.height()}; |
474 | screen.rootWindow().changeProperty(m_net_desktop_geometry, | 474 | screen.rootWindow().changeProperty(m_net_desktop_geometry, |
475 | XA_CARDINAL, 32, | 475 | XA_CARDINAL, 32, |
476 | PropModeReplace, | 476 | PropModeReplace, |
@@ -497,7 +497,7 @@ void Ewmh::updateWorkarea(BScreen &screen) { | |||
497 | * Not sure how to handle xinerama stuff here. | 497 | * Not sure how to handle xinerama stuff here. |
498 | * So i'm just doing this on the first head. | 498 | * So i'm just doing this on the first head. |
499 | */ | 499 | */ |
500 | unsigned int *coords = new unsigned int[4*screen.getCount()]; | 500 | unsigned long *coords = new unsigned long[4*screen.getCount()]; |
501 | for (unsigned int i=0; i<screen.getCount()*4; i+=4) { | 501 | for (unsigned int i=0; i<screen.getCount()*4; i+=4) { |
502 | // x, y | 502 | // x, y |
503 | coords[i] = screen.maxLeft(0); | 503 | coords[i] = screen.maxLeft(0); |
@@ -568,7 +568,7 @@ void Ewmh::updateHints(FluxboxWindow &win) { | |||
568 | } | 568 | } |
569 | 569 | ||
570 | void Ewmh::updateWorkspace(FluxboxWindow &win) { | 570 | void Ewmh::updateWorkspace(FluxboxWindow &win) { |
571 | int workspace = win.workspaceNumber(); | 571 | long workspace = win.workspaceNumber(); |
572 | if (win.isStuck()) | 572 | if (win.isStuck()) |
573 | workspace = 0xFFFFFFFF; // appear on all desktops/workspaces | 573 | workspace = 0xFFFFFFFF; // appear on all desktops/workspaces |
574 | 574 | ||