nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

closes #1107213, 64bit issues with XChangeProperty

Browse source 
submitted by  Matthieu Herrb <matthieu.herrb@laas.fr>
This commit is contained in:
mathias 2005-01-31 16:55:38 +00:00
parent f4d3d79d38
commit 67098a21ea
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Ewmh.cc
View file

@ -415,7 +415,7 @@ void Ewmh::updateCurrentWorkspace(BScreen &screen) {
* 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 @@ void Ewmh::updateWorkspaceCount(BScreen &screen) {
* 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 @@ void Ewmh::updateViewPort(BScreen &screen) {
* 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 @@ void Ewmh::updateGeometry(BScreen &screen) {
* 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 @@ void Ewmh::updateWorkarea(BScreen &screen) {
* 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

2
src/FbTk/FbPixmap.cc
View file

@ -288,7 +288,7 @@ Pixmap FbPixmap::getRootPixmap(int screen_num) {
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[] = {

8
src/Gnome.cc
View file

@ -234,13 +234,13 @@ void Gnome::updateCurrentWorkspace(BScreen &screen) {
}
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::updateWorkspace(FluxboxWindow &win) {
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::updateState(FluxboxWindow &win) {
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();

6
src/Window.hh
View file

@ -143,13 +143,13 @@ public:
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;