diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2012-11-16 16:51:59 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2012-11-16 17:02:14 +0000 |
| commit | a7482576c90846fe1c8e1d28420cf51acb73c7c1 (patch) | |
| tree | 17b44a0bb48921c257898d02edf978d14f34b000 /xserver/hw/xquartz/darwin.c | |
| parent | 8c0b9a29cc37b38638970b5187e048ebf931ea2b (diff) | |
Update to xserver 1.13
Diffstat (limited to 'xserver/hw/xquartz/darwin.c')
| -rw-r--r-- | xserver/hw/xquartz/darwin.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xserver/hw/xquartz/darwin.c b/xserver/hw/xquartz/darwin.c index 74e11feac..d26f18a12 100644 --- a/xserver/hw/xquartz/darwin.c +++ b/xserver/hw/xquartz/darwin.c @@ -78,6 +78,8 @@ #include "quartzKeyboard.h" #include "quartz.h" +#include "X11Application.h" + aslclient aslc; void @@ -191,7 +193,7 @@ DarwinSaveScreen(ScreenPtr pScreen, int on) * Initialize the screen and communicate information about it back to dix. */ static Bool -DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) +DarwinScreenInit(ScreenPtr pScreen, int argc, char **argv) { int dpi; static int foundIndex = 0; @@ -202,7 +204,7 @@ DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) return FALSE; // reset index of found screens for each server generation - if (index == 0) { + if (pScreen->myNum == 0) { foundIndex = 0; // reset the visual list @@ -273,7 +275,7 @@ DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) pScreen->SaveScreen = DarwinSaveScreen; // finish mode dependent screen setup including cursor support - if (!QuartzSetupScreen(index, pScreen)) { + if (!QuartzSetupScreen(pScreen->myNum, pScreen)) { return FALSE; } @@ -670,9 +672,9 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) * OsVendorFatalError */ void -OsVendorFatalError(void) +OsVendorFatalError(const char *f, va_list args) { - ErrorF(" OsVendorFatalError\n"); + X11ApplicationFatalError(f, args); } /* |