From 3744281b9ae8aa0ab86ceaee1afe8a603e3aeb2c Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 19 Nov 2012 10:16:38 +0100 Subject: dos -> unix --- xorg-server/hw/Makefile.am | 82 +- xorg-server/hw/dmx/.gitignore | 4 +- xorg-server/hw/dmx/config/.gitignore | 14 +- xorg-server/hw/dmx/config/TODO | 14 +- xorg-server/hw/dmx/config/dmxcompat.h | 88 +- xorg-server/hw/dmx/config/parser.y | 452 ++--- xorg-server/hw/dmx/config/test-a.in | 2 +- xorg-server/hw/dmx/config/test-a.out | 4 +- xorg-server/hw/dmx/config/test-b.in | 2 +- xorg-server/hw/dmx/config/test-b.out | 2 +- xorg-server/hw/dmx/config/test-c.in | 2 +- xorg-server/hw/dmx/config/test-c.out | 4 +- xorg-server/hw/dmx/config/test-d.in | 2 +- xorg-server/hw/dmx/config/test-d.out | 4 +- xorg-server/hw/dmx/config/test-e.in | 2 +- xorg-server/hw/dmx/config/test-e.out | 4 +- xorg-server/hw/dmx/config/test-f.in | 4 +- xorg-server/hw/dmx/config/test-g.in | 8 +- xorg-server/hw/dmx/config/test-g.out | 8 +- xorg-server/hw/dmx/config/test-h.in | 14 +- xorg-server/hw/dmx/config/test-h.out | 14 +- xorg-server/hw/dmx/config/test-i.in | 6 +- xorg-server/hw/dmx/config/test-i.out | 6 +- xorg-server/hw/dmx/config/test-j.in | 26 +- xorg-server/hw/dmx/config/test-j.out | 22 +- xorg-server/hw/dmx/config/test-k.in | 6 +- xorg-server/hw/dmx/config/test-k.out | 6 +- xorg-server/hw/dmx/config/test-l.in | 24 +- xorg-server/hw/dmx/config/test-l.out | 24 +- xorg-server/hw/dmx/doc/DMXSpec-v1.txt | 916 +++++----- xorg-server/hw/dmx/doc/DMXSpec.txt | 1750 ++++++++++---------- xorg-server/hw/dmx/examples/.gitignore | 34 +- xorg-server/hw/dmx/input/Makefile.am | 134 +- xorg-server/hw/dmx/input/dmxdummy.h | 86 +- xorg-server/hw/kdrive/Makefile.am | 60 +- xorg-server/hw/kdrive/Xkdrive.man | 114 +- xorg-server/hw/kdrive/ephyr/README | 146 +- xorg-server/hw/kdrive/fake/.gitignore | 4 +- xorg-server/hw/kdrive/fake/Makefile.am | 60 +- xorg-server/hw/kdrive/fbdev/.gitignore | 4 +- xorg-server/hw/kdrive/fbdev/Makefile.am | 58 +- xorg-server/hw/kdrive/fbdev/Xfbdev.man | 56 +- xorg-server/hw/kdrive/linux/Makefile.am | 54 +- xorg-server/hw/kdrive/src/Makefile.am | 56 +- xorg-server/hw/xfree86/common/.gitignore | 6 +- xorg-server/hw/xfree86/common/extramodes | 54 +- xorg-server/hw/xfree86/common/modeline2c.awk | 186 +-- xorg-server/hw/xfree86/common/vesamodes | 222 +-- xorg-server/hw/xfree86/common/xf86Build.h.in | 4 +- xorg-server/hw/xfree86/ddc/DDC.HOWTO | 194 +-- xorg-server/hw/xfree86/ddc/Makefile.am | 22 +- xorg-server/hw/xfree86/fbdevhw/README | 32 +- xorg-server/hw/xfree86/i2c/i2c_def.h | 12 +- xorg-server/hw/xfree86/int10/INT10.HOWTO | 688 ++++---- xorg-server/hw/xfree86/int10/Makefile.am | 92 +- xorg-server/hw/xfree86/int10/x86emu.c | 24 +- xorg-server/hw/xfree86/int10/xf86x86emu.h | 108 +- xorg-server/hw/xfree86/modes/Makefile.am | 70 +- xorg-server/hw/xfree86/os-support/bsd/Makefile.am | 152 +- xorg-server/hw/xfree86/os-support/hurd/Makefile.am | 30 +- xorg-server/hw/xfree86/os-support/hurd/hurd_bell.c | 74 +- xorg-server/hw/xfree86/os-support/int10Defines.h | 178 +- xorg-server/hw/xfree86/os-support/misc/Makefile.am | 24 +- .../hw/xfree86/os-support/solaris/Makefile.am | 74 +- .../hw/xfree86/os-support/solaris/apSolaris.shar | 1612 +++++++++--------- .../hw/xfree86/os-support/solaris/sun_inout.s | 248 +-- xorg-server/hw/xfree86/ramdac/CURSOR.NOTES | 382 ++--- xorg-server/hw/xfree86/vgahw/Makefile.am | 18 +- xorg-server/hw/xfree86/x86emu/Makefile.am | 58 +- xorg-server/hw/xnest/icon | 28 +- xorg-server/hw/xnest/screensaver | 1372 +++++++-------- xorg-server/hw/xquartz/bundle/.gitignore | 2 +- xorg-server/hw/xquartz/bundle/X11.sh | 30 +- xorg-server/hw/xquartz/bundle/Xquartz.plist | 54 +- xorg-server/hw/xquartz/mach-startup/.gitignore | 16 +- .../hw/xquartz/mach-startup/mach_startup.defs | 100 +- xorg-server/hw/xquartz/pbproxy/.gitignore | 2 +- xorg-server/hw/xquartz/xpr/Makefile.am | 64 +- xorg-server/hw/xwin/glx/winpriv.h | 22 +- xorg-server/hw/xwin/system.XWinrc | 256 +-- 80 files changed, 5446 insertions(+), 5446 deletions(-) (limited to 'xorg-server/hw') diff --git a/xorg-server/hw/Makefile.am b/xorg-server/hw/Makefile.am index 31e2565db..6c2cc6bd4 100644 --- a/xorg-server/hw/Makefile.am +++ b/xorg-server/hw/Makefile.am @@ -1,41 +1,41 @@ -if DMX -DMX_SUBDIRS = dmx -endif - -if XORG -XORG_SUBDIRS = xfree86 -endif - -if XVFB -XVFB_SUBDIRS = vfb -endif - -if XNEST -XNEST_SUBDIRS = xnest -endif - -if XWIN -XWIN_SUBDIRS = xwin -endif - -if KDRIVE -KDRIVE_SUBDIRS = kdrive -endif - -if XQUARTZ -XQUARTZ_SUBDIRS = xquartz -endif - -SUBDIRS = \ - $(XORG_SUBDIRS) \ - $(XWIN_SUBDIRS) \ - $(XVFB_SUBDIRS) \ - $(XNEST_SUBDIRS) \ - $(DMX_SUBDIRS) \ - $(KDRIVE_SUBDIRS) \ - $(XQUARTZ_SUBDIRS) - -DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive - -relink: - $(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done +if DMX +DMX_SUBDIRS = dmx +endif + +if XORG +XORG_SUBDIRS = xfree86 +endif + +if XVFB +XVFB_SUBDIRS = vfb +endif + +if XNEST +XNEST_SUBDIRS = xnest +endif + +if XWIN +XWIN_SUBDIRS = xwin +endif + +if KDRIVE +KDRIVE_SUBDIRS = kdrive +endif + +if XQUARTZ +XQUARTZ_SUBDIRS = xquartz +endif + +SUBDIRS = \ + $(XORG_SUBDIRS) \ + $(XWIN_SUBDIRS) \ + $(XVFB_SUBDIRS) \ + $(XNEST_SUBDIRS) \ + $(DMX_SUBDIRS) \ + $(KDRIVE_SUBDIRS) \ + $(XQUARTZ_SUBDIRS) + +DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive + +relink: + $(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done diff --git a/xorg-server/hw/dmx/.gitignore b/xorg-server/hw/dmx/.gitignore index f71acff10..4dd9b0358 100644 --- a/xorg-server/hw/dmx/.gitignore +++ b/xorg-server/hw/dmx/.gitignore @@ -1,2 +1,2 @@ -# Add & Override for this directory and it's subdirectories -Xdmx +# Add & Override for this directory and it's subdirectories +Xdmx diff --git a/xorg-server/hw/dmx/config/.gitignore b/xorg-server/hw/dmx/config/.gitignore index bf5e80873..086062204 100644 --- a/xorg-server/hw/dmx/config/.gitignore +++ b/xorg-server/hw/dmx/config/.gitignore @@ -1,7 +1,7 @@ -# Add & Override for this directory and it's subdirectories -dmxtodmx -parser.c -parser.h -scanner.c -vdltodmx -xdmxconfig +# Add & Override for this directory and it's subdirectories +dmxtodmx +parser.c +parser.h +scanner.c +vdltodmx +xdmxconfig diff --git a/xorg-server/hw/dmx/config/TODO b/xorg-server/hw/dmx/config/TODO index 0e9255fd2..2998ff4a0 100644 --- a/xorg-server/hw/dmx/config/TODO +++ b/xorg-server/hw/dmx/config/TODO @@ -1,7 +1,7 @@ -Fri May 31 13:20:17 2002 - -1) Sanitize values from input boxes. - -2) Add canvas colors to cavas widget resources or to command-line options. - -3) Add ability to edit option line(s) and wall. +Fri May 31 13:20:17 2002 + +1) Sanitize values from input boxes. + +2) Add canvas colors to cavas widget resources or to command-line options. + +3) Add ability to edit option line(s) and wall. diff --git a/xorg-server/hw/dmx/config/dmxcompat.h b/xorg-server/hw/dmx/config/dmxcompat.h index b9b083ff6..718892040 100644 --- a/xorg-server/hw/dmx/config/dmxcompat.h +++ b/xorg-server/hw/dmx/config/dmxcompat.h @@ -1,44 +1,44 @@ -/* - * Copyright 2002 Red Hat Inc., Durham, North Carolina. - * - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation on the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial - * portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/* - * Authors: - * Rickard E. (Rik) Faith - * - */ - -/** \file - * Interface to VDL compatibility support. \see dmxcompat.c - * - * This file is not used by the DMX server. - */ - -#ifndef _DMXCOMPAT_H_ -#define _DMXCOMPAT_H_ - -extern DMXConfigEntryPtr dmxVDLRead(const char *filename); -#endif +/* + * Copyright 2002 Red Hat Inc., Durham, North Carolina. + * + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation on the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/* + * Authors: + * Rickard E. (Rik) Faith + * + */ + +/** \file + * Interface to VDL compatibility support. \see dmxcompat.c + * + * This file is not used by the DMX server. + */ + +#ifndef _DMXCOMPAT_H_ +#define _DMXCOMPAT_H_ + +extern DMXConfigEntryPtr dmxVDLRead(const char *filename); +#endif diff --git a/xorg-server/hw/dmx/config/parser.y b/xorg-server/hw/dmx/config/parser.y index 9a45e624f..ac2441017 100644 --- a/xorg-server/hw/dmx/config/parser.y +++ b/xorg-server/hw/dmx/config/parser.y @@ -1,226 +1,226 @@ -/* $XFree86$ */ -/* - * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. - * - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation on the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial - * portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/* - * Authors: - * Rickard E. (Rik) Faith - * - */ - -%{ -#ifdef HAVE_DMX_CONFIG_H -#include -#endif - -#include "dmxparse.h" -#include -#include -#define YYDEBUG 1 -#define YYERROR_VERBOSE -#define YY_USE_PROTOS - -DMXConfigEntryPtr dmxConfigEntry = NULL; -#define APPEND(type, h, t) \ -{ \ - type pt; \ - for (pt = h; pt->next; pt = pt->next); \ - pt->next = t; \ -} -%} - -%union { - DMXConfigTokenPtr token; - DMXConfigStringPtr string; - DMXConfigNumberPtr number; - DMXConfigPairPtr pair; - DMXConfigFullDimPtr fdim; - DMXConfigPartDimPtr pdim; - DMXConfigDisplayPtr display; - DMXConfigWallPtr wall; - DMXConfigOptionPtr option; - DMXConfigParamPtr param; - DMXConfigCommentPtr comment; - DMXConfigSubPtr subentry; - DMXConfigVirtualPtr virtual; - DMXConfigEntryPtr entry; -} - - /* Terminals */ -%token '{' '}' ';' '/' T_VIRTUAL T_DISPLAY T_WALL T_OPTION T_PARAM -%token T_STRING -%token T_DIMENSION T_OFFSET T_ORIGIN -%token T_COMMENT T_LINE_COMMENT - - /* Non-termials */ -%type Display Wall Terminal Open Close -%type NameList Name -%type Dimension Offset Origin -%type PartialDim -%type FullDim -%type DisplayEntry -%type