Synchronised line endinge with release branch

1 files changed, 155 insertions, 155 deletions

diff --git a/libXt/src/Hooks.c b/libXt/src/Hooks.c
index a314b716e..bf26a13e0 100644
--- a/libXt/src/Hooks.c
+++ b/libXt/src/Hooks.c
@@ -1,155 +1,155 @@
-/*

-

-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.

-

-*/

-

-/*LINTLIBRARY*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "IntrinsicI.h"

-#include "CreateI.h"

-

-static void FreeBlockHookList(

-    Widget widget,		/* unused (and invalid) */

-    XtPointer closure,		/* ActionHook* */

-    XtPointer call_data)	/* unused */

-{

-    BlockHook list = *(BlockHook*)closure;

-    while (list != NULL) {

-	BlockHook next = list->next;

-	XtFree( (XtPointer)list );

-	list = next;

-    }

-}

-

-

-XtBlockHookId XtAppAddBlockHook(

-    XtAppContext app,

-    XtBlockHookProc proc,

-    XtPointer closure)

-{

-    BlockHook hook = XtNew(BlockHookRec);

-    LOCK_APP(app);

-    hook->next = app->block_hook_list;

-    hook->app = app;

-    hook->proc = proc;

-    hook->closure = closure;

-    if (app->block_hook_list == NULL) {

-	_XtAddCallback( &app->destroy_callbacks,

-		        FreeBlockHookList,

-		        (XtPointer)&app->block_hook_list

-		      );

-    }

-    app->block_hook_list = hook;

-    UNLOCK_APP(app);

-    return (XtBlockHookId)hook;

-}

-

-

-void XtRemoveBlockHook(

-    XtBlockHookId id)

-{

-    BlockHook *p, hook = (BlockHook)id;

-    XtAppContext app = hook->app;

-    LOCK_APP(app);

-    for (p = &app->block_hook_list; p != NULL && *p != hook; p = &(*p)->next);

-    if (p == NULL) {

-#ifdef DEBUG

-	XtAppWarningMsg(app, "badId", "xtRemoveBlockHook", XtCXtToolkitError,

-			"XtRemoveBlockHook called with bad or old hook id",

-			(String*)NULL, (Cardinal*)NULL);

-#endif /*DEBUG*/

-	UNLOCK_APP(app);

-	return;

-    }

-    *p = hook->next;

-    XtFree( (XtPointer)hook );

-    UNLOCK_APP(app);

-}

-

-static void DeleteShellFromHookObj(

-    Widget shell,

-    XtPointer closure,

-    XtPointer call_data)

-{

-    /* app_con is locked when this function is called */

-    Cardinal ii, jj;

-    HookObject ho = (HookObject) closure;

-

-    for (ii = 0; ii < ho->hooks.num_shells; ii++)

-	if (ho->hooks.shells[ii] == shell) {

-	    /* collapse the list */

-	    for (jj = ii; jj < ho->hooks.num_shells; jj++) {

-		if ((jj+1) < ho->hooks.num_shells)

-		    ho->hooks.shells[jj] = ho->hooks.shells[jj+1];

-	    }

-	    break;

-	}

-    ho->hooks.num_shells--;

-}

-

-#define SHELL_INCR 4

-

-void _XtAddShellToHookObj(

-    Widget shell)

-{

-    /* app_con is locked when this function is called */

-    HookObject ho = (HookObject) XtHooksOfDisplay(XtDisplay(shell));

-

-    if (ho->hooks.num_shells == ho->hooks.max_shells) {

-	ho->hooks.max_shells += SHELL_INCR;

-	ho->hooks.shells =

-	    (WidgetList)XtRealloc((char*)ho->hooks.shells,

-		ho->hooks.max_shells * sizeof (Widget));

-    }

-    ho->hooks.shells[ho->hooks.num_shells++] = shell;

-

-    XtAddCallback(shell, XtNdestroyCallback, DeleteShellFromHookObj,

-		  (XtPointer)ho);

-}

-

-Boolean _XtIsHookObject(

-    Widget widget)

-{

-    return (widget->core.widget_class == hookObjectClass);

-}

-

-Widget XtHooksOfDisplay(

-    Display* dpy)

-{

-    Widget retval;

-    XtPerDisplay pd;

-    DPY_TO_APPCON(dpy);

-

-    LOCK_APP(app);

-    pd = _XtGetPerDisplay(dpy);

-    if (pd->hook_object == NULL)

-	pd->hook_object =

-	    _XtCreateHookObj((Screen*)DefaultScreenOfDisplay(dpy));

-    retval = pd->hook_object;

-    UNLOCK_APP(app);

-    return retval;

-}

+/*
+
+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.
+
+*/
+
+/*LINTLIBRARY*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "IntrinsicI.h"
+#include "CreateI.h"
+
+static void FreeBlockHookList(
+    Widget widget,		/* unused (and invalid) */
+    XtPointer closure,		/* ActionHook* */
+    XtPointer call_data)	/* unused */
+{
+    BlockHook list = *(BlockHook*)closure;
+    while (list != NULL) {
+	BlockHook next = list->next;
+	XtFree( (XtPointer)list );
+	list = next;
+    }
+}
+
+
+XtBlockHookId XtAppAddBlockHook(
+    XtAppContext app,
+    XtBlockHookProc proc,
+    XtPointer closure)
+{
+    BlockHook hook = XtNew(BlockHookRec);
+    LOCK_APP(app);
+    hook->next = app->block_hook_list;
+    hook->app = app;
+    hook->proc = proc;
+    hook->closure = closure;
+    if (app->block_hook_list == NULL) {
+	_XtAddCallback( &app->destroy_callbacks,
+		        FreeBlockHookList,
+		        (XtPointer)&app->block_hook_list
+		      );
+    }
+    app->block_hook_list = hook;
+    UNLOCK_APP(app);
+    return (XtBlockHookId)hook;
+}
+
+
+void XtRemoveBlockHook(
+    XtBlockHookId id)
+{
+    BlockHook *p, hook = (BlockHook)id;
+    XtAppContext app = hook->app;
+    LOCK_APP(app);
+    for (p = &app->block_hook_list; p != NULL && *p != hook; p = &(*p)->next);
+    if (p == NULL) {
+#ifdef DEBUG
+	XtAppWarningMsg(app, "badId", "xtRemoveBlockHook", XtCXtToolkitError,
+			"XtRemoveBlockHook called with bad or old hook id",
+			(String*)NULL, (Cardinal*)NULL);
+#endif /*DEBUG*/
+	UNLOCK_APP(app);
+	return;
+    }
+    *p = hook->next;
+    XtFree( (XtPointer)hook );
+    UNLOCK_APP(app);
+}
+
+static void DeleteShellFromHookObj(
+    Widget shell,
+    XtPointer closure,
+    XtPointer call_data)
+{
+    /* app_con is locked when this function is called */
+    Cardinal ii, jj;
+    HookObject ho = (HookObject) closure;
+
+    for (ii = 0; ii < ho->hooks.num_shells; ii++)
+	if (ho->hooks.shells[ii] == shell) {
+	    /* collapse the list */
+	    for (jj = ii; jj < ho->hooks.num_shells; jj++) {
+		if ((jj+1) < ho->hooks.num_shells)
+		    ho->hooks.shells[jj] = ho->hooks.shells[jj+1];
+	    }
+	    break;
+	}
+    ho->hooks.num_shells--;
+}
+
+#define SHELL_INCR 4
+
+void _XtAddShellToHookObj(
+    Widget shell)
+{
+    /* app_con is locked when this function is called */
+    HookObject ho = (HookObject) XtHooksOfDisplay(XtDisplay(shell));
+
+    if (ho->hooks.num_shells == ho->hooks.max_shells) {
+	ho->hooks.max_shells += SHELL_INCR;
+	ho->hooks.shells =
+	    (WidgetList)XtRealloc((char*)ho->hooks.shells,
+		ho->hooks.max_shells * sizeof (Widget));
+    }
+    ho->hooks.shells[ho->hooks.num_shells++] = shell;
+
+    XtAddCallback(shell, XtNdestroyCallback, DeleteShellFromHookObj,
+		  (XtPointer)ho);
+}
+
+Boolean _XtIsHookObject(
+    Widget widget)
+{
+    return (widget->core.widget_class == hookObjectClass);
+}
+
+Widget XtHooksOfDisplay(
+    Display* dpy)
+{
+    Widget retval;
+    XtPerDisplay pd;
+    DPY_TO_APPCON(dpy);
+
+    LOCK_APP(app);
+    pd = _XtGetPerDisplay(dpy);
+    if (pd->hook_object == NULL)
+	pd->hook_object =
+	    _XtCreateHookObj((Screen*)DefaultScreenOfDisplay(dpy));
+    retval = pd->hook_object;
+    UNLOCK_APP(app);
+    return retval;
+}