svn merge ^/branches/released .

1 files changed, 134 insertions, 137 deletions

diff --git a/libXt/src/HookObj.c b/libXt/src/HookObj.c
index f4ac749b2..962761ef9 100644
--- a/libXt/src/HookObj.c
+++ b/libXt/src/HookObj.c
@@ -1,137 +1,134 @@
-/* $Xorg: HookObj.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
-/*
-
-Copyright 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xt/HookObj.c,v 1.2 2001/08/22 22:52:18 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "IntrinsicI.h"
-#include "StringDefs.h"
-/******************************************************************
- *
- * Hook Object Resources
- *
- ******************************************************************/
-
-static XtResource resources[] = {
-  { XtNcreateHook, XtCCallback, XtRCallback, sizeof(XtPointer),
-    XtOffsetOf(HookObjRec, hooks.createhook_callbacks),
-    XtRCallback, (XtPointer)NULL},
-  { XtNchangeHook, XtCCallback, XtRCallback, sizeof(XtPointer),
-    XtOffsetOf(HookObjRec, hooks.changehook_callbacks),
-    XtRCallback, (XtPointer)NULL},
-  { XtNconfigureHook, XtCCallback, XtRCallback, sizeof(XtPointer),
-    XtOffsetOf(HookObjRec, hooks.confighook_callbacks),
-    XtRCallback, (XtPointer)NULL},
-  { XtNgeometryHook, XtCCallback, XtRCallback, sizeof(XtPointer),
-    XtOffsetOf(HookObjRec, hooks.geometryhook_callbacks),
-    XtRCallback, (XtPointer)NULL},
-  { XtNdestroyHook, XtCCallback, XtRCallback, sizeof(XtPointer),
-    XtOffsetOf(HookObjRec, hooks.destroyhook_callbacks),
-    XtRCallback, (XtPointer)NULL},
-  { XtNshells, XtCReadOnly, XtRWidgetList, sizeof(WidgetList),
-    XtOffsetOf(HookObjRec, hooks.shells), XtRImmediate, (XtPointer) NULL },
-  { XtNnumShells, XtCReadOnly, XtRCardinal, sizeof(Cardinal),
-    XtOffsetOf(HookObjRec, hooks.num_shells), XtRImmediate, (XtPointer) 0 }
-};
-
-static void GetValuesHook(Widget widget, ArgList args, Cardinal *num_args);
-static void Initialize(Widget req, Widget new, ArgList args,
-			Cardinal *num_args);
-
-externaldef(hookobjclassrec) HookObjClassRec hookObjClassRec = {
-  { /* Object Class Part */
-    /* superclass	  */	(WidgetClass)&objectClassRec,
-    /* class_name	  */	"Hook",
-    /* widget_size	  */	sizeof(HookObjRec),
-    /* class_initialize   */    NULL,
-    /* class_part_initialize*/	NULL,
-    /* class_inited       */	FALSE,
-    /* initialize	  */	Initialize,
-    /* initialize_hook    */	NULL,
-    /* realize		  */	NULL,
-    /* actions		  */	NULL,
-    /* num_actions	  */	0,
-    /* resources	  */	resources,
-    /* num_resources	  */	XtNumber(resources),
-    /* xrm_class	  */	NULLQUARK,
-    /* compress_motion	  */	FALSE,
-    /* compress_exposure  */	TRUE,
-    /* compress_enterleave*/ 	FALSE,
-    /* visible_interest	  */	FALSE,
-    /* destroy		  */	NULL,
-    /* resize		  */	NULL,
-    /* expose		  */	NULL,
-    /* set_values	  */	NULL,
-    /* set_values_hook    */	NULL,
-    /* set_values_almost  */	NULL,
-    /* get_values_hook    */	GetValuesHook,
-    /* accept_focus	  */	NULL,
-    /* version		  */	XtVersion,
-    /* callback_offsets   */    NULL,
-    /* tm_table           */    NULL,
-    /* query_geometry	    */  NULL,
-    /* display_accelerator  */	NULL,
-    /* extension	    */  NULL
-  },
-  { /* HookObj Class Part */
-    /* unused               */	0
-  }
-};
-
-externaldef(hookObjectClass) WidgetClass hookObjectClass =
-	(WidgetClass)&hookObjClassRec;
-
-static void FreeShellList(
-    Widget w,
-    XtPointer closure,
-    XtPointer call_data)
-{
-    HookObject h = (HookObject)w;
-    if (h->hooks.shells != NULL)
-	XtFree((char*)h->hooks.shells);
-}
-
-static void Initialize(
-    Widget req,
-    Widget new,
-    ArgList args,
-    Cardinal* num_args)
-{
-    HookObject w = (HookObject) new;
-    w->hooks.max_shells = 0;
-    XtAddCallback (new, XtNdestroyCallback, FreeShellList, (XtPointer) NULL);
-}
-
-static void GetValuesHook(
-    Widget widget,
-    ArgList args,
-    Cardinal* num_args)
-{
-    /* get the XtNshells and XtNnumShells pseudo-resources */
-}
+/*

+

+Copyright 1994, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "IntrinsicI.h"

+#include "StringDefs.h"

+/******************************************************************

+ *

+ * Hook Object Resources

+ *

+ ******************************************************************/

+

+static XtResource resources[] = {

+  { XtNcreateHook, XtCCallback, XtRCallback, sizeof(XtPointer),

+    XtOffsetOf(HookObjRec, hooks.createhook_callbacks),

+    XtRCallback, (XtPointer)NULL},

+  { XtNchangeHook, XtCCallback, XtRCallback, sizeof(XtPointer),

+    XtOffsetOf(HookObjRec, hooks.changehook_callbacks),

+    XtRCallback, (XtPointer)NULL},

+  { XtNconfigureHook, XtCCallback, XtRCallback, sizeof(XtPointer),

+    XtOffsetOf(HookObjRec, hooks.confighook_callbacks),

+    XtRCallback, (XtPointer)NULL},

+  { XtNgeometryHook, XtCCallback, XtRCallback, sizeof(XtPointer),

+    XtOffsetOf(HookObjRec, hooks.geometryhook_callbacks),

+    XtRCallback, (XtPointer)NULL},

+  { XtNdestroyHook, XtCCallback, XtRCallback, sizeof(XtPointer),

+    XtOffsetOf(HookObjRec, hooks.destroyhook_callbacks),

+    XtRCallback, (XtPointer)NULL},

+  { XtNshells, XtCReadOnly, XtRWidgetList, sizeof(WidgetList),

+    XtOffsetOf(HookObjRec, hooks.shells), XtRImmediate, (XtPointer) NULL },

+  { XtNnumShells, XtCReadOnly, XtRCardinal, sizeof(Cardinal),

+    XtOffsetOf(HookObjRec, hooks.num_shells), XtRImmediate, (XtPointer) 0 }

+};

+

+static void GetValuesHook(Widget widget, ArgList args, Cardinal *num_args);

+static void Initialize(Widget req, Widget new, ArgList args,

+			Cardinal *num_args);

+

+externaldef(hookobjclassrec) HookObjClassRec hookObjClassRec = {

+  { /* Object Class Part */

+    /* superclass	  */	(WidgetClass)&objectClassRec,

+    /* class_name	  */	"Hook",

+    /* widget_size	  */	sizeof(HookObjRec),

+    /* class_initialize   */    NULL,

+    /* class_part_initialize*/	NULL,

+    /* class_inited       */	FALSE,

+    /* initialize	  */	Initialize,

+    /* initialize_hook    */	NULL,

+    /* realize		  */	NULL,

+    /* actions		  */	NULL,

+    /* num_actions	  */	0,

+    /* resources	  */	resources,

+    /* num_resources	  */	XtNumber(resources),

+    /* xrm_class	  */	NULLQUARK,

+    /* compress_motion	  */	FALSE,

+    /* compress_exposure  */	TRUE,

+    /* compress_enterleave*/ 	FALSE,

+    /* visible_interest	  */	FALSE,

+    /* destroy		  */	NULL,

+    /* resize		  */	NULL,

+    /* expose		  */	NULL,

+    /* set_values	  */	NULL,

+    /* set_values_hook    */	NULL,

+    /* set_values_almost  */	NULL,

+    /* get_values_hook    */	GetValuesHook,

+    /* accept_focus	  */	NULL,

+    /* version		  */	XtVersion,

+    /* callback_offsets   */    NULL,

+    /* tm_table           */    NULL,

+    /* query_geometry	    */  NULL,

+    /* display_accelerator  */	NULL,

+    /* extension	    */  NULL

+  },

+  { /* HookObj Class Part */

+    /* unused               */	0

+  }

+};

+

+externaldef(hookObjectClass) WidgetClass hookObjectClass =

+	(WidgetClass)&hookObjClassRec;

+

+static void FreeShellList(

+    Widget w,

+    XtPointer closure,

+    XtPointer call_data)

+{

+    HookObject h = (HookObject)w;

+    if (h->hooks.shells != NULL)

+	XtFree((char*)h->hooks.shells);

+}

+

+static void Initialize(

+    Widget req,

+    Widget new,

+    ArgList args,

+    Cardinal* num_args)

+{

+    HookObject w = (HookObject) new;

+    w->hooks.max_shells = 0;

+    XtAddCallback (new, XtNdestroyCallback, FreeShellList, (XtPointer) NULL);

+}

+

+static void GetValuesHook(

+    Widget widget,

+    ArgList args,

+    Cardinal* num_args)

+{

+    /* get the XtNshells and XtNnumShells pseudo-resources */

+}