9838b7032e
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>
193 lines
5.8 KiB
C
193 lines
5.8 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 "servermd.h"
|
|
|
|
#include "Xnest.h"
|
|
|
|
#include "Display.h"
|
|
#include "Args.h"
|
|
|
|
char *xnestDisplayName = NULL;
|
|
Bool xnestSynchronize = False;
|
|
Bool xnestFullGeneration = False;
|
|
int xnestDefaultClass;
|
|
Bool xnestUserDefaultClass = False;
|
|
int xnestDefaultDepth;
|
|
Bool xnestUserDefaultDepth = False;
|
|
Bool xnestSoftwareScreenSaver = False;
|
|
int xnestX;
|
|
int xnestY;
|
|
unsigned int xnestWidth;
|
|
unsigned int xnestHeight;
|
|
int xnestUserGeometry = 0;
|
|
int xnestBorderWidth;
|
|
Bool xnestUserBorderWidth = False;
|
|
char *xnestWindowName = NULL;
|
|
int xnestNumScreens = 0;
|
|
Bool xnestDoDirectColormaps = False;
|
|
Window xnestParentWindow = 0;
|
|
|
|
int
|
|
ddxProcessArgument(int argc, char *argv[], int i)
|
|
{
|
|
if (!strcmp(argv[i], "-display")) {
|
|
if (++i < argc) {
|
|
xnestDisplayName = argv[i];
|
|
return 2;
|
|
}
|
|
return 0;
|
|
}
|
|
if (!strcmp(argv[i], "-sync")) {
|
|
xnestSynchronize = True;
|
|
return 1;
|
|
}
|
|
if (!strcmp(argv[i], "-full")) {
|
|
xnestFullGeneration = True;
|
|
return 1;
|
|
}
|
|
if (!strcmp(argv[i], "-class")) {
|
|
if (++i < argc) {
|
|
if (!strcmp(argv[i], "StaticGray")) {
|
|
xnestDefaultClass = StaticGray;
|
|
xnestUserDefaultClass = True;
|
|
return 2;
|
|
}
|
|
else if (!strcmp(argv[i], "GrayScale")) {
|
|
xnestDefaultClass = GrayScale;
|
|
xnestUserDefaultClass = True;
|
|
return 2;
|
|
}
|
|
else if (!strcmp(argv[i], "StaticColor")) {
|
|
xnestDefaultClass = StaticColor;
|
|
xnestUserDefaultClass = True;
|
|
return 2;
|
|
}
|
|
else if (!strcmp(argv[i], "PseudoColor")) {
|
|
xnestDefaultClass = PseudoColor;
|
|
xnestUserDefaultClass = True;
|
|
return 2;
|
|
}
|
|
else if (!strcmp(argv[i], "TrueColor")) {
|
|
xnestDefaultClass = TrueColor;
|
|
xnestUserDefaultClass = True;
|
|
return 2;
|
|
}
|
|
else if (!strcmp(argv[i], "DirectColor")) {
|
|
xnestDefaultClass = DirectColor;
|
|
xnestUserDefaultClass = True;
|
|
return 2;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
if (!strcmp(argv[i], "-cc")) {
|
|
if (++i < argc && sscanf(argv[i], "%i", &xnestDefaultClass) == 1) {
|
|
if (xnestDefaultClass >= 0 && xnestDefaultClass <= 5) {
|
|
xnestUserDefaultClass = True;
|
|
/* lex the OS layer process it as well, so return 0 */
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
if (!strcmp(argv[i], "-depth")) {
|
|
if (++i < argc && sscanf(argv[i], "%i", &xnestDefaultDepth) == 1) {
|
|
if (xnestDefaultDepth > 0) {
|
|
xnestUserDefaultDepth = True;
|
|
return 2;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
if (!strcmp(argv[i], "-sss")) {
|
|
xnestSoftwareScreenSaver = True;
|
|
return 1;
|
|
}
|
|
if (!strcmp(argv[i], "-geometry")) {
|
|
if (++i < argc) {
|
|
xnestUserGeometry = XParseGeometry(argv[i],
|
|
&xnestX, &xnestY,
|
|
&xnestWidth, &xnestHeight);
|
|
if (xnestUserGeometry)
|
|
return 2;
|
|
}
|
|
return 0;
|
|
}
|
|
if (!strcmp(argv[i], "-bw")) {
|
|
if (++i < argc && sscanf(argv[i], "%i", &xnestBorderWidth) == 1) {
|
|
if (xnestBorderWidth >= 0) {
|
|
xnestUserBorderWidth = True;
|
|
return 2;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
if (!strcmp(argv[i], "-name")) {
|
|
if (++i < argc) {
|
|
xnestWindowName = argv[i];
|
|
return 2;
|
|
}
|
|
return 0;
|
|
}
|
|
if (!strcmp(argv[i], "-scrns")) {
|
|
if (++i < argc && sscanf(argv[i], "%i", &xnestNumScreens) == 1) {
|
|
if (xnestNumScreens > 0) {
|
|
if (xnestNumScreens > MAXSCREENS) {
|
|
ErrorF("Maximum number of screens is %d.\n", MAXSCREENS);
|
|
xnestNumScreens = MAXSCREENS;
|
|
}
|
|
return 2;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
if (!strcmp(argv[i], "-install")) {
|
|
xnestDoDirectColormaps = True;
|
|
return 1;
|
|
}
|
|
if (!strcmp(argv[i], "-parent")) {
|
|
if (++i < argc) {
|
|
xnestParentWindow = (XID) strtol(argv[i], (char **) NULL, 0);
|
|
return 2;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
ddxUseMsg(void)
|
|
{
|
|
ErrorF("-display string display name of the real server\n");
|
|
ErrorF("-sync sinchronize with the real server\n");
|
|
ErrorF("-full utilize full regeneration\n");
|
|
ErrorF("-class string default visual class\n");
|
|
ErrorF("-depth int default depth\n");
|
|
ErrorF("-sss use software screen saver\n");
|
|
ErrorF("-geometry WxH+X+Y window size and position\n");
|
|
ErrorF("-bw int window border width\n");
|
|
ErrorF("-name string window name\n");
|
|
ErrorF("-scrns int number of screens to generate\n");
|
|
ErrorF("-install instal colormaps directly\n");
|
|
}
|