mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2025-12-21 09:50:05 +01:00
8384075e1a
This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:
-bap
-psl
-T PrivatePtr
-T pmWait
-T _XFUNCPROTOBEGIN
-T _XFUNCPROTOEND
-T _X_EXPORT
The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.
The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.
The comparison was done with this script:
dir1=$1
dir2=$2
for dir in $dir1 $dir2; do
(cd $dir && find . -name '*.o' | while read file; do
dir=`dirname $file`
base=`basename $file .o`
dump=$dir/$base.dump
objdump -d $file > $dump
done)
done
find $dir1 -name '*.dump' | while read dump; do
otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
diff -u $dump $otherdump
done
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit 9838b7032e)
156 lines
3.5 KiB
C
156 lines
3.5 KiB
C
/*
|
|
|
|
Copyright 1993 by Davor Matic
|
|
|
|
Permission to use, copy, modify, distribute, and sell this software
|
|
and its documentation for any purpose is hereby granted without fee,
|
|
provided that the above copyright notice appear in all copies and that
|
|
both that copyright notice and this permission notice appear in
|
|
supporting documentation. Davor Matic makes no representations about
|
|
the suitability of this software for any purpose. It is provided "as
|
|
is" without express or implied warranty.
|
|
|
|
*/
|
|
|
|
#ifdef HAVE_XNEST_CONFIG_H
|
|
#include <xnest-config.h>
|
|
#endif
|
|
|
|
#include <X11/X.h>
|
|
#include <X11/Xproto.h>
|
|
#include "screenint.h"
|
|
#include "input.h"
|
|
#include "misc.h"
|
|
#include "scrnintstr.h"
|
|
#include "windowstr.h"
|
|
#include "servermd.h"
|
|
#include "mi.h"
|
|
#include <X11/fonts/fontstruct.h>
|
|
|
|
#include "Xnest.h"
|
|
|
|
#include "Display.h"
|
|
#include "Screen.h"
|
|
#include "Pointer.h"
|
|
#include "Keyboard.h"
|
|
#include "Handlers.h"
|
|
#include "Init.h"
|
|
#include "Args.h"
|
|
#include "Drawable.h"
|
|
#include "XNGC.h"
|
|
#include "XNFont.h"
|
|
#ifdef DPMSExtension
|
|
#include "dpmsproc.h"
|
|
#endif
|
|
|
|
Bool xnestDoFullGeneration = True;
|
|
|
|
void
|
|
InitOutput(ScreenInfo * screenInfo, int argc, char *argv[])
|
|
{
|
|
int i, j;
|
|
|
|
xnestOpenDisplay(argc, argv);
|
|
|
|
screenInfo->imageByteOrder = ImageByteOrder(xnestDisplay);
|
|
screenInfo->bitmapScanlineUnit = BitmapUnit(xnestDisplay);
|
|
screenInfo->bitmapScanlinePad = BitmapPad(xnestDisplay);
|
|
screenInfo->bitmapBitOrder = BitmapBitOrder(xnestDisplay);
|
|
|
|
screenInfo->numPixmapFormats = 0;
|
|
for (i = 0; i < xnestNumPixmapFormats; i++)
|
|
for (j = 0; j < xnestNumDepths; j++)
|
|
if ((xnestPixmapFormats[i].depth == 1) ||
|
|
(xnestPixmapFormats[i].depth == xnestDepths[j])) {
|
|
screenInfo->formats[screenInfo->numPixmapFormats].depth =
|
|
xnestPixmapFormats[i].depth;
|
|
screenInfo->formats[screenInfo->numPixmapFormats].bitsPerPixel =
|
|
xnestPixmapFormats[i].bits_per_pixel;
|
|
screenInfo->formats[screenInfo->numPixmapFormats].scanlinePad =
|
|
xnestPixmapFormats[i].scanline_pad;
|
|
screenInfo->numPixmapFormats++;
|
|
break;
|
|
}
|
|
|
|
xnestFontPrivateIndex = AllocateFontPrivateIndex();
|
|
|
|
if (!xnestNumScreens)
|
|
xnestNumScreens = 1;
|
|
|
|
for (i = 0; i < xnestNumScreens; i++)
|
|
AddScreen(xnestOpenScreen, argc, argv);
|
|
|
|
xnestNumScreens = screenInfo->numScreens;
|
|
|
|
xnestDoFullGeneration = xnestFullGeneration;
|
|
}
|
|
|
|
void
|
|
InitInput(int argc, char *argv[])
|
|
{
|
|
int rc;
|
|
|
|
rc = AllocDevicePair(serverClient, "Xnest",
|
|
&xnestPointerDevice,
|
|
&xnestKeyboardDevice,
|
|
xnestPointerProc, xnestKeyboardProc, FALSE);
|
|
|
|
if (rc != Success)
|
|
FatalError("Failed to init Xnest default devices.\n");
|
|
|
|
mieqInit();
|
|
|
|
AddEnabledDevice(XConnectionNumber(xnestDisplay));
|
|
|
|
RegisterBlockAndWakeupHandlers(xnestBlockHandler, xnestWakeupHandler, NULL);
|
|
}
|
|
|
|
void
|
|
CloseInput(void)
|
|
{
|
|
mieqFini();
|
|
}
|
|
|
|
/*
|
|
* DDX - specific abort routine. Called by AbortServer().
|
|
*/
|
|
void
|
|
AbortDDX(enum ExitCode error)
|
|
{
|
|
xnestDoFullGeneration = True;
|
|
xnestCloseDisplay();
|
|
}
|
|
|
|
/* Called by GiveUp(). */
|
|
void
|
|
ddxGiveUp(enum ExitCode error)
|
|
{
|
|
AbortDDX(error);
|
|
}
|
|
|
|
#ifdef __APPLE__
|
|
void
|
|
DarwinHandleGUI(int argc, char *argv[])
|
|
{
|
|
}
|
|
#endif
|
|
|
|
void
|
|
OsVendorInit(void)
|
|
{
|
|
return;
|
|
}
|
|
|
|
void
|
|
OsVendorFatalError(void)
|
|
{
|
|
return;
|
|
}
|
|
|
|
#if defined(DDXBEFORERESET)
|
|
void
|
|
ddxBeforeReset(void)
|
|
{
|
|
return;
|
|
}
|
|
#endif
|