fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-24 11:20:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Darwin: Formatting Cleanup

Browse source 
To better line up with xorg-server-1.4-apple branch
This commit is contained in:
Jeremy Huddleston 2007-11-20 04:51:18 -08:00
parent a649bbe974
commit 84490775b9
5 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hw/darwin/quartz/cr/crFrame.m
View file

@ -36,7 +36,7 @@
#undef BOOL
#define BOOL xBOOL
#include "rootless.h"
#include "applewmExt.h"
#include "quartz/applewmExt.h"
#include "windowstr.h"
#undef BOOL

10
hw/darwin/quartz/cr/crScreen.m
View file

@ -36,12 +36,12 @@
#undef BOOL
#define BOOL xBOOL
#include "darwin.h"
#include "quartz.h"
#include "quartzCursor.h"
#include "quartz/quartz.h"
#include "quartz/quartzCursor.h"
#include "rootless.h"
#include "safeAlpha.h"
#include "pseudoramiX.h"
#include "applewmExt.h"
#include "safeAlpha/safeAlpha.h"
#include "quartz/pseudoramiX.h"
#include "quartz/applewmExt.h"
#include "regionstr.h"
#include "scrnintstr.h"

4
hw/darwin/quartz/fullscreen/fullscreen.c
View file

@ -31,8 +31,8 @@
#endif
#include "quartzCommon.h"
#include "darwin.h"
#include "quartz.h"
#include "quartzCursor.h"
#include "quartz/quartz.h"
#include "quartz/quartzCursor.h"
#include "colormapst.h"
#include "scrnintstr.h"
#include "micmap.h"

1
hw/darwin/quartz/xpr/xprAppleWM.c
View file

@ -36,7 +36,6 @@
#include "Xplugin.h"
#include <X11/X.h>
static int xprSetWindowLevel(
WindowPtr pWin,
int level)

14
hw/darwin/quartz/xpr/xprScreen.c
View file

@ -110,9 +110,8 @@ eventHandler(unsigned int type, const void *arg,
}
}
/*
* displayScreenBounds
* displayAtIndex
* Return the display ID for a particular display index.
*/
static CGDirectDisplayID
@ -129,7 +128,6 @@ displayAtIndex(int index)
return kCGNullDirectDisplay;
}
/*
* displayScreenBounds
* Return the bounds of a particular display.
@ -152,7 +150,6 @@ displayScreenBounds(CGDirectDisplayID id)
return frame;
}
/*
* xprAddPseudoramiXScreens
* Add a single virtual screen encompassing all the physical screens
@ -208,7 +205,6 @@ xprAddPseudoramiXScreens(int *x, int *y, int *width, int *height)
xfree(displayList);
}
/*
* xprDisplayInit
* Find number of CoreGraphics displays and initialize Xplugin.
@ -231,9 +227,7 @@ xprDisplayInit(void)
darwinScreensFound = 1;
if (xp_init(XP_BACKGROUND_EVENTS | XP_NO_DEFERRED_UPDATES) != Success)
{
FatalError("Could not initialize the Xplugin library.");
}
xp_select_events(XP_EVENT_DISPLAY_CHANGED
| XP_EVENT_WINDOW_STATE_CHANGED
@ -246,7 +240,6 @@ xprDisplayInit(void)
xprAppleWMInit();
}
/*
* xprAddScreen
* Init the framebuffer and record pixmap parameters for the screen.
@ -316,7 +309,6 @@ xprAddScreen(int index, ScreenPtr pScreen)
return TRUE;
}
/*
* xprSetupScreen
* Setup the screen for rootless access.
@ -353,7 +345,6 @@ xprSetupScreen(int index, ScreenPtr pScreen)
return DRIFinishScreenInit(pScreen);
}
/*
* xprUpdateScreen
* Update screen after configuation change.
@ -370,7 +361,6 @@ xprUpdateScreen(ScreenPtr pScreen)
RootlessUpdateScreenPixmap(pScreen);
}
/*
* xprInitInput
* Finalize xpr specific setup.
@ -387,7 +377,6 @@ xprInitInput(int argc, char **argv)
AppleWMSetScreenOrigin(WindowTable[i]);
}
/*
* Quartz display mode function list.
*/
@ -413,7 +402,6 @@ static QuartzModeProcsRec xprModeProcs = {
DRIDestroySurface
};
/*
* QuartzModeBundleInit
* Initialize the display mode bundle after loading.