diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | app-defaults/Editres | 4 | ||||
| -rw-r--r-- | comm.c | 9 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | editres.c | 2 | ||||
| -rw-r--r-- | editresP.h | 8 | ||||
| -rw-r--r-- | geometry.c | 2 | ||||
| -rw-r--r-- | handler.c | 18 | ||||
| -rw-r--r-- | setvalues.c | 2 | ||||
| -rw-r--r-- | svpopup.c | 2 | ||||
| -rw-r--r-- | utils.c | 10 | ||||
| -rw-r--r-- | widgets.c | 8 | ||||
| -rw-r--r-- | wtree.c | 6 |
13 files changed, 37 insertions, 38 deletions
@@ -25,7 +25,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/app/editres diff --git a/app-defaults/Editres b/app-defaults/Editres index 8907299..e9ddd90 100644 --- a/app-defaults/Editres +++ b/app-defaults/Editres @@ -96,7 +96,7 @@ Editres.Geometry: 500x568 *xt*label7: Unable to own the Resource Selection *xt*label12: Widget Tree for client %s(%s). *xt*label14: Click on any widget in the client.\nEditres will select that widget in the tree display. -*xt*label17: No widget Tree is avaliable. +*xt*label17: No widget Tree is available. *xt*label19: This function requires exactly one (1) widget to be selected. *xt*label23: There are no currently active widgets. *xt*label27: There is no widget tree to display. @@ -107,7 +107,7 @@ Editres.Geometry: 500x568 *iv*label7: Unable to own the Attribute Selection *iv*label12: Style Tree for client %s(%s). *iv*label14: Click on any style in the client.\nEditres will select that style in the tree display. -*iv*label17: No style Tree is avaliable. +*iv*label17: No style Tree is available. *iv*label19: This function requires exactly one (1) style to be selected. *iv*label23: There are no currently active styles. *iv*label27: There is no style tree to display. @@ -318,7 +318,7 @@ ConvertCommand(Widget w, Atom *selection, Atom *target, Atom *type_ret, static void SelectionDone(Widget w, Atom *sel, Atom *targ) { - /* Keep the toolkit from automaticaly freeing the selection value */ + /* Keep the toolkit from automatically freeing the selection value */ } @@ -427,8 +427,8 @@ GetClientValue(Widget w, XtPointer data, Atom *selection, Atom *type, case ProtocolMismatch: error_str = ProtocolFailure(stream); --global_effective_protocol_version; - /* normaly protocol version is reset to current during a SendWidgetTree - * request, however, after a protocol failure this is skiped once for + /* normally protocol version is reset to current during a SendWidgetTree + * request, however, after a protocol failure this is skipped once for * a retry. */ reset_protocol_level = False; @@ -686,7 +686,7 @@ BuildEvent(ProtocolStream *stream) goto done; } else { - if (!(_XEditResGetBoolean(stream, &(info->visable)) && + if (!(_XEditResGetBoolean(stream, &(info->visible)) && _XEditResGetSigned16(stream, &(info->x)) && _XEditResGetSigned16(stream, &(info->y)) && _XEditResGet16(stream, &(info->width)) && @@ -924,4 +924,3 @@ GetNewIdent(void) return(ident++); } - diff --git a/configure.ac b/configure.ac index 42dab59..81fe3bf 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,7 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -# Obtain compiler/linker options from depedencies +# Obtain compiler/linker options from dependencies PKG_CHECK_MODULES(EDITRES, [xaw7 x11 xt >= 1.0.99.1 xmu xproto >= 7.0.17]) PKG_CHECK_MODULES(APPDEFS, xt) @@ -132,7 +132,7 @@ main(int argc, char **argv) * Description: Prints a the calling syntax for this function to stdout. * Arguments: app_con - the application context. * call - the name of the application. - * Returns: none - exits tho. + * Returns: none - exits though. */ static void @@ -95,13 +95,13 @@ typedef struct _NameInfo { typedef struct _ResourceBoxInfo { Widget value_wid; /* The string containing the value. */ - Widget res_label; /* The label containing current resoruce. */ + Widget res_label; /* The label containing current resource. */ Widget shell; /* Shell widget containing resource box. */ Widget norm_list; /* The List widget for the normal list. */ Widget cons_list; /* The List widget for the Constriaint Resources */ NameInfo * name_info; /* The info about the widgets for each - name and class in the instance heirarchy. */ + name and class in the instance hierarchy. */ } ResourceBoxInfo; typedef struct _WidgetResourceInfo { @@ -132,7 +132,7 @@ typedef struct _WNode { */ typedef struct _AnyInfo { - WNode * node; /* A Pointer off to the node corrsponding to + WNode * node; /* A Pointer off to the node corresponding to this resource box. */ Widget left_dot, left_star; /* The dot and star widgets to our left. */ Widget right_dot, right_star; /* The dot and star widgets to our right. */ @@ -279,7 +279,7 @@ typedef struct _GetGeomInfo { WidgetInfo widgets; Boolean error; char * message; - Boolean visable; + Boolean visible; short x, y; unsigned short width, height, border_width; } GetGeomInfo; @@ -204,7 +204,7 @@ AddToFlashList(TreeInfo *tree_info, GetGeomInfo *geom_info, char **errors) return; } - if (!geom_info->visable) { + if (!geom_info->visible) { snprintf(buf, sizeof(buf), "%s(0x%lx) - This widget is not mapped\n", node->name, node->id); AddString(errors, buf); @@ -216,7 +216,7 @@ PortholeCallback(Widget w, XtPointer panner_ptr, XtPointer report_ptr) } /* Function Name: FlashActiveWidgets - * Description: called to flass all active widgets in the display. + * Description: called to flash all active widgets in the display. * Arguments: *** NOT USED *** * Returns: none. */ @@ -265,7 +265,7 @@ GetResourceList(Widget w, XtPointer junk, XtPointer garbage) } /* - * No resoruces, fetch them from the client. + * No resources, fetch them from the client. */ _XEditResResetStream(stream); @@ -414,7 +414,7 @@ ActivateWidgetsAndSetResourceString(Widget w, * Description: Sets the resource label to correspond to the currently * chosen string. * Arguments: w - The widget that invoked this callback, or NULL. - * node_ptr - pointer to widget node contating this res box. + * node_ptr - pointer to widget node containing this res box. * call_data - The call data for the action that invoked * this callback. * Returns: none. @@ -489,12 +489,12 @@ SetResourceString(Widget w, XtPointer node_ptr, XtPointer junk) /* Function Name: ResourceListCallback * Description: Callback functions for the resource lists. This - * routine is essentialy called by the list widgets + * routine is essentially called by the list widgets * Notify action. If action EnableGetVal has been * invoked, ResourceListCallback will perform a * GetValues protocol request. * Arguments: list - the list widget that we are dealing with. - * node_ptr - pointer to widget node contating this res box. + * node_ptr - pointer to widget node containing this res box. * junk - UNUSED. * Returns: none */ @@ -655,7 +655,7 @@ SetFile(Widget w, XtPointer junk, XtPointer garbage) * Description: Apply the current resource to the running application. * Arguments: w - any widget in the application. * node_ptr - a pointer to the node containing - * the current resouce box. + * the current resource box. * junk - UNUSED. * Returns: none */ @@ -700,7 +700,7 @@ ApplyResource(Widget w, XtPointer node_ptr, XtPointer junk) len = stream->current - stream->top; /* - * Insert the widget count, overriden later. + * Insert the widget count, overridden later. */ _XEditResPut16(stream, 0); @@ -724,7 +724,7 @@ ApplyResource(Widget w, XtPointer node_ptr, XtPointer junk) /* Function Name: ObtainResource * Description: Obtain the current resource from the running application. * Arguments: node_ptr - a pointer to the node containing - * the current resouce box. + * the current resource box. * Returns: none */ @@ -873,7 +873,7 @@ ActivateResourceWidgets(Widget w, XtPointer node_ptr, XtPointer junk) /* Function Name: SetOnlyMatchingWidgets * Description: Activates all widgets in the tree that match this - * resource specifiction. + * resource specification. * Arguments: node - the current node. * info_ptr - the pointer to the apply info. * Returns: none diff --git a/setvalues.c b/setvalues.c index 441d7ac..95df80b 100644 --- a/setvalues.c +++ b/setvalues.c @@ -96,7 +96,7 @@ GetResourceValueForSetValues(WNode *node, unsigned short *size) /* * This makes sure that exactly the same thing happens during a set - * values, that would happend of we were to insert this value into + * values, that would happen if we were to insert this value into * the resource database. */ @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ #include <X11/Intrinsic.h> -#include <X11/StringDefs.h> /* Get standard string definations. */ +#include <X11/StringDefs.h> /* Get standard string definitions. */ #include <X11/Xatom.h> #include <X11/cursorfont.h> #include <X11/Shell.h> @@ -65,7 +65,7 @@ SetMessage(Widget w, String str) } /* Function Name: GetAllStrings - * Description: Returns a list of strings that have been borken up by + * Description: Returns a list of strings that have been broken up by * the character specified. * Arguments: in - the string to parse. * sep - the separator character. @@ -428,7 +428,7 @@ PopupCentered(XEvent *event, Widget w, XtGrabKind mode) /* Function Name: _PopdownFileDialog * Description: Destroys the file dialog, and calls the correct function. * Arguments: w - a child of the dialog widget. - * client_data - TRUE if command was sucessful. + * client_data - TRUE if command was successful. * junk - ** UNUSED **. * Returns: none. */ @@ -689,7 +689,7 @@ AddResource(ResourceInfo *res_info, WidgetResourceInfo *resource) /* Function Name: FreeResources - * Description: frees the resource inforation. + * Description: frees the resource information. * Arguments: resources. * Returns: none. */ @@ -724,7 +724,7 @@ FreeResources(WidgetResources *resources) /* Function Name: CheckDatabase * Description: Checks to see if the node is in the database. * Arguments: db - the db to check - * names, clases - names and clases, represented as quarks. + * names, classes - names and classes, represented as quarks. * Returns: True if this entry is found. */ @@ -738,7 +738,7 @@ CheckDatabase(XrmDatabase db, XrmQuarkList names, XrmQuarkList classes) } /* Function Name: Quarkify - * Description: Quarkifies the string list specifed. + * Description: Quarkifies the string list specified. * Arguments: list - list of strings to quarkify * ptr - an additional string to quarkify. * Returns: none. @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. #include <stdio.h> #include <X11/Intrinsic.h> -#include <X11/StringDefs.h> /* Get standard string definations. */ +#include <X11/StringDefs.h> /* Get standard string definitions. */ #include <X11/Xaw/AsciiText.h> #include <X11/Xaw/Box.h> @@ -73,7 +73,7 @@ static void FreeResBox ( Widget w, XtPointer ptr, XtPointer junk ); /* Function Name: RebuildMenusAndLabel - * Description: Determins if the user has selected an application + * Description: Determines if the user has selected an application * which uses a different toolkit. Xt is the default. * If this is so, destroys and recreates the menus and * information label at the top of the application. @@ -310,7 +310,7 @@ CreateCommandMenu(Widget parent, String toolkit) /* Function Name: CreateTreeCommandMenu - * Description: Creats the command menu. + * Description: Creates the command menu. * Arguments: parent - widget to put this menu into. * Returns: none. */ @@ -407,7 +407,7 @@ CreateTreeCommandMenu(Widget parent, String toolkit) static Pixmap old_pixmap; /* Function Name: PrepareToLayoutTree - * Description: prepares the Tree widget to be layed out. + * Description: prepares the Tree widget to be laid out. * Arguments: tree - the Tree widget. * Returns: none */ @@ -343,7 +343,7 @@ _TreeSelect(TreeInfo *tree_info, SelectTypes type) } /* Function Name: _TreeSelectNode - * Description: Modifies the state of a node and all its decendants. + * Description: Modifies the state of a node and all its descendants. * Arguments: node - node to operate on. * type - type of selection to perform. * recurse - whether to continue on down the tree. @@ -388,7 +388,7 @@ _TreeSelectNode(WNode *node, SelectTypes type, Boolean recurse) } /* Function Name: _TreeRelabelNodes - * Description: Modifies the node and all its decendants label. + * Description: Modifies the node and all its descendants label. * Arguments: node - node to operate on. * type - type of selection to perform. * recurse - whether to continue on down the tree. @@ -448,7 +448,7 @@ _TreeRelabelNode(WNode *node, LabelTypes type, Boolean recurse) } /* Function Name: _TreeActivateNode - * Description: Activates relatives of the node specfied, as specified + * Description: Activates relatives of the node specified, as specified * by type. * Arguments: node - node to opererate on. * type - type of activate to invode. |