[Fte-cvs] fte/src con_x11.cpp,1.39,1.40

[Zdenek K. <ka...@us...>]

Update of /cvsroot/fte/fte/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29069

Modified Files:
	con_x11.cpp 
Log Message:
* use  long type for 32bit quantities of XChangeProperties() - fixes bug in
  64bit environment
* use XF86XK_Back, XF86XK_Forward for windows switching


Index: con_x11.cpp
===================================================================
RCS file: /cvsroot/fte/fte/src/con_x11.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- con_x11.cpp	12 Apr 2009 16:44:00 -0000	1.39
+++ con_x11.cpp	2 Sep 2009 19:45:19 -0000	1.40
@@ -47,6 +47,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
+#include <X11/XF86keysym.h>
 #include <X11/Xos.h>
 #ifdef USE_XTINIT
 #include <X11/Intrinsic.h>
@@ -594,9 +595,11 @@
     }
     if (i == ICON_COUNT) {
         // Everything OK, can create property
-        CARD32 *iconBuffer = (CARD32 *)malloc(iconBufferSize * sizeof(CARD32) + 16);
+        // XChangeProperty takes 32-bit entities in long array
+        // (which is 64bit on x86_64)
+        long *iconBuffer = (long *)malloc(iconBufferSize * sizeof(long) + 16);
         if (iconBuffer) {
-            CARD32 *b = iconBuffer;
+            long *b = iconBuffer;
             for (i = 0; i < ICON_COUNT; i++) {
                 XpmImage &xpm = xpmImage[i];
                 CARD32 *&colors = xpmColors[i];
@@ -1067,6 +1070,8 @@
     { XK_KP_End,         kbEnd | kfGray },
     { XK_KP_Down,        kbDown | kfGray },
     { XK_KP_Next,        kbPgDn| kfGray },
+    { XF86XK_Back,       kbLeft | kfAlt },
+    { XF86XK_Forward,    kbRight | kfAlt },
     { XK_Num_Lock,       kbNumLock },
     { XK_Caps_Lock,      kbCapsLock },
     { XK_Print,          kbPrtScr },