mirror of
https://github.com/X11Libre/xserver.git
synced 2026-11-01 03:03:58 +00:00
Darwin: Dead code removal, Code cleanup, Added launcher
Imported changes from xorg-server-1.2-apple to make master more current wrt file layout, build system changes, and dead code removal.
This commit is contained in:
parent
a55ec1a9f4
commit
bcbaf2a0ce
103 changed files with 343 additions and 11013 deletions
|
|
@ -39,11 +39,14 @@
|
|||
#include "X11/extensions/applewm.h"
|
||||
#include "applewmExt.h"
|
||||
|
||||
#include "X11Application.h"
|
||||
|
||||
// X headers
|
||||
#include "scrnintstr.h"
|
||||
#include "windowstr.h"
|
||||
#include "colormapst.h"
|
||||
#include "globals.h"
|
||||
#include "rootlessWindow.h"
|
||||
|
||||
// System headers
|
||||
#include <sys/types.h>
|
||||
|
|
@ -84,7 +87,9 @@ Bool DarwinModeAddScreen(
|
|||
{
|
||||
// allocate space for private per screen Quartz specific storage
|
||||
QuartzScreenPtr displayInfo = xcalloc(sizeof(QuartzScreenRec), 1);
|
||||
QUARTZ_PRIV(pScreen) = displayInfo;
|
||||
|
||||
// QUARTZ_PRIV(pScreen) = displayInfo;
|
||||
pScreen->devPrivates[quartzScreenIndex].ptr = displayInfo;
|
||||
|
||||
// do Quartz mode specific initialization
|
||||
return quartzProcs->AddScreen(index, pScreen);
|
||||
|
|
@ -158,12 +163,7 @@ void DarwinModeInitInput(
|
|||
int argc,
|
||||
char **argv )
|
||||
{
|
||||
#ifdef INXQUARTZ
|
||||
X11ApplicationServerReady();
|
||||
#else
|
||||
QuartzMessageMainThread(kQuartzServerStarted, NULL, 0);
|
||||
#endif
|
||||
|
||||
X11ApplicationServerReady();
|
||||
// Do final display mode specific initialization before handling events
|
||||
if (quartzProcs->InitInput)
|
||||
quartzProcs->InitInput(argc, argv);
|
||||
|
|
@ -276,9 +276,6 @@ static void QuartzHide(void)
|
|||
}
|
||||
}
|
||||
quartzServerVisible = FALSE;
|
||||
#ifndef INXQUARTZ
|
||||
QuartzMessageMainThread(kQuartzServerHidden, NULL, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -386,7 +383,7 @@ void DarwinModeProcessEvent(
|
|||
|
||||
case kXDarwinWindowMoved:
|
||||
// ErrorF("kXDarwinWindowMoved\n");
|
||||
RootlessNativeWindowMoved (xe->u.clientMessage.u.l.longs0);
|
||||
RootlessNativeWindowMoved ((WindowPtr)xe->u.clientMessage.u.l.longs0);
|
||||
break;
|
||||
|
||||
case kXDarwinToggleFullscreen:
|
||||
|
|
|
|||
Loading…
Reference in a new issue