Merge remote branch 'jeremyhu/master'
This commit is contained in:
commit
57cb1a854a
|
@ -98,8 +98,6 @@ void __glXDisp_CallLists(GLbyte * pc)
|
||||||
const GLenum type = *(GLenum *)(pc + 4);
|
const GLenum type = *(GLenum *)(pc + 4);
|
||||||
const GLvoid * lists = (const GLvoid *)(pc + 8);
|
const GLvoid * lists = (const GLvoid *)(pc + 8);
|
||||||
|
|
||||||
lists = (const GLvoid *) (pc + 8);
|
|
||||||
|
|
||||||
CALL_CallLists( GET_DISPATCH(), (
|
CALL_CallLists( GET_DISPATCH(), (
|
||||||
n,
|
n,
|
||||||
type,
|
type,
|
||||||
|
|
|
@ -525,8 +525,7 @@ bool getGlCapabilities(struct glCapabilities *cap) {
|
||||||
|
|
||||||
conf = malloc(sizeof(*conf));
|
conf = malloc(sizeof(*conf));
|
||||||
if(NULL == conf) {
|
if(NULL == conf) {
|
||||||
perror("malloc");
|
FatalError("Unable to allocate memory for OpenGL capabilities\n");
|
||||||
OsAbort();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Copy the struct. */
|
/* Copy the struct. */
|
||||||
|
|
|
@ -602,7 +602,7 @@ void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* OsVendorFataError
|
* OsVendorFatalError
|
||||||
*/
|
*/
|
||||||
void OsVendorFatalError( void )
|
void OsVendorFatalError( void )
|
||||||
{
|
{
|
||||||
|
@ -760,7 +760,7 @@ void ddxUseMsg( void )
|
||||||
*/
|
*/
|
||||||
void ddxGiveUp( void )
|
void ddxGiveUp( void )
|
||||||
{
|
{
|
||||||
ErrorF( "Quitting Xquartz...\n" );
|
ErrorF( "Quitting Xquartz\n" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -773,11 +773,7 @@ void ddxGiveUp( void )
|
||||||
void AbortDDX( void )
|
void AbortDDX( void )
|
||||||
{
|
{
|
||||||
ErrorF( " AbortDDX\n" );
|
ErrorF( " AbortDDX\n" );
|
||||||
/*
|
OsAbort();
|
||||||
* This is needed for a abnormal server exit, since the normal exit stuff
|
|
||||||
* MUST also be performed (i.e. the vt must be left in a defined state)
|
|
||||||
*/
|
|
||||||
ddxGiveUp();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "mivalidate.h" // for union _Validate used by windowstr.h
|
#include "mivalidate.h" // for union _Validate used by windowstr.h
|
||||||
|
|
|
@ -73,10 +73,11 @@ extern int noPanoramiXExtension;
|
||||||
#define XSERVER_VERSION "?"
|
#define XSERVER_VERSION "?"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const int __crashreporter_info__len = 4096;
|
static char __crashreporter_info_buff__[4096] = {0};
|
||||||
const char *__crashreporter_info__base = "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE;
|
static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];
|
||||||
char __crashreporter_info__buf[4096];
|
asm (".desc __crashreporter_info__, 0x10");
|
||||||
char *__crashreporter_info__ = __crashreporter_info__buf;
|
|
||||||
|
static const char *__crashreporter_info__base = "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE;
|
||||||
|
|
||||||
static char *launchd_id_prefix = NULL;
|
static char *launchd_id_prefix = NULL;
|
||||||
static char *server_bootstrap_name = NULL;
|
static char *server_bootstrap_name = NULL;
|
||||||
|
@ -548,7 +549,7 @@ int main(int argc, char **argv, char **envp) {
|
||||||
noPanoramiXExtension = TRUE;
|
noPanoramiXExtension = TRUE;
|
||||||
|
|
||||||
/* Setup the initial crasherporter info */
|
/* Setup the initial crasherporter info */
|
||||||
strlcpy(__crashreporter_info__, __crashreporter_info__base, __crashreporter_info__len);
|
strlcpy(__crashreporter_info_buff__, __crashreporter_info__base, sizeof(__crashreporter_info_buff__));
|
||||||
|
|
||||||
fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
|
fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
|
||||||
for(i=0; i < argc; i++) {
|
for(i=0; i < argc; i++) {
|
||||||
|
|
|
@ -268,8 +268,11 @@ void QuartzUpdateScreens(void) {
|
||||||
DarwinAdjustScreenOrigins(&screenInfo);
|
DarwinAdjustScreenOrigins(&screenInfo);
|
||||||
quartzProcs->UpdateScreen(pScreen);
|
quartzProcs->UpdateScreen(pScreen);
|
||||||
|
|
||||||
sx = x + darwinMainScreenX;
|
/* DarwinAdjustScreenOrigins or UpdateScreen may change dixScreenOrigins,
|
||||||
sy = y + darwinMainScreenY;
|
* so use it rather than x/y
|
||||||
|
*/
|
||||||
|
sx = dixScreenOrigins[pScreen->myNum].x + darwinMainScreenX;
|
||||||
|
sy = dixScreenOrigins[pScreen->myNum].y + darwinMainScreenY;
|
||||||
|
|
||||||
/* Adjust the root window. */
|
/* Adjust the root window. */
|
||||||
pRoot = WindowTable[pScreen->myNum];
|
pRoot = WindowTable[pScreen->myNum];
|
||||||
|
|
|
@ -735,7 +735,10 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
|
||||||
if (err != noErr) continue;
|
if (err != noErr) continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (len > 0 && s[0] != 0x0010) {
|
/* Not sure why 0x0010 is there.
|
||||||
|
* 0x0000 - <rdar://problem/7793566> 'Unicode Hex Input' ...
|
||||||
|
*/
|
||||||
|
if (len > 0 && s[0] != 0x0010 && s[0] != 0x0000) {
|
||||||
k[j] = ucs2keysym (s[0]);
|
k[j] = ucs2keysym (s[0]);
|
||||||
if (dead_key_state != 0) k[j] = make_dead_key (k[j]);
|
if (dead_key_state != 0) k[j] = make_dead_key (k[j]);
|
||||||
}
|
}
|
||||||
|
|
9
os/log.c
9
os/log.c
|
@ -117,6 +117,12 @@ static char *saveBuffer = NULL;
|
||||||
static int bufferSize = 0, bufferUnused = 0, bufferPos = 0;
|
static int bufferSize = 0, bufferUnused = 0, bufferPos = 0;
|
||||||
static Bool needBuffer = TRUE;
|
static Bool needBuffer = TRUE;
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
|
static char __crashreporter_info_buff__[4096] = {0};
|
||||||
|
static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];
|
||||||
|
asm (".desc __crashreporter_info__, 0x10");
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Prefix strings for log messages. */
|
/* Prefix strings for log messages. */
|
||||||
#ifndef X_UNKNOWN_STRING
|
#ifndef X_UNKNOWN_STRING
|
||||||
#define X_UNKNOWN_STRING "(\?\?)"
|
#define X_UNKNOWN_STRING "(\?\?)"
|
||||||
|
@ -527,6 +533,9 @@ FatalError(const char *f, ...)
|
||||||
ErrorF("\nFatal server error:\n");
|
ErrorF("\nFatal server error:\n");
|
||||||
|
|
||||||
va_start(args, f);
|
va_start(args, f);
|
||||||
|
#ifdef __APPLE__
|
||||||
|
(void)vsnprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__), f, args);
|
||||||
|
#endif
|
||||||
VErrorF(f, args);
|
VErrorF(f, args);
|
||||||
va_end(args);
|
va_end(args);
|
||||||
ErrorF("\n");
|
ErrorF("\n");
|
||||||
|
|
|
@ -1315,7 +1315,9 @@ OsReleaseSignals (void)
|
||||||
void
|
void
|
||||||
OsAbort (void)
|
OsAbort (void)
|
||||||
{
|
{
|
||||||
|
#ifndef __APPLE__
|
||||||
OsBlockSignals();
|
OsBlockSignals();
|
||||||
|
#endif
|
||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue