aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2005-01-31 16:55:38 (GMT)
committermathias <mathias>2005-01-31 16:55:38 (GMT)
commit67098a21ea9104fda0933ee14278819565f1cbc0 (patch)
treeefd3fa13eb486c7c5a6c0188f0e0e8e091da9596
parentf4d3d79d385044701cec897d32b09c861b600993 (diff)
downloadfluxbox_paul-67098a21ea9104fda0933ee14278819565f1cbc0.zip
fluxbox_paul-67098a21ea9104fda0933ee14278819565f1cbc0.tar.bz2
closes #1107213, 64bit issues with XChangeProperty
submitted by Matthieu Herrb <matthieu.herrb@laas.fr>
-rw-r--r--src/Ewmh.cc12
-rw-r--r--src/FbTk/FbPixmap.cc2
-rw-r--r--src/Gnome.cc8
-rw-r--r--src/Window.hh6
4 files changed, 14 insertions, 14 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
570void Ewmh::updateWorkspace(FluxboxWindow &win) { 570void 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
diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc
index 9fd9860..ed9a771 100644
--- a/src/FbTk/FbPixmap.cc
+++ b/src/FbTk/FbPixmap.cc
@@ -288,7 +288,7 @@ Pixmap FbPixmap::getRootPixmap(int screen_num) {
288 Atom real_type; 288 Atom real_type;
289 int real_format; 289 int real_format;
290 unsigned long items_read, items_left; 290 unsigned long items_read, items_left;
291 unsigned int *data; 291 unsigned long *data;
292 292
293 unsigned int prop = 0; 293 unsigned int prop = 0;
294 static const char* prop_ids[] = { 294 static const char* prop_ids[] = {
diff --git a/src/Gnome.cc b/src/Gnome.cc
index 097484c..097a462 100644
--- a/src/Gnome.cc
+++ b/src/Gnome.cc
@@ -234,13 +234,13 @@ void Gnome::updateCurrentWorkspace(BScreen &screen) {
234} 234}
235 235
236void Gnome::updateWorkspaceCount(BScreen &screen) { 236void Gnome::updateWorkspaceCount(BScreen &screen) {
237 int numworkspaces = screen.getCount(); 237 long numworkspaces = screen.getCount();
238 screen.rootWindow().changeProperty(m_gnome_wm_win_workspace_count, XA_CARDINAL, 32, PropModeReplace, 238 screen.rootWindow().changeProperty(m_gnome_wm_win_workspace_count, XA_CARDINAL, 32, PropModeReplace,
239 (unsigned char *)&numworkspaces, 1); 239 (unsigned char *)&numworkspaces, 1);
240} 240}
241 241
242void Gnome::updateWorkspace(FluxboxWindow &win) { 242void Gnome::updateWorkspace(FluxboxWindow &win) {
243 int val = win.workspaceNumber(); 243 long val = win.workspaceNumber();
244 if (win.isStuck()) { 244 if (win.isStuck()) {
245 val = -1; 245 val = -1;
246 } 246 }
@@ -259,7 +259,7 @@ void Gnome::updateWorkspace(FluxboxWindow &win) {
259 259
260void Gnome::updateState(FluxboxWindow &win) { 260void Gnome::updateState(FluxboxWindow &win) {
261 //translate to gnome win state 261 //translate to gnome win state
262 int state=0; 262 long state=0;
263 if (win.isStuck()) 263 if (win.isStuck())
264 state |= WIN_STATE_STICKY; 264 state |= WIN_STATE_STICKY;
265 if (win.isIconic()) 265 if (win.isIconic())
@@ -279,7 +279,7 @@ void Gnome::updateState(FluxboxWindow &win) {
279void Gnome::updateLayer(FluxboxWindow &win) { 279void Gnome::updateLayer(FluxboxWindow &win) {
280 //TODO - map from flux layers to gnome ones 280 //TODO - map from flux layers to gnome ones
281 // our layers are in the opposite direction to GNOME 281 // our layers are in the opposite direction to GNOME
282 int layernum = Fluxbox::instance()->getDesktopLayer() - win.layerNum(); 282 long layernum = Fluxbox::instance()->getDesktopLayer() - win.layerNum();
283 283
284 FluxboxWindow::ClientList::iterator client_it = win.clientList().begin(); 284 FluxboxWindow::ClientList::iterator client_it = win.clientList().begin();
285 FluxboxWindow::ClientList::iterator client_it_end = win.clientList().end(); 285 FluxboxWindow::ClientList::iterator client_it_end = win.clientList().end();
diff --git a/src/Window.hh b/src/Window.hh
index 7c98b2c..ac13da6 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -143,13 +143,13 @@ public:
143 143
144 typedef struct _blackbox_hints { 144 typedef struct _blackbox_hints {
145 unsigned long flags, attrib, workspace, stack; 145 unsigned long flags, attrib, workspace, stack;
146 int decoration; 146 long decoration;
147 } BlackboxHints; 147 } BlackboxHints;
148 148
149 typedef struct _blackbox_attributes { 149 typedef struct _blackbox_attributes {
150 unsigned long flags, attrib, workspace, stack; 150 unsigned long flags, attrib, workspace, stack;
151 int premax_x, premax_y; 151 long premax_x, premax_y;
152 unsigned int premax_w, premax_h; 152 unsigned long premax_w, premax_h;
153 } BlackboxAttributes; 153 } BlackboxAttributes;
154 154
155 typedef std::list<WinClient *> ClientList; 155 typedef std::list<WinClient *> ClientList;