Fix _NET_FRAME_EXTENTS on 64-bit systems

This commit is contained in:
simonb 2006-12-31 14:10:55 +00:00
parent 7a9fcd66fd
commit b3a94f59d8
3 changed files with 12 additions and 5 deletions

View file

@ -1,5 +1,12 @@
(Format: Year/Month/Day)
Changes for 1.0rc3:
*07/01/01:
* Happy New Year!
* Fix data type of data passed to set _NET_FRAME_EXTENTS (Simon)
(sf.net #1621980)
Similar fix for gnome current workspace... remember that XA_CARDINAL
"32-bit" type is actually a "long array" argument (=64bit on 64 systems)
Ewmh.cc Gnome.cc
*06/12/28:
* Don't add 2 pixels to a specified toolbar height, bug #1528646 (Mark)
Toolbar.cc

View file

@ -859,11 +859,11 @@ bool Ewmh::checkClientMessage(const XClientMessageEvent &ce,
if (!screen)
return true;
FbWinFrameTheme &theme = screen->winFrameTheme();
int title_h = theme.titleHeight() ||
long title_h = theme.titleHeight() ||
theme.font().height() + 2*theme.bevelWidth() + 2;
title_h += theme.border().width();
int handle_h = theme.handleWidth() + theme.border().width();
int extents[4];
long handle_h = theme.handleWidth() + theme.border().width();
long extents[4];
// our frames currently don't protrude from left/right
extents[0] = 0;
extents[1] = 0;
@ -1271,7 +1271,7 @@ void Ewmh::updateFrameExtents(FluxboxWindow &win) {
protrudes from the client window, on left, right, top, bottom
(it is independent of window position).
*/
int extents[4];
long extents[4];
// our frames currently don't protrude from left/right
extents[0] = 0;
extents[1] = 0;

View file

@ -235,7 +235,7 @@ void Gnome::updateWorkspaceNames(BScreen &screen) {
}
void Gnome::updateCurrentWorkspace(BScreen &screen) {
int workspace = screen.currentWorkspaceID();
long workspace = screen.currentWorkspaceID();
screen.rootWindow().changeProperty(m_gnome_wm_win_workspace, XA_CARDINAL, 32, PropModeReplace,
(unsigned char *)&workspace, 1);