closes #1107213, 64bit issues with XChangeProperty submitted by Matthieu Herrb <matthieu.herrb@laas.fr>
mathias mathias
4 files changed,
14 insertions(+),
14 deletions(-)
M
src/Ewmh.cc
→
src/Ewmh.cc
@@ -415,7 +415,7 @@ * an integer between 0 and _NET_NUMBER_OF_DESKTOPS - 1.
* This MUST be set and updated by the Window Manager. * */ - unsigned int workspace = screen.currentWorkspaceID(); + unsigned long workspace = screen.currentWorkspaceID(); screen.rootWindow().changeProperty(m_net_current_desktop, XA_CARDINAL, 32, PropModeReplace,@@ -432,7 +432,7 @@ * This property SHOULD be set and updated by the
* Window Manager to indicate the number of virtual * desktops. */ - unsigned int numworkspaces = screen.getCount(); + unsigned long numworkspaces = screen.getCount(); screen.rootWindow().changeProperty(m_net_number_of_desktops, XA_CARDINAL, 32, PropModeReplace,@@ -450,7 +450,7 @@ * For Window Managers that don't support large
* desktops, this MUST always be set to (0,0). * */ - int value[2] = {0, 0}; // we dont support large desktops + long value[2] = {0, 0}; // we dont support large desktops screen.rootWindow().changeProperty(m_net_desktop_viewport, XA_CARDINAL, 32, PropModeReplace,@@ -470,7 +470,7 @@ * of the desktop). This property SHOULD be set by the
* Window Manager. * */ - int value[2] = {screen.width(), screen.height()}; + long value[2] = {screen.width(), screen.height()}; screen.rootWindow().changeProperty(m_net_desktop_geometry, XA_CARDINAL, 32, PropModeReplace,@@ -497,7 +497,7 @@ /* !!TODO
* Not sure how to handle xinerama stuff here. * So i'm just doing this on the first head. */ - unsigned int *coords = new unsigned int[4*screen.getCount()]; + unsigned long *coords = new unsigned long[4*screen.getCount()]; for (unsigned int i=0; i<screen.getCount()*4; i+=4) { // x, y coords[i] = screen.maxLeft(0);@@ -568,7 +568,7 @@ void Ewmh::updateHints(FluxboxWindow &win) {
} void Ewmh::updateWorkspace(FluxboxWindow &win) { - int workspace = win.workspaceNumber(); + long workspace = win.workspaceNumber(); if (win.isStuck()) workspace = 0xFFFFFFFF; // appear on all desktops/workspaces
M
src/FbTk/FbPixmap.cc
→
src/FbTk/FbPixmap.cc
@@ -288,7 +288,7 @@
Atom real_type; int real_format; unsigned long items_read, items_left; - unsigned int *data; + unsigned long *data; unsigned int prop = 0; static const char* prop_ids[] = {
M
src/Gnome.cc
→
src/Gnome.cc
@@ -234,13 +234,13 @@ updateClientList(screen); // make sure the client list is updated too
} void Gnome::updateWorkspaceCount(BScreen &screen) { - int numworkspaces = screen.getCount(); + long numworkspaces = screen.getCount(); screen.rootWindow().changeProperty(m_gnome_wm_win_workspace_count, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&numworkspaces, 1); } void Gnome::updateWorkspace(FluxboxWindow &win) { - int val = win.workspaceNumber(); + long val = win.workspaceNumber(); if (win.isStuck()) { val = -1; }@@ -259,7 +259,7 @@ }
void Gnome::updateState(FluxboxWindow &win) { //translate to gnome win state - int state=0; + long state=0; if (win.isStuck()) state |= WIN_STATE_STICKY; if (win.isIconic())@@ -279,7 +279,7 @@
void Gnome::updateLayer(FluxboxWindow &win) { //TODO - map from flux layers to gnome ones // our layers are in the opposite direction to GNOME - int layernum = Fluxbox::instance()->getDesktopLayer() - win.layerNum(); + long layernum = Fluxbox::instance()->getDesktopLayer() - win.layerNum(); FluxboxWindow::ClientList::iterator client_it = win.clientList().begin(); FluxboxWindow::ClientList::iterator client_it_end = win.clientList().end();
M
src/Window.hh
→
src/Window.hh
@@ -143,13 +143,13 @@ };
typedef struct _blackbox_hints { unsigned long flags, attrib, workspace, stack; - int decoration; + long decoration; } BlackboxHints; typedef struct _blackbox_attributes { unsigned long flags, attrib, workspace, stack; - int premax_x, premax_y; - unsigned int premax_w, premax_h; + long premax_x, premax_y; + unsigned long premax_w, premax_h; } BlackboxAttributes; typedef std::list<WinClient *> ClientList;