summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-12-31 14:10:55 (GMT)
committersimonb <simonb>2006-12-31 14:10:55 (GMT)
commitb3a94f59d8bb301fa38a65317da7bb81733de933 (patch)
tree037c03b07937d20c89345a93bdbbd6afc46f45db
parent7a9fcd66fd09f138485accb12f0bd71c81efd959 (diff)
downloadfluxbox_lack-b3a94f59d8bb301fa38a65317da7bb81733de933.zip
fluxbox_lack-b3a94f59d8bb301fa38a65317da7bb81733de933.tar.bz2
Fix _NET_FRAME_EXTENTS on 64-bit systems
-rw-r--r--ChangeLog7
-rw-r--r--src/Ewmh.cc8
-rw-r--r--src/Gnome.cc2
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index da4ab47..d90ea30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/01/01:
4 * Happy New Year!
5 * Fix data type of data passed to set _NET_FRAME_EXTENTS (Simon)
6 (sf.net #1621980)
7 Similar fix for gnome current workspace... remember that XA_CARDINAL
8 "32-bit" type is actually a "long array" argument (=64bit on 64 systems)
9 Ewmh.cc Gnome.cc
3*06/12/28: 10*06/12/28:
4 * Don't add 2 pixels to a specified toolbar height, bug #1528646 (Mark) 11 * Don't add 2 pixels to a specified toolbar height, bug #1528646 (Mark)
5 Toolbar.cc 12 Toolbar.cc
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 6fe6b83..9a3665e 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -859,11 +859,11 @@ bool Ewmh::checkClientMessage(const XClientMessageEvent &ce,
859 if (!screen) 859 if (!screen)
860 return true; 860 return true;
861 FbWinFrameTheme &theme = screen->winFrameTheme(); 861 FbWinFrameTheme &theme = screen->winFrameTheme();
862 int title_h = theme.titleHeight() || 862 long title_h = theme.titleHeight() ||
863 theme.font().height() + 2*theme.bevelWidth() + 2; 863 theme.font().height() + 2*theme.bevelWidth() + 2;
864 title_h += theme.border().width(); 864 title_h += theme.border().width();
865 int handle_h = theme.handleWidth() + theme.border().width(); 865 long handle_h = theme.handleWidth() + theme.border().width();
866 int extents[4]; 866 long extents[4];
867 // our frames currently don't protrude from left/right 867 // our frames currently don't protrude from left/right
868 extents[0] = 0; 868 extents[0] = 0;
869 extents[1] = 0; 869 extents[1] = 0;
@@ -1271,7 +1271,7 @@ void Ewmh::updateFrameExtents(FluxboxWindow &win) {
1271 protrudes from the client window, on left, right, top, bottom 1271 protrudes from the client window, on left, right, top, bottom
1272 (it is independent of window position). 1272 (it is independent of window position).
1273 */ 1273 */
1274 int extents[4]; 1274 long extents[4];
1275 // our frames currently don't protrude from left/right 1275 // our frames currently don't protrude from left/right
1276 extents[0] = 0; 1276 extents[0] = 0;
1277 extents[1] = 0; 1277 extents[1] = 0;
diff --git a/src/Gnome.cc b/src/Gnome.cc
index 33bc88d..92b7b51 100644
--- a/src/Gnome.cc
+++ b/src/Gnome.cc
@@ -235,7 +235,7 @@ void Gnome::updateWorkspaceNames(BScreen &screen) {
235} 235}
236 236
237void Gnome::updateCurrentWorkspace(BScreen &screen) { 237void Gnome::updateCurrentWorkspace(BScreen &screen) {
238 int workspace = screen.currentWorkspaceID(); 238 long workspace = screen.currentWorkspaceID();
239 screen.rootWindow().changeProperty(m_gnome_wm_win_workspace, XA_CARDINAL, 32, PropModeReplace, 239 screen.rootWindow().changeProperty(m_gnome_wm_win_workspace, XA_CARDINAL, 32, PropModeReplace,
240 (unsigned char *)&workspace, 1); 240 (unsigned char *)&workspace, 1);
241 241