From 7295e544332b0fa929f651304f9d4aca3db4a33e Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 6 May 2008 00:06:19 -0700 Subject: XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite (cherry picked from commit 453a982e6382cff06ea27abba225440b07068f50) --- configure.ac | 15 +- hw/xquartz/Makefile.am | 8 +- hw/xquartz/bundle/Dutch.lproj/InfoPlist.strings | Bin 274 -> 0 bytes hw/xquartz/bundle/Dutch.lproj/Localizable.strings | Bin 1084 -> 0 bytes .../bundle/Dutch.lproj/main.nib/keyedobjects.nib | Bin 32654 -> 0 bytes hw/xquartz/bundle/English.lproj/InfoPlist.strings | Bin 276 -> 0 bytes .../bundle/English.lproj/Localizable.strings | Bin 1078 -> 0 bytes .../bundle/English.lproj/main.nib/designable.nib | 3753 -------------------- .../bundle/English.lproj/main.nib/keyedobjects.nib | Bin 38309 -> 0 bytes hw/xquartz/bundle/French.lproj/InfoPlist.strings | Bin 276 -> 0 bytes hw/xquartz/bundle/French.lproj/Localizable.strings | Bin 1168 -> 0 bytes .../bundle/French.lproj/main.nib/keyedobjects.nib | Bin 36404 -> 0 bytes hw/xquartz/bundle/German.lproj/InfoPlist.strings | Bin 276 -> 0 bytes hw/xquartz/bundle/German.lproj/Localizable.strings | Bin 1096 -> 0 bytes .../bundle/German.lproj/main.nib/keyedobjects.nib | Bin 34995 -> 0 bytes hw/xquartz/bundle/Italian.lproj/InfoPlist.strings | Bin 278 -> 0 bytes .../bundle/Italian.lproj/Localizable.strings | Bin 1146 -> 0 bytes .../bundle/Italian.lproj/main.nib/keyedobjects.nib | Bin 33677 -> 0 bytes hw/xquartz/bundle/Japanese.lproj/InfoPlist.strings | Bin 272 -> 0 bytes .../bundle/Japanese.lproj/Localizable.strings | Bin 916 -> 0 bytes .../Japanese.lproj/main.nib/keyedobjects.nib | Bin 33095 -> 0 bytes hw/xquartz/bundle/Makefile.am | 13 +- .../bundle/Resources/Dutch.lproj/InfoPlist.strings | Bin 0 -> 274 bytes .../Resources/Dutch.lproj/Localizable.strings | Bin 0 -> 1084 bytes .../Dutch.lproj/main.nib/keyedobjects.nib | Bin 0 -> 32654 bytes .../Resources/English.lproj/InfoPlist.strings | Bin 0 -> 276 bytes .../Resources/English.lproj/Localizable.strings | Bin 0 -> 1078 bytes .../English.lproj/main.nib/designable.nib | 3753 ++++++++++++++++++++ .../English.lproj/main.nib/keyedobjects.nib | Bin 0 -> 38309 bytes .../Resources/French.lproj/InfoPlist.strings | Bin 0 -> 276 bytes .../Resources/French.lproj/Localizable.strings | Bin 0 -> 1168 bytes .../French.lproj/main.nib/keyedobjects.nib | Bin 0 -> 36404 bytes .../Resources/German.lproj/InfoPlist.strings | Bin 0 -> 276 bytes .../Resources/German.lproj/Localizable.strings | Bin 0 -> 1096 bytes .../German.lproj/main.nib/keyedobjects.nib | Bin 0 -> 34995 bytes .../Resources/Italian.lproj/InfoPlist.strings | Bin 0 -> 278 bytes .../Resources/Italian.lproj/Localizable.strings | Bin 0 -> 1146 bytes .../Italian.lproj/main.nib/keyedobjects.nib | Bin 0 -> 33677 bytes .../Resources/Japanese.lproj/InfoPlist.strings | Bin 0 -> 272 bytes .../Resources/Japanese.lproj/Localizable.strings | Bin 0 -> 916 bytes .../Japanese.lproj/main.nib/keyedobjects.nib | Bin 0 -> 33095 bytes .../Resources/Spanish.lproj/InfoPlist.strings | Bin 0 -> 276 bytes .../Resources/Spanish.lproj/Localizable.strings | Bin 0 -> 1134 bytes .../Spanish.lproj/main.nib/keyedobjects.nib | Bin 0 -> 35294 bytes hw/xquartz/bundle/Resources/X11.icns | Bin 0 -> 65908 bytes .../bundle/Resources/da.lproj/InfoPlist.strings | Bin 0 -> 276 bytes .../bundle/Resources/da.lproj/Localizable.strings | Bin 0 -> 1090 bytes .../Resources/da.lproj/main.nib/keyedobjects.nib | Bin 0 -> 34164 bytes .../bundle/Resources/fi.lproj/InfoPlist.strings | Bin 0 -> 274 bytes .../bundle/Resources/fi.lproj/Localizable.strings | Bin 0 -> 1102 bytes .../Resources/fi.lproj/main.nib/keyedobjects.nib | Bin 0 -> 34765 bytes .../bundle/Resources/ko.lproj/InfoPlist.strings | Bin 0 -> 266 bytes .../bundle/Resources/ko.lproj/Localizable.strings | Bin 0 -> 916 bytes .../Resources/ko.lproj/main.nib/keyedobjects.nib | Bin 0 -> 32690 bytes .../bundle/Resources/no.lproj/InfoPlist.strings | Bin 0 -> 276 bytes .../bundle/Resources/no.lproj/Localizable.strings | Bin 0 -> 1084 bytes .../Resources/no.lproj/main.nib/keyedobjects.nib | Bin 0 -> 33581 bytes .../bundle/Resources/pl.lproj/InfoPlist.strings | Bin 0 -> 274 bytes .../bundle/Resources/pl.lproj/Localizable.strings | Bin 0 -> 1116 bytes .../Resources/pl.lproj/main.nib/keyedobjects.nib | Bin 0 -> 35113 bytes .../bundle/Resources/pt.lproj/InfoPlist.strings | Bin 0 -> 274 bytes .../bundle/Resources/pt.lproj/Localizable.strings | Bin 0 -> 1192 bytes .../Resources/pt.lproj/main.nib/keyedobjects.nib | Bin 0 -> 34533 bytes .../bundle/Resources/pt_PT.lproj/InfoPlist.strings | Bin 0 -> 274 bytes .../Resources/pt_PT.lproj/Localizable.strings | Bin 0 -> 1140 bytes .../pt_PT.lproj/main.nib/keyedobjects.nib | Bin 0 -> 35485 bytes .../bundle/Resources/ru.lproj/InfoPlist.strings | Bin 0 -> 274 bytes .../bundle/Resources/ru.lproj/Localizable.strings | Bin 0 -> 1122 bytes .../Resources/ru.lproj/main.nib/keyedobjects.nib | Bin 0 -> 36593 bytes .../bundle/Resources/sv.lproj/InfoPlist.strings | Bin 0 -> 260 bytes .../bundle/Resources/sv.lproj/Localizable.strings | Bin 0 -> 1106 bytes .../Resources/sv.lproj/main.nib/keyedobjects.nib | Bin 0 -> 35017 bytes .../bundle/Resources/zh_CN.lproj/InfoPlist.strings | Bin 0 -> 260 bytes .../Resources/zh_CN.lproj/Localizable.strings | Bin 0 -> 884 bytes .../zh_CN.lproj/main.nib/keyedobjects.nib | Bin 0 -> 31481 bytes .../bundle/Resources/zh_TW.lproj/InfoPlist.strings | Bin 0 -> 266 bytes .../Resources/zh_TW.lproj/Localizable.strings | Bin 0 -> 890 bytes .../zh_TW.lproj/main.nib/keyedobjects.nib | Bin 0 -> 31748 bytes hw/xquartz/bundle/Spanish.lproj/InfoPlist.strings | Bin 276 -> 0 bytes .../bundle/Spanish.lproj/Localizable.strings | Bin 1134 -> 0 bytes .../bundle/Spanish.lproj/main.nib/keyedobjects.nib | Bin 35294 -> 0 bytes hw/xquartz/bundle/X11.icns | Bin 65908 -> 0 bytes hw/xquartz/bundle/bundle-main.c | 13 +- hw/xquartz/bundle/da.lproj/InfoPlist.strings | Bin 276 -> 0 bytes hw/xquartz/bundle/da.lproj/Localizable.strings | Bin 1090 -> 0 bytes .../bundle/da.lproj/main.nib/keyedobjects.nib | Bin 34164 -> 0 bytes hw/xquartz/bundle/fi.lproj/InfoPlist.strings | Bin 274 -> 0 bytes hw/xquartz/bundle/fi.lproj/Localizable.strings | Bin 1102 -> 0 bytes .../bundle/fi.lproj/main.nib/keyedobjects.nib | Bin 34765 -> 0 bytes hw/xquartz/bundle/ko.lproj/InfoPlist.strings | Bin 266 -> 0 bytes hw/xquartz/bundle/ko.lproj/Localizable.strings | Bin 916 -> 0 bytes .../bundle/ko.lproj/main.nib/keyedobjects.nib | Bin 32690 -> 0 bytes hw/xquartz/bundle/no.lproj/InfoPlist.strings | Bin 276 -> 0 bytes hw/xquartz/bundle/no.lproj/Localizable.strings | Bin 1084 -> 0 bytes .../bundle/no.lproj/main.nib/keyedobjects.nib | Bin 33581 -> 0 bytes hw/xquartz/bundle/pl.lproj/InfoPlist.strings | Bin 274 -> 0 bytes hw/xquartz/bundle/pl.lproj/Localizable.strings | Bin 1116 -> 0 bytes .../bundle/pl.lproj/main.nib/keyedobjects.nib | Bin 35113 -> 0 bytes hw/xquartz/bundle/pt.lproj/InfoPlist.strings | Bin 274 -> 0 bytes hw/xquartz/bundle/pt.lproj/Localizable.strings | Bin 1192 -> 0 bytes .../bundle/pt.lproj/main.nib/keyedobjects.nib | Bin 34533 -> 0 bytes hw/xquartz/bundle/pt_PT.lproj/InfoPlist.strings | Bin 274 -> 0 bytes hw/xquartz/bundle/pt_PT.lproj/Localizable.strings | Bin 1140 -> 0 bytes .../bundle/pt_PT.lproj/main.nib/keyedobjects.nib | Bin 35485 -> 0 bytes hw/xquartz/bundle/ru.lproj/InfoPlist.strings | Bin 274 -> 0 bytes hw/xquartz/bundle/ru.lproj/Localizable.strings | Bin 1122 -> 0 bytes .../bundle/ru.lproj/main.nib/keyedobjects.nib | Bin 36593 -> 0 bytes hw/xquartz/bundle/sv.lproj/InfoPlist.strings | Bin 260 -> 0 bytes hw/xquartz/bundle/sv.lproj/Localizable.strings | Bin 1106 -> 0 bytes .../bundle/sv.lproj/main.nib/keyedobjects.nib | Bin 35017 -> 0 bytes hw/xquartz/bundle/zh_CN.lproj/InfoPlist.strings | Bin 260 -> 0 bytes hw/xquartz/bundle/zh_CN.lproj/Localizable.strings | Bin 884 -> 0 bytes .../bundle/zh_CN.lproj/main.nib/keyedobjects.nib | Bin 31481 -> 0 bytes hw/xquartz/bundle/zh_TW.lproj/InfoPlist.strings | Bin 266 -> 0 bytes hw/xquartz/bundle/zh_TW.lproj/Localizable.strings | Bin 890 -> 0 bytes .../bundle/zh_TW.lproj/main.nib/keyedobjects.nib | Bin 31748 -> 0 bytes hw/xquartz/quartzStartup.c | 2 +- hw/xquartz/stub/Makefile.am | 11 + hw/xquartz/stub/stub.c | 96 + hw/xquartz/xpr/Makefile.am | 11 +- 120 files changed, 3882 insertions(+), 3793 deletions(-) delete mode 100644 hw/xquartz/bundle/Dutch.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/Dutch.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/Dutch.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/English.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/English.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/English.lproj/main.nib/designable.nib delete mode 100644 hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/French.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/French.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/French.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/German.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/German.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/German.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/Italian.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/Italian.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/Italian.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/Japanese.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/Japanese.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/Japanese.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/English.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib create mode 100644 hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/French.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/German.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/X11.icns create mode 100644 hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/da.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/no.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings create mode 100644 hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings create mode 100644 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/Spanish.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/Spanish.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/Spanish.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/X11.icns delete mode 100644 hw/xquartz/bundle/da.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/da.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/da.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/fi.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/fi.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/fi.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/ko.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/ko.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/ko.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/no.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/no.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/no.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/pl.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/pl.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/pl.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/pt.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/pt.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/pt.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/pt_PT.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/pt_PT.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/pt_PT.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/ru.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/ru.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/ru.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/sv.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/sv.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/sv.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/zh_CN.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/zh_CN.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/zh_CN.lproj/main.nib/keyedobjects.nib delete mode 100644 hw/xquartz/bundle/zh_TW.lproj/InfoPlist.strings delete mode 100644 hw/xquartz/bundle/zh_TW.lproj/Localizable.strings delete mode 100644 hw/xquartz/bundle/zh_TW.lproj/main.nib/keyedobjects.nib create mode 100644 hw/xquartz/stub/Makefile.am create mode 100644 hw/xquartz/stub/stub.c diff --git a/configure.ac b/configure.ac index f695551e4..9b7753492 100644 --- a/configure.ac +++ b/configure.ac @@ -562,9 +562,6 @@ AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (d AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes]) AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto]) AC_ARG_ENABLE(xquartz, AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto]) -AC_ARG_ENABLE(x11app, AS_HELP_STRING([--enable-x11app], [Build Apple's X11.app for Xquartz (default: auto)]), [X11APP=$enableval], [X11APP=auto]) -AC_ARG_WITH(x11app-archs, AS_HELP_STRING([--with-x11app-archs=ARCHS], [Architectures to build X11.app for, space delimeted (default: "ppc i386")]), [X11APP_ARCHS=$enableval], [X11APP_ARCHS="ppc i386"]) -AC_SUBST([X11APP_ARCHS]) AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto]) AC_ARG_ENABLE(xprint, AS_HELP_STRING([--enable-xprint], [Build Xprint extension and server (default: no)]), [XPRINT=$enableval], [XPRINT=no]) AC_ARG_ENABLE(xgl, AS_HELP_STRING([--enable-xgl], [Build Xgl server (default: no)]), [XGL=$enableval], [XGL=no]) @@ -1756,17 +1753,6 @@ AM_CONDITIONAL(HAVE_XPLUGIN, [test "x$ac_cv_lib_Xplugin_xp_init" = xyes]) AM_CONDITIONAL(HAVE_AGL_FRAMEWORK, [test "x$xorg_cv_AGL_framework" = xyes]) AM_CONDITIONAL(XQUARTZ, [test "x$XQUARTZ" = xyes]) -if test "x$X11APP" = xauto; then - AC_MSG_CHECKING([whether to build X11.app]) - if test "x$XQUARTZ" = xyes ; then - X11APP=yes - else - X11APP=no - fi - AC_MSG_RESULT([$X11APP]) -fi -AM_CONDITIONAL(X11APP,[test "X$X11APP" = Xyes]) - if test "x$LAUNCHD" = "xauto"; then if test "x$XQUARTZ" = "xyes" ; then LAUNCHD=yes @@ -2165,6 +2151,7 @@ hw/xwin/Makefile hw/xquartz/Makefile hw/xquartz/GL/Makefile hw/xquartz/bundle/Makefile +hw/xquartz/stub/Makefile hw/xquartz/xpr/Makefile hw/kdrive/Makefile hw/kdrive/ati/Makefile diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am index b2674be4f..bbd21f816 100644 --- a/hw/xquartz/Makefile.am +++ b/hw/xquartz/Makefile.am @@ -9,16 +9,12 @@ AM_CPPFLAGS = \ -DXFree86Server \ -I$(top_srcdir)/miext/rootless -if X11APP -X11APP_SUBDIRS = bundle -endif - -SUBDIRS = . GL xpr $(X11APP_SUBDIRS) -DIST_SUBDIRS = GL xpr bundle +SUBDIRS = bundle . GL xpr stub libXquartz_la_SOURCES = \ $(top_srcdir)/fb/fbcmap_mi.c \ $(top_srcdir)/mi/miinitext.c \ + bundle/bundle-main.c \ X11Application.m \ X11Controller.m \ applewm.c \ diff --git a/hw/xquartz/bundle/Dutch.lproj/InfoPlist.strings b/hw/xquartz/bundle/Dutch.lproj/InfoPlist.strings deleted file mode 100644 index 8f978d63f..000000000 Binary files a/hw/xquartz/bundle/Dutch.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/Dutch.lproj/Localizable.strings b/hw/xquartz/bundle/Dutch.lproj/Localizable.strings deleted file mode 100644 index 1ff39fe67..000000000 Binary files a/hw/xquartz/bundle/Dutch.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/Dutch.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Dutch.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index 95c26d7b3..000000000 Binary files a/hw/xquartz/bundle/Dutch.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/English.lproj/InfoPlist.strings b/hw/xquartz/bundle/English.lproj/InfoPlist.strings deleted file mode 100644 index 88e1f04ac..000000000 Binary files a/hw/xquartz/bundle/English.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/English.lproj/Localizable.strings b/hw/xquartz/bundle/English.lproj/Localizable.strings deleted file mode 100644 index 63a135255..000000000 Binary files a/hw/xquartz/bundle/English.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/English.lproj/main.nib/designable.nib b/hw/xquartz/bundle/English.lproj/main.nib/designable.nib deleted file mode 100644 index c93d02372..000000000 --- a/hw/xquartz/bundle/English.lproj/main.nib/designable.nib +++ /dev/null @@ -1,3753 +0,0 @@ - - - - 1050 - 9C7010 - 639 - 949.26 - 352.00 - - YES - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - YES - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - YES - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - YES - - - About X11 - - 2147483647 - - - - - - Preferences... - , - 1048576 - 2147483647 - - - - - - Check for updates... - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - - Services - - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Toggle Full Screen - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide X11 - h - 1048576 - 2147483647 - - - 42 - - - - Hide Others - - 1048576 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Applications - - 1048576 - 2147483647 - - - submenuAction: - - Applications - - YES - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Customize... - - 1048576 - 2147483647 - - - - - - - - - Edit - - 1048576 - 2147483647 - - - submenuAction: - - Edit - - YES - - - Undo - z - 1048576 - 2147483647 - - - - - - Redo - Z - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Cut - x - 1048576 - 2147483647 - - - - - - Copy - c - 1048576 - 2147483647 - - - - - - Paste - v - 1048576 - 2147483647 - - - - - - Delete - - 1048576 - 2147483647 - - - - - - Select All - a - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - - Window - - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - Cycle Through Windows - ` - 1048840 - 2147483647 - - - - - - Reverse Cycle Through Windows - ~ - 1179914 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Close - w - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 1048576 - 2147483647 - - - submenuAction: - - Help - - YES - - - X11 Help - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 392}, {484, 280}} - 1350041600 - X11 Preferences - NSPanel - - View - - {3.40282e+38, 3.40282e+38} - {213, 107} - - - 256 - - YES - - - 256 - {{13, 10}, {458, 264}} - - - YES - - - 1 - - - - 256 - - YES - - - 256 - {{18, 182}, {402, 18}} - - YES - - 67239424 - 0 - Emulate three button mouse - - LucidaGrande - 1.300000e+01 - 1044 - - - 1211912703 - 2 - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 32}, {385, 31}} - - YES - - 67239424 - 4194304 - When enabled, menu bar key equivalents may interfere with X11 applications that use the Meta modifier. - - LucidaGrande - 1.100000e+01 - 3100 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2OQA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 147}, {385, 29}} - - YES - - 67239424 - 4194304 - SG9sZCBPcHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8gYWN0aXZhdGUgdGhlIG1pZGRs -ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - YES - - 67239424 - 0 - Enable key equivalents under X11 - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{36, 98}, {385, 14}} - - YES - - 67239424 - 4194304 - Allows input menu changes to overwrite the current X11 keymap. - - - - - - - - - 256 - {{18, 118}, {402, 18}} - - YES - - 67239424 - 0 - Follow system keyboard layout - - - 1211912703 - 2 - - - - 200 - 25 - - - - {{10, 33}, {438, 218}} - - - Input - - - - - - 2 - - - - 256 - - YES - - - 256 - {{18, 55}, {402, 18}} - - YES - - 67239424 - 0 - Use system alert effect - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{36, 21}, {385, 28}} - - YES - - 67239424 - 4194304 - X11 beeps will use the standard system alert, as defined in the Sound Effects system preferences panel. - - - - - - - - - 256 - {{74, 174}, {128, 26}} - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 1.300000e+01 - 16 - - - - - - - - 400 - 75 - - - From Display - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - YES - - - - 256 Colors - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Thousands - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Millions - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 177}, {55, 20}} - - YES - - 67239424 - 4194304 - Q29sb3JzOgo - - - - - - - - - 256 - {{36, 155}, {392, 14}} - - YES - - 67239424 - 4194304 - This option takes effect when X11 is launched again. - - - - - - - - - 256 - {{18, 121}, {409, 23}} - - YES - - 67239424 - 0 - Full screen mode - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{36, 84}, {385, 31}} - - YES - - 67239424 - 4194304 - Enables the X11 root window. Use the Command-Option-A keystroke to enter and leave full screen mode. - - - - - - - - {{10, 33}, {438, 218}} - - Output - - - - - - 2 - - - - 256 - - YES - - - 256 - {{15, 184}, {402, 18}} - - YES - - 67239424 - 0 - Click-through Inactive Windows - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{23, 147}, {385, 31}} - - YES - - 67239424 - 4194304 - When enabled, clicking on an inactive window will cause that mouse click to pass through to that window in addition to activating it. - - - - - - - - - 256 - {{15, 123}, {402, 18}} - - YES - - 67239424 - 0 - Focus Follows Mouse - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{23, 100}, {385, 17}} - - YES - - 67239424 - 4194304 - X11 window focus follows the cursor - - - - - - - - - 256 - {{15, 79}, {402, 18}} - - YES - - 67239424 - 0 - Focus On New Windows - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{23, 45}, {385, 28}} - - YES - - 67239424 - 4194304 - When enabled, creation of a new X11 window will cause X11.app to move to the foreground (instead of Finder.app, Terminal.app, etc.) - - - - - - - - {{10, 33}, {438, 218}} - - Windows - - - - - - - 256 - - YES - - - 256 - {{18, 182}, {402, 18}} - - YES - - 67239424 - 0 - Authenticate connections - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{18, 105}, {402, 18}} - - YES - - 67239424 - 0 - Allow connections from network clients - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{36, 134}, {385, 42}} - - YES - - 67239424 - 4194304 - TGF1bmNoaW5nIFgxMSB3aWxsIGNyZWF0ZSBYYXV0aG9yaXR5IGFjY2Vzcy1jb250cm9sIGtleXMuIElm -IHRoZSBzeXN0ZW0ncyBJUCBhZGRyZXNzIGNoYW5nZXMsIHRoZXNlIGtleXMgYmVjb21lIGludmFsaWQg -d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4 - - - - - - - - - 256 - {{36, 57}, {385, 42}} - - YES - - 67239424 - 4194304 - If enabled, Authenticate connections must also be enabled to ensure system security. When disabled, connections from remote applications are not allowed. - - - - - - - - - 256 - {{20, -44}, {404, 14}} - - YES - - 67239424 - 4194304 - These options take effect when X11 is next launched. - - - - - - - - {{10, 33}, {438, 218}} - - Security - - - - - - - 0 - YES - YES - - YES - - - - - {484, 280} - - {{0, 0}, {1280, 938}} - {213, 129} - {3.40282e+38, 3.40282e+38} - x11_prefs - - - 11 - 2 - {{302, 400}, {454, 311}} - 1350041600 - X11 Application Menu - NSPanel - - View - - {10000, 10000} - {320, 240} - - - 256 - - YES - - - 265 - {{340, 231}, {100, 32}} - - YES - - 67239424 - 137887744 - Duplicate - - - -2038284033 - 1 - - Helvetica - 1.300000e+01 - 16 - - - - - - - - 200 - 25 - - - - - 265 - {{340, 199}, {100, 32}} - - YES - - 67239424 - 137887744 - Remove - - - -2038284033 - 1 - - - - - - - - 200 - 25 - - - - - 274 - - YES - - - 2304 - - YES - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - YES - - 9.900000e+01 - 4.000000e+01 - 1.000000e+03 - - 75628032 - 0 - Name - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - 3 - MQA - - - - 3 - YES - YES - - - - 1.217310e+02 - 6.273100e+01 - 1.000000e+03 - - 75628032 - 0 - Command - - - - - - 338820672 - 1024 - Text Cell - - - - - - 3 - YES - YES - - - - 7.100000e+01 - 1.000000e+01 - 1.000000e+03 - - 67239424 - 0 - Shortcut - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 1.200000e+01 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3.000000e+00 - 2.000000e+00 - - - 6 - System - gridColor - - 3 - MC41AA - - - 1.700000e+01 - 1379958784 - 1 - -1 - 0 - YES - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 9.949238e-01 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 6.885246e-01 - - - - 2304 - - YES - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 60}, {318, 231}} - - - 50 - - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 263}, {100, 32}} - - YES - - -2080244224 - 137887744 - Add Item - - - -2038284033 - 1 - - - - - - - - 200 - 25 - - - - - 257 - {{356, 12}, {84, 32}} - - YES - - -2080244224 - 137887744 - Cancel - - - -2038284033 - 1 - - - - - - - - 200 - 25 - - - - - 257 - {{272, 12}, {84, 32}} - - YES - - -2080244224 - 137887744 - Done - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 311} - - {{0, 0}, {1280, 938}} - {320, 262} - x11_apps - - - Menu - - YES - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Applications - - 1048576 - 2147483647 - - - submenuAction: - - Applications - - YES - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Q3VzdG9taXpl4oCmA - - 1048576 - 2147483647 - - - - - - - - - - - SUUpdater - - - - - YES - - - cut: - - - - 175 - - - - paste: - - - - 176 - - - - redo: - - - - 178 - - - - selectAll: - - - - 179 - - - - undo: - - - - 180 - - - - copy: - - - - 181 - - - - delete: - - - - 195 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_done: - - - - 302 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_cancel: - - - - 309 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - use_sysbeep - - - - 390 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 397 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - window_separator - - - - 300331 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - checkForUpdates: - - - - 300397 - - - - - YES - - 0 - - YES - - - - - - -2 - - - RmlsZSdzIE93bmVyA - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - MainMenu - - - 19 - - - YES - - - - - - 24 - - - YES - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - YES - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - YES - - - - - - 169 - - - YES - - - - - - - - - - - - - 156 - - - - - 157 - - - - - 158 - - - - - 160 - - - - - 164 - - - - - 171 - - - - - 172 - - - - - 173 - - - - - 269 - - - YES - - - - - - 270 - - - YES - - - - - - - 272 - - - - - 305 - - - - - 419 - - - YES - - - - - - 420 - - - YES - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - YES - - - - PrefsPanel - - - 245 - - - YES - - - - - - 348 - - - YES - - - - - - - - - 349 - - - YES - - - - - - 351 - - - YES - - - - - - - - - - - 363 - - - YES - - - - - - 364 - - - YES - - - - - - 365 - - - YES - - - - - - 368 - - - YES - - - - - - 369 - - - YES - - - - - - 370 - - - YES - - - - - - 352 - - - YES - - - - - - 350 - - - YES - - - - - - - - - - - - 371 - - - YES - - - - - - 372 - - - YES - - - - - - 382 - - - YES - - - - - - 385 - - - YES - - - - - - 386 - - - YES - - - - - - 541 - - - YES - - - - - - 543 - - - YES - - - - - - 353 - - - YES - - - - - - 354 - - - YES - - - - - - - - - - 374 - - - YES - - - - - - 375 - - - YES - - - - - - 376 - - - YES - - - - - - 377 - - - YES - - - - - - 379 - - - YES - - - - - - 285 - - - YES - - - - EditPrograms - - - 286 - - - YES - - - - - - - - - - - 423 - - - YES - - - - - DockMenu - - - 524 - - - - - 526 - - - YES - - - - - - 527 - - - YES - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100371 - - - - - 100372 - - - - - 100382 - - - YES - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - YES - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - YES - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - YES - - - - - - - - 535 - - - YES - - - - - - 575 - - - - - 298 - - - YES - - - - - - 573 - - - - - 297 - - - YES - - - - - - 574 - - - - - 310 - - - YES - - - - - - 100310 - - - - - 292 - - - YES - - - - - - 100292 - - - - - 293 - - - YES - - - - - - 100293 - - - - - 299 - - - YES - - - - - - 100299 - - - - - 291 - - - YES - - - - - - 100291 - - - - - 300330 - - - - - 300337 - - - YES - - - - - - 300338 - - - YES - - - - - - - - - - - 300358 - - - YES - - - - - - 300359 - - - YES - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - YES - - - - - - 300363 - - - - - 300364 - - - YES - - - - - - 300365 - - - - - 300368 - - - YES - - - - - - 300369 - - - - - 300370 - - - YES - - - - - - 300371 - - - - - 300395 - - - Updater - - - 300396 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - -3.ImportedFromIB2 - 100295.IBShouldRemoveOnLegacySave - 129.IBPluginDependency - 129.ImportedFromIB2 - 130.IBPluginDependency - 130.ImportedFromIB2 - 131.IBPluginDependency - 131.ImportedFromIB2 - 134.IBPluginDependency - 134.ImportedFromIB2 - 136.IBPluginDependency - 136.ImportedFromIB2 - 143.IBPluginDependency - 143.ImportedFromIB2 - 144.IBPluginDependency - 144.ImportedFromIB2 - 145.IBPluginDependency - 145.ImportedFromIB2 - 149.IBPluginDependency - 149.ImportedFromIB2 - 150.IBPluginDependency - 150.ImportedFromIB2 - 156.IBPluginDependency - 156.ImportedFromIB2 - 157.IBPluginDependency - 157.ImportedFromIB2 - 158.IBPluginDependency - 158.ImportedFromIB2 - 160.IBPluginDependency - 160.ImportedFromIB2 - 163.IBPluginDependency - 163.ImportedFromIB2 - 164.IBPluginDependency - 164.ImportedFromIB2 - 169.IBPluginDependency - 169.ImportedFromIB2 - 169.editorWindowContentRectSynchronizationRect - 171.IBPluginDependency - 171.ImportedFromIB2 - 172.IBPluginDependency - 172.ImportedFromIB2 - 173.IBPluginDependency - 173.ImportedFromIB2 - 19.IBPluginDependency - 19.ImportedFromIB2 - 196.IBPluginDependency - 196.ImportedFromIB2 - 200295.IBShouldRemoveOnLegacySave - 203.IBPluginDependency - 203.ImportedFromIB2 - 204.IBPluginDependency - 204.ImportedFromIB2 - 23.IBPluginDependency - 23.ImportedFromIB2 - 24.IBPluginDependency - 24.ImportedFromIB2 - 24.editorWindowContentRectSynchronizationRect - 244.IBEditorWindowLastContentRect - 244.IBPluginDependency - 244.IBWindowTemplateEditedContentRect - 244.ImportedFromIB2 - 244.editorWindowContentRectSynchronizationRect - 244.windowTemplate.hasMaxSize - 244.windowTemplate.hasMinSize - 244.windowTemplate.maxSize - 244.windowTemplate.minSize - 245.IBPluginDependency - 245.ImportedFromIB2 - 269.IBPluginDependency - 269.ImportedFromIB2 - 270.IBPluginDependency - 270.ImportedFromIB2 - 270.editorWindowContentRectSynchronizationRect - 272.IBPluginDependency - 272.ImportedFromIB2 - 285.IBEditorWindowLastContentRect - 285.IBPluginDependency - 285.IBViewEditorWindowController.showingBoundsRectangles - 285.IBViewEditorWindowController.showingLayoutRectangles - 285.IBWindowTemplateEditedContentRect - 285.ImportedFromIB2 - 285.editorWindowContentRectSynchronizationRect - 285.windowTemplate.hasMaxSize - 285.windowTemplate.hasMinSize - 285.windowTemplate.maxSize - 285.windowTemplate.minSize - 286.IBPluginDependency - 286.ImportedFromIB2 - 29.IBEditorWindowLastContentRect - 29.IBPluginDependency - 29.ImportedFromIB2 - 29.editorWindowContentRectSynchronizationRect - 291.IBPluginDependency - 291.ImportedFromIB2 - 292.IBPluginDependency - 292.ImportedFromIB2 - 293.IBPluginDependency - 293.ImportedFromIB2 - 295.IBPluginDependency - 295.ImportedFromIB2 - 296.IBPluginDependency - 296.ImportedFromIB2 - 297.IBPluginDependency - 297.ImportedFromIB2 - 298.IBPluginDependency - 298.ImportedFromIB2 - 299.IBPluginDependency - 299.ImportedFromIB2 - 300295.IBShouldRemoveOnLegacySave - 300330.IBPluginDependency - 300330.ImportedFromIB2 - 300337.IBPluginDependency - 300337.ImportedFromIB2 - 300338.IBPluginDependency - 300338.ImportedFromIB2 - 300358.IBPluginDependency - 300358.ImportedFromIB2 - 300359.IBPluginDependency - 300359.ImportedFromIB2 - 300362.IBPluginDependency - 300362.ImportedFromIB2 - 300364.IBPluginDependency - 300364.ImportedFromIB2 - 300368.IBPluginDependency - 300368.ImportedFromIB2 - 300370.IBPluginDependency - 300370.ImportedFromIB2 - 300395.IBPluginDependency - 300396.IBPluginDependency - 305.IBPluginDependency - 305.ImportedFromIB2 - 310.IBPluginDependency - 310.ImportedFromIB2 - 348.IBPluginDependency - 348.ImportedFromIB2 - 349.IBPluginDependency - 349.ImportedFromIB2 - 350.IBPluginDependency - 350.ImportedFromIB2 - 351.IBPluginDependency - 351.ImportedFromIB2 - 352.IBPluginDependency - 352.ImportedFromIB2 - 353.IBPluginDependency - 353.ImportedFromIB2 - 354.IBPluginDependency - 354.ImportedFromIB2 - 363.IBPluginDependency - 363.ImportedFromIB2 - 364.IBPluginDependency - 364.ImportedFromIB2 - 365.IBPluginDependency - 365.ImportedFromIB2 - 368.IBPluginDependency - 368.ImportedFromIB2 - 369.IBPluginDependency - 369.ImportedFromIB2 - 370.IBPluginDependency - 370.ImportedFromIB2 - 371.IBPluginDependency - 371.ImportedFromIB2 - 372.IBPluginDependency - 372.ImportedFromIB2 - 374.IBPluginDependency - 374.ImportedFromIB2 - 375.IBPluginDependency - 375.ImportedFromIB2 - 376.IBPluginDependency - 376.ImportedFromIB2 - 377.IBPluginDependency - 377.ImportedFromIB2 - 379.IBPluginDependency - 379.ImportedFromIB2 - 380.IBPluginDependency - 380.ImportedFromIB2 - 381.IBPluginDependency - 381.ImportedFromIB2 - 382.IBPluginDependency - 382.ImportedFromIB2 - 383.IBPluginDependency - 383.ImportedFromIB2 - 384.IBPluginDependency - 384.ImportedFromIB2 - 385.IBPluginDependency - 385.ImportedFromIB2 - 386.IBPluginDependency - 386.ImportedFromIB2 - 419.IBPluginDependency - 419.ImportedFromIB2 - 420.IBPluginDependency - 420.ImportedFromIB2 - 421.IBPluginDependency - 421.ImportedFromIB2 - 423.IBPluginDependency - 423.ImportedFromIB2 - 435.IBPluginDependency - 435.ImportedFromIB2 - 5.IBPluginDependency - 5.ImportedFromIB2 - 524.IBPluginDependency - 524.ImportedFromIB2 - 526.IBPluginDependency - 526.ImportedFromIB2 - 527.IBPluginDependency - 527.ImportedFromIB2 - 532.IBPluginDependency - 532.ImportedFromIB2 - 533.IBPluginDependency - 533.ImportedFromIB2 - 535.IBPluginDependency - 535.ImportedFromIB2 - 536.IBPluginDependency - 536.ImportedFromIB2 - 537.IBPluginDependency - 537.ImportedFromIB2 - 538.IBPluginDependency - 538.ImportedFromIB2 - 541.IBPluginDependency - 541.ImportedFromIB2 - 543.IBPluginDependency - 543.ImportedFromIB2 - 544.IBPluginDependency - 544.ImportedFromIB2 - 545.IBPluginDependency - 545.ImportedFromIB2 - 56.IBPluginDependency - 56.ImportedFromIB2 - 57.IBEditorWindowLastContentRect - 57.IBPluginDependency - 57.ImportedFromIB2 - 57.editorWindowContentRectSynchronizationRect - 573.IBPluginDependency - 573.ImportedFromIB2 - 574.IBPluginDependency - 574.ImportedFromIB2 - 575.IBPluginDependency - 575.ImportedFromIB2 - 58.IBPluginDependency - 58.ImportedFromIB2 - 92.IBPluginDependency - 92.ImportedFromIB2 - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{313, 353}, {484, 280}} - com.apple.InterfaceBuilder.CocoaPlugin - {{313, 353}, {484, 280}} - - {{184, 290}, {481, 345}} - - - {3.40282e+38, 3.40282e+38} - {213, 107} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{407, 545}, {454, 311}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{407, 545}, {454, 311}} - - {{433, 406}, {486, 327}} - - - {3.40282e+38, 3.40282e+38} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{0, 836}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{12, 633}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - YES - - YES - - - YES - - - - - YES - - YES - - - YES - - - - 300397 - - - - YES - - FirstResponder - - IBUserSource - - - - - NSFormatter - - IBUserSource - - - - - X11Controller - NSObject - - IBUserSource - - - - - - YES - - SUUpdater - NSObject - - checkForUpdates: - id - - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUUpdater.h - - - - X11Controller - NSObject - - YES - - YES - apps_table_cancel: - apps_table_delete: - apps_table_done: - apps_table_duplicate: - apps_table_new: - apps_table_show: - bring_to_front: - close_window: - enable_fullscreen_changed: - minimize_window: - next_window: - prefs_changed: - prefs_show: - previous_window: - quit: - toggle_fullscreen: - x11_help: - zoom_window: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - apps_separator - apps_table - click_through - depth - dock_apps_menu - dock_menu - dock_window_separator - enable_auth - enable_fullscreen - enable_keyequivs - enable_tcp - fake_buttons - focus_follows_mouse - focus_on_new_window - prefs_panel - sync_keymap - toggle_fullscreen_item - use_sysbeep - window_separator - x11_about_item - - - YES - NSMenuItem - NSTableView - NSButton - NSPopUpButton - NSMenu - NSMenu - NSMenuItem - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSPanel - NSButton - NSMenuItem - NSButton - NSMenuItem - NSMenuItem - - - - IBDocumentRelativeSource - ../../X11Controller.h - - - - - 0 - ../X11.xcodeproj - 3 - - diff --git a/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index 066fdbe9e..000000000 Binary files a/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/French.lproj/InfoPlist.strings b/hw/xquartz/bundle/French.lproj/InfoPlist.strings deleted file mode 100644 index 88e1f04ac..000000000 Binary files a/hw/xquartz/bundle/French.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/French.lproj/Localizable.strings b/hw/xquartz/bundle/French.lproj/Localizable.strings deleted file mode 100644 index 2770dfb8c..000000000 Binary files a/hw/xquartz/bundle/French.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/French.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/French.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index 9f9a7da67..000000000 Binary files a/hw/xquartz/bundle/French.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/German.lproj/InfoPlist.strings b/hw/xquartz/bundle/German.lproj/InfoPlist.strings deleted file mode 100644 index aa37e7555..000000000 Binary files a/hw/xquartz/bundle/German.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/German.lproj/Localizable.strings b/hw/xquartz/bundle/German.lproj/Localizable.strings deleted file mode 100644 index a5489ab5c..000000000 Binary files a/hw/xquartz/bundle/German.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/German.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/German.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index 19532a9c2..000000000 Binary files a/hw/xquartz/bundle/German.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/Italian.lproj/InfoPlist.strings b/hw/xquartz/bundle/Italian.lproj/InfoPlist.strings deleted file mode 100644 index 412169880..000000000 Binary files a/hw/xquartz/bundle/Italian.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/Italian.lproj/Localizable.strings b/hw/xquartz/bundle/Italian.lproj/Localizable.strings deleted file mode 100644 index d05d73d44..000000000 Binary files a/hw/xquartz/bundle/Italian.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/Italian.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Italian.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index b6e2e1bb1..000000000 Binary files a/hw/xquartz/bundle/Italian.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/Japanese.lproj/InfoPlist.strings b/hw/xquartz/bundle/Japanese.lproj/InfoPlist.strings deleted file mode 100644 index 2d6330fa7..000000000 Binary files a/hw/xquartz/bundle/Japanese.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/Japanese.lproj/Localizable.strings b/hw/xquartz/bundle/Japanese.lproj/Localizable.strings deleted file mode 100644 index 99821ea1f..000000000 Binary files a/hw/xquartz/bundle/Japanese.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/Japanese.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Japanese.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index 523fd0856..000000000 Binary files a/hw/xquartz/bundle/Japanese.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am index 801fdc7d8..b7776967f 100644 --- a/hw/xquartz/bundle/Makefile.am +++ b/hw/xquartz/bundle/Makefile.am @@ -1,20 +1,11 @@ -bin_SCRIPTS = x11app - -.PHONY: x11app - -x11app: - xcodebuild CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ARCHS="$(X11APP_ARCHS)" - install-data-hook: - xcodebuild install DSTROOT="/$(DESTDIR)" INSTALL_PATH="$(APPLE_APPLICATIONS_DIR)" DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)" - -clean-local: - rm -rf build + ./mk_bundke.sh $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/X11.app resourcedir=$(libdir)/X11/xserver resource_DATA = Xquartz.plist EXTRA_DIST = \ + mk_bundke.sh \ $(resource_DATA) \ Info.plist \ X11.icns \ diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings new file mode 100644 index 000000000..8f978d63f Binary files /dev/null and b/hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings new file mode 100644 index 000000000..1ff39fe67 Binary files /dev/null and b/hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..95c26d7b3 Binary files /dev/null and b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings new file mode 100644 index 000000000..88e1f04ac Binary files /dev/null and b/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings new file mode 100644 index 000000000..63a135255 Binary files /dev/null and b/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib new file mode 100644 index 000000000..c93d02372 --- /dev/null +++ b/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib @@ -0,0 +1,3753 @@ + + + + 1050 + 9C7010 + 639 + 949.26 + 352.00 + + YES + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + + NSApplication + + + + FirstResponder + + + NSApplication + + + MainMenu + + YES + + + X11 + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + X11 + + YES + + + About X11 + + 2147483647 + + + + + + Preferences... + , + 1048576 + 2147483647 + + + + + + Check for updates... + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + + Services + + + YES + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Toggle Full Screen + a + 1572864 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Hide X11 + h + 1048576 + 2147483647 + + + 42 + + + + Hide Others + + 1048576 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + 42 + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Quit X11 + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + Applications + + 1048576 + 2147483647 + + + submenuAction: + + Applications + + YES + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Customize... + + 1048576 + 2147483647 + + + + + + + + + Edit + + 1048576 + 2147483647 + + + submenuAction: + + Edit + + YES + + + Undo + z + 1048576 + 2147483647 + + + + + + Redo + Z + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Cut + x + 1048576 + 2147483647 + + + + + + Copy + c + 1048576 + 2147483647 + + + + + + Paste + v + 1048576 + 2147483647 + + + + + + Delete + + 1048576 + 2147483647 + + + + + + Select All + a + 1048576 + 2147483647 + + + + + + + + + Window + + 1048576 + 2147483647 + + + submenuAction: + + + Window + + + YES + + + Minimize + m + 1048576 + 2147483647 + + + + + + Zoom + + 1048576 + 2147483647 + + + + + + Cycle Through Windows + ` + 1048840 + 2147483647 + + + + + + Reverse Cycle Through Windows + ~ + 1179914 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Close + w + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Bring All to Front + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + _NSWindowsMenu + + + + + Help + + 1048576 + 2147483647 + + + submenuAction: + + Help + + YES + + + X11 Help + + 1048576 + 2147483647 + + + + + + + + _NSMainMenu + + + X11Controller + + + 3 + 2 + {{266, 392}, {484, 280}} + 1350041600 + X11 Preferences + NSPanel + + View + + {3.40282e+38, 3.40282e+38} + {213, 107} + + + 256 + + YES + + + 256 + {{13, 10}, {458, 264}} + + + YES + + + 1 + + + + 256 + + YES + + + 256 + {{18, 182}, {402, 18}} + + YES + + 67239424 + 0 + Emulate three button mouse + + LucidaGrande + 1.300000e+01 + 1044 + + + 1211912703 + 2 + + NSSwitch + + + + 200 + 25 + + + + + 256 + {{36, 32}, {385, 31}} + + YES + + 67239424 + 4194304 + When enabled, menu bar key equivalents may interfere with X11 applications that use the Meta modifier. + + LucidaGrande + 1.100000e+01 + 3100 + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2OQA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + + + + 256 + {{36, 147}, {385, 29}} + + YES + + 67239424 + 4194304 + SG9sZCBPcHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8gYWN0aXZhdGUgdGhlIG1pZGRs +ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA + + + + + + + + + 256 + {{18, 69}, {402, 18}} + + YES + + 67239424 + 0 + Enable key equivalents under X11 + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{36, 98}, {385, 14}} + + YES + + 67239424 + 4194304 + Allows input menu changes to overwrite the current X11 keymap. + + + + + + + + + 256 + {{18, 118}, {402, 18}} + + YES + + 67239424 + 0 + Follow system keyboard layout + + + 1211912703 + 2 + + + + 200 + 25 + + + + {{10, 33}, {438, 218}} + + + Input + + + + + + 2 + + + + 256 + + YES + + + 256 + {{18, 55}, {402, 18}} + + YES + + 67239424 + 0 + Use system alert effect + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{36, 21}, {385, 28}} + + YES + + 67239424 + 4194304 + X11 beeps will use the standard system alert, as defined in the Sound Effects system preferences panel. + + + + + + + + + 256 + {{74, 174}, {128, 26}} + + YES + + -2076049856 + 1024 + + + 109199615 + 1 + + LucidaGrande + 1.300000e+01 + 16 + + + + + + + + 400 + 75 + + + From Display + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + -1 + + + YES + + + OtherViews + + + YES + + + + 256 Colors + + 1048576 + 2147483647 + + + _popUpItemAction: + 8 + + + + + Thousands + + 1048576 + 2147483647 + + + _popUpItemAction: + 15 + + + + + Millions + + 1048576 + 2147483647 + + + _popUpItemAction: + 24 + + + + + 3 + YES + YES + 1 + + + + + 256 + {{17, 177}, {55, 20}} + + YES + + 67239424 + 4194304 + Q29sb3JzOgo + + + + + + + + + 256 + {{36, 155}, {392, 14}} + + YES + + 67239424 + 4194304 + This option takes effect when X11 is launched again. + + + + + + + + + 256 + {{18, 121}, {409, 23}} + + YES + + 67239424 + 0 + Full screen mode + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{36, 84}, {385, 31}} + + YES + + 67239424 + 4194304 + Enables the X11 root window. Use the Command-Option-A keystroke to enter and leave full screen mode. + + + + + + + + {{10, 33}, {438, 218}} + + Output + + + + + + 2 + + + + 256 + + YES + + + 256 + {{15, 184}, {402, 18}} + + YES + + 67239424 + 0 + Click-through Inactive Windows + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{23, 147}, {385, 31}} + + YES + + 67239424 + 4194304 + When enabled, clicking on an inactive window will cause that mouse click to pass through to that window in addition to activating it. + + + + + + + + + 256 + {{15, 123}, {402, 18}} + + YES + + 67239424 + 0 + Focus Follows Mouse + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{23, 100}, {385, 17}} + + YES + + 67239424 + 4194304 + X11 window focus follows the cursor + + + + + + + + + 256 + {{15, 79}, {402, 18}} + + YES + + 67239424 + 0 + Focus On New Windows + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{23, 45}, {385, 28}} + + YES + + 67239424 + 4194304 + When enabled, creation of a new X11 window will cause X11.app to move to the foreground (instead of Finder.app, Terminal.app, etc.) + + + + + + + + {{10, 33}, {438, 218}} + + Windows + + + + + + + 256 + + YES + + + 256 + {{18, 182}, {402, 18}} + + YES + + 67239424 + 0 + Authenticate connections + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{18, 105}, {402, 18}} + + YES + + 67239424 + 0 + Allow connections from network clients + + + 1211912703 + 2 + + + + 200 + 25 + + + + + 256 + {{36, 134}, {385, 42}} + + YES + + 67239424 + 4194304 + TGF1bmNoaW5nIFgxMSB3aWxsIGNyZWF0ZSBYYXV0aG9yaXR5IGFjY2Vzcy1jb250cm9sIGtleXMuIElm +IHRoZSBzeXN0ZW0ncyBJUCBhZGRyZXNzIGNoYW5nZXMsIHRoZXNlIGtleXMgYmVjb21lIGludmFsaWQg +d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4 + + + + + + + + + 256 + {{36, 57}, {385, 42}} + + YES + + 67239424 + 4194304 + If enabled, Authenticate connections must also be enabled to ensure system security. When disabled, connections from remote applications are not allowed. + + + + + + + + + 256 + {{20, -44}, {404, 14}} + + YES + + 67239424 + 4194304 + These options take effect when X11 is next launched. + + + + + + + + {{10, 33}, {438, 218}} + + Security + + + + + + + 0 + YES + YES + + YES + + + + + {484, 280} + + {{0, 0}, {1280, 938}} + {213, 129} + {3.40282e+38, 3.40282e+38} + x11_prefs + + + 11 + 2 + {{302, 400}, {454, 311}} + 1350041600 + X11 Application Menu + NSPanel + + View + + {10000, 10000} + {320, 240} + + + 256 + + YES + + + 265 + {{340, 231}, {100, 32}} + + YES + + 67239424 + 137887744 + Duplicate + + + -2038284033 + 1 + + Helvetica + 1.300000e+01 + 16 + + + + + + + + 200 + 25 + + + + + 265 + {{340, 199}, {100, 32}} + + YES + + 67239424 + 137887744 + Remove + + + -2038284033 + 1 + + + + + + + + 200 + 25 + + + + + 274 + + YES + + + 2304 + + YES + + + 256 + {301, 198} + + YES + + + 256 + {301, 17} + + + + + + 256 + {{302, 0}, {16, 17}} + + + + YES + + 9.900000e+01 + 4.000000e+01 + 1.000000e+03 + + 75628032 + 0 + Name + + + 3 + MC4zMzMzMzI5OQA + + + 6 + System + headerTextColor + + + + + 338820672 + 1024 + Text Cell + + + + 3 + MQA + + + + 3 + YES + YES + + + + 1.217310e+02 + 6.273100e+01 + 1.000000e+03 + + 75628032 + 0 + Command + + + + + + 338820672 + 1024 + Text Cell + + + + + + 3 + YES + YES + + + + 7.100000e+01 + 1.000000e+01 + 1.000000e+03 + + 67239424 + 0 + Shortcut + + + 6 + System + headerColor + + + + + + 338820672 + 1024 + Text Cell + + LucidaGrande + 1.200000e+01 + 16 + + + YES + + 6 + System + controlBackgroundColor + + + + + 3 + YES + YES + + + + 3.000000e+00 + 2.000000e+00 + + + 6 + System + gridColor + + 3 + MC41AA + + + 1.700000e+01 + 1379958784 + 1 + -1 + 0 + YES + + + {{1, 17}, {301, 198}} + + + + + 4 + + + + 256 + {{302, 17}, {15, 198}} + + + _doScroller: + 9.949238e-01 + + + + 256 + {{1, 215}, {301, 15}} + + 1 + + _doScroller: + 6.885246e-01 + + + + 2304 + + YES + + + {{1, 0}, {301, 17}} + + + + + 4 + + + + {{20, 60}, {318, 231}} + + + 50 + + + + + + QSAAAEEgAABBmAAAQZgAAA + + + + 265 + {{340, 263}, {100, 32}} + + YES + + -2080244224 + 137887744 + Add Item + + + -2038284033 + 1 + + + + + + + + 200 + 25 + + + + + 257 + {{356, 12}, {84, 32}} + + YES + + -2080244224 + 137887744 + Cancel + + + -2038284033 + 1 + + + + + + + + 200 + 25 + + + + + 257 + {{272, 12}, {84, 32}} + + YES + + -2080244224 + 137887744 + Done + + + -2038284033 + 1 + + + + + + 200 + 25 + + + + {454, 311} + + {{0, 0}, {1280, 938}} + {320, 262} + x11_apps + + + Menu + + YES + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Applications + + 1048576 + 2147483647 + + + submenuAction: + + Applications + + YES + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Q3VzdG9taXpl4oCmA + + 1048576 + 2147483647 + + + + + + + + + + + SUUpdater + + + + + YES + + + cut: + + + + 175 + + + + paste: + + + + 176 + + + + redo: + + + + 178 + + + + selectAll: + + + + 179 + + + + undo: + + + + 180 + + + + copy: + + + + 181 + + + + delete: + + + + 195 + + + + minimize_window: + + + + 202 + + + + close_window: + + + + 205 + + + + zoom_window: + + + + 206 + + + + bring_to_front: + + + + 207 + + + + hideOtherApplications: + + + + 263 + + + + apps_separator + + + + 273 + + + + apps_table + + + + 301 + + + + apps_table_done: + + + + 302 + + + + apps_table_delete: + + + + 303 + + + + apps_table_duplicate: + + + + 304 + + + + apps_table_show: + + + + 308 + + + + apps_table_cancel: + + + + 309 + + + + apps_table_new: + + + + 311 + + + + prefs_show: + + + + 318 + + + + x11_about_item + + + + 321 + + + + enable_auth + + + + 387 + + + + enable_tcp + + + + 388 + + + + depth + + + + 389 + + + + use_sysbeep + + + + 390 + + + + fake_buttons + + + + 391 + + + + sync_keymap + + + + 392 + + + + enable_keyequivs + + + + 393 + + + + prefs_changed: + + + + 394 + + + + prefs_changed: + + + + 395 + + + + prefs_changed: + + + + 396 + + + + prefs_changed: + + + + 397 + + + + prefs_changed: + + + + 398 + + + + prefs_changed: + + + + 399 + + + + prefs_changed: + + + + 401 + + + + prefs_panel + + + + 402 + + + + x11_help: + + + + 422 + + + + dockMenu + + + + 426 + + + + dock_menu + + + + 428 + + + + delegate + + + + 429 + + + + hide: + + + + 430 + + + + unhideAllApplications: + + + + 431 + + + + orderFrontStandardAboutPanel: + + + + 433 + + + + dock_apps_menu + + + + 530 + + + + dock_window_separator + + + + 531 + + + + apps_table_show: + + + + 534 + + + + next_window: + + + + 539 + + + + previous_window: + + + + 540 + + + + enable_fullscreen + + + + 546 + + + + enable_fullscreen_changed: + + + + 547 + + + + toggle_fullscreen: + + + + 548 + + + + toggle_fullscreen_item + + + + 549 + + + + window_separator + + + + 300331 + + + + menu + + + + 300334 + + + + terminate: + + + + 300336 + + + + prefs_changed: + + + + 300389 + + + + prefs_changed: + + + + 300390 + + + + prefs_changed: + + + + 300391 + + + + click_through + + + + 300392 + + + + focus_follows_mouse + + + + 300393 + + + + focus_on_new_window + + + + 300394 + + + + checkForUpdates: + + + + 300397 + + + + + YES + + 0 + + YES + + + + + + -2 + + + RmlsZSdzIE93bmVyA + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + YES + + + + + + + + MainMenu + + + 19 + + + YES + + + + + + 24 + + + YES + + + + + + + + + + + + + + 5 + + + + + 23 + + + + + 92 + + + + + 203 + + + + + 204 + + + + + 536 + + + + + 537 + + + + + 538 + + + + + 56 + + + YES + + + + + + 57 + + + YES + + + + + + + + + + + + + + + + + + 58 + + + + + 129 + + + + + 131 + + + YES + + + + + + 130 + + + + + 134 + + + + + 136 + + + + + 143 + + + + + 144 + + + + + 145 + + + + + 149 + + + + + 150 + + + + + 544 + + + + + 545 + + + + + 163 + + + YES + + + + + + 169 + + + YES + + + + + + + + + + + + + 156 + + + + + 157 + + + + + 158 + + + + + 160 + + + + + 164 + + + + + 171 + + + + + 172 + + + + + 173 + + + + + 269 + + + YES + + + + + + 270 + + + YES + + + + + + + 272 + + + + + 305 + + + + + 419 + + + YES + + + + + + 420 + + + YES + + + + + + 421 + + + + + 196 + + + X11Controller + + + 244 + + + YES + + + + PrefsPanel + + + 245 + + + YES + + + + + + 348 + + + YES + + + + + + + + + 349 + + + YES + + + + + + 351 + + + YES + + + + + + + + + + + 363 + + + YES + + + + + + 364 + + + YES + + + + + + 365 + + + YES + + + + + + 368 + + + YES + + + + + + 369 + + + YES + + + + + + 370 + + + YES + + + + + + 352 + + + YES + + + + + + 350 + + + YES + + + + + + + + + + + + 371 + + + YES + + + + + + 372 + + + YES + + + + + + 382 + + + YES + + + + + + 385 + + + YES + + + + + + 386 + + + YES + + + + + + 541 + + + YES + + + + + + 543 + + + YES + + + + + + 353 + + + YES + + + + + + 354 + + + YES + + + + + + + + + + 374 + + + YES + + + + + + 375 + + + YES + + + + + + 376 + + + YES + + + + + + 377 + + + YES + + + + + + 379 + + + YES + + + + + + 285 + + + YES + + + + EditPrograms + + + 286 + + + YES + + + + + + + + + + + 423 + + + YES + + + + + DockMenu + + + 524 + + + + + 526 + + + YES + + + + + + 527 + + + YES + + + + + + + 532 + + + + + 533 + + + + + 100363 + + + + + 100364 + + + + + 100365 + + + + + 100368 + + + + + 100369 + + + + + 100370 + + + + + 100371 + + + + + 100372 + + + + + 100382 + + + YES + + + + + + 100385 + + + + + 100386 + + + + + 100541 + + + + + 100543 + + + + + 100374 + + + + + 100375 + + + + + 100376 + + + + + 100377 + + + + + 100379 + + + + + 380 + + + YES + + + + + + + + + 435 + + + + + 384 + + + + + 383 + + + + + 381 + + + + + 295 + + + YES + + + + + + + + + 300295 + + + + + 200295 + + + + + 100295 + + + + + 296 + + + YES + + + + + + + + 535 + + + YES + + + + + + 575 + + + + + 298 + + + YES + + + + + + 573 + + + + + 297 + + + YES + + + + + + 574 + + + + + 310 + + + YES + + + + + + 100310 + + + + + 292 + + + YES + + + + + + 100292 + + + + + 293 + + + YES + + + + + + 100293 + + + + + 299 + + + YES + + + + + + 100299 + + + + + 291 + + + YES + + + + + + 100291 + + + + + 300330 + + + + + 300337 + + + YES + + + + + + 300338 + + + YES + + + + + + + + + + + 300358 + + + YES + + + + + + 300359 + + + YES + + + + + + 300360 + + + + + 300361 + + + + + 300362 + + + YES + + + + + + 300363 + + + + + 300364 + + + YES + + + + + + 300365 + + + + + 300368 + + + YES + + + + + + 300369 + + + + + 300370 + + + YES + + + + + + 300371 + + + + + 300395 + + + Updater + + + 300396 + + + + + + + YES + + YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + -3.ImportedFromIB2 + 100295.IBShouldRemoveOnLegacySave + 129.IBPluginDependency + 129.ImportedFromIB2 + 130.IBPluginDependency + 130.ImportedFromIB2 + 131.IBPluginDependency + 131.ImportedFromIB2 + 134.IBPluginDependency + 134.ImportedFromIB2 + 136.IBPluginDependency + 136.ImportedFromIB2 + 143.IBPluginDependency + 143.ImportedFromIB2 + 144.IBPluginDependency + 144.ImportedFromIB2 + 145.IBPluginDependency + 145.ImportedFromIB2 + 149.IBPluginDependency + 149.ImportedFromIB2 + 150.IBPluginDependency + 150.ImportedFromIB2 + 156.IBPluginDependency + 156.ImportedFromIB2 + 157.IBPluginDependency + 157.ImportedFromIB2 + 158.IBPluginDependency + 158.ImportedFromIB2 + 160.IBPluginDependency + 160.ImportedFromIB2 + 163.IBPluginDependency + 163.ImportedFromIB2 + 164.IBPluginDependency + 164.ImportedFromIB2 + 169.IBPluginDependency + 169.ImportedFromIB2 + 169.editorWindowContentRectSynchronizationRect + 171.IBPluginDependency + 171.ImportedFromIB2 + 172.IBPluginDependency + 172.ImportedFromIB2 + 173.IBPluginDependency + 173.ImportedFromIB2 + 19.IBPluginDependency + 19.ImportedFromIB2 + 196.IBPluginDependency + 196.ImportedFromIB2 + 200295.IBShouldRemoveOnLegacySave + 203.IBPluginDependency + 203.ImportedFromIB2 + 204.IBPluginDependency + 204.ImportedFromIB2 + 23.IBPluginDependency + 23.ImportedFromIB2 + 24.IBPluginDependency + 24.ImportedFromIB2 + 24.editorWindowContentRectSynchronizationRect + 244.IBEditorWindowLastContentRect + 244.IBPluginDependency + 244.IBWindowTemplateEditedContentRect + 244.ImportedFromIB2 + 244.editorWindowContentRectSynchronizationRect + 244.windowTemplate.hasMaxSize + 244.windowTemplate.hasMinSize + 244.windowTemplate.maxSize + 244.windowTemplate.minSize + 245.IBPluginDependency + 245.ImportedFromIB2 + 269.IBPluginDependency + 269.ImportedFromIB2 + 270.IBPluginDependency + 270.ImportedFromIB2 + 270.editorWindowContentRectSynchronizationRect + 272.IBPluginDependency + 272.ImportedFromIB2 + 285.IBEditorWindowLastContentRect + 285.IBPluginDependency + 285.IBViewEditorWindowController.showingBoundsRectangles + 285.IBViewEditorWindowController.showingLayoutRectangles + 285.IBWindowTemplateEditedContentRect + 285.ImportedFromIB2 + 285.editorWindowContentRectSynchronizationRect + 285.windowTemplate.hasMaxSize + 285.windowTemplate.hasMinSize + 285.windowTemplate.maxSize + 285.windowTemplate.minSize + 286.IBPluginDependency + 286.ImportedFromIB2 + 29.IBEditorWindowLastContentRect + 29.IBPluginDependency + 29.ImportedFromIB2 + 29.editorWindowContentRectSynchronizationRect + 291.IBPluginDependency + 291.ImportedFromIB2 + 292.IBPluginDependency + 292.ImportedFromIB2 + 293.IBPluginDependency + 293.ImportedFromIB2 + 295.IBPluginDependency + 295.ImportedFromIB2 + 296.IBPluginDependency + 296.ImportedFromIB2 + 297.IBPluginDependency + 297.ImportedFromIB2 + 298.IBPluginDependency + 298.ImportedFromIB2 + 299.IBPluginDependency + 299.ImportedFromIB2 + 300295.IBShouldRemoveOnLegacySave + 300330.IBPluginDependency + 300330.ImportedFromIB2 + 300337.IBPluginDependency + 300337.ImportedFromIB2 + 300338.IBPluginDependency + 300338.ImportedFromIB2 + 300358.IBPluginDependency + 300358.ImportedFromIB2 + 300359.IBPluginDependency + 300359.ImportedFromIB2 + 300362.IBPluginDependency + 300362.ImportedFromIB2 + 300364.IBPluginDependency + 300364.ImportedFromIB2 + 300368.IBPluginDependency + 300368.ImportedFromIB2 + 300370.IBPluginDependency + 300370.ImportedFromIB2 + 300395.IBPluginDependency + 300396.IBPluginDependency + 305.IBPluginDependency + 305.ImportedFromIB2 + 310.IBPluginDependency + 310.ImportedFromIB2 + 348.IBPluginDependency + 348.ImportedFromIB2 + 349.IBPluginDependency + 349.ImportedFromIB2 + 350.IBPluginDependency + 350.ImportedFromIB2 + 351.IBPluginDependency + 351.ImportedFromIB2 + 352.IBPluginDependency + 352.ImportedFromIB2 + 353.IBPluginDependency + 353.ImportedFromIB2 + 354.IBPluginDependency + 354.ImportedFromIB2 + 363.IBPluginDependency + 363.ImportedFromIB2 + 364.IBPluginDependency + 364.ImportedFromIB2 + 365.IBPluginDependency + 365.ImportedFromIB2 + 368.IBPluginDependency + 368.ImportedFromIB2 + 369.IBPluginDependency + 369.ImportedFromIB2 + 370.IBPluginDependency + 370.ImportedFromIB2 + 371.IBPluginDependency + 371.ImportedFromIB2 + 372.IBPluginDependency + 372.ImportedFromIB2 + 374.IBPluginDependency + 374.ImportedFromIB2 + 375.IBPluginDependency + 375.ImportedFromIB2 + 376.IBPluginDependency + 376.ImportedFromIB2 + 377.IBPluginDependency + 377.ImportedFromIB2 + 379.IBPluginDependency + 379.ImportedFromIB2 + 380.IBPluginDependency + 380.ImportedFromIB2 + 381.IBPluginDependency + 381.ImportedFromIB2 + 382.IBPluginDependency + 382.ImportedFromIB2 + 383.IBPluginDependency + 383.ImportedFromIB2 + 384.IBPluginDependency + 384.ImportedFromIB2 + 385.IBPluginDependency + 385.ImportedFromIB2 + 386.IBPluginDependency + 386.ImportedFromIB2 + 419.IBPluginDependency + 419.ImportedFromIB2 + 420.IBPluginDependency + 420.ImportedFromIB2 + 421.IBPluginDependency + 421.ImportedFromIB2 + 423.IBPluginDependency + 423.ImportedFromIB2 + 435.IBPluginDependency + 435.ImportedFromIB2 + 5.IBPluginDependency + 5.ImportedFromIB2 + 524.IBPluginDependency + 524.ImportedFromIB2 + 526.IBPluginDependency + 526.ImportedFromIB2 + 527.IBPluginDependency + 527.ImportedFromIB2 + 532.IBPluginDependency + 532.ImportedFromIB2 + 533.IBPluginDependency + 533.ImportedFromIB2 + 535.IBPluginDependency + 535.ImportedFromIB2 + 536.IBPluginDependency + 536.ImportedFromIB2 + 537.IBPluginDependency + 537.ImportedFromIB2 + 538.IBPluginDependency + 538.ImportedFromIB2 + 541.IBPluginDependency + 541.ImportedFromIB2 + 543.IBPluginDependency + 543.ImportedFromIB2 + 544.IBPluginDependency + 544.ImportedFromIB2 + 545.IBPluginDependency + 545.ImportedFromIB2 + 56.IBPluginDependency + 56.ImportedFromIB2 + 57.IBEditorWindowLastContentRect + 57.IBPluginDependency + 57.ImportedFromIB2 + 57.editorWindowContentRectSynchronizationRect + 573.IBPluginDependency + 573.ImportedFromIB2 + 574.IBPluginDependency + 574.ImportedFromIB2 + 575.IBPluginDependency + 575.ImportedFromIB2 + 58.IBPluginDependency + 58.ImportedFromIB2 + 92.IBPluginDependency + 92.ImportedFromIB2 + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{202, 626}, {154, 153}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{271, 666}, {301, 153}} + {{313, 353}, {484, 280}} + com.apple.InterfaceBuilder.CocoaPlugin + {{313, 353}, {484, 280}} + + {{184, 290}, {481, 345}} + + + {3.40282e+38, 3.40282e+38} + {213, 107} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{100, 746}, {155, 33}} + com.apple.InterfaceBuilder.CocoaPlugin + + {{407, 545}, {454, 311}} + com.apple.InterfaceBuilder.CocoaPlugin + + + {{407, 545}, {454, 311}} + + {{433, 406}, {486, 327}} + + + {3.40282e+38, 3.40282e+38} + {320, 240} + com.apple.InterfaceBuilder.CocoaPlugin + + {{0, 836}, {336, 20}} + com.apple.InterfaceBuilder.CocoaPlugin + + {{67, 819}, {336, 20}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{12, 633}, {218, 203}} + com.apple.InterfaceBuilder.CocoaPlugin + + {{79, 616}, {218, 203}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + YES + + YES + + + YES + + + + + YES + + YES + + + YES + + + + 300397 + + + + YES + + FirstResponder + + IBUserSource + + + + + NSFormatter + + IBUserSource + + + + + X11Controller + NSObject + + IBUserSource + + + + + + YES + + SUUpdater + NSObject + + checkForUpdates: + id + + + IBDocumentRelativeSource + ../Sparkle.framework/Versions/A/Headers/SUUpdater.h + + + + X11Controller + NSObject + + YES + + YES + apps_table_cancel: + apps_table_delete: + apps_table_done: + apps_table_duplicate: + apps_table_new: + apps_table_show: + bring_to_front: + close_window: + enable_fullscreen_changed: + minimize_window: + next_window: + prefs_changed: + prefs_show: + previous_window: + quit: + toggle_fullscreen: + x11_help: + zoom_window: + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + apps_separator + apps_table + click_through + depth + dock_apps_menu + dock_menu + dock_window_separator + enable_auth + enable_fullscreen + enable_keyequivs + enable_tcp + fake_buttons + focus_follows_mouse + focus_on_new_window + prefs_panel + sync_keymap + toggle_fullscreen_item + use_sysbeep + window_separator + x11_about_item + + + YES + NSMenuItem + NSTableView + NSButton + NSPopUpButton + NSMenu + NSMenu + NSMenuItem + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSPanel + NSButton + NSMenuItem + NSButton + NSMenuItem + NSMenuItem + + + + IBDocumentRelativeSource + ../../X11Controller.h + + + + + 0 + ../X11.xcodeproj + 3 + + diff --git a/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..066fdbe9e Binary files /dev/null and b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings new file mode 100644 index 000000000..88e1f04ac Binary files /dev/null and b/hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/French.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/French.lproj/Localizable.strings new file mode 100644 index 000000000..2770dfb8c Binary files /dev/null and b/hw/xquartz/bundle/Resources/French.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..9f9a7da67 Binary files /dev/null and b/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings new file mode 100644 index 000000000..aa37e7555 Binary files /dev/null and b/hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/German.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/German.lproj/Localizable.strings new file mode 100644 index 000000000..a5489ab5c Binary files /dev/null and b/hw/xquartz/bundle/Resources/German.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..19532a9c2 Binary files /dev/null and b/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings new file mode 100644 index 000000000..412169880 Binary files /dev/null and b/hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings new file mode 100644 index 000000000..d05d73d44 Binary files /dev/null and b/hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..b6e2e1bb1 Binary files /dev/null and b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings new file mode 100644 index 000000000..2d6330fa7 Binary files /dev/null and b/hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings new file mode 100644 index 000000000..99821ea1f Binary files /dev/null and b/hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..523fd0856 Binary files /dev/null and b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings new file mode 100644 index 000000000..0e4287d14 Binary files /dev/null and b/hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings new file mode 100644 index 000000000..652f432a5 Binary files /dev/null and b/hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..029349dd0 Binary files /dev/null and b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/X11.icns b/hw/xquartz/bundle/Resources/X11.icns new file mode 100644 index 000000000..d770e617d Binary files /dev/null and b/hw/xquartz/bundle/Resources/X11.icns differ diff --git a/hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings new file mode 100644 index 000000000..88e1f04ac Binary files /dev/null and b/hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings new file mode 100644 index 000000000..9608a2e6b Binary files /dev/null and b/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..4a2bd4bde Binary files /dev/null and b/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings new file mode 100644 index 000000000..8e4f6474f Binary files /dev/null and b/hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings new file mode 100644 index 000000000..e8420fbaa Binary files /dev/null and b/hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..b5039fd44 Binary files /dev/null and b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings new file mode 100644 index 000000000..4c738f8b2 Binary files /dev/null and b/hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings new file mode 100644 index 000000000..56a335859 Binary files /dev/null and b/hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..925945c4d Binary files /dev/null and b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings new file mode 100644 index 000000000..eb1cfb002 Binary files /dev/null and b/hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings new file mode 100644 index 000000000..5157a67de Binary files /dev/null and b/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..ca25327f5 Binary files /dev/null and b/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings new file mode 100644 index 000000000..b9c950214 Binary files /dev/null and b/hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings new file mode 100644 index 000000000..4ae12d77f Binary files /dev/null and b/hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..e9ca5404b Binary files /dev/null and b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings new file mode 100644 index 000000000..33c637448 Binary files /dev/null and b/hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings new file mode 100644 index 000000000..23ea96847 Binary files /dev/null and b/hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..e88cccdba Binary files /dev/null and b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings new file mode 100644 index 000000000..33c637448 Binary files /dev/null and b/hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings new file mode 100644 index 000000000..71c33ad14 Binary files /dev/null and b/hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..a61933475 Binary files /dev/null and b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings new file mode 100644 index 000000000..7f722e4b6 Binary files /dev/null and b/hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings new file mode 100644 index 000000000..3b3811234 Binary files /dev/null and b/hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..9354e0264 Binary files /dev/null and b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings new file mode 100644 index 000000000..655d5ff63 Binary files /dev/null and b/hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings new file mode 100644 index 000000000..796f06c21 Binary files /dev/null and b/hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..bd01c2dac Binary files /dev/null and b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings new file mode 100644 index 000000000..b5df36885 Binary files /dev/null and b/hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings new file mode 100644 index 000000000..f88a6da4b Binary files /dev/null and b/hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..e36c15fb6 Binary files /dev/null and b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings new file mode 100644 index 000000000..92d5473b0 Binary files /dev/null and b/hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings differ diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings new file mode 100644 index 000000000..f009302c2 Binary files /dev/null and b/hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings differ diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib new file mode 100644 index 000000000..36602c53e Binary files /dev/null and b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib differ diff --git a/hw/xquartz/bundle/Spanish.lproj/InfoPlist.strings b/hw/xquartz/bundle/Spanish.lproj/InfoPlist.strings deleted file mode 100644 index 0e4287d14..000000000 Binary files a/hw/xquartz/bundle/Spanish.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/Spanish.lproj/Localizable.strings b/hw/xquartz/bundle/Spanish.lproj/Localizable.strings deleted file mode 100644 index 652f432a5..000000000 Binary files a/hw/xquartz/bundle/Spanish.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/Spanish.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Spanish.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index 029349dd0..000000000 Binary files a/hw/xquartz/bundle/Spanish.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/X11.icns b/hw/xquartz/bundle/X11.icns deleted file mode 100644 index d770e617d..000000000 Binary files a/hw/xquartz/bundle/X11.icns and /dev/null differ diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c index e97770a55..042fa3ab8 100644 --- a/hw/xquartz/bundle/bundle-main.c +++ b/hw/xquartz/bundle/bundle-main.c @@ -43,7 +43,9 @@ static int execute(const char *command); static char *command_from_prefs(const char *key, const char *default_value); -int main(int argc, char **argv) { +int server_main(int argc, char **argv, char **envp); + +int main(int argc, char **argv, char **envp) { Display *display; const char *s; @@ -52,7 +54,12 @@ int main(int argc, char **argv) { for(i=0; i < argc; i++) { fprintf(stderr, "\targv[%u] = %s\n", (unsigned)i, argv[i]); } - + + /* Take care of the case where we're called like a normal DDX */ + if(argc > 1 && argv[1][0] == ':') { + exit(server_main(argc, argv, envp)); + } + /* If we have a process serial number and it's our only arg, act as if * the user double clicked the app bundle: launch app_to_run if possible */ @@ -73,7 +80,7 @@ int main(int argc, char **argv) { } /* Start the server */ - if(s = getenv("DISPLAY")) { + if((s = getenv("DISPLAY"))) { fprintf(stderr, "X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting). Starting X server.\n", s); unsetenv("DISPLAY"); } else { diff --git a/hw/xquartz/bundle/da.lproj/InfoPlist.strings b/hw/xquartz/bundle/da.lproj/InfoPlist.strings deleted file mode 100644 index 88e1f04ac..000000000 Binary files a/hw/xquartz/bundle/da.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/da.lproj/Localizable.strings b/hw/xquartz/bundle/da.lproj/Localizable.strings deleted file mode 100644 index 9608a2e6b..000000000 Binary files a/hw/xquartz/bundle/da.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/da.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/da.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index 4a2bd4bde..000000000 Binary files a/hw/xquartz/bundle/da.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/fi.lproj/InfoPlist.strings b/hw/xquartz/bundle/fi.lproj/InfoPlist.strings deleted file mode 100644 index 8e4f6474f..000000000 Binary files a/hw/xquartz/bundle/fi.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/fi.lproj/Localizable.strings b/hw/xquartz/bundle/fi.lproj/Localizable.strings deleted file mode 100644 index e8420fbaa..000000000 Binary files a/hw/xquartz/bundle/fi.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/fi.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/fi.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index b5039fd44..000000000 Binary files a/hw/xquartz/bundle/fi.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/ko.lproj/InfoPlist.strings b/hw/xquartz/bundle/ko.lproj/InfoPlist.strings deleted file mode 100644 index 4c738f8b2..000000000 Binary files a/hw/xquartz/bundle/ko.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/ko.lproj/Localizable.strings b/hw/xquartz/bundle/ko.lproj/Localizable.strings deleted file mode 100644 index 56a335859..000000000 Binary files a/hw/xquartz/bundle/ko.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/ko.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/ko.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index 925945c4d..000000000 Binary files a/hw/xquartz/bundle/ko.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/no.lproj/InfoPlist.strings b/hw/xquartz/bundle/no.lproj/InfoPlist.strings deleted file mode 100644 index eb1cfb002..000000000 Binary files a/hw/xquartz/bundle/no.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/no.lproj/Localizable.strings b/hw/xquartz/bundle/no.lproj/Localizable.strings deleted file mode 100644 index 5157a67de..000000000 Binary files a/hw/xquartz/bundle/no.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/no.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/no.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index ca25327f5..000000000 Binary files a/hw/xquartz/bundle/no.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/pl.lproj/InfoPlist.strings b/hw/xquartz/bundle/pl.lproj/InfoPlist.strings deleted file mode 100644 index b9c950214..000000000 Binary files a/hw/xquartz/bundle/pl.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/pl.lproj/Localizable.strings b/hw/xquartz/bundle/pl.lproj/Localizable.strings deleted file mode 100644 index 4ae12d77f..000000000 Binary files a/hw/xquartz/bundle/pl.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/pl.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/pl.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index e9ca5404b..000000000 Binary files a/hw/xquartz/bundle/pl.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/pt.lproj/InfoPlist.strings b/hw/xquartz/bundle/pt.lproj/InfoPlist.strings deleted file mode 100644 index 33c637448..000000000 Binary files a/hw/xquartz/bundle/pt.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/pt.lproj/Localizable.strings b/hw/xquartz/bundle/pt.lproj/Localizable.strings deleted file mode 100644 index 23ea96847..000000000 Binary files a/hw/xquartz/bundle/pt.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/pt.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/pt.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index e88cccdba..000000000 Binary files a/hw/xquartz/bundle/pt.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/pt_PT.lproj/InfoPlist.strings b/hw/xquartz/bundle/pt_PT.lproj/InfoPlist.strings deleted file mode 100644 index 33c637448..000000000 Binary files a/hw/xquartz/bundle/pt_PT.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/pt_PT.lproj/Localizable.strings b/hw/xquartz/bundle/pt_PT.lproj/Localizable.strings deleted file mode 100644 index 71c33ad14..000000000 Binary files a/hw/xquartz/bundle/pt_PT.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/pt_PT.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/pt_PT.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index a61933475..000000000 Binary files a/hw/xquartz/bundle/pt_PT.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/ru.lproj/InfoPlist.strings b/hw/xquartz/bundle/ru.lproj/InfoPlist.strings deleted file mode 100644 index 7f722e4b6..000000000 Binary files a/hw/xquartz/bundle/ru.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/ru.lproj/Localizable.strings b/hw/xquartz/bundle/ru.lproj/Localizable.strings deleted file mode 100644 index 3b3811234..000000000 Binary files a/hw/xquartz/bundle/ru.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/ru.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/ru.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index 9354e0264..000000000 Binary files a/hw/xquartz/bundle/ru.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/sv.lproj/InfoPlist.strings b/hw/xquartz/bundle/sv.lproj/InfoPlist.strings deleted file mode 100644 index 655d5ff63..000000000 Binary files a/hw/xquartz/bundle/sv.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/sv.lproj/Localizable.strings b/hw/xquartz/bundle/sv.lproj/Localizable.strings deleted file mode 100644 index 796f06c21..000000000 Binary files a/hw/xquartz/bundle/sv.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/sv.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/sv.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index bd01c2dac..000000000 Binary files a/hw/xquartz/bundle/sv.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/zh_CN.lproj/InfoPlist.strings b/hw/xquartz/bundle/zh_CN.lproj/InfoPlist.strings deleted file mode 100644 index b5df36885..000000000 Binary files a/hw/xquartz/bundle/zh_CN.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/zh_CN.lproj/Localizable.strings b/hw/xquartz/bundle/zh_CN.lproj/Localizable.strings deleted file mode 100644 index f88a6da4b..000000000 Binary files a/hw/xquartz/bundle/zh_CN.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/zh_CN.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/zh_CN.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index e36c15fb6..000000000 Binary files a/hw/xquartz/bundle/zh_CN.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/bundle/zh_TW.lproj/InfoPlist.strings b/hw/xquartz/bundle/zh_TW.lproj/InfoPlist.strings deleted file mode 100644 index 92d5473b0..000000000 Binary files a/hw/xquartz/bundle/zh_TW.lproj/InfoPlist.strings and /dev/null differ diff --git a/hw/xquartz/bundle/zh_TW.lproj/Localizable.strings b/hw/xquartz/bundle/zh_TW.lproj/Localizable.strings deleted file mode 100644 index f009302c2..000000000 Binary files a/hw/xquartz/bundle/zh_TW.lproj/Localizable.strings and /dev/null differ diff --git a/hw/xquartz/bundle/zh_TW.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/zh_TW.lproj/main.nib/keyedobjects.nib deleted file mode 100644 index 36602c53e..000000000 Binary files a/hw/xquartz/bundle/zh_TW.lproj/main.nib/keyedobjects.nib and /dev/null differ diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c index a4472e659..43f1502a1 100644 --- a/hw/xquartz/quartzStartup.c +++ b/hw/xquartz/quartzStartup.c @@ -94,7 +94,7 @@ void QuartzInitServer(int argc, char **argv, char **envp) { } } -int main(int argc, char **argv, char **envp) { +int server_main(int argc, char **argv, char **envp) { int i; int fd[2]; diff --git a/hw/xquartz/stub/Makefile.am b/hw/xquartz/stub/Makefile.am new file mode 100644 index 000000000..3752dc111 --- /dev/null +++ b/hw/xquartz/stub/Makefile.am @@ -0,0 +1,11 @@ +AM_CPPFLAGS = \ + -DBUILD_DATE=\"$(BUILD_DATE)\" \ + -DXSERVER_VERSION=\"$(VERSION)\" + +bin_PROGRAMS = Xquartz + +Xquartz_SOURCES = \ + stub.c + +Xquartz_LDFLAGS = \ + -framework CoreServices diff --git a/hw/xquartz/stub/stub.c b/hw/xquartz/stub/stub.c new file mode 100644 index 000000000..70f222c27 --- /dev/null +++ b/hw/xquartz/stub/stub.c @@ -0,0 +1,96 @@ +/* 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 + +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + +#include +#include +#include + +#define kX11AppBundleId "org.x.X11" +#define kX11AppBundlePath "/Contents/MacOS/X11" + +static char x11_path[PATH_MAX + 1]; + +static void set_x11_path() { + CFURLRef appURL = NULL; + OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL); + + switch (osstatus) { + case noErr: + if (appURL == NULL) { + fprintf(stderr, "xinit: Invalid response from LSFindApplicationForInfo(%s)\n", + kX11AppBundleId); + exit(1); + } + + if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) { + fprintf(stderr, "xinit: Error resolving URL for %s\n", kX11AppBundleId); + exit(2); + } + + strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path)); +#ifdef DEBUG + fprintf(stderr, "XQuartz: X11.app = %s\n", x11_path); +#endif + break; + case kLSApplicationNotFoundErr: + fprintf(stderr, "XQuartz: Unable to find application for %s\n", kX11AppBundleId); + exit(4); + default: + fprintf(stderr, "XQuartz: Unable to find application for %s, error code = %d\n", + kX11AppBundleId, (int)osstatus); + exit(5); + } +} + +#ifndef BUILD_DATE +#define BUILD_DATE "?" +#endif +#ifndef XSERVER_VERSION +#define XSERVER_VERSION "?" +#endif + +int main(int argc, char **argv) { + + if(argc == 2 && !strcmp(argv[1], "-version")) { + fprintf(stderr, "X.org Release 7.3\n"); + fprintf(stderr, "X.Org X Server %s\n", XSERVER_VERSION); + fprintf(stderr, "Build Date: %s\n", BUILD_DATE); + return 0; + } + + set_x11_path(); + + argv[0] = x11_path; + return execvp(x11_path, argv); +} diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am index 41f2b8655..6bf99a402 100644 --- a/hw/xquartz/xpr/Makefile.am +++ b/hw/xquartz/xpr/Makefile.am @@ -1,4 +1,5 @@ -bin_PROGRAMS = Xquartz +x11appdir = $(APPLE_APPLICATIONS_DIR)/X11.app/Contents/MacOS +x11app_PROGRAMS = X11 AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) AM_CPPFLAGS = \ @@ -6,7 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/miext \ -I$(top_srcdir)/miext/rootless -Xquartz_SOURCES = \ +X11_SOURCES = \ appledri.c \ dri.c \ xprAppleWM.c \ @@ -18,13 +19,13 @@ Xquartz_SOURCES = \ x-hook.c \ x-list.c -Xquartz_LDADD = \ +X11_LDADD = \ $(top_builddir)/hw/xquartz/libXquartz.la \ $(top_builddir)/dix/dixfonts.lo \ $(top_builddir)/miext/rootless/librootless.la \ - $(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin + $(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin -lX11 -Xquartz_LDFLAGS = \ +X11_LDFLAGS = \ -XCClinker -Objc \ -Wl,-u,_miDCInitialize \ -Wl,-framework,Carbon \ -- cgit v1.2.3