From 990bc3f015a4f8fce2eb918375defcd44980a845 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 8 Jun 2012 09:33:13 +0200 Subject: Used synchronise script to update files --- xorg-server/hw/xquartz/bundle/.gitignore | 1 + xorg-server/hw/xquartz/bundle/X11.sh | 30 +++---- xorg-server/hw/xquartz/bundle/Xquartz.plist | 54 +++++------ xorg-server/hw/xquartz/darwin.c | 6 +- xorg-server/hw/xquartz/mach-startup/.gitignore | 8 ++ .../hw/xquartz/mach-startup/mach_startup.defs | 100 ++++++++++----------- xorg-server/hw/xquartz/pbproxy/.gitignore | 1 + xorg-server/hw/xquartz/xpr/Makefile.am | 64 ++++++------- 8 files changed, 137 insertions(+), 127 deletions(-) create mode 100644 xorg-server/hw/xquartz/bundle/.gitignore create mode 100644 xorg-server/hw/xquartz/mach-startup/.gitignore create mode 100644 xorg-server/hw/xquartz/pbproxy/.gitignore (limited to 'xorg-server/hw/xquartz') diff --git a/xorg-server/hw/xquartz/bundle/.gitignore b/xorg-server/hw/xquartz/bundle/.gitignore new file mode 100644 index 000000000..fbdbd09cd --- /dev/null +++ b/xorg-server/hw/xquartz/bundle/.gitignore @@ -0,0 +1 @@ +Info.plist diff --git a/xorg-server/hw/xquartz/bundle/X11.sh b/xorg-server/hw/xquartz/bundle/X11.sh index 3b8b6799c..48c0553d1 100644 --- a/xorg-server/hw/xquartz/bundle/X11.sh +++ b/xorg-server/hw/xquartz/bundle/X11.sh @@ -1,15 +1,15 @@ -#!/bin/bash - -set "$(dirname "$0")"/X11.bin "${@}" - -if [ -x ~/.x11run ]; then - exec ~/.x11run "${@}" -fi - -case $(basename "${SHELL}") in - bash) exec -l "${SHELL}" --login -c 'exec "${@}"' - "${@}" ;; - ksh|sh|zsh) exec -l "${SHELL}" -c 'exec "${@}"' - "${@}" ;; - csh|tcsh) exec -l "${SHELL}" -c 'exec $argv:q' "${@}" ;; - es|rc) exec -l "${SHELL}" -l -c 'exec $*' "${@}" ;; - *) exec "${@}" ;; -esac +#!/bin/bash + +set "$(dirname "$0")"/X11.bin "${@}" + +if [ -x ~/.x11run ]; then + exec ~/.x11run "${@}" +fi + +case $(basename "${SHELL}") in + bash) exec -l "${SHELL}" --login -c 'exec "${@}"' - "${@}" ;; + ksh|sh|zsh) exec -l "${SHELL}" -c 'exec "${@}"' - "${@}" ;; + csh|tcsh) exec -l "${SHELL}" -c 'exec $argv:q' "${@}" ;; + es|rc) exec -l "${SHELL}" -l -c 'exec $*' "${@}" ;; + *) exec "${@}" ;; +esac diff --git a/xorg-server/hw/xquartz/bundle/Xquartz.plist b/xorg-server/hw/xquartz/bundle/Xquartz.plist index e15704516..3ee787807 100644 --- a/xorg-server/hw/xquartz/bundle/Xquartz.plist +++ b/xorg-server/hw/xquartz/bundle/Xquartz.plist @@ -1,27 +1,27 @@ - - - - - - - - apps_menu - - - Terminal - xterm - n - - - xman - xman - - - - xlogo - xlogo - - - - - + + + + + + + + apps_menu + + + Terminal + xterm + n + + + xman + xman + + + + xlogo + xlogo + + + + + diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c index 41db72af8..d26f18a12 100644 --- a/xorg-server/hw/xquartz/darwin.c +++ b/xorg-server/hw/xquartz/darwin.c @@ -193,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; @@ -204,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 @@ -275,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; } diff --git a/xorg-server/hw/xquartz/mach-startup/.gitignore b/xorg-server/hw/xquartz/mach-startup/.gitignore new file mode 100644 index 000000000..0bda6e75c --- /dev/null +++ b/xorg-server/hw/xquartz/mach-startup/.gitignore @@ -0,0 +1,8 @@ +# Add & Override for this directory and it's subdirectories +mach_startup.h +mach_startupServer.c +mach_startupServer.h +mach_startupUser.c +X11.bin +Xquartz + diff --git a/xorg-server/hw/xquartz/mach-startup/mach_startup.defs b/xorg-server/hw/xquartz/mach-startup/mach_startup.defs index e47f49c3c..7b575bf54 100644 --- a/xorg-server/hw/xquartz/mach-startup/mach_startup.defs +++ b/xorg-server/hw/xquartz/mach-startup/mach_startup.defs @@ -1,50 +1,50 @@ -/* Copyright (c) 2008 Apple Inc. - * - * 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 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 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 - * NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT - * HOLDER(S) 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. - * - * Except as contained in this notice, the name(s) of the above - * copyright holders shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization. - */ - -#include -#include -import "mach_startup_types.h"; - -subsystem mach_startup 1000; -serverprefix do_; - -type string_t = c_string[1024]; -type string_array_t = array[] of string_t; - -routine start_x11_server( - port : mach_port_t; - argv : string_array_t; - envp : string_array_t); - -routine request_fd_handoff_socket ( - port : mach_port_t; - out socket_filename : string_t); - -routine request_pid ( - port : mach_port_t; - out pid : int); +/* Copyright (c) 2008 Apple Inc. + * + * 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 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 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 + * NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT + * HOLDER(S) 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. + * + * Except as contained in this notice, the name(s) of the above + * copyright holders shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization. + */ + +#include +#include +import "mach_startup_types.h"; + +subsystem mach_startup 1000; +serverprefix do_; + +type string_t = c_string[1024]; +type string_array_t = array[] of string_t; + +routine start_x11_server( + port : mach_port_t; + argv : string_array_t; + envp : string_array_t); + +routine request_fd_handoff_socket ( + port : mach_port_t; + out socket_filename : string_t); + +routine request_pid ( + port : mach_port_t; + out pid : int); diff --git a/xorg-server/hw/xquartz/pbproxy/.gitignore b/xorg-server/hw/xquartz/pbproxy/.gitignore new file mode 100644 index 000000000..d6e6710f2 --- /dev/null +++ b/xorg-server/hw/xquartz/pbproxy/.gitignore @@ -0,0 +1 @@ +xpbproxy diff --git a/xorg-server/hw/xquartz/xpr/Makefile.am b/xorg-server/hw/xquartz/xpr/Makefile.am index 763a7cd5c..685052702 100644 --- a/xorg-server/hw/xquartz/xpr/Makefile.am +++ b/xorg-server/hw/xquartz/xpr/Makefile.am @@ -1,32 +1,32 @@ -noinst_LTLIBRARIES = libXquartzXpr.la - -AM_CFLAGS = $(DIX_CFLAGS) -AM_CPPFLAGS = \ - -I$(srcdir) -I$(srcdir)/.. \ - -I$(top_srcdir)/miext \ - -I$(top_srcdir)/miext/rootless - -libXquartzXpr_la_SOURCES = \ - appledri.c \ - dri.c \ - driWrap.c \ - xprAppleWM.c \ - xprCursor.c \ - xprEvent.c \ - xprFrame.c \ - xprScreen.c \ - x-hash.c \ - x-hook.c \ - x-list.c - -EXTRA_DIST = \ - dri.h \ - driWrap.h \ - dristruct.h \ - appledri.h \ - appledristr.h \ - x-hash.h \ - x-hook.h \ - x-list.h \ - xpr.h \ - xprEvent.h +noinst_LTLIBRARIES = libXquartzXpr.la + +AM_CFLAGS = $(DIX_CFLAGS) +AM_CPPFLAGS = \ + -I$(srcdir) -I$(srcdir)/.. \ + -I$(top_srcdir)/miext \ + -I$(top_srcdir)/miext/rootless + +libXquartzXpr_la_SOURCES = \ + appledri.c \ + dri.c \ + driWrap.c \ + xprAppleWM.c \ + xprCursor.c \ + xprEvent.c \ + xprFrame.c \ + xprScreen.c \ + x-hash.c \ + x-hook.c \ + x-list.c + +EXTRA_DIST = \ + dri.h \ + driWrap.h \ + dristruct.h \ + appledri.h \ + appledristr.h \ + x-hash.h \ + x-hook.h \ + x-list.h \ + xpr.h \ + xprEvent.h -- cgit v1.2.3