xquartz: Apply spell check fixes from master for easier cherry-picking of changes in xquartz
See also: 23e83724df
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
parent
67f25cc187
commit
1edc9b980b
|
@ -369,7 +369,7 @@ handleDepthModes(struct glCapabilitiesConfig *c, GLint dmodes)
|
||||||
assert(c->total_depth_buffer_depths < GLCAPS_DEPTH_BUFFERS);
|
assert(c->total_depth_buffer_depths < GLCAPS_DEPTH_BUFFERS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return non-zero if an error occured. */
|
/* Return non-zero if an error occurred. */
|
||||||
static CGLError
|
static CGLError
|
||||||
handleRendererDescriptions(CGLRendererInfoObj info, GLint r,
|
handleRendererDescriptions(CGLRendererInfoObj info, GLint r,
|
||||||
struct glCapabilitiesConfig *c)
|
struct glCapabilitiesConfig *c)
|
||||||
|
@ -521,7 +521,7 @@ freeGlCapabilities(struct glCapabilities *cap)
|
||||||
cap->configurations = NULL;
|
cap->configurations = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*Return true if an error occured. */
|
/* Return true if an error occurred. */
|
||||||
bool
|
bool
|
||||||
getGlCapabilities(struct glCapabilities *cap)
|
getGlCapabilities(struct glCapabilities *cap)
|
||||||
{
|
{
|
||||||
|
@ -566,6 +566,6 @@ getGlCapabilities(struct glCapabilities *cap)
|
||||||
|
|
||||||
CGLDestroyRendererInfo(info);
|
CGLDestroyRendererInfo(info);
|
||||||
|
|
||||||
/* No error occured. We are done. */
|
/* No error occurred. We are done. */
|
||||||
return kCGLNoError;
|
return kCGLNoError;
|
||||||
}
|
}
|
||||||
|
|
|
@ -114,7 +114,7 @@ _gl_convert_to_x_visual_type(int visualType)
|
||||||
/**
|
/**
|
||||||
* Copy a GLX visual config structure to a GL context mode structure. All
|
* Copy a GLX visual config structure to a GL context mode structure. All
|
||||||
* of the fields in \c config are copied to \c mode. Additional fields in
|
* of the fields in \c config are copied to \c mode. Additional fields in
|
||||||
* \c mode that can be derrived from the fields of \c config (i.e.,
|
* \c mode that can be derived from the fields of \c config (i.e.,
|
||||||
* \c haveDepthBuffer) are also filled in. The remaining fields in \c mode
|
* \c haveDepthBuffer) are also filled in. The remaining fields in \c mode
|
||||||
* that cannot be derived are set to default values.
|
* that cannot be derived are set to default values.
|
||||||
*
|
*
|
||||||
|
@ -408,10 +408,10 @@ _gl_get_context_mode_data(const __GLcontextModes *mode, int attribute,
|
||||||
* \param count Number of structures to allocate.
|
* \param count Number of structures to allocate.
|
||||||
* \param minimum_size Minimum size of a structure to allocate. This allows
|
* \param minimum_size Minimum size of a structure to allocate. This allows
|
||||||
* for differences in the version of the
|
* for differences in the version of the
|
||||||
* \c __GLcontextModes stucture used in libGL and in a
|
* \c __GLcontextModes structure used in libGL and in a
|
||||||
* DRI-based driver.
|
* DRI-based driver.
|
||||||
* \returns A pointer to the first element in a linked list of \c count
|
* \returns A pointer to the first element in a linked list of \c count
|
||||||
* stuctures on success, or \c NULL on failure.
|
* structures on success, or \c NULL on failure.
|
||||||
*
|
*
|
||||||
* \warning Use of \c minimum_size does \b not guarantee binary compatibility.
|
* \warning Use of \c minimum_size does \b not guarantee binary compatibility.
|
||||||
* The fundamental assumption is that if the \c minimum_size
|
* The fundamental assumption is that if the \c minimum_size
|
||||||
|
@ -469,7 +469,7 @@ _gl_context_modes_create(unsigned count, size_t minimum_size)
|
||||||
* Destroy a linked list of \c __GLcontextModes structures created by
|
* Destroy a linked list of \c __GLcontextModes structures created by
|
||||||
* \c _gl_context_modes_create.
|
* \c _gl_context_modes_create.
|
||||||
*
|
*
|
||||||
* \param modes Linked list of structures to be destroyed. All structres
|
* \param modes Linked list of structures to be destroyed. All structures
|
||||||
* in the list will be freed.
|
* in the list will be freed.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
IBOutlet NSMenuItem *window_separator;
|
IBOutlet NSMenuItem *window_separator;
|
||||||
// window_separator is DEPRECATED due to this radar:
|
// window_separator is DEPRECATED due to this radar:
|
||||||
// <rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
|
// <rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
|
||||||
// It is kept around for localization compatability and is subject to removal "eventually"
|
// It is kept around for localization compatibility and is subject to removal "eventually"
|
||||||
// If it is !NULL (meaning it is in the nib), it is removed from the menu and released
|
// If it is !NULL (meaning it is in the nib), it is removed from the menu and released
|
||||||
|
|
||||||
IBOutlet NSMenuItem *x11_about_item;
|
IBOutlet NSMenuItem *x11_about_item;
|
||||||
|
@ -83,7 +83,7 @@
|
||||||
IBOutlet NSMenuItem *apps_separator;
|
IBOutlet NSMenuItem *apps_separator;
|
||||||
IBOutlet NSMenuItem *toggle_fullscreen_item;
|
IBOutlet NSMenuItem *toggle_fullscreen_item;
|
||||||
#ifdef XQUARTZ_SPARKLE
|
#ifdef XQUARTZ_SPARKLE
|
||||||
NSMenuItem *check_for_updates_item; // Programatically enabled
|
NSMenuItem *check_for_updates_item; // Programmatically enabled
|
||||||
#endif
|
#endif
|
||||||
IBOutlet NSMenuItem *copy_menu_item;
|
IBOutlet NSMenuItem *copy_menu_item;
|
||||||
IBOutlet NSMenu *dock_apps_menu;
|
IBOutlet NSMenu *dock_apps_menu;
|
||||||
|
|
|
@ -750,7 +750,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
|
||||||
|
|
||||||
if (!strcmp(argv[i], "-fakemouse2")) {
|
if (!strcmp(argv[i], "-fakemouse2")) {
|
||||||
if (i == argc - 1) {
|
if (i == argc - 1) {
|
||||||
FatalError("-fakemouse2 must be followed by a modifer list\n");
|
FatalError("-fakemouse2 must be followed by a modifier list\n");
|
||||||
}
|
}
|
||||||
if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], ""))
|
if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], ""))
|
||||||
darwinFakeMouse2Mask = 0;
|
darwinFakeMouse2Mask = 0;
|
||||||
|
@ -763,7 +763,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
|
||||||
|
|
||||||
if (!strcmp(argv[i], "-fakemouse3")) {
|
if (!strcmp(argv[i], "-fakemouse3")) {
|
||||||
if (i == argc - 1) {
|
if (i == argc - 1) {
|
||||||
FatalError("-fakemouse3 must be followed by a modifer list\n");
|
FatalError("-fakemouse3 must be followed by a modifier list\n");
|
||||||
}
|
}
|
||||||
if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], ""))
|
if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], ""))
|
||||||
darwinFakeMouse3Mask = 0;
|
darwinFakeMouse3Mask = 0;
|
||||||
|
|
2
hw/xquartz/mach-startup/.gitignore
vendored
2
hw/xquartz/mach-startup/.gitignore
vendored
|
@ -1,4 +1,4 @@
|
||||||
# Add & Override for this directory and it's subdirectories
|
# Add & Override for this directory and its subdirectories
|
||||||
mach_startup.h
|
mach_startup.h
|
||||||
mach_startupServer.c
|
mach_startupServer.c
|
||||||
mach_startupServer.h
|
mach_startupServer.h
|
||||||
|
|
|
@ -778,7 +778,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
|
||||||
[self send_reply:&reply];
|
[self send_reply:&reply];
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return nil if an error occured. */
|
/* Return nil if an error occurred. */
|
||||||
/* DO NOT retain the encdata for longer than the length of an event response.
|
/* DO NOT retain the encdata for longer than the length of an event response.
|
||||||
* The autorelease pool will reuse/free it.
|
* The autorelease pool will reuse/free it.
|
||||||
*/
|
*/
|
||||||
|
@ -809,8 +809,8 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
|
||||||
return encdata;
|
return encdata;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return YES when an error has occured when trying to send the PICT. */
|
/* Return YES when an error has occurred when trying to send the PICT. */
|
||||||
/* The caller should send a default reponse with a property of None when an error occurs. */
|
/* The caller should send a default response with a property of None when an error occurs. */
|
||||||
- (BOOL) send_image_pict_reply:(XSelectionRequestEvent *)e
|
- (BOOL) send_image_pict_reply:(XSelectionRequestEvent *)e
|
||||||
pasteboard:(NSPasteboard *)pb
|
pasteboard:(NSPasteboard *)pb
|
||||||
type:(NSBitmapImageFileType)imagetype
|
type:(NSBitmapImageFileType)imagetype
|
||||||
|
@ -857,7 +857,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
|
||||||
return NO; /*no error*/
|
return NO; /*no error*/
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return YES if an error occured. */
|
/* Return YES if an error occurred. */
|
||||||
/* The caller should send a reply with a property of None when an error occurs. */
|
/* The caller should send a reply with a property of None when an error occurs. */
|
||||||
- (BOOL) send_image_tiff_reply:(XSelectionRequestEvent *)e
|
- (BOOL) send_image_tiff_reply:(XSelectionRequestEvent *)e
|
||||||
pasteboard:(NSPasteboard *)pb
|
pasteboard:(NSPasteboard *)pb
|
||||||
|
@ -1040,7 +1040,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete,
|
||||||
if (get_property(e->requestor, e->property, &pdata, /*Delete*/ True,
|
if (get_property(e->requestor, e->property, &pdata, /*Delete*/ True,
|
||||||
&type)) {
|
&type)) {
|
||||||
/*
|
/*
|
||||||
* An error occured, so we should invoke the copy_completed:, but
|
* An error occurred, so we should invoke the copy_completed:, but
|
||||||
* not handle_selection:type:propdata:
|
* not handle_selection:type:propdata:
|
||||||
*/
|
*/
|
||||||
[self copy_completed:e->selection];
|
[self copy_completed:e->selection];
|
||||||
|
|
|
@ -453,7 +453,7 @@ xprSetupScreen(int index, ScreenPtr pScreen)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* xprUpdateScreen
|
* xprUpdateScreen
|
||||||
* Update screen after configuation change.
|
* Update screen after configuration change.
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
xprUpdateScreen(ScreenPtr pScreen)
|
xprUpdateScreen(ScreenPtr pScreen)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user