--- metisse-0.4.0-rc4/FvwmCompositor/desktop/MetisseWindow.H 2007-01-12 13:56:20.000000000 -0800
+++ metisse/FvwmCompositor/desktop/MetisseWindow.H 2008-06-09 08:12:37.000000000 -0700
@@ -127,6 +127,9 @@
sgNode *_duplicateFor;
+ sgNode *_pseudoSwallowNode;
+ sgNode *_pseudoSwallowedBy;
+
bool _isAToolGlass;
FacadeMapping _facade;
@@ -262,8 +265,12 @@
bool isEwmhDesktop(void);
void setToolTips(void);
bool isToolTips(void);
- void setTransientFor(sgNode *n, sgNode *n = 0, cut *c = 0);
- void setUnmanagedFor(sgNode *n, sgNode *n = 0, cut *c = 0);
+ void pseudoSwallow(sgNode *n);
+ sgNode *getPseudoSwallowedNode(void);
+ void setPseudoSwallowedBy(sgNode *n);
+ sgNode *getPseudoSwallowedBy(void);
+ void setTransientFor(sgNode *n1, sgNode *n2 = 0, cut *c = 0);
+ void setUnmanagedFor(sgNode *n1, sgNode *n2 = 0, cut *c = 0);
void setDuplicateFor(sgNode *n);
sgNode *getTransientFor(void);
sgNode *getUnmanagedFor(void);
--- metisse-0.4.0-rc4/FvwmCompositor/desktop/MetisseDesktop.H 2006-12-19 15:35:54.000000000 -0800
+++ metisse/FvwmCompositor/desktop/MetisseDesktop.H 2008-07-04 06:07:24.000000000 -0700
@@ -75,9 +71,10 @@
MetisseWindow *findWindow(Window id);
WindowMapping getWindowMapping(void);
+ bool isWindowValide(MetisseWindow *win);
void handleConfigureWindow(
- Window id, int x, int y, int width, int width, int isroot);
+ Window id, int x, int y, int width, int height, int isroot);
void handleCursorPosition(int x, int y);
void handleImageFramebufferUpdate(
MetisseWindow *win, bool isRoot, Image *img, int x, int y,
--- metisse-0.4.0-rc4/FvwmCompositor/desktop/MetisseSource.cxx 2007-01-24 01:22:26.000000000 -0800
+++ metisse/FvwmCompositor/desktop/MetisseSource.cxx 2008-07-04 06:07:22.000000000 -0700
@@ -786,10 +789,10 @@
{
RECEIVE((char *)&colors, sz_rfbXCursorColors);
- buf = (char *)malloc(bd * 2);
+ buf = new char[bd * 2];
if (buf == NULL)
{
- std::cerr << "MetisseSource: malloc failed" << std::endl;
+ std::cerr << "MetisseSource: allocation failed" << std::endl;
if (shmid!=0 && shmdt(shm)==-1) perror("shmdt (MetisseSource)") ;
return False;
}
@@ -811,10 +814,10 @@
if (bufSize)
{
- buf = (char *)malloc(bufSize);
+ buf = new char[bufSize];
if (buf == NULL)
{
- std::cerr << "MetisseSource: malloc failed" << std::endl;
+ std::cerr << "MetisseSource: allocation failed" << std::endl;
if (shmid!=0 && shmdt(shm)==-1) perror("shmdt (MetisseSource)") ;
return False;
}
@@ -856,7 +859,7 @@
CARD16 *buf = NULL;
if (size)
{
- buf = (CARD16 *)malloc(size);
+ buf = new CARD16[size];
RECEIVE((char *)buf, size) ;
}
_metisseDesktop->handleWindowShape(MetisseWin, buf, h.nrects);
@@ -874,7 +877,7 @@
CARD32 *buf = NULL;
if (size)
{
- buf = (CARD32 *)malloc(size);
+ buf = new CARD32[size];
RECEIVE((char *)buf, size) ;
}
_metisseDesktop->handleWindowFacades(MetisseWin, buf, h.ncuts);
--- metisse-0.4.0-rc4/FvwmCompositor/fvwmmodule/FvwmModule.cxx 2007-01-17 23:59:43.000000000 -0800
+++ metisse-0.4.0-rc4/FvwmCompositor/fvwmmodule/FvwmModule.cxx.new 2008-08-20 16:58:31.000000000 -0700
@@ -28,6 +28,9 @@
#include <unistd.h>
#include <stdio.h>
+#include <alloca.h>
+#include <cstdlib>
+
void FvwmModule::parseOptions(void)
{
char *tline= NULL;
--- metisse-0.4.0-rc4/FvwmCompositor/renderer/WindowRenderer.cxx 2006-12-21 01:36:25.000000000 -0800
+++ metisse-0.4.0-rc4/FvwmCompositor/renderer/WindowRenderer.cxx.new 2008-08-20 17:06:17.000000000 -0700
@@ -29,6 +29,8 @@
#include "goodies.H"
#include "WindowRenderer.H"
+#include <alloca.h>
+#include <cstdlib>
static GLfloat Identity[18] =
{
--- metisse-0.4.0-rc4/FvwmCompositor/renderer/WindowShaders.cxx 2007-01-07 23:16:15.000000000 -0800
+++ metisse-0.4.0-rc4/FvwmCompositor/renderer/WindowShaders.cxx.new 2008-08-20 17:16:53.000000000 -0700
@@ -19,6 +19,8 @@
#include "WindowShaders.H"
+#include <cstdlib>
+
void WindowShaders::removeShaderWindow(
WindowRenderer *win, std::string shadername)
{
--- metisse-0.4.0-rc4/FvwmCompositor/texture/glTiledTexturedImage.cxx 2006-12-12 03:15:35.000000000 -0800
+++ metisse-0.4.0-rc4/FvwmCompositor/texture/glTiledTexturedImage.cxx.new 2008-08-20 17:25:23.000000000 -0700
@@ -19,6 +19,9 @@
#include <nucleo/image/encoding/Conversion.H>
#include <nucleo/utils/ByteOrder.H>
+#include <cstring>
+#include <cstdlib>
+
/* Mac OS X notes:
*
* - "OpenGL Image" sample code from Apple says that the
--- metisse-0.4.0-rc4/FvwmCompositor/main/compositor.cxx 2007-01-24 01:22:26.000000000 -0800
+++ metisse-0.4.0-rc4/FvwmCompositor/main/compositor.cxx.new 2008-08-20 17:50:12.000000000 -0700
@@ -32,6 +32,8 @@
#include <sys/time.h>
+#include <cstdlib>
+
using namespace nucleo ;
#define VERBOSE 0
--- metisse-0.4.0-rc4/FvwmCompositor/main/WidgetManager.cxx 2006-11-22 06:13:06.000000000 -0800
+++ metisse-0.4.0-rc4/FvwmCompositor/main/WidgetManager.cxx.new 2008-08-20 17:50:55.000000000 -0700
@@ -30,6 +30,8 @@
#include "AScreen.H"
#include "WidgetManager.H"
+#include <cstdlib>
+
// ----------------------------------------------------------------------------
//
--- metisse-0.4.0-rc4/FvwmCompositor/main/AUtils.cxx 2006-12-19 15:35:55.000000000 -0800
+++ metisse-0.4.0-rc4/FvwmCompositor/main/AUtils.cxx.new 2008-08-20 18:02:26.000000000 -0700
@@ -23,6 +23,8 @@
#include "AUtils.H"
+#include <cstdlib>
+
#define DEBUG_LEVEL 0
// --------------------------------------------------------------------
--- metisse-0.4.0-rc4/FvwmCompositor/main/LayerManager.cxx 2007-01-12 13:11:24.000000000 -0800
+++ metisse-0.4.0-rc4/FvwmCompositor/main/LayerManager.cxx.new 2008-08-20 18:09:21.000000000 -0700
@@ -21,6 +21,8 @@
#include "desktop/MetisseWindow.H"
#include "LayerManager.H"
+#include <cstdlib>
+
#define A_PAGER_MODE_MARGIN_P 0.02
// --------------------------------------------------------------------
--- metisse-0.4.0-rc4/FvwmCompositor/main/AScreen.cxx 2007-01-12 13:31:54.000000000 -0800
+++ metisse-0.4.0-rc4/FvwmCompositor/main/AScreen.cxx.new 2008-08-20 18:17:00.000000000 -0700
@@ -33,6 +33,8 @@
#include <stdio.h>
#include <stdexcept>
+#include <cstdlib>
+
#define SR_SNAP_DIST 12
#define CAPTURE_ON_TIMER 0
--- metisse-0.4.0-rc4/FvwmCompositor/main/Persistence.cxx 2006-11-22 06:12:02.000000000 -0800
+++ metisse-0.4.0-rc4/FvwmCompositor/main/Persistence.cxx.new 2008-08-20 17:50:41.000000000 -0700
@@ -19,6 +19,8 @@
#include "Persistence.H"
+#include <cstdlib>
+
#define P_FACADES_FILE_NAME ".facades"
static std::list<FacadeDescription *> allFacades;
