mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-22 01:20:26 +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
|
|
@ -174,7 +174,7 @@ ProcAppleDRIAuthConnection(
|
|||
rep.authenticated = 1;
|
||||
|
||||
if (!DRIAuthConnection( screenInfo.screens[stuff->screen], stuff->magic)) {
|
||||
ErrorF("Failed to authenticate %u\n", stuff->magic);
|
||||
ErrorF("Failed to authenticate %u\n", (unsigned int)stuff->magic);
|
||||
rep.authenticated = 0;
|
||||
}
|
||||
WriteToClient(client, sizeof(xAppleDRIAuthConnectionReply), (char *)&rep);
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ X_PFX (hook_remove) (x_list *lst, x_hook_function *fun, void *data)
|
|||
}
|
||||
|
||||
X_PFX (list_free) (to_delete);
|
||||
return lst;
|
||||
}
|
||||
|
||||
X_EXTERN void
|
||||
|
|
|
|||
|
|
@ -380,7 +380,8 @@ QuartzInitCursor(ScreenPtr pScreen)
|
|||
if (ScreenPriv == NULL)
|
||||
return FALSE;
|
||||
|
||||
CURSOR_PRIV(pScreen) = ScreenPriv;
|
||||
/* CURSOR_PRIV(pScreen) = ScreenPriv; */
|
||||
pScreen->devPrivates[darwinCursorScreenIndex].ptr = ScreenPriv;
|
||||
|
||||
/* override some screen procedures */
|
||||
ScreenPriv->QueryBestSize = pScreen->QueryBestSize;
|
||||
|
|
|
|||
|
|
@ -41,6 +41,9 @@
|
|||
#include "Xplugin.h"
|
||||
#include "quartz/applewmExt.h"
|
||||
|
||||
// From xprFrame.c
|
||||
WindowPtr xprGetXWindow(xp_window_id wid);
|
||||
|
||||
#ifdef DAMAGE
|
||||
# include "damage.h"
|
||||
#endif
|
||||
|
|
@ -84,13 +87,7 @@ eventHandler(unsigned int type, const void *arg,
|
|||
{
|
||||
xp_window_id id = * (xp_window_id *) arg;
|
||||
WindowPtr pWin = xprGetXWindow(id);
|
||||
BoxRec box;
|
||||
xp_error retval = xp_get_window_bounds(id, &box);
|
||||
if (retval != Success) {
|
||||
ErrorF("Unable to find new bounds for window\n");
|
||||
break;
|
||||
}
|
||||
QuartzMessageServerThread(kXDarwinWindowMoved, 3, pWin, box.x1, box.y1);
|
||||
QuartzMessageServerThread(kXDarwinWindowMoved, 1, pWin);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue