svn merge ^/branches/released .

1 files changed, 138 insertions, 141 deletions

diff --git a/libXmu/src/CursorName.c b/libXmu/src/CursorName.c
index 17f390246..b2abea92b 100644
--- a/libXmu/src/CursorName.c
+++ b/libXmu/src/CursorName.c
@@ -1,141 +1,138 @@
-/* $Xorg: CursorName.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
-/*
- 
-Copyright 1989, 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/Xmu/CursorName.c,v 3.7tsi Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xmu/CharSet.h>
-#include <X11/Xmu/CurUtil.h>
-#include <X11/cursorfont.h>
-#include <string.h>
-
-int
-XmuCursorNameToIndex(_Xconst char *name)
-{
-    static _Xconst struct _CursorName {
-	_Xconst char	*name;
-	unsigned int	shape;
-    } cursor_names[] = {
-			{"x_cursor",		XC_X_cursor},
-			{"arrow",		XC_arrow},
-			{"based_arrow_down",	XC_based_arrow_down},
-			{"based_arrow_up",	XC_based_arrow_up},
-			{"boat",		XC_boat},
-			{"bogosity",		XC_bogosity},
-			{"bottom_left_corner",	XC_bottom_left_corner},
-			{"bottom_right_corner",	XC_bottom_right_corner},
-			{"bottom_side",		XC_bottom_side},
-			{"bottom_tee",		XC_bottom_tee},
-			{"box_spiral",		XC_box_spiral},
-			{"center_ptr",		XC_center_ptr},
-			{"circle",		XC_circle},
-			{"clock",		XC_clock},
-			{"coffee_mug",		XC_coffee_mug},
-			{"cross",		XC_cross},
-			{"cross_reverse",	XC_cross_reverse},
-			{"crosshair",		XC_crosshair},
-			{"diamond_cross",	XC_diamond_cross},
-			{"dot",			XC_dot},
-			{"dotbox",		XC_dotbox},
-			{"double_arrow",	XC_double_arrow},
-			{"draft_large",		XC_draft_large},
-			{"draft_small",		XC_draft_small},
-			{"draped_box",		XC_draped_box},
-			{"exchange",		XC_exchange},
-			{"fleur",		XC_fleur},
-			{"gobbler",		XC_gobbler},
-			{"gumby",		XC_gumby},
-			{"hand1",		XC_hand1},
-			{"hand2",		XC_hand2},
-			{"heart",		XC_heart},
-			{"icon",		XC_icon},
-			{"iron_cross",		XC_iron_cross},
-			{"left_ptr",		XC_left_ptr},
-			{"left_side",		XC_left_side},
-			{"left_tee",		XC_left_tee},
-			{"leftbutton",		XC_leftbutton},
-			{"ll_angle",		XC_ll_angle},
-			{"lr_angle",		XC_lr_angle},
-			{"man",			XC_man},
-			{"middlebutton",	XC_middlebutton},
-			{"mouse",		XC_mouse},
-			{"pencil",		XC_pencil},
-			{"pirate",		XC_pirate},
-			{"plus",		XC_plus},
-			{"question_arrow",	XC_question_arrow},
-			{"right_ptr",		XC_right_ptr},
-			{"right_side",		XC_right_side},
-			{"right_tee",		XC_right_tee},
-			{"rightbutton",		XC_rightbutton},
-			{"rtl_logo",		XC_rtl_logo},
-			{"sailboat",		XC_sailboat},
-			{"sb_down_arrow",	XC_sb_down_arrow},
-			{"sb_h_double_arrow",	XC_sb_h_double_arrow},
-			{"sb_left_arrow",	XC_sb_left_arrow},
-			{"sb_right_arrow",	XC_sb_right_arrow},
-			{"sb_up_arrow",		XC_sb_up_arrow},
-			{"sb_v_double_arrow",	XC_sb_v_double_arrow},
-			{"shuttle",		XC_shuttle},
-			{"sizing",		XC_sizing},
-			{"spider",		XC_spider},
-			{"spraycan",		XC_spraycan},
-			{"star",		XC_star},
-			{"target",		XC_target},
-			{"tcross",		XC_tcross},
-			{"top_left_arrow",	XC_top_left_arrow},
-			{"top_left_corner",	XC_top_left_corner},
-			{"top_right_corner",	XC_top_right_corner},
-			{"top_side",		XC_top_side},
-			{"top_tee",		XC_top_tee},
-			{"trek",		XC_trek},
-			{"ul_angle",		XC_ul_angle},
-			{"umbrella",		XC_umbrella},
-			{"ur_angle",		XC_ur_angle},
-			{"watch",		XC_watch},
-			{"xterm",		XC_xterm},
-    };
-#define NUM_CURSOR_NAMES    (sizeof (cursor_names) / sizeof (cursor_names[0]))
-    register _Xconst struct _CursorName *table;
-    register int i;
-    char tmp[40];
-    
-    if (strlen (name) >= sizeof tmp) return -1;
-    XmuCopyISOLatin1Lowered (tmp, name);
-
-    for (i=0, table=cursor_names; i < NUM_CURSOR_NAMES; i++, table++ ) {
-	if (strcmp(tmp, table->name) == 0) return table->shape;
-    }
-
-    return -1;
-}
-
-
-
-
-
+/*

+ 

+Copyright 1989, 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 <X11/Xmu/CharSet.h>

+#include <X11/Xmu/CurUtil.h>

+#include <X11/cursorfont.h>

+#include <string.h>

+

+int

+XmuCursorNameToIndex(_Xconst char *name)

+{

+    static _Xconst struct _CursorName {

+	_Xconst char	*name;

+	unsigned int	shape;

+    } cursor_names[] = {

+			{"x_cursor",		XC_X_cursor},

+			{"arrow",		XC_arrow},

+			{"based_arrow_down",	XC_based_arrow_down},

+			{"based_arrow_up",	XC_based_arrow_up},

+			{"boat",		XC_boat},

+			{"bogosity",		XC_bogosity},

+			{"bottom_left_corner",	XC_bottom_left_corner},

+			{"bottom_right_corner",	XC_bottom_right_corner},

+			{"bottom_side",		XC_bottom_side},

+			{"bottom_tee",		XC_bottom_tee},

+			{"box_spiral",		XC_box_spiral},

+			{"center_ptr",		XC_center_ptr},

+			{"circle",		XC_circle},

+			{"clock",		XC_clock},

+			{"coffee_mug",		XC_coffee_mug},

+			{"cross",		XC_cross},

+			{"cross_reverse",	XC_cross_reverse},

+			{"crosshair",		XC_crosshair},

+			{"diamond_cross",	XC_diamond_cross},

+			{"dot",			XC_dot},

+			{"dotbox",		XC_dotbox},

+			{"double_arrow",	XC_double_arrow},

+			{"draft_large",		XC_draft_large},

+			{"draft_small",		XC_draft_small},

+			{"draped_box",		XC_draped_box},

+			{"exchange",		XC_exchange},

+			{"fleur",		XC_fleur},

+			{"gobbler",		XC_gobbler},

+			{"gumby",		XC_gumby},

+			{"hand1",		XC_hand1},

+			{"hand2",		XC_hand2},

+			{"heart",		XC_heart},

+			{"icon",		XC_icon},

+			{"iron_cross",		XC_iron_cross},

+			{"left_ptr",		XC_left_ptr},

+			{"left_side",		XC_left_side},

+			{"left_tee",		XC_left_tee},

+			{"leftbutton",		XC_leftbutton},

+			{"ll_angle",		XC_ll_angle},

+			{"lr_angle",		XC_lr_angle},

+			{"man",			XC_man},

+			{"middlebutton",	XC_middlebutton},

+			{"mouse",		XC_mouse},

+			{"pencil",		XC_pencil},

+			{"pirate",		XC_pirate},

+			{"plus",		XC_plus},

+			{"question_arrow",	XC_question_arrow},

+			{"right_ptr",		XC_right_ptr},

+			{"right_side",		XC_right_side},

+			{"right_tee",		XC_right_tee},

+			{"rightbutton",		XC_rightbutton},

+			{"rtl_logo",		XC_rtl_logo},

+			{"sailboat",		XC_sailboat},

+			{"sb_down_arrow",	XC_sb_down_arrow},

+			{"sb_h_double_arrow",	XC_sb_h_double_arrow},

+			{"sb_left_arrow",	XC_sb_left_arrow},

+			{"sb_right_arrow",	XC_sb_right_arrow},

+			{"sb_up_arrow",		XC_sb_up_arrow},

+			{"sb_v_double_arrow",	XC_sb_v_double_arrow},

+			{"shuttle",		XC_shuttle},

+			{"sizing",		XC_sizing},

+			{"spider",		XC_spider},

+			{"spraycan",		XC_spraycan},

+			{"star",		XC_star},

+			{"target",		XC_target},

+			{"tcross",		XC_tcross},

+			{"top_left_arrow",	XC_top_left_arrow},

+			{"top_left_corner",	XC_top_left_corner},

+			{"top_right_corner",	XC_top_right_corner},

+			{"top_side",		XC_top_side},

+			{"top_tee",		XC_top_tee},

+			{"trek",		XC_trek},

+			{"ul_angle",		XC_ul_angle},

+			{"umbrella",		XC_umbrella},

+			{"ur_angle",		XC_ur_angle},

+			{"watch",		XC_watch},

+			{"xterm",		XC_xterm},

+    };

+#define NUM_CURSOR_NAMES    (sizeof (cursor_names) / sizeof (cursor_names[0]))

+    register _Xconst struct _CursorName *table;

+    register int i;

+    char tmp[40];

+    

+    if (strlen (name) >= sizeof tmp) return -1;

+    XmuCopyISOLatin1Lowered (tmp, name);

+

+    for (i=0, table=cursor_names; i < NUM_CURSOR_NAMES; i++, table++ ) {

+	if (strcmp(tmp, table->name) == 0) return table->shape;

+    }

+

+    return -1;

+}

+

+

+

+

+