diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-05-07 10:56:22 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-05-07 10:58:54 -0700 |
| commit | 794367d1ac396842c0213064ebcfe1f4e2219657 (patch) | |
| tree | 55fe87da95c1b506aeb0beea91088516b309e5cf | |
| parent | f704f8cf083140a592a79705a3b104063d9b67c4 (diff) | |
| download | xorg-lib-libXaw-794367d1ac396842c0213064ebcfe1f4e2219657.tar.gz | |
Fix spelling/wording issues
Found by using:
codespell --builtin clear,rare,usage,informal,code,names
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
66 files changed, 222 insertions, 221 deletions
@@ -6,7 +6,7 @@ Xorg mailing list: https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/lib/libXaw diff --git a/include/X11/Xaw/AsciiSinkP.h b/include/X11/Xaw/AsciiSinkP.h index 4bf440a..2598d0f 100644 --- a/include/X11/Xaw/AsciiSinkP.h +++ b/include/X11/Xaw/AsciiSinkP.h @@ -81,7 +81,7 @@ typedef struct { XawTextInsertState laststate; short cursor_x, cursor_y; /* Cursor Location. */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } AsciiSinkPart; diff --git a/include/X11/Xaw/AsciiSrcP.h b/include/X11/Xaw/AsciiSrcP.h index 1f3f06e..9e1df91 100644 --- a/include/X11/Xaw/AsciiSrcP.h +++ b/include/X11/Xaw/AsciiSrcP.h @@ -112,7 +112,7 @@ typedef struct _AsciiSrcPart { int ascii_length; /* length field for ascii string emulation */ #ifdef ASCII_DISK - String filename; /* name of file for Compatability */ + String filename; /* name of file for Compatibility */ #endif /* ASCII_DISK */ /* private */ @@ -125,7 +125,7 @@ typedef struct _AsciiSrcPart { XawTextPosition length; /* length of file */ Piece *first_piece; /* first piece of the text */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } AsciiSrcPart; diff --git a/include/X11/Xaw/AsciiTextP.h b/include/X11/Xaw/AsciiTextP.h index f91c362..6127297 100644 --- a/include/X11/Xaw/AsciiTextP.h +++ b/include/X11/Xaw/AsciiTextP.h @@ -82,7 +82,7 @@ extern AsciiTextClassRec asciiTextClassRec; typedef struct { int resource; #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } AsciiPart; @@ -114,7 +114,7 @@ extern AsciiStringClassRec asciiStringClassRec; typedef struct { int resource; #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } AsciiStringPart; @@ -148,7 +148,7 @@ extern AsciiDiskClassRec asciiDiskClassRec; typedef struct { char resource; #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } AsciiDiskPart; diff --git a/include/X11/Xaw/BoxP.h b/include/X11/Xaw/BoxP.h index b3c2573..352a4eb 100644 --- a/include/X11/Xaw/BoxP.h +++ b/include/X11/Xaw/BoxP.h @@ -81,7 +81,7 @@ typedef struct { XtGeometryMask last_query_mode; #ifndef OLDXAW XawDisplayList *display_list; - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } BoxPart; diff --git a/include/X11/Xaw/CommandP.h b/include/X11/Xaw/CommandP.h index d0be64e..e0cc450 100644 --- a/include/X11/Xaw/CommandP.h +++ b/include/X11/Xaw/CommandP.h @@ -96,7 +96,7 @@ typedef struct { Dimension corner_round; #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } CommandPart; diff --git a/include/X11/Xaw/DialogP.h b/include/X11/Xaw/DialogP.h index 8fb4735..7114d80 100644 --- a/include/X11/Xaw/DialogP.h +++ b/include/X11/Xaw/DialogP.h @@ -76,7 +76,7 @@ typedef struct _DialogPart { Widget labelW; /* widget to display description */ Widget valueW; /* user response TextWidget */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } DialogPart; diff --git a/include/X11/Xaw/FormP.h b/include/X11/Xaw/FormP.h index 43a58e9..12510be 100644 --- a/include/X11/Xaw/FormP.h +++ b/include/X11/Xaw/FormP.h @@ -97,7 +97,7 @@ typedef struct _FormPart { Boolean resize_is_no_op; /* Causes resize to take not action */ #ifndef OLDXAW XawDisplayList *display_list; - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } FormPart; diff --git a/include/X11/Xaw/GripP.h b/include/X11/Xaw/GripP.h index 427948a..d5b437c 100644 --- a/include/X11/Xaw/GripP.h +++ b/include/X11/Xaw/GripP.h @@ -71,7 +71,7 @@ extern GripClassRec gripClassRec; typedef struct { XtCallbackList grip_action; #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } GripPart; diff --git a/include/X11/Xaw/LabelP.h b/include/X11/Xaw/LabelP.h index e8cc611..3b520af 100644 --- a/include/X11/Xaw/LabelP.h +++ b/include/X11/Xaw/LabelP.h @@ -95,7 +95,7 @@ typedef struct { int lbm_y; /* where in label */ unsigned int lbm_width, lbm_height; /* size of pixmap */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } LabelPart; diff --git a/include/X11/Xaw/List.h b/include/X11/Xaw/List.h index 663b17f..48a6482 100644 --- a/include/X11/Xaw/List.h +++ b/include/X11/Xaw/List.h @@ -72,7 +72,7 @@ in this Software without prior written authorization from The Open Group. y Position Position 0 **1 - If the Width or Height of the list widget is zero (0) then the value - is set to the minimum size necessay to fit the entire list. + is set to the minimum size necessary to fit the entire list. If both Width and Height are zero then they are adjusted to fit the entire list that is created width the number of default columns @@ -161,7 +161,7 @@ _XFUNCPROTOBEGIN * Changes the list being used and shown. * * Note: - * If nitems of longest are <= 0 then they will be caluculated + * If nitems of longest are <= 0 then they will be calculated * If nitems is <= 0 then the list needs to be NULL terminated */ void XawListChange diff --git a/include/X11/Xaw/ListP.h b/include/X11/Xaw/ListP.h index 5f53982..28ecedc 100644 --- a/include/X11/Xaw/ListP.h +++ b/include/X11/Xaw/ListP.h @@ -100,7 +100,7 @@ typedef struct { Boolean show_current; char pad1[(sizeof(XtPointer) - sizeof(Boolean)) + (sizeof(XtPointer) - sizeof(int))]; - XtPointer pad2[2]; /* for future use and keep binary compatability */ + XtPointer pad2[2]; /* for future use and keep binary compatibility */ #endif } ListPart; diff --git a/include/X11/Xaw/MenuButtoP.h b/include/X11/Xaw/MenuButtoP.h index 9aa39bc..44c2c4d 100644 --- a/include/X11/Xaw/MenuButtoP.h +++ b/include/X11/Xaw/MenuButtoP.h @@ -63,7 +63,7 @@ typedef struct { /* resources */ char * menu_name; #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } MenuButtonPart; diff --git a/include/X11/Xaw/MultiSinkP.h b/include/X11/Xaw/MultiSinkP.h index 019f5f4..a6d8b7c 100644 --- a/include/X11/Xaw/MultiSinkP.h +++ b/include/X11/Xaw/MultiSinkP.h @@ -108,7 +108,7 @@ typedef struct { short cursor_x, cursor_y; /* Cursor Location */ XFontSet fontset; /* font set to draw */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } MultiSinkPart; diff --git a/include/X11/Xaw/MultiSrc.h b/include/X11/Xaw/MultiSrc.h index 628da0c..b7b7993 100644 --- a/include/X11/Xaw/MultiSrc.h +++ b/include/X11/Xaw/MultiSrc.h @@ -101,7 +101,7 @@ typedef struct _MultiSrcRec *MultiSrcObject; * * the AsciiSrc API which currently forwards requests here. * - * future versions (like theres going to be an R7 Xaw!) may + * future versions (like there's going to be an R7 Xaw!) may * * eliminate this file or at least these functions entirely. * diff --git a/include/X11/Xaw/MultiSrcP.h b/include/X11/Xaw/MultiSrcP.h index 95642a4..39d9c2c 100644 --- a/include/X11/Xaw/MultiSrcP.h +++ b/include/X11/Xaw/MultiSrcP.h @@ -156,7 +156,7 @@ typedef struct _MultiSrcPart { XawTextPosition length; /* length of file - IN CHARACTERS, NOT BYTES */ MultiPiece *first_piece; /* first piece of the text */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } MultiSrcPart; diff --git a/include/X11/Xaw/Paned.h b/include/X11/Xaw/Paned.h index 4b7e115..d9edcbd 100644 --- a/include/X11/Xaw/Paned.h +++ b/include/X11/Xaw/Paned.h @@ -96,7 +96,7 @@ SOFTWARE. ** These resources now are set to the vertical or horizontal cursor depending upon orientation, by default. If a value is specified here - then that cursor will be used reguardless of orientation. + then that cursor will be used regardless of orientation. CONSTRAINT RESOURCES: diff --git a/include/X11/Xaw/PanedP.h b/include/X11/Xaw/PanedP.h index 4e40eaf..17df479 100644 --- a/include/X11/Xaw/PanedP.h +++ b/include/X11/Xaw/PanedP.h @@ -159,7 +159,7 @@ typedef struct { int num_panes; /* count of managed panes */ PaneStack *stack; /* The pane stack for this widget */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } PanedPart; diff --git a/include/X11/Xaw/PannerP.h b/include/X11/Xaw/PannerP.h index 8a7f580..f061d29 100644 --- a/include/X11/Xaw/PannerP.h +++ b/include/X11/Xaw/PannerP.h @@ -82,7 +82,7 @@ typedef struct { XRectangle shadow_rects[2]; /* location of shadows */ Position last_x, last_y; /* previous location of knob */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } PannerPart; diff --git a/include/X11/Xaw/PortholeP.h b/include/X11/Xaw/PortholeP.h index 31bd65f..5891aac 100644 --- a/include/X11/Xaw/PortholeP.h +++ b/include/X11/Xaw/PortholeP.h @@ -47,7 +47,7 @@ typedef struct { /* resources */ XtCallbackList report_callbacks; /* callback/Callback */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } PortholePart; diff --git a/include/X11/Xaw/RepeaterP.h b/include/X11/Xaw/RepeaterP.h index 3eebf82..a07553f 100644 --- a/include/X11/Xaw/RepeaterP.h +++ b/include/X11/Xaw/RepeaterP.h @@ -59,7 +59,7 @@ typedef struct { int next_delay; /* next amount for timer */ XtIntervalId timer; /* timer that will fire */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } RepeaterPart; diff --git a/include/X11/Xaw/ScrollbarP.h b/include/X11/Xaw/ScrollbarP.h index b36472d..e89af21 100644 --- a/include/X11/Xaw/ScrollbarP.h +++ b/include/X11/Xaw/ScrollbarP.h @@ -69,7 +69,7 @@ typedef struct { float shown; Dimension length; /* either height or width */ Dimension thickness; /* either width or height */ - Dimension min_thumb; /* minium size for the thumb */ + Dimension min_thumb; /* minimum size for the thumb */ /* private */ Cursor inactiveCursor; /* The normal cursor for scrollbar */ @@ -78,7 +78,7 @@ typedef struct { Position topLoc; /* Pixel that corresponds to top */ Dimension shownLength; /* Num pixels corresponding to shown */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } ScrollbarPart; diff --git a/include/X11/Xaw/SimpleMenP.h b/include/X11/Xaw/SimpleMenP.h index e01c151..62bb464 100644 --- a/include/X11/Xaw/SimpleMenP.h +++ b/include/X11/Xaw/SimpleMenP.h @@ -84,7 +84,7 @@ typedef struct _SimpleMenuPart { XawDisplayList *display_list; Widget sub_menu; unsigned char state; - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } SimpleMenuPart; diff --git a/include/X11/Xaw/SimpleP.h b/include/X11/Xaw/SimpleP.h index d801162..f6bddeb 100644 --- a/include/X11/Xaw/SimpleP.h +++ b/include/X11/Xaw/SimpleP.h @@ -84,7 +84,7 @@ typedef struct { #ifndef OLDXAW XawDisplayList *display_list; String tip; - XtPointer pad[3]; /* for future use and keep binary compatability */ + XtPointer pad[3]; /* for future use and keep binary compatibility */ #endif } SimplePart; diff --git a/include/X11/Xaw/SmeBSBP.h b/include/X11/Xaw/SmeBSBP.h index 299e4ca..315481f 100644 --- a/include/X11/Xaw/SmeBSBP.h +++ b/include/X11/Xaw/SmeBSBP.h @@ -63,7 +63,7 @@ typedef struct { /* private */ Boolean set_values_area_cleared; /* do we need to unhighlight? */ - GC norm_gc; /* noral color gc */ + GC norm_gc; /* normal color gc */ GC rev_gc; /* reverse color gc */ GC norm_gray_gc; /* Normal color (grayed out) gc */ GC invert_gc; /* gc for flipping colors */ @@ -75,7 +75,7 @@ typedef struct { #ifndef OLDXAW /* new resources */ char * menu_name; /* name of nested sub menu or NULL */ - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } SmeBSBPart; diff --git a/include/X11/Xaw/SmeLineP.h b/include/X11/Xaw/SmeLineP.h index ae9f1d5..ed80c67 100644 --- a/include/X11/Xaw/SmeLineP.h +++ b/include/X11/Xaw/SmeLineP.h @@ -58,7 +58,7 @@ typedef struct { /* private */ GC gc; /* Graphics context for drawing line */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } SmeLinePart; diff --git a/include/X11/Xaw/SmeP.h b/include/X11/Xaw/SmeP.h index bd4bd9d..87c6ac1 100644 --- a/include/X11/Xaw/SmeP.h +++ b/include/X11/Xaw/SmeP.h @@ -68,7 +68,7 @@ typedef struct { XtCallbackList callbacks; Boolean international; #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } SmePart; diff --git a/include/X11/Xaw/StripCharP.h b/include/X11/Xaw/StripCharP.h index a0085b4..d69e754 100644 --- a/include/X11/Xaw/StripCharP.h +++ b/include/X11/Xaw/StripCharP.h @@ -76,7 +76,7 @@ typedef struct { XtCallbackList get_value; /* proc to call to fetch load pt */ int jump_val; /* Amount to jump on each scroll */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } StripChartPart; diff --git a/include/X11/Xaw/Text.h b/include/X11/Xaw/Text.h index 78c1478..76cc157 100644 --- a/include/X11/Xaw/Text.h +++ b/include/X11/Xaw/Text.h @@ -362,7 +362,7 @@ void XawTextDisplayCaret _XFUNCPROTOEND /* - * For R3 compatability only + * For R3 compatibility only */ #include <X11/Xaw/AsciiSrc.h> #include <X11/Xaw/AsciiSink.h> diff --git a/include/X11/Xaw/TextP.h b/include/X11/Xaw/TextP.h index 60f4624..3052ffe 100644 --- a/include/X11/Xaw/TextP.h +++ b/include/X11/Xaw/TextP.h @@ -155,7 +155,7 @@ typedef struct _XmuScanline XmuTextUpdate; struct SearchAndReplace { Boolean selection_changed; /* flag so that the selection cannot be changed out from underneath query-replace.*/ - Widget search_popup; /* The poppup widget that allows searches.*/ + Widget search_popup; /* The popup widget that allows searches.*/ Widget label1; /* The label widgets for the search window. */ Widget label2; Widget left_toggle; /* The left search toggle radioGroup. */ @@ -256,7 +256,7 @@ typedef struct _TextPart { */ short left_column, right_column; XawTextJustifyMode justify; - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } TextPart; diff --git a/include/X11/Xaw/TextSink.h b/include/X11/Xaw/TextSink.h index f3dd968..d5f6d1a 100644 --- a/include/X11/Xaw/TextSink.h +++ b/include/X11/Xaw/TextSink.h @@ -100,7 +100,7 @@ _XFUNCPROTOBEGIN * y - "" * pos1 - location of starting and ending points in the text buffer * pos2 - "" - * highlight - hightlight this text? + * highlight - highlight this text? * * Description: * Stub function that in subclasses will display text. @@ -236,7 +236,7 @@ void XawTextSinkFindPosition * fromX - x location of starting Position * toPos - end Position * resWidth - Distance between fromPos and toPos - * resPos - Acutal toPos used + * resPos - Actual toPos used * resHeight - Height required by this text * * Description: @@ -265,7 +265,7 @@ void XawTextSinkFindDistance * resPos - resulting position * * Description: - * Resloves a location to a position. + * Resolves a location to a position. */ void XawTextSinkResolve ( @@ -312,7 +312,7 @@ int XawTextSinkMaxLines * Height * * Description: - * Finds the Minium height that will contain a given number lines. + * Finds the Minimum height that will contain a given number lines. */ int XawTextSinkMaxHeight ( diff --git a/include/X11/Xaw/TextSinkP.h b/include/X11/Xaw/TextSinkP.h index 78f41d2..6cff1cc 100644 --- a/include/X11/Xaw/TextSinkP.h +++ b/include/X11/Xaw/TextSinkP.h @@ -213,7 +213,7 @@ typedef struct { Pixel cursor_color; XawTextPropertyList *properties; XawTextPaintList *paint; - XtPointer pad[2]; /* for future use and keep binary compatability */ + XtPointer pad[2]; /* for future use and keep binary compatibility */ #endif } TextSinkPart; diff --git a/include/X11/Xaw/TextSrc.h b/include/X11/Xaw/TextSrc.h index 2c65e66..888dcb4 100644 --- a/include/X11/Xaw/TextSrc.h +++ b/include/X11/Xaw/TextSrc.h @@ -116,7 +116,7 @@ _XFUNCPROTOBEGIN * * Parameters: * w - TextSrc Object - * pos - position of the text to retreive + * pos - position of the text to retrieve * text - text block that will contain returned text * length - maximum number of characters to read * @@ -167,7 +167,7 @@ int XawTextSourceReplace * position - position to start scanning * type - type of thing to scan for * dir - direction to scan - * count - which occurance if this thing to search for + * count - which occurrence if this thing to search for * include - whether or not to include the character found in * the position that is returned. * @@ -205,7 +205,7 @@ XawTextPosition XawTextSourceScan * text - the text block to search for * * Description: - * Searchs the text source for the text block passed. + * Searches the text source for the text block passed. * * Returns: * The position of the text we are searching for or XawTextSearchError @@ -230,7 +230,7 @@ XawTextPosition XawTextSourceSearch * w - TextSrc object * selection - current selection atom * target - current target atom - * type - type to conver the selection to + * type - type to convert the selection to * value - return value that has been converted * length - "" * format - format of the returned value diff --git a/include/X11/Xaw/TextSrcP.h b/include/X11/Xaw/TextSrcP.h index 27514c2..5a94596 100644 --- a/include/X11/Xaw/TextSrcP.h +++ b/include/X11/Xaw/TextSrcP.h @@ -152,7 +152,7 @@ typedef struct { XtCallbackList property_callback; XawTextAnchor **anchors; int num_anchors; - XtPointer pad[1]; /* for future use and keep binary compatability */ + XtPointer pad[1]; /* for future use and keep binary compatibility */ #endif } TextSrcPart; diff --git a/include/X11/Xaw/ToggleP.h b/include/X11/Xaw/ToggleP.h index a816598..1be3d47 100644 --- a/include/X11/Xaw/ToggleP.h +++ b/include/X11/Xaw/ToggleP.h @@ -76,7 +76,7 @@ typedef struct { /* private */ RadioGroup *radio_group; #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } TogglePart; diff --git a/include/X11/Xaw/TreeP.h b/include/X11/Xaw/TreeP.h index 01d2bdc..158505b 100644 --- a/include/X11/Xaw/TreeP.h +++ b/include/X11/Xaw/TreeP.h @@ -81,7 +81,7 @@ typedef struct { Dimension maxwidth, maxheight; /* for shrink wrapping */ #ifndef OLDXAW XawDisplayList *display_list; - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } TreePart; @@ -110,7 +110,7 @@ typedef struct _TreeConstraintsPart { Position x, y; #ifndef OLDXAW XtPointer pad[2]; /* leave some space for future optimizations, and - * keep binary compatability + * keep binary compatibility */ #endif } TreeConstraintsPart; diff --git a/include/X11/Xaw/VendorEP.h b/include/X11/Xaw/VendorEP.h index b91f10a..5814a5e 100644 --- a/include/X11/Xaw/VendorEP.h +++ b/include/X11/Xaw/VendorEP.h @@ -69,7 +69,7 @@ typedef struct { XawImPart im; XawIcPart ic; #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } XawVendorShellExtPart; diff --git a/include/X11/Xaw/ViewportP.h b/include/X11/Xaw/ViewportP.h index 2aeb8a5..52d9519 100644 --- a/include/X11/Xaw/ViewportP.h +++ b/include/X11/Xaw/ViewportP.h @@ -83,7 +83,7 @@ typedef struct _ViewportPart { Widget clip, child; /* The clipping and (scrolled) child widgets */ Widget horiz_bar, vert_bar; /* What scrollbars we currently have */ #ifndef OLDXAW - XtPointer pad[4]; /* for future use and keep binary compatability */ + XtPointer pad[4]; /* for future use and keep binary compatibility */ #endif } ViewportPart; diff --git a/man/Xaw.man b/man/Xaw.man index 55caefe..dc65378 100644 --- a/man/Xaw.man +++ b/man/Xaw.man @@ -123,7 +123,7 @@ Currently the only existing class is \fIxlib\fP, which provides access to the Xlib drawing primitives. .PP \fBFunction-name\fP is the drawing or configuration function to be called, -described bellow. +described below. .PP \fBArguments\fP may be anything suitable to the displayList function being called. When the function requires a coordinate, the syntax is diff --git a/old-doc/CHANGES b/old-doc/CHANGES index a6a95fd..165c5f2 100644 --- a/old-doc/CHANGES +++ b/old-doc/CHANGES @@ -46,7 +46,7 @@ Dialog: Form: The geometry handler now will now disallow geometry management - reqests that will force the child outside the Form's window. + requests that will force the child outside the Form's window. Fixed missing parens typo in PreferredGeometry. diff --git a/old-doc/Changelog b/old-doc/Changelog index cabbb2c..3a892ae 100644 --- a/old-doc/Changelog +++ b/old-doc/Changelog @@ -30,7 +30,7 @@ resource-name: background constant-name: - Especial values. They aren't normally contants, but a special state + Special values. They aren't normally constants, but a special state not triggered with resources or variables (They have the highest precedence, so, to allow these strings as resource names I'll need to allow some sort of escape sequences). Examples: @@ -189,7 +189,7 @@ Patch 6 (#1701) 24 May 1998 + Allows setting the resources label_x and label_y inherited from labelWidget. This is useful for moving the contents of a button when it is pressed ( I included a simple test for it ) - + Added OS/2 patchs + + Added OS/2 patches + The buffer overflow problems were resolved in a different way. I added a function XmuSnprintf, that is used by Xaw and Xmu. + Correction of a problem in SimpleMenu, when it tries to optimize the @@ -199,7 +199,7 @@ Patch 6 (#1701) 24 May 1998 ----- + Function XmuNCopyISOLatin1Lowered, defined in <X11/Xmu/CharSet.h> + Function XmuSnprintf, defined in <X11/Xmu/SysUtil.h> - + All ocurrences of sprintf were replaced by XmuSnprintf and all ocurrences + + All occurrences of sprintf were replaced by XmuSnprintf and all occurrences of XmuCopyISOLatin1Lowered were replaced by XmuNCopyISOLation1Lowered. @@ -216,7 +216,7 @@ Patch 7 (#1738) 21 June 1998 MultiSrc.c:Scan() functions. + I added clipping code to the {Ascii,Multi}Sink widgets, to allow use of displayList's as decoration. The best solution I found to avoid too much - server requests, and keep full binary compatability was to use the resize + server requests, and keep full binary compatibility was to use the resize method of these widgets, to tell them to the parent widget have changed it's size. + Now the TextWidget has a xterm/emacs like cursor. And it is possible to @@ -224,14 +224,14 @@ Patch 7 (#1738) 21 June 1998 + Fixed several problems caused by code assuming a line of text will be shown as one line in the TextWidget. This is not always true when it uses XawtextWrapLine or XawTextWrapWord, the most common problem was - the cursor becomming invisible, after calling the function + the cursor becoming invisible, after calling the function Text.c:_XawTextShowPosition() that is called to make sure it is visible ;) + Added code that it will not forget the cursor distance from the left of the window while moving the cursor one line up or down. + Ansification of the text code (not yet complete). Private routines now uses prototypes and wide parameters. External routines were kept as before (but with prototypes not masked by NeedFunctionPrototypes), - to avoid binary compatability problems. The bigger problem I found in the + to avoid binary compatibility problems. The bigger problem I found in the ansification was a function with 6 parameters being called with only 5. + Several routines were rewritten, sometimes from scratch. + The cursor navigation of the TextWidget was completely reviewed. It @@ -239,7 +239,7 @@ Patch 7 (#1738) 21 June 1998 when the cursor in move one line up or down and becomes invisible; the text will be scrolled so that the line with the cursor will be centered in the screen. Also, when doing page up, the cursor will be positioned - in the bottom-left, instead of allways in the top-left. + in the bottom-left, instead of always in the top-left. Patch 8 (#1752) 27 June 1998 @@ -276,11 +276,11 @@ Corrected problem when moving the cursor over a non-printing character, Does not allow anymore scrolling of the text width Ctrl+Z if the text has only one line, or only one line of text. Several changes in the TextWidget. I did not gratuitously break binary - compatability. Source compatability is only granted to programs that + compatibility. Source compatibility is only granted to programs that do not access private structures. This is required because there are several changes in the behaviour of the TextWidget, and if a program becomes non compilable, it is because it will not work properly with - the changes in the text widget (please read bellow for a explanation) + the changes in the text widget (please read below for a explanation) Better cursor navigation when moving line-up or line-down over a tab: cursor | @@ -293,10 +293,10 @@ Better cursor navigation when moving line-up or line-down over a tab: now: tab | |#ext There were several problems in the Text.c:_XawTextReplace(), when deleting - a character and the cursor (shoud be) moved to the previous line. This + a character and the cursor (should be) moved to the previous line. This problem was corrected. -The text code was doing too much redrawing! When typping text, it would - redraw all the current line at each character typped, and also redraw the +The text code was doing too much redrawing! When typing text, it would + redraw all the current line at each character typed, and also redraw the entire window till the bottom. Now it only redraws the minimum necessary (and makes a minimum of requests for the Xserver, when clearing areas), most of these problems were related to Text.c:_XawTextReplace() (rewritten @@ -308,16 +308,16 @@ Now, when selecting text, with: button1-down, button1-move, the window will Added a set-keyboard-focus translation to the text code, and in the default translation, it is called when pressing the left mouse button over a text widget (so that the mouse does not need to be over the text window - when typping) + when typing) -These are the changes to Xaw that made it not fully source compatable (I'm -open to comments, to make it source compatable, but as I said above, if +These are the changes to Xaw that made it not fully source compatible (I'm +open to comments, to make it source compatible, but as I said above, if a program does not compile anymore, it is because it is not granted it will work properly): scrollMode set to WhenNeeded is not supported anymore. I spent several hours fighting side-effects caused when a scrollbar is created or destroyed - 'on demand', and have (after tired of long debug sessions) choosed that - it is not required (it saves a lot of potencial unespected conditions + 'on demand', and have (after tired of long debug sessions) chosen that + it is not required (it saves a lot of potential unexpected conditions being found by a user). I changed the 'type' of the scroll mode to Boolean, so, to have a scrollbar, is enough to say: *Text.scrollVertical: True. Since the type now is Boolean, Xt will print warning messages when the @@ -332,7 +332,7 @@ wrap-mode set to line may not work properly wrap-mode set to word does not work properly always (never did) the multiply should be setable to a variable value; the default value is 4, i.e. Ctrl+U <text+action> -I will work on the itens listed above, and I'm also planning: +I will work on the items listed above, and I'm also planning: one level undo, for text actions C style indentation and 'jumping' the cursor to show matching '(', '[' and '{' @@ -345,7 +345,7 @@ Moved the code clipping code I have put in Text.c in my previous patch to I get by cutting and pasting code under a #if 0 :(), but it was corrected. The code in the new file 'Clip.c' is very useful for creating clipiing lists and thus, avoiding too much server requests, or code for the same - functionality (poorly) repeteated in several places around the libary. This + functionality (poorly) repeteated in several places around the library. This code is now heavily used by the TextWidget. @@ -363,7 +363,7 @@ Updated the Scrollbar configurations in Xedit.ad #1788 12 July 1998 -- TextWidget -- - + Corrected problem whem moving the cursor over a non-printing character + + Corrected problem when moving the cursor over a non-printing character + Now, does not allow scroll with ^Z when there is only one line of text + Automatic resize was removed, it is not required with automatic horizontal scroll, but I will look for programs that rely on it; the only program @@ -372,13 +372,13 @@ Updated the Scrollbar configurations in Xedit.ad request. + Scroll mode set to "WhenNeeded" was removed. It generates several unespected conditions when editing text, and the new feature of automatic scrolling - the text widget while typping is more useful. + the text widget while typing is more useful. + Removed a leak in TextAction.c:AutoFill(), generated by the code text.ptr = (char *)XtMalloc(sizeof(wchar_t) * 2); that memory was never released, but the fix was simple, since the amount of memory requested is fixed. + Several optimizations in the redisplay of the text. - + Now, wrap mode set to word or line is expected to work, while typping text. + + Now, wrap mode set to word or line is expected to work, while typing text. + AutoFill will only break lines in word boundaries now. + Added a set-keyboard-focus action to TextAction.c, so that when pressing the left button over a text widget, it will receive the keyboard focus. @@ -395,7 +395,7 @@ Updated the Scrollbar configurations in Xedit.ad -- XAW -- + I had added a XawStackAlloc definition to "Private.h", to avoid a XtMalloc - request for every character typped in TextAction.c:InsertChar(), but + request for every character typed in TextAction.c:InsertChar(), but when syncing with 3.9Aj, saw that the file "XawAlloc.h" is no longer required. Please, remove XawAlloc.h from 3.9Aj. @@ -406,7 +406,7 @@ Updated the Scrollbar configurations in Xedit.ad -- xedit -- + Removed a XDefineCursor from xedit.c:main() - + I have added a XtSetKeyboardFocus in xedit.c:main(), but comented it + + I have added a XtSetKeyboardFocus in xedit.c:main(), but commented it because it would make xedit unusable with previous versions of Xaw, or with the Xaw replacements (Xaw3d, Xaw95 ...) @@ -415,13 +415,13 @@ Comments: that code made the cursor do not erase portions of the text while moving the it, but it was failing at some places that would need that the TextWidget, and not only the {Ascii,Multi}SinkObject had access to the fonts, so I -choosed to left it to the future (and keep the sources simple, by now). -The text widget is useable with italic fonts, but fonts with: +chose to left it to the future (and keep the sources simple, by now). +The text widget is usable with italic fonts, but fonts with: f->per_char[<char> - f->min_char_or_byte2].rbearing > f->per_char[<char> - f->min_char_or_byte2].width or f->per_char[<char> - f->min_char_or_byte2].lbearing < 0 -will not allways be displayed correctly. +will not always be displayed correctly. I haved also added a xedit configuration file to this mail. @@ -453,11 +453,11 @@ Corrected problem with the 'virtual' function Layout of the Form widget. That calling that function with only 3 parameters; the ansification flagred that error. TextTr.c was modified to have only one string. I believe that that weird - thing was due to the inheritance of compatability with some very old and + thing was due to the inheritance of compatibility with some very old and probably buggy ld. -Xaw is expected to be binary compatable with R6.3; there are some - preprocessor macros that keeps binary compatability, and unless the gains - of breaking binary compatability show worth enough (and people think) it +Xaw is expected to be binary compatible with R6.3; there are some + preprocessor macros that keeps binary compatibility, and unless the gains + of breaking binary compatibility show worth enough (and people think) it is good that code would be made default, otherwise it will be forgotten. I have also added a XFree86 copyright notice to Text.c, since there is a very large amount of work in that file (and it is not yet ready). @@ -526,7 +526,7 @@ also fixed a possible buffer overflow while searching the source of the instead of a const if the given atom is 0. + Corrected a typo in Xmu.h + Several 'ansification' patches, to get function definitions and avoid - unecessary definitions. + unnecessary definitions. #2028, 2033, 7 Oct 1998 @@ -541,7 +541,7 @@ Added a ^Q<any-char> translation to the text widget, to be able to insert Changed TextAction.c:Move() to set ctx->text.showposition, so that even if the cursor did not change the position, it will become visible. Corrected problem with the 'form-paragraph' translation, so that the - text will be always correclty shown. + text will be always correctly shown. Modified the automatic scrolling of the text to one line at a time, to make it easier to see what is being selected. Added a 'hack' to be able to type ^U<any-numeric-sequence> to be able @@ -572,9 +572,9 @@ Added file completion in the filename prompt. This is a very nice -- XAW -- Changed the functions {Ascii,Multi}Sink.c:CharWidth and PaintText, to improve speed, and avoid too much recalculations. On normal files, it - becames about 5:1 faster, but can go up to 20:1 when editting files with + became about 5:1 faster, but can go up to 20:1 when editing files with very large lines. Besides this speed improvement, I believe it can - surely be made faster (based on comparition with some popular X editors). + surely be made faster (based on comparison with some popular X editors). Changed the way the AsciiSink prints characters with value bigger than 126 decimal. Now it prints DEL as ^?, and the other characters as \XXX where 'X' is an octal digit. The MultiSink widget was unchanged in this @@ -582,7 +582,7 @@ Changed the way the AsciiSink prints characters with value bigger than xedit -xrm '*international: true' Converted all calls to strncpy, in AsciiSrc.c to memcpy, so that the (ascii) text widget will work properly with data containing nulls. -Added a experimental 'Xaw Scan Type' XawstAlphaNumeric, that shoud make +Added a experimental 'Xaw Scan Type' XawstAlphaNumeric, that should make edition of C (or any other language) easier in xedit (i.e. the text widget). It can be tested with Ctrl-Left and Ctrl-Right, by now. Changed the TextWidget to handle text lines that would result in more than @@ -591,7 +591,7 @@ Changed the TextWidget to handle text lines that would result in more than Changed Text.c:TextScroll() to be smarter when calculating the offset of the line table on scroll up. Added a nice feature, to show the matching '(', '[' or '{', when a ')', - ']' or '}' is typped. + ']' or '}' is typed. Changed TextAction.c:FormParagraph() to generate only one undo/redo step. -- xedit -- @@ -619,7 +619,7 @@ Added a 'hints' feature to xedit. Instead of a 'dead' problem, but could left the text window with incorrect data. + Moved the undo/redo code to TextSrc.c, and some code/data from {Ascii,Multi}Src.c to TextSrc.c. The callback now is called when the - source is changed, or becames unchanged due to an undo/redo. Also + source is changed, or becomes unchanged due to an undo/redo. Also changed the Scan procedure to be a bit faster. + The asciiTextWidget will now accept a source or sink object being set at creation time. @@ -703,7 +703,7 @@ Added a 'hints' feature to xedit. Instead of a 'dead' TextWidget's sharing the same source. + Added a kill ring list to the text code. This works like the emacs feature, but, unlike emacs, it is not required to press C-Y before M-Y, to start - looping through the kill ring list. To use it, just press M-Y repeteadly, + looping through the kill ring list. To use it, just press M-Y repeatedly, and all the text that was killed will be inserted, one at a time, so that you can choose one. Note that the text inserted from the kill ring list will also enter in the undo list. @@ -718,7 +718,7 @@ Added a 'hints' feature to xedit. Instead of a 'dead' --- xedit --- + Added a few more resource settings to the Xedit-sample file. + Added some sanity checkings when trying to save a file. This avoids the - case of saving a file with the name of a directory (but moving the directoy + case of saving a file with the name of a directory (but moving the directory to other name before). A possible case is: have a directory named 'dir', saves a file as 'dir', but before saving, renames the directory as 'dir~'. + Allows saving a file that xedit thinks is not changed (the file may have @@ -737,7 +737,7 @@ Added a 'hints' feature to xedit. Instead of a 'dead' text. -- xedit -- - + Added code to keep the file mode, after saving. This is useful when editting + + Added code to keep the file mode, after saving. This is useful when editing scripts, so that the executable flag will not be lost after edition. @@ -748,7 +748,7 @@ Added a 'hints' feature to xedit. Instead of a 'dead' using the international resource. Actions.c: + Corrected some bugs in the boolean expression parser. The old version would - not parse correclty parenthized expressions, and was giving equal precedence + not parse correctly parenthized expressions, and was giving equal precedence to AND, OR and XOR (what is incorrect). AsciiSink.c: + Changed to display characters in the range 0x32-0x7e and 0xa0-0xff literally. @@ -758,7 +758,7 @@ AsciiText.c: + Changed the code, so that even if the *international resource is not set, _XawImRegister and _XawImUnregister are called for the text widget. This is useful for latin-* locales, that use one byte wide characters, and makes Xaw - more compatable with modern toolkits, like qt and gtk. + more compatible with modern toolkits, like qt and gtk. List.c: + Added code to work correctly with a background pixmap. + Added a smarter code for list window size calculation, that is used if the @@ -771,7 +771,7 @@ Text.c: funcionality was not finished, and by now, it is not required. TextAction.c: + Does not call XLookpupString in InsertChar any more, but the new function - _XawLookupString (in XawIm.c) to work correclty with composed characters. + _XawLookupString (in XawIm.c) to work correctly with composed characters. XawIm.c: + Added the private function _XawLookupString, that just calls XmbLookupString, or in case of any initialization error, XLookupString. @@ -821,8 +821,8 @@ xedit.c: #2662 10 Apr 1999 -- Xaw -- - + Corrected the problems gererated in my last patch. I was compiling with - -DUSE_XPM defined, and did'nt realize that the patch would not compile + + Corrected the problems generated in my last patch. I was compiling with + -DUSE_XPM defined, and didn't realize that the patch would not compile without it. Just ifdef'ed again the code to avoid warnings or dead code. -- xedit -- @@ -834,7 +834,7 @@ xedit.c: Undo: When this button is sensitive, allow undoing the last replace, this is useful when doing a incorrect "Replace All" action. Ignore: Ignore this word, and continues spell checking. - All (right side of Ignore button): Ignore any further ocurrences of the + All (right side of Ignore button): Ignore any further occurrences of the selected word. Add: Add's the selected word to the user's private dictionary. Suspend: Go back to text edition, but does not kill the ispell process, @@ -844,7 +844,7 @@ xedit.c: add to your private dictionary. Close: Kill the ispell process, and go back to text edition. Automatically saves the user's private dictionary. - When pressing the Add button, the word in the "Mispelled word:" field is + When pressing the Add button, the word in the "Misspelled word:" field is added to the user private dictionary (normally ~/.ispell_*). When pressing the Replace button, the text in the "Replace with:" field is used. If no word is selected in the "Suggestions:" field, this mean that the @@ -855,10 +855,10 @@ xedit.c: -- Xaw -- + Minor changes to AsciiSrc.c to try to get more speed in the FindPiece function. Xedit may become very slow when editing files bigger than 1M, - and I'm studing ways to get more speed in the Scan and FindPiece functions. + and I'm studying ways to get more speed in the Scan and FindPiece functions. The FindPosition function in *Sink.c also can consume a lot of cpu time, and may need some rework. - + Added submenus support to the SimpleMenuWidget. This is something essencial + + Added submenus support to the SimpleMenuWidget. This is something essential to a widget toolkit. Just plugged in the code of a menu widget I wrote some time ago. Xedit uses submenus now. To use it, set the resource menuName of a SmeBSBObject to the name of the submenu. @@ -876,7 +876,7 @@ xedit.c: Functions to tabify, untabify, get block boundaries, verify if a line is completely blank, and strip excess of spaces. + Added a indent action to the TextWidget. The default translation, only - used by xedit, is C-X Tab, did this way, to make it fully compatable with + used by xedit, is C-X Tab, did this way, to make it fully compatible with emacs, but other translations can be used. The multiply value is used to calculate the amount of spaces to move to the left or right. + Corrected a very hard to find (and reproduce) bug in the undo code, that @@ -909,12 +909,12 @@ xedit.c: + Rewrite of the functions *Sink.c:FindPosition() and FindDistance() to try to get more speed. + Reworked the function Text.c:_BuildLineTable, to correct some strange - code, and to avoid unecessary recalculations. + code, and to avoid unnecessary recalculations. + Made negative values of the multiply work for all the actions, not only for negative indentations. This makes the TextWidget behaviour more - compatable with emacs. + compatible with emacs. + Optimization of the new code for text justification, to avoid a call to - malloc on every char typped, when undo is enabled. + malloc on every char typed, when undo is enabled. + Reorganized the offsets of the fields of the TextWidget, trying to make xxgdb work again with the new Xaw code, but, unfortunately, the SimpleWidget (a subclass of the TextWidget) have growed by 4 bytes (a XawDisplayList*) @@ -971,7 +971,7 @@ xedit.c: problems. Most of them were changed to address more directly the resource, and avoid confusion. Also, added some new resource settings to configure the code I added to widgets.c. - + Changed widgets.c to make sure the resource setting dialog is allways + + Changed widgets.c to make sure the resource setting dialog is always entirely in the screen, and if it does not fit, scrollbars will be created. @@ -996,7 +996,7 @@ xedit.c: had set to the tab stops. + Fixed a very bad bug in the form-paragraph function. It was very hard to find because I was looking at the wrong places. If the text was - allready formatted, or did not need formatting, the code was not + already formatted, or did not need formatting, the code was not reenabling undo, making the undo/redo behaviour imprevisible. -- xedit -- @@ -1013,7 +1013,7 @@ xedit.c: the code keeps information about words already ignored or correct in the xedit side, instead of asking ispell every time. Added also a terseMode resource, and made the interface ask for user interaction - allways ispell does not say the word is completely correct; the + always ispell does not say the word is completely correct; the terseMode resource makes ispell itself decide what words are correct or not. @@ -1029,7 +1029,7 @@ xedit.c: + Changed the code to always create the horizontal scrollbar, if requested. + Small changes to TextPop.c, to automatically scroll horizontally the text window when the text found in a search/replace action is not visible. - + Added a optimization when editting large files, to rebuild the line table + + Added a optimization when editing large files, to rebuild the line table if the region containing the text being added/replaced overlaps the lt.top field of the text widget. + Changed the undo code to also merge text typed when overwrite mode is @@ -1041,7 +1041,7 @@ xedit.c: some new features to xedit, like auto indentation of program files. The first feature added is the 'autoReplace' resource, described in the xedit man page. - + Corrected a bug in ispell.c, that would make the code alocate lots of + + Corrected a bug in ispell.c, that would make the code allocate lots of memory unnecessarily, due to an uninitialized variable. Thanks to David Dawes that found the bug. The bug was not in 3.9Pn, but the solution in the later release was not completely correct. @@ -1078,7 +1078,7 @@ xedit.c: checking the word in the text field. This feature was borrowed from the spell checking interface of the Netscape html editor. + The ispell checking interface now also asks for user interaction if there are - two identical words togheter. + two identical words together. + Added a status bar to the ispell interface, to give feedback to the user about what is happening. + Added some new resources, to let easier customization of the ispell status @@ -1094,13 +1094,13 @@ xedit.c: + Add a XawVersion define. The value for the new xaw is 7000L, and for the compatible one is 6700L (same comments as for the XawVendor define). + Bug fixes to the undo/redo code, and code to merge erases generated by - ^H and ^D. Also, if the cursor is moved, it stops merging the text typped + ^H and ^D. Also, if the cursor is moved, it stops merging the text typed in the undo buffer. + Bug fixes to the Form widget geometry management code, to work correctly when child widgets are removed or added at run time. + Xaw now links with XPM by default, and the config files where changed to enable newly compiled programs to do so. - + Added 16 pad bytes to every widget, to try to avoid binary compatability + + Added 16 pad bytes to every widget, to try to avoid binary compatibility problems in the future. + Added a displayList resource to the Tree Widget. + Added the functions XawTextGetSink and XawTextLastPosition, to enable a @@ -1263,7 +1263,7 @@ xedit.c: #2964 3 Jul 1999 -- Xaw -- - + Fix for problem found in the search/replace dialog when using splitted + + Fix for problem found in the search/replace dialog when using split windows in xedit. + Added initialization for the display_list field of the Tree widget. @@ -1275,7 +1275,7 @@ xedit.c: -- Xaw -- + Added code to check the return value of XAllocColor and XAllocNamedColor in Pixmap.c. - + Reverted back some code, and did a carefull review of the code in TextPop.c + + Reverted back some code, and did a careful review of the code in TextPop.c to avoid the possibility of calling XawTextDisableRedisplay, and not calling XawTextEnableRedisplay later (due to errors or end of file reached). + Added code to TextSrc.c, to use two static variables, that represent a new diff --git a/specs/Dialog.xml b/specs/Dialog.xml index dad5557..9aed148 100644 --- a/specs/Dialog.xml +++ b/specs/Dialog.xml @@ -435,10 +435,11 @@ The first layout method uses the <function>fromVert</function> mand <function>fr resources to place the children of the Dialog. A single pass is made through the Dialog widget's children in the order that they were created. Each child is then placed in -the Dialog widget below or to the right of the widget speci- -fied by the <function>fromVert</function> mand <function>fromHoriz</function> mresources. The distance -the new child is placed from its left or upper neighbor is -determined by the <function>horizDistance</function> mand <function>vertDistance</function> mresources. +the Dialog widget below or to the right of the widget specified by the +<function>fromVert</function> and <function>fromHoriz</function> resources. +The distance the new child is placed from its left or upper neighbor is +determined by the <function>horizDistance</function> and +<function>vertDistance</function> resources. This implies some things about how the order of creation affects the possible placement of the children. The Form widget registers a string to widget converter which does not diff --git a/specs/Repeater.xml b/specs/Repeater.xml index 8eaa64c..befcbb6 100644 --- a/specs/Repeater.xml +++ b/specs/Repeater.xml @@ -527,7 +527,7 @@ frequency until the <function>stop</function> action occurs. <listitem> <para> This invokes the functions on the <function>stopCallback</function> list and prevents any -further timers from occuring until the next <function>start</function> action. +further timers from occurring until the next <function>start</function> action. </para> </listitem> </varlistentry> diff --git a/src/Actions.c b/src/Actions.c index eceb1f9..ae330d5 100644 --- a/src/Actions.c +++ b/src/Actions.c @@ -149,7 +149,7 @@ static Cardinal num_variable_list; * Start of Boolean Expression Evaluation Implementation Code */ Bool -XawParseBoolean(Widget w, String param, XEvent *event, Bool *succed) +XawParseBoolean(Widget w, String param, XEvent *event, Bool *succeed) { char *tmp = (char *)param; int value; @@ -179,7 +179,7 @@ XawParseBoolean(Widget w, String param, XEvent *event, Bool *succed) else if (XmuCompareISOLatin1(param, "faked") == 0) return (event->xany.send_event != 0); else - *succed = False; + *succeed = False; return (False); } @@ -246,7 +246,7 @@ get_token(XawEvalInfo *info) /* It's a symbol name, resolve it. */ if (ch == XAW_PRIV_VAR_PREFIX || isalnum(ch) || ch == '_' || ch == '\\') { - Bool succed = True; + Bool succeed = True; p = info->cp - 1; @@ -262,13 +262,13 @@ get_token(XawEvalInfo *info) String value = XawConvertActionVar(info->vlist, name); info->value = info->parse_proc(info->widget, value, info->event, - &succed) & 1; + &succeed) & 1; } else { info->value = info->parse_proc(info->widget, name, info->event, - &succed) & 1; - if (!succed) + &succeed) & 1; + if (!succeed) { String value = XawConvertActionRes(info->rlist, info->widget, @@ -276,18 +276,18 @@ get_token(XawEvalInfo *info) /* '\\' may have been used to escape a resource name. */ - succed = True; + succeed = True; info->value = info->parse_proc(info->widget, value, info->event, - &succed) & 1; - if (!succed) + &succeed) & 1; + if (!succeed) { /* not a numeric value or boolean string */ info->value = True; - succed = True; + succeed = True; } } } - if (succed) + if (succeed) return (info->token = BOOLEAN); } else if (ch == '\0') diff --git a/src/AsciiSink.c b/src/AsciiSink.c index af715f0..29850ba 100644 --- a/src/AsciiSink.c +++ b/src/AsciiSink.c @@ -1878,7 +1878,7 @@ MaxLines(Widget w, unsigned int height) * lines - number of lines * * Description: - * Finds the Minium height that will contain a given number lines. + * Finds the Minimum height that will contain a given number lines. * * Returns: * the height diff --git a/src/AsciiSrc.c b/src/AsciiSrc.c index 875b97c..75ce714 100644 --- a/src/AsciiSrc.c +++ b/src/AsciiSrc.c @@ -336,7 +336,7 @@ XawAsciiSrcInitialize(Widget request _X_UNUSED, Widget cnew, * * Parameters: * w - AsciiSource widget - * pos - position of the text to retreive. + * pos - position of the text to retrieve. * text - text block that will contain returned text * length - maximum number of characters to read * @@ -618,7 +618,7 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos, * position - position to start scanning * type - type of thing to scan for * dir - direction to scan - * count - which occurance if this thing to search for. + * count - which occurrence if this thing to search for. * include - whether or not to include the character found in * the position that is returned * @@ -746,7 +746,7 @@ Scan(Widget w, register XawTextPosition position, XawTextScanType type, while (True) { if (ptr < lim) { piece = piece->prev; - if (piece == NULL) /* Begining of text */ + if (piece == NULL) /* Beginning of text */ return (0); ptr = piece->text + piece->used - 1; lim = piece->text; @@ -821,7 +821,7 @@ Scan(Widget w, register XawTextPosition position, XawTextScanType type, * text - text block to search for * * Description: - * Searchs the text source for the text block passed. + * Searches the text source for the text block passed. * * Returns: * The position of the item found @@ -1046,7 +1046,7 @@ XawAsciiSrcGetValuesHook(Widget w, ArgList args, Cardinal *num_args) if (streq(args[i].name, XtNstring)) { if (src->ascii_src.use_string_in_place) *((char **)args[i].value) = src->ascii_src.first_piece->text; - else if (XawAsciiSave(w)) /* If save sucessful */ + else if (XawAsciiSave(w)) /* If save successful */ *((char **)args[i].value) = src->ascii_src.string; break; } @@ -1181,7 +1181,7 @@ XawAsciiSave(Widget w) * Save the current buffer as a file. * * Returns: - * True if the save was sucessful + * True if the save was successful */ Bool XawAsciiSaveAsFile(Widget w, _Xconst char *name) @@ -1270,10 +1270,10 @@ RemoveOldStringOrFile(AsciiSrcObject src, Bool checkString) * name - the name of the file * * Description: - * Write the string specified to the begining of the file specified. + * Write the string specified to the beginning of the file specified. * * Returns: - * returns True if sucessful, False otherwise + * returns True if successful, False otherwise */ static Bool WriteToFile(String string, String name, unsigned length) @@ -1308,7 +1308,7 @@ WriteToFile(String string, String name, unsigned length) * what can be useful when editing very large files. * * Returns: - * returns True if sucessful, False otherwise + * returns True if successful, False otherwise */ static Bool WritePiecesToFile(AsciiSrcObject src, String name) @@ -1790,7 +1790,7 @@ GetDefaultPieceSize(Widget w _X_UNUSED, int offset _X_UNUSED, XrmValue *value) #ifdef ASCII_STRING /* - * Compatability functions. + * Compatibility functions. */ /* * Function: @@ -436,7 +436,7 @@ XawBoxResize(Widget w) /* * Try to do a new layout within the current width and height; - * if that fails try to resize and do it within the box returne + * if that fails try to resize and do it within the box returned * by XawBoxQueryGeometry * * TryNewLayout just says if it's possible, and doesn't actually move the kids @@ -533,7 +533,7 @@ XawBoxGeometryManager(Widget w, XtWidgetGeometry *request, || ((request->request_mode & CWY) && request->y != XtY(w))) return (XtGeometryNo); - /* Size changes must see if the new size can be accomodated */ + /* Size changes must see if the new size can be accommodated */ if (request->request_mode & (CWWidth | CWHeight | CWBorderWidth)) { /* Make all three fields in the request valid */ if ((request->request_mode & CWWidth) == 0) diff --git a/src/Converters.c b/src/Converters.c index cc3efcb..a818e33 100644 --- a/src/Converters.c +++ b/src/Converters.c @@ -154,7 +154,7 @@ XawInitializeDefaultConverters(void) first_time = False; - /* Replace with more apropriate converters */ + /* Replace with more appropriate converters */ XtSetTypeConverter(XtRCallback, XtRString, _XawCvtCARD32ToString, NULL, 0, XtCacheNone, NULL); XtSetTypeConverter(XtRColormap, XtRString, _XawCvtCARD32ToString, diff --git a/src/DisplayList.c b/src/DisplayList.c index 540cc1e..1c79035 100644 --- a/src/DisplayList.c +++ b/src/DisplayList.c @@ -494,7 +494,7 @@ XawDestroyDisplayList(_XawDisplayList *dlist) /********************************************************************** * If you want to implement your own class of procedures, look at - * the code bellow. + * the code below. **********************************************************************/ /* Start of Implementation of class "xlib" */ typedef struct _XawXlibData { @@ -650,7 +650,7 @@ ResizeChildren(Widget w) if (fw->form.no_refigure) { /* - * I am changing the widget wrapper w/o modifing the window. This is + * I am changing the widget wrapper w/o modifying the window. This is * risky, but I can get away with it since I am the parent of this * widget, and he must ask me for any geometry changes * @@ -893,7 +893,7 @@ XawFormGeometryManager(Widget w, XtWidgetGeometry *request, if (fw->form.no_refigure) { /* - * I am changing the widget wrapper w/o modifing the window. + * I am changing the widget wrapper w/o modifying the window. * This is risky, but I can get away with it since I am the * parent of this widget, and he must ask me for any geometry * changes @@ -455,11 +455,11 @@ ChangeSize(Widget w, unsigned int width, unsigned int height) Layout(w, False, False, &request.width, &request.height); request.request_mode = CWWidth | CWHeight; XtMakeGeometryRequest(w, &request, &reply); - /*FALLTROUGH*/ + /*FALLTHROUGH*/ default: break; } - /*FALLTROUGH*/ + /*FALLTHROUGH*/ default: break; } diff --git a/src/MultiSink.c b/src/MultiSink.c index 3e9a6f3..c9d5169 100644 --- a/src/MultiSink.c +++ b/src/MultiSink.c @@ -880,7 +880,7 @@ MaxLines(Widget w, unsigned int height) * lines - number of lines * * Description: - * Finds the Minium height that will contain a given number lines. + * Finds the Minimum height that will contain a given number lines. * Returns: * The height */ diff --git a/src/MultiSrc.c b/src/MultiSrc.c index b4a123c..a9e84ba 100644 --- a/src/MultiSrc.c +++ b/src/MultiSrc.c @@ -515,8 +515,8 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos, * position - position to start scanning * type - type of thing to scan for * dir - direction to scan - * count - which occurance if this thing to search for - * include - whether or not to include the character found in + * count - which occurrence of this thing to search for + * include - whether or not to include the character found in * the position that is returned * * Description: @@ -526,8 +526,8 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos, * The position of the item found * * Note: - * While there are only 'n' characters in the file there are n+1 - * possible cursor positions (one before the first character and + * While there are only 'n' characters in the file there are n+1 + * possible cursor positions (one before the first character and * one after the last character */ static XawTextPosition @@ -584,7 +584,7 @@ Scan(Widget w, register XawTextPosition position, XawTextScanType type, if (ptr < piece->text) { piece = piece->prev; - if (piece == NULL) /* Begining of text */ + if (piece == NULL) /* Beginning of text */ return (0); ptr = piece->text + piece->used - 1; c = *ptr; @@ -671,7 +671,7 @@ Scan(Widget w, register XawTextPosition position, XawTextScanType type, * text - text block to search for * * Description: - * Searchs the text source for the text block passed. + * Searches the text source for the text block passed. * * Returns: * The position of the item found @@ -708,7 +708,7 @@ Search(Widget w, register XawTextPosition position, XawTextScanDirection dir, I'm being passed a string claiming to be 8bit chars (ie, MB text.) If that is the case, naturally I convert to 32bit format */ - /*if the block was FMT8BIT, length will convert to REAL wchar count bellow */ + /*if the block was FMT8BIT, length will convert to REAL wchar count below */ wtarget_len = text->length; if (text->format == XawFmtWide) @@ -752,7 +752,7 @@ Search(Widget w, register XawTextPosition position, XawTextScanDirection dir, cnt = (int)(piece->text - ptr); piece = piece->prev; - if (piece == NULL) { /* Begining of text */ + if (piece == NULL) { /* Beginning of text */ XtFree((char *)buf); return (XawTextSearchError); } @@ -877,7 +877,7 @@ XawMultiSrcGetValuesHook(Widget w, ArgList args, Cardinal *num_args) if (src->multi_src.use_string_in_place) *((char **)args[i].value) = (char *) src->multi_src.first_piece->text; - else if (_XawMultiSave(w)) /* If save sucessful */ + else if (_XawMultiSave(w)) /* If save successful */ *((char **)args[i].value) = (char *)src->multi_src.string; break; } @@ -1025,7 +1025,7 @@ _XawMultiSave(Widget w) * Save the current buffer as a file. * * Returns: - * True if the save was sucessful + * True if the save was successful * * Note: * The public interface is XawAsciiSaveAsFile! @@ -1078,10 +1078,10 @@ RemoveOldStringOrFile(MultiSrcObject src, Bool checkString) * name - name of the file * * Description: - * Write the string specified to the begining of the file specified. + * Write the string specified to the beginning of the file specified. * * Returns: - * Returns True if sucessful, False otherwise + * Returns True if successful, False otherwise */ static Bool WriteToFile(String string, String name) diff --git a/src/Paned.c b/src/Paned.c index 1cd5e4a..363c969 100644 --- a/src/Paned.c +++ b/src/Paned.c @@ -566,7 +566,7 @@ AdjustPanedSize(PanedWidget pw, unsigned int off_size, * * 1) size < max && size > min * 2) skip adjust == False - * 3) widget not its prefered height + * 3) widget not its preferred height * && this change will bring it closer * && The user has not resized this pane. * @@ -723,7 +723,7 @@ LoopAndRefigureChildren(PanedWidget pw, int paneindex, Direction dir, * dir - AnyPane. * * If either of these is true then all panes may be resized and - * the choosing of panes procedes in reverse order starting with the + * the choosing of panes proceeds in reverse order starting with the * last child. */ static void @@ -1822,7 +1822,7 @@ XawPanedChangeManaged(Widget w) if (HasGrip(*childP)) PaneInfo(pane->grip)->position = pw->paned.num_panes; - pane->position = pw->paned.num_panes; /* TEMPORY -CDP 3/89 */ + pane->position = pw->paned.num_panes; /* TEMPORARY -CDP 3/89 */ pw->paned.num_panes++; } else diff --git a/src/Scrollbar.c b/src/Scrollbar.c index 855013d..5bc8db9 100644 --- a/src/Scrollbar.c +++ b/src/Scrollbar.c @@ -807,7 +807,7 @@ EndScroll(Widget gw, XEvent *event _X_UNUSED, String *params _X_UNUSED, Cardinal ScrollbarWidget w = (ScrollbarWidget)gw; XtVaSetValues(gw, XtNcursor, w->scrollbar.inactiveCursor, NULL); - XFlush(XtDisplay(w)); /* make sure it get propogated */ + XFlush(XtDisplay(w)); /* make sure it get propagated */ w->scrollbar.direction = 0; } diff --git a/src/SimpleMenu.c b/src/SimpleMenu.c index 89711b9..4ac62a5 100644 --- a/src/SimpleMenu.c +++ b/src/SimpleMenu.c @@ -1087,7 +1087,7 @@ CreateLabel(Widget w) * about the return values, and just want a relayout. * * if this is not the case then it will set width_ret and height_ret - * to be width and height that the child would get if it were layed out + * to be width and height that the child would get if it were laid out * at this time. * * "w" can be the simple menu widget or any of its object children. @@ -1379,7 +1379,7 @@ PositionMenu(Widget w, XPoint *location) * * Description: * Actually moves the menu, may force it to - * to be fully visable if menu_on_screen is True. + * to be fully visible if menu_on_screen is True. */ static void MoveMenu(Widget w, int x, int y) @@ -134,7 +134,7 @@ WidgetClass smeObjectClass = (WidgetClass)&smeClassRec; * XawSmeClassPartInitialize * * Parameters: - * cclass - widget classs of this widget + * cclass - widget class of this widget * * Description: * Handles inheritance of class functions. @@ -186,7 +186,7 @@ XawSmeInitialize(Widget request _X_UNUSED, Widget cnew, * w - menu entry * * Description: - * Default highlight proceedure for menu entries. + * Default highlight procedure for menu entries. */ /*ARGSUSED*/ static void @@ -202,7 +202,7 @@ Highlight(Widget w _X_UNUSED) * w - menu entry * * Description: - * Default unhighlight proceedure for menu entries. + * Default unhighlight procedure for menu entries. */ /*ARGSUSED*/ static void @@ -218,7 +218,7 @@ Unhighlight(Widget w _X_UNUSED) * w - menu entry * * Description: - * Calls the callback proceedures for this entry. + * Calls the callback procedures for this entry. */ static void Notify(Widget w) diff --git a/src/StripChart.c b/src/StripChart.c index 96ae48d..942a7d5 100644 --- a/src/StripChart.c +++ b/src/StripChart.c @@ -297,7 +297,7 @@ XawStripChartDestroy(Widget gw) } /* - * NOTE: This function really needs to recieve graphics exposure + * NOTE: This function really needs to receive graphics exposure * events, but since this is not easily supported until R4 I am * going to hold off until then. */ @@ -925,7 +925,7 @@ XawTextInitialize(Widget request _X_UNUSED, Widget cnew, ctx->text.update = XmuNewScanline(0, 0, 0); ctx->text.gc = XtGetGC(cnew, 0, 0); ctx->text.hasfocus = False; - ctx->text.margin = ctx->text.r_margin; /* Strucure copy */ + ctx->text.margin = ctx->text.r_margin; /* Structure copy */ ctx->text.left_margin = ctx->text.r_margin.left; ctx->text.update_disabled = False; ctx->text.clear_to_eol = True; @@ -1095,7 +1095,7 @@ _XawTextGetText(TextWidget ctx, XawTextPosition left, XawTextPosition right) bytes = sizeof(unsigned char); else if (XawTextFormat(ctx, XawFmtWide)) bytes = sizeof(wchar_t); - else /* if there is another fomat, add here */ + else /* if there is another format, add here */ bytes = 1; /* leave space for ZERO */ @@ -1459,7 +1459,7 @@ _BuildLineTable(TextWidget ctx, XawTextPosition position, int line) * * Description: * Returns the width (in pixels) of the widest line that - * is currently visable. + * is currently visible. * * Returns: * The width of the widest line @@ -2824,8 +2824,8 @@ DisplayText(Widget w, XawTextPosition left, XawTextPosition right) /* * This routine implements multi-click selection in a hardwired manner. * It supports multi-click entity cycling (char, word, line, file) and mouse - * motion adjustment of the selected entitie (i.e. select a word then, with - * button still down, adjust wich word you really meant by moving the mouse). + * motion adjustment of the selected entity (i.e. select a word then, with + * button still down, adjust which word you really meant by moving the mouse). * [NOTE: This routine is to be replaced by a set of procedures that * will allows clients to implements a wide class of draw through and * multi-click selection user interfaces.] @@ -3289,7 +3289,7 @@ XawTextExpose(Widget w, XEvent *event, Region region) } /* - * This routine does all setup required to syncronize batched screen updates + * This routine does all setup required to synchronize batched screen updates */ void _XawTextPrepareToUpdate(TextWidget ctx) @@ -3802,7 +3802,7 @@ XawTextGetValuesHook(Widget w, ArgList args, Cardinal *num_args) * pos - any position * * Description: - * Returns a valid position given any postition. + * Returns a valid position given any position. * * Returns: * A position between (0 and lastPos) diff --git a/src/TextAction.c b/src/TextAction.c index 43d1d32..aabeffd 100644 --- a/src/TextAction.c +++ b/src/TextAction.c @@ -2822,7 +2822,7 @@ RedrawDisplay(Widget w, XEvent *event, String *p _X_UNUSED, Cardinal *n _X_UNUSE /* This is kind of a hack, but, only one text widget can have focus at * a time on one display. There is a problem in the implementation of the - * text widget, the scrollbars can not be adressed via editres, since they + * text widget, the scrollbars can not be addressed via editres, since they * are not children of a subclass of composite. * The focus variable is required to make sure only one text window will * show a block cursor at one time. @@ -2971,7 +2971,7 @@ TextLeaveWindow(Widget w, XEvent *event, String *params _X_UNUSED, Cardinal *num * Arguments: ctx - The text widget. * * Description: - * Breaks the line at the previous word boundry when + * Breaks the line at the previous word boundary when * called inside InsertChar. */ static void @@ -3201,7 +3201,7 @@ InsertChar(Widget w, XEvent *event, String *p _X_UNUSED, Cardinal *n _X_UNUSED) * * i18n requires the ability to specify multiple characters in a hexa- * decimal string at once. Since Insert was already too long, I made - * this a seperate routine. + * this a separate routine. * * A legal hex string in MBNF: '0' 'x' ( HEX-DIGIT HEX-DIGIT )+ '\0' * @@ -3259,7 +3259,7 @@ IfHexConvertHexElseReturnParam(char *param, int *len_return) } } - /* We quit the above loop becasue we hit a non hex. If that char is \0... */ + /* We quit the above loop because we hit a non hex. If that char is \0... */ if ((c == '\0') && first_digit) { *len_return = (int)strlen(hexval); return (hexval); /* ...it was a legal hex string, so return it */ @@ -4130,7 +4130,7 @@ NoOp(Widget w, XEvent *event _X_UNUSED, String *params, Cardinal *num_params) case 'R': case 'r': XBell(XtDisplay(w), 0); - /*FALLTROUGH*/ + /*FALLTHROUGH*/ default: break; } diff --git a/src/TextPop.c b/src/TextPop.c index 3f942aa..9bf35ee 100644 --- a/src/TextPop.c +++ b/src/TextPop.c @@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group. * used by all more than one of these dialogs. * * The following functions are the only non-static ones defined - * in this module. They are located at the begining of the + * in this module. They are located at the beginning of the * section that contains this dialog box that uses them. * * void _XawTextInsertFileAction(w, event, params, num_params); @@ -296,7 +296,7 @@ DoInsert(Widget w, XtPointer closure, XtPointer call_data) * Inserts a file into the text widget. * * Returns: - * True if the insert was sucessful, False otherwise. + * True if the insert was successful, False otherwise. */ static Bool InsertFileNamed(Widget tw, String str) @@ -417,7 +417,7 @@ AddInsertFileChildren(Widget form, String ptr, Widget tw) * will search for a string in the main Text Widget. * * Note: - * If the search was sucessful and the argument popdown is passed to + * If the search was successful and the argument popdown is passed to * this action routine then the widget will automatically popdown the * search widget */ @@ -515,7 +515,7 @@ SearchButton(Widget w _X_UNUSED, XtPointer closure, XtPointer call_data _X_UNUSE * * First Entry: * The first entry is the direction to search by default. - * This arguement must be specified and may have a value of + * This argument must be specified and may have a value of * "left" or "right". * * Second Entry: @@ -547,7 +547,7 @@ _XawTextSearch(Widget w, XEvent *event, String *params, Cardinal *num_params) ptr = params[1]; else if (XawTextFormat(ctx, XawFmtWide)) { /* This just does the equivalent of - ptr = ""L, a waste because params[1] isnt W aligned */ + ptr = ""L, a waste because params[1] isn't W aligned */ ptr = (char *)wcs; wcs[0] = 0; } @@ -601,7 +601,7 @@ _XawTextSearch(Widget w, XEvent *event, String *params, Cardinal *num_params) * * Description: * This function initializes the search widget and - * is called each time the search widget is poped up. + * is called each time the search widget is popped up. */ static void InitializeSearchWidget(struct SearchAndReplace *search, @@ -830,7 +830,7 @@ AddSearchChildren(Widget form, String ptr, Widget tw) * Performs a search * * Returns: - * True if sucessful + * True if successful */ /*ARGSUSED*/ static Bool @@ -1256,7 +1256,7 @@ _SetField(Widget cnew, Widget old) * name of the child and the shell widget of the dialog. * * Returns: - * True if sucessful + * True if successful */ static Bool SetResourceByName(Widget shell, String name, String res_name, XtArgVal value) diff --git a/src/TextSink.c b/src/TextSink.c index bb6b0f2..40442e9 100644 --- a/src/TextSink.c +++ b/src/TextSink.c @@ -364,7 +364,7 @@ XawTextSinkSetValues(Widget current, Widget request _X_UNUSED, Widget cnew, * y - "" * pos1 - location of starting and ending points in the text buffer * pos2 - "" - * highlight - hightlight this text? + * highlight - highlight this text? * * Description: * Stub function that in subclasses will display text. @@ -475,7 +475,7 @@ FindPosition(Widget w _X_UNUSED, XawTextPosition fromPos _X_UNUSED, int fromx _X * fromX - x location of starting Position * toPos - end Position * resWidth - Distance between fromPos and toPos - * resPos - Acutal toPos used + * resPos - Actual toPos used * resHeight - Height required by this text * * Description: @@ -503,7 +503,7 @@ FindDistance(Widget w _X_UNUSED, XawTextPosition fromPos, int fromx _X_UNUSED, * resPos - resulting position * * Description: - * Resloves a location to a position. + * Resolves a location to a position. */ /*ARGSUSED*/ static void @@ -549,7 +549,7 @@ MaxLines(Widget w _X_UNUSED, unsigned int height _X_UNUSED) * lines - number of lines * * Description: - * Finds the Minium height that will contain a given number lines. + * Finds the Minimum height that will contain a given number lines. * * Returns: * the height @@ -610,7 +610,7 @@ GetCursorBounds(Widget w _X_UNUSED, XRectangle *rect) * y - "" * pos1 - location of starting and ending points in the text buffer * pos2 - "" - * highlight - hightlight this text? + * highlight - highlight this text? */ /*ARGSUSED*/ void @@ -750,7 +750,7 @@ XawTextSinkFindPosition(Widget w, XawTextPosition fromPos, int fromx, int width, * fromX - x location of starting Position * toPos - end Position * resWidth - Distance between fromPos and toPos - * resPos - Acutal toPos used + * resPos - Actual toPos used * resHeight - Height required by this text * * Description: @@ -780,7 +780,7 @@ XawTextSinkFindDistance(Widget w, XawTextPosition fromPos, int fromx, * resPos - resulting position * * Description: - * Resloves a location to a position. + * Resolves a location to a position. */ /*ARGSUSED*/ void @@ -828,7 +828,7 @@ XawTextSinkMaxLines(Widget w, Dimension height) * lines - number of lines * * Description: - * Finds the Minium height that will contain a given number lines. + * Finds the Minimum height that will contain a given number lines. * * Returns: * the height diff --git a/src/TextSrc.c b/src/TextSrc.c index 0a9db66..adea9b3 100644 --- a/src/TextSrc.c +++ b/src/TextSrc.c @@ -399,7 +399,7 @@ XawTextSrcSetValues(Widget current _X_UNUSED, Widget request _X_UNUSED, Widget c * * Parameters: * w - TextSrc Object - * pos - position of the text to retreive + * pos - position of the text to retrieve * text - text block that will contain returned text * length - maximum number of characters to read * @@ -446,8 +446,8 @@ Replace(Widget w _X_UNUSED, XawTextPosition startPos _X_UNUSED, XawTextPosition * position - position to start scanning * type - type of thing to scan for * dir - direction to scan - * count - which occurance if this thing to search for - * include - whether or not to include the character found in + * count - which occurrence 0f this thing to search for + * include - whether or not to include the character found in * the position that is returned * * Description: @@ -472,7 +472,7 @@ Scan(Widget w _X_UNUSED, XawTextPosition position _X_UNUSED, XawTextScanType typ * text - the text block to search for * * Description: - * Searchs the text source for the text block passed + * Searches the text source for the text block passed */ /*ARGSUSED*/ static XawTextPosition @@ -690,7 +690,7 @@ _XawSourceSetUndoErase(TextSrcObject src, int value) } /* - * To diferentiate insert-char's separeted by cursor movements. + * To differentiate insert-char's separated by cursor movements. */ void _XawSourceSetUndoMerge(TextSrcObject src, Bool state) @@ -1399,7 +1399,7 @@ UndoGC(XawTextUndo *undo) * position - position to start scanning * type - type of thing to scan for * dir - direction to scan - * count - which occurance if this thing to search for + * count - which occurrence if this thing to search for * include - whether or not to include the character found in * the position that is returned. * @@ -1439,7 +1439,7 @@ XawTextSourceScan(Widget w, XawTextPosition position, * The position of the text we are searching for or XawTextSearchError. * * Description: - * Searchs the text source for the text block passed + * Searches the text source for the text block passed */ XawTextPosition XawTextSourceSearch(Widget w, XawTextPosition position, @@ -1463,7 +1463,7 @@ XawTextSourceSearch(Widget w, XawTextPosition position, * w - TextSrc object * selection - current selection atom * target - current target atom - * type - type to conver the selection to + * type - type to convert the selection to * value - return value that has been converted * length - "" * format - format of the returned value @@ -1489,7 +1489,7 @@ XawTextSourceConvertSelection(Widget w, Atom *selection, Atom *target, * Parameters: * w - TextSrc object * left - bounds of the selection - * rigth - "" + * right - "" * selection - selection atom * * Description: @@ -1522,7 +1522,7 @@ _XawTextFormat(TextWidget tw) * The caller is responsible for freeing both the source and ret string * * wstr - source wchar string - * len_in_out - lengh of string. + * len_in_out - length of string. * As In, length of source wchar string, measured in wchar * As Out, length of returned string */ @@ -1548,7 +1548,7 @@ _XawTextWCToMB(Display *d, wchar_t *wstr, int *len_in_out) * The caller is responsible for freeing both the source and ret string. * * str - source string - * len_in_out - lengh of string + * len_in_out - length of string * As In, it is length of source string * As Out, it is length of returned string, measured in wchar */ diff --git a/src/Toggle.c b/src/Toggle.c index 9b93d41..eb6281d 100644 --- a/src/Toggle.c +++ b/src/Toggle.c @@ -179,7 +179,7 @@ ToggleClassRec toggleClassRec = { WidgetClass toggleWidgetClass = (WidgetClass)&toggleClassRec; /* - * Impelementation + * Implementation */ static void XawToggleClassInitialize(void) @@ -248,10 +248,10 @@ XawToggleInitialize(Widget request, Widget cnew, * have to handle the case where it needs to be set * * If this widget is in a radio group then it may cause another - * widget to be unset, thus calling the notify proceedure + * widget to be unset, thus calling the notify procedure * * I want to set the toggle if the user set the state to "On" in - * the resource group, reguardless of what my ancestors did + * the resource group, regardless of what my ancestors did */ if (tw_req->command.set) ToggleSet(cnew, NULL, NULL, NULL); diff --git a/src/Viewport.c b/src/Viewport.c index 893c8bf..9256ffa 100644 --- a/src/Viewport.c +++ b/src/Viewport.c @@ -707,7 +707,7 @@ ComputeLayout(Widget widget, Bool query, Bool destroy_scrollbars) * Parameters: * widget - viewport widget * query - whether or not to query the child - * intended - cache of the childs height is stored here + * intended - cache of the child's height is stored here * (used and returned) * clip_width - size of clip window (used and returned) * clip_height - "" diff --git a/src/XawIm.c b/src/XawIm.c index 1c733cd..db0f3e8 100644 --- a/src/XawIm.c +++ b/src/XawIm.c @@ -357,7 +357,7 @@ DestroyAllIM(XawVendorShellExtPart *ve) contextErrDataRec *contextErrData; /* - * Destory all ICs + * Destroy all ICs */ if (IsSharedIC(ve)) { if ((p = ve->ic.shared_ic_table) && p->xic) { |