andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://sandmann@git.freedesktop.org/git/xorg/xserver

Browse Source
This commit is contained in:
Søren Sandmann Pedersen 2009-05-27 15:56:30 -04:00
commit b12010e10f
123 changed files with 2959 additions and 4268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

970
COPYING
View File

File diff suppressed because it is too large Load Diff

9
Xext/xselinux.c
View File

@ -1346,15 +1346,6 @@ ProcSELinuxSetCreateContext(ClientPtr client, unsigned offset)
goto out;
privPtr = &serverClient->devPrivates;
}
else if (offset == USE_SEL) {
/* Selection use context currently requires no selections owned */
Selection *pSel;
for (pSel = CurrentSelections; pSel; pSel = pSel->next)
if (pSel->client == client) {
rc = BadMatch;
goto out;
}
}
ptr = dixLookupPrivate(privPtr, subjectKey);
pSid = (security_id_t *)(ptr + offset);

41
composite/compalloc.c
View File

@ -1,23 +1,30 @@
/*
* Copyright © 2006 Sun Microsystems
* Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Sun Microsystems not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Sun Microsystems makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
* 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, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS 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
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale, use
* or other dealings in this Software without prior written authorization
* of the copyright holder.
*
* Copyright © 2003 Keith Packard
*

41
composite/compext.c
View File

@ -1,23 +1,30 @@
/*
* Copyright © 2006 Sun Microsystems
* Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Sun Microsystems not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Sun Microsystems makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
* 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, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS 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
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale, use
* or other dealings in this Software without prior written authorization
* of the copyright holder.
*
* Copyright © 2003 Keith Packard
*

41
composite/compinit.c
View File

@ -1,23 +1,30 @@
/*
* Copyright © 2006 Sun Microsystems
* Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Sun Microsystems not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Sun Microsystems makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
* 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, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS 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
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale, use
* or other dealings in this Software without prior written authorization
* of the copyright holder.
*
* Copyright © 2003 Keith Packard
*

41
composite/compint.h
View File

@ -1,23 +1,30 @@
/*
* Copyright © 2006 Sun Microsystems
* Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Sun Microsystems not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Sun Microsystems makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
* 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, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS 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
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale, use
* or other dealings in this Software without prior written authorization
* of the copyright holder.
*
* Copyright © 2003 Keith Packard
*

41
composite/compoverlay.c
View File

@ -1,23 +1,30 @@
/*
* Copyright © 2006 Sun Microsystems
* Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Sun Microsystems not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Sun Microsystems makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
* 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, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS 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
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale, use
* or other dealings in this Software without prior written authorization
* of the copyright holder.
*
* Copyright © 2003 Keith Packard
*

41
composite/compwindow.c
View File

@ -1,23 +1,30 @@
/*
* Copyright © 2006 Sun Microsystems
* Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Sun Microsystems not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Sun Microsystems makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
* 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, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS 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
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale, use
* or other dealings in this Software without prior written authorization
* of the copyright holder.
*
* Copyright © 2003 Keith Packard
*

2
dix/devices.c
View File

@ -224,6 +224,8 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
/* device grab defaults */
dev->deviceGrab.grabTime = currentTime;
dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
dev->coreEvents = TRUE;

6
dix/dispatch.c
View File

@ -413,12 +413,6 @@ Dispatch(void)
}
client->sequence++;
#ifdef DEBUG
if (client->requestLogIndex == MAX_REQUEST_LOG)
client->requestLogIndex = 0;
client->requestLog[client->requestLogIndex] = MAJOROP;
client->requestLogIndex++;
#endif
#ifdef XSERVER_DTRACE
XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP,
((xReq *)client->requestBuffer)->length,

13
dix/events.c
View File

@ -3989,8 +3989,7 @@ CoreEnterLeaveEvent(
if ((type == EnterNotify) && (mask & KeymapStateMask))
{
xKeymapEvent ke;
ClientPtr client = grab ? rClient(grab)
: clients[CLIENT_ID(pWin->drawable.id)];
ClientPtr client = grab ? rClient(grab) : wClient(pWin);
if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess))
bzero((char *)&ke.map[0], 31);
else
@ -4087,11 +4086,11 @@ CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
((pWin->eventMask | wOtherEventMasks(pWin)) & KeymapStateMask))
{
xKeymapEvent ke;
ClientPtr client = clients[CLIENT_ID(pWin->drawable.id)];
if (XaceHook(XACE_DEVICE_ACCESS, client, dev, FALSE))
memmove((char *)&ke.map[0], (char *)&dev->key->down[1], 31);
else
ClientPtr client = wClient(pWin);
if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess))
bzero((char *)&ke.map[0], 31);
else
memmove((char *)&ke.map[0], (char *)&dev->key->down[1], 31);
ke.type = KeymapNotify;
DeliverEventsToWindow(dev, pWin, (xEvent *)&ke, 1,
@ -5181,7 +5180,7 @@ DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources)
to None
*/
#ifdef NOTDEF
|| clients[CLIENT_ID(parent->drawable.id)]->clientGone
|| wClient(parent)->clientGone
#endif
);
DoFocusEvents(keybd, pWin, parent, focusEventMode);

12
dix/inpututils.c
View File

@ -275,14 +275,10 @@ change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *modkeymap,
do_modmap_change(client, tmp, modmap);
}
}
else {
for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {
if (tmp->isMaster && tmp->u.lastSlave == dev) {
/* If this fails, expect the results to be weird. */
if (check_modmap_change(client, tmp, modmap))
do_modmap_change(client, tmp, modmap);
}
}
else if (dev->u.master && dev->u.master->u.lastSlave == dev) {
/* If this fails, expect the results to be weird. */
if (check_modmap_change(client, dev->u.master, modmap))
do_modmap_change(client, dev->u.master, modmap);
}
return Success;

29
dix/window.c
View File

@ -2,25 +2,24 @@
Copyright (c) 2006, Red Hat, Inc.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
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 above copyright notice and this permission notice (including the next
paragraph) shall be included in all copies or substantial portions of the
Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
RED HAT 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 of Red Hat shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from Red Hat.
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS 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.
Copyright 1987, 1998 The Open Group

53
exa/exa.c
View File

@ -1048,6 +1048,50 @@ exaCreateScreenResources(ScreenPtr pScreen)
return TRUE;
}
static void
ExaBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
pointer pReadmask)
{
ScreenPtr pScreen = screenInfo.screens[screenNum];
ExaScreenPriv(pScreen);
unwrap(pExaScr, pScreen, BlockHandler);
(*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler);
/* Try and keep the offscreen memory area tidy every now and then (at most
* once per second) when the server has been idle for at least 100ms.
*/
if (pExaScr->numOffscreenAvailable > 1) {
CARD32 now = GetTimeInMillis();
pExaScr->nextDefragment = now +
max(100, (INT32)(pExaScr->lastDefragment + 1000 - now));
AdjustWaitForDelay(pTimeout, pExaScr->nextDefragment - now);
}
}
static void
ExaWakeupHandler(int screenNum, pointer wakeupData, unsigned long result,
pointer pReadmask)
{
ScreenPtr pScreen = screenInfo.screens[screenNum];
ExaScreenPriv(pScreen);
unwrap(pExaScr, pScreen, WakeupHandler);
(*pScreen->WakeupHandler) (screenNum, wakeupData, result, pReadmask);
wrap(pExaScr, pScreen, WakeupHandler, ExaWakeupHandler);
if (result == 0 && pExaScr->numOffscreenAvailable > 1) {
CARD32 now = GetTimeInMillis();
if ((int)(now - pExaScr->nextDefragment) > 0) {
ExaOffscreenDefragment(pScreen);
pExaScr->lastDefragment = now;
}
}
}
/**
* exaCloseScreen() unwraps its wrapped screen functions and tears down EXA's
* screen private, before calling down to the next CloseSccreen.
@ -1063,6 +1107,10 @@ exaCloseScreen(int i, ScreenPtr pScreen)
if (ps->Glyphs == exaGlyphs)
exaGlyphsFini(pScreen);
if (pScreen->BlockHandler == ExaBlockHandler)
unwrap(pExaScr, pScreen, BlockHandler);
if (pScreen->WakeupHandler == ExaWakeupHandler)
unwrap(pExaScr, pScreen, WakeupHandler);
unwrap(pExaScr, pScreen, CreateGC);
unwrap(pExaScr, pScreen, CloseScreen);
unwrap(pExaScr, pScreen, GetImage);
@ -1223,6 +1271,11 @@ exaDriverInit (ScreenPtr pScreen,
/*
* Replace various fb screen functions
*/
if ((pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) &&
!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) {
wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler);
wrap(pExaScr, pScreen, WakeupHandler, ExaWakeupHandler);
}
wrap(pExaScr, pScreen, CreateGC, exaCreateGC);
wrap(pExaScr, pScreen, CloseScreen, exaCloseScreen);
wrap(pExaScr, pScreen, GetImage, exaGetImage);

13
exa/exa.h
View File

@ -66,6 +66,9 @@ struct _ExaOffscreenArea {
ExaOffscreenArea *next;
unsigned eviction_cost;
ExaOffscreenArea *prev; /* Double-linked list for defragmentation */
int align; /* required alignment */
};
/**
@ -744,6 +747,16 @@ typedef struct _ExaDriver {
*/
#define EXA_SUPPORTS_PREPARE_AUX (1 << 4)
/**
* EXA_SUPPORTS_OFFSCREEN_OVERLAPS indicates to EXA that the driver Copy hooks
* can handle the source and destination occupying overlapping offscreen memory
* areas. This allows the offscreen memory defragmentation code to defragment
* areas where the defragmented position overlaps the fragmented position.
*
* Typically this is supported by traditional 2D engines but not by 3D engines.
*/
#define EXA_SUPPORTS_OFFSCREEN_OVERLAPS (1 << 5)
/** @} */
/* in exa.c */

35
exa/exa_accel.c
View File

@ -406,7 +406,8 @@ exaHWCopyNtoN (DrawablePtr pSrcDrawable,
xfree(rects);
if (!pGC || !exaGCReadsDestination(pDstDrawable, pGC->planemask,
pGC->fillStyle, pGC->alu)) {
pGC->fillStyle, pGC->alu,
pGC->clientClipType)) {
dstregion = REGION_CREATE(pScreen, NullBox, 0);
REGION_COPY(pScreen, dstregion, srcregion);
REGION_TRANSLATE(pScreen, dstregion, dst_off_x - dx - src_off_x,
@ -734,7 +735,8 @@ exaPolySegment (DrawablePtr pDrawable, GCPtr pGC, int nseg,
}
static Bool exaFillRegionSolid (DrawablePtr pDrawable, RegionPtr pRegion,
Pixel pixel, CARD32 planemask, CARD32 alu);
Pixel pixel, CARD32 planemask, CARD32 alu,
unsigned int clientClipType);
static void
exaPolyFillRect(DrawablePtr pDrawable,
@ -787,10 +789,11 @@ exaPolyFillRect(DrawablePtr pDrawable,
if (((pGC->fillStyle == FillSolid || pGC->tileIsPixel) &&
exaFillRegionSolid(pDrawable, pReg, pGC->fillStyle == FillSolid ?
pGC->fgPixel : pGC->tile.pixel, pGC->planemask,
pGC->alu)) ||
pGC->alu, pGC->clientClipType)) ||
(pGC->fillStyle == FillTiled && !pGC->tileIsPixel &&
exaFillRegionTiled(pDrawable, pReg, pGC->tile.pixmap, &pGC->patOrg,
pGC->planemask, pGC->alu))) {
pGC->planemask, pGC->alu,
pGC->clientClipType))) {
goto out;
}
}
@ -952,11 +955,8 @@ exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
}
static Bool
exaFillRegionSolid (DrawablePtr pDrawable,
RegionPtr pRegion,
Pixel pixel,
CARD32 planemask,
CARD32 alu)
exaFillRegionSolid (DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel,
CARD32 planemask, CARD32 alu, unsigned int clientClipType)
{
ExaScreenPriv(pDrawable->pScreen);
PixmapPtr pPixmap = exaGetDrawablePixmap (pDrawable);
@ -969,7 +969,8 @@ exaFillRegionSolid (DrawablePtr pDrawable,
pixmaps[0].as_src = FALSE;
pixmaps[0].pPix = pPixmap;
pixmaps[0].pReg = exaGCReadsDestination(pDrawable, planemask, FillSolid,
alu) ? NULL : pRegion;
alu, clientClipType)
? NULL : pRegion;
exaGetDrawableDeltas(pDrawable, pPixmap, &xoff, &yoff);
REGION_TRANSLATE(pScreen, pRegion, xoff, yoff);
@ -1032,12 +1033,9 @@ out:
* Based on fbFillRegionTiled(), fbTile().
*/
Bool
exaFillRegionTiled (DrawablePtr pDrawable,
RegionPtr pRegion,
PixmapPtr pTile,
DDXPointPtr pPatOrg,
CARD32 planemask,
CARD32 alu)
exaFillRegionTiled (DrawablePtr pDrawable, RegionPtr pRegion, PixmapPtr pTile,
DDXPointPtr pPatOrg, CARD32 planemask, CARD32 alu,
unsigned int clientClipType)
{
ExaScreenPriv(pDrawable->pScreen);
PixmapPtr pPixmap;
@ -1060,13 +1058,14 @@ exaFillRegionTiled (DrawablePtr pDrawable,
if (tileWidth == 1 && tileHeight == 1)
return exaFillRegionSolid(pDrawable, pRegion,
exaGetPixmapFirstPixel (pTile), planemask,
alu);
alu, clientClipType);
pixmaps[0].as_dst = TRUE;
pixmaps[0].as_src = FALSE;
pixmaps[0].pPix = pPixmap = exaGetDrawablePixmap (pDrawable);
pixmaps[0].pReg = exaGCReadsDestination(pDrawable, planemask, FillTiled,
alu) ? NULL : pRegion;
alu, clientClipType)
? NULL : pRegion;
pixmaps[1].as_dst = FALSE;
pixmaps[1].as_src = TRUE;
pixmaps[1].pPix = pTile;

71
exa/exa_glyphs.c
View File

@ -354,8 +354,14 @@ exaGlyphCacheHashRemove(ExaGlyphCachePtr cache,
* is to use the UploadToScreen() driver hook; this allows us to
* pipeline glyph uploads and to avoid creating offscreen pixmaps for
* glyphs that we'll never use again.
*
* If we can't do it with UploadToScreen (because the glyph is offscreen, etc),
* we fall back to CompositePicture.
*
* We need to damage the cache pixmap manually in either case because the damage
* layer unwrapped the picture screen before calling exaGlyphs.
*/
static Bool
static void
exaGlyphCacheUploadGlyph(ScreenPtr pScreen,
ExaGlyphCachePtr cache,
int pos,
@ -369,16 +375,16 @@ exaGlyphCacheUploadGlyph(ScreenPtr pScreen,
ExaMigrationRec pixmaps[1];
if (!pExaScr->info->UploadToScreen || pExaScr->swappedOut || pExaPixmap->accel_blocked)
return FALSE;
goto composite;
/* If the glyph pixmap is already uploaded, no point in doing
* things this way */
if (exaPixmapIsOffscreen(pGlyphPixmap))
return FALSE;
goto composite;
/* UploadToScreen only works if bpp match */
if (pGlyphPixmap->drawable.bitsPerPixel != pCachePixmap->drawable.bitsPerPixel)
return FALSE;
goto composite;
/* cache pixmap must be offscreen. */
pixmaps[0].as_dst = TRUE;
@ -388,26 +394,37 @@ exaGlyphCacheUploadGlyph(ScreenPtr pScreen,
exaDoMigration (pixmaps, 1, TRUE);
if (!exaPixmapIsOffscreen(pCachePixmap))
return FALSE;
goto composite;
/* CACHE_{X,Y} are in pixmap coordinates, no need for cache{X,Y}off */
if (!pExaScr->info->UploadToScreen(pCachePixmap,
CACHE_X(pos),
CACHE_Y(pos),
pGlyph->info.width,
pGlyph->info.height,
(char *)pExaPixmap->sys_ptr,
pExaPixmap->sys_pitch))
return FALSE;
if (pExaScr->info->UploadToScreen(pCachePixmap,
CACHE_X(pos),
CACHE_Y(pos),
pGlyph->info.width,
pGlyph->info.height,
(char *)pExaPixmap->sys_ptr,
pExaPixmap->sys_pitch))
goto damage;
/* This pixmap should never be bound to a window, so no need to offset coordinates. */
composite:
CompositePicture (PictOpSrc,
pGlyphPicture,
None,
cache->picture,
0, 0,
0, 0,
CACHE_X(pos),
CACHE_Y(pos),
pGlyph->info.width,
pGlyph->info.height);
damage:
/* The cache pixmap isn't a window, so no need to offset coordinates. */
exaPixmapDirty (pCachePixmap,
CACHE_X(pos),
CACHE_Y(pos),
CACHE_X(pos) + pGlyph->info.width,
CACHE_Y(pos) + pGlyph->info.height);
return TRUE;
CACHE_X(pos) + cache->glyphWidth,
CACHE_Y(pos) + cache->glyphHeight);
}
static ExaGlyphCacheResult
@ -483,23 +500,7 @@ exaGlyphCacheBufferGlyph(ScreenPtr pScreen,
cache->evictionPosition = rand() % cache->size;
}
/* Now actually upload the glyph into the cache picture; if
* we can't do it with UploadToScreen (because the glyph is
* offscreen, etc), we fall back to CompositePicture.
*/
if (!exaGlyphCacheUploadGlyph(pScreen, cache, pos, pGlyph)) {
CompositePicture (PictOpSrc,
GlyphPicture(pGlyph)[pScreen->myNum],
None,
cache->picture,
0, 0,
0, 0,
CACHE_X(pos),
CACHE_Y(pos),
pGlyph->info.width,
pGlyph->info.height);
}
exaGlyphCacheUploadGlyph(pScreen, cache, pos, pGlyph);
}
buffer->mask = cache->picture;

246
exa/exa_offscreen.c
View File

@ -93,7 +93,7 @@ exaFindAreaToEvict(ExaScreenPrivPtr pExaScr, int size, int align)
{
ExaOffscreenArea *begin, *end, *best;
unsigned cost, best_cost;
int avail, real_size, tmp;
int avail, real_size;
best_cost = UINT_MAX;
begin = end = pExaScr->info->offScreenAreas;
@ -111,10 +111,7 @@ exaFindAreaToEvict(ExaScreenPrivPtr pExaScr, int size, int align)
break;
/* adjust size needed to account for alignment loss for this area */
real_size = size;
tmp = begin->base_offset % align;
if (tmp)
real_size += (align - tmp);
real_size = size + (begin->base_offset + begin->size - size) % align;
while (avail < real_size && end != NULL)
{
@ -172,7 +169,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
{
ExaOffscreenArea *area;
ExaScreenPriv (pScreen);
int tmp, real_size = 0;
int real_size = 0, free_total = 0, largest_avail = 0;
#if DEBUG_OFFSCREEN
static int number = 0;
ErrorF("================= ============ allocating a new pixmap %d\n", ++number);
@ -205,14 +202,37 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
continue;
/* adjust size to match alignment requirement */
real_size = size;
tmp = area->base_offset % align;
if (tmp)
real_size += (align - tmp);
real_size = size + (area->base_offset + area->size - size) % align;
/* does it fit? */
if (real_size <= area->size)
break;
free_total += area->size;
if (area->size > largest_avail)
largest_avail = area->size;
}
if (!area && free_total >= size) {
CARD32 now = GetTimeInMillis();
/* Don't defragment more than once per second, to avoid adding more
* overhead than we're trying to prevent
*/
if (abs((INT32) (now - pExaScr->lastDefragment)) > 1000) {
area = ExaOffscreenDefragment(pScreen);
pExaScr->lastDefragment = now;
if (area) {
/* adjust size to match alignment requirement */
real_size = size + (area->base_offset + area->size - size) % align;
/* does it fit? */
if (real_size > area->size)
area = NULL;
}
}
}
if (!area)
@ -228,10 +248,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
}
/* adjust size needed to account for alignment loss for this area */
real_size = size;
tmp = area->base_offset % align;
if (tmp)
real_size += (align - tmp);
real_size = size + (area->base_offset + area->size - size) % align;
/*
* Kick out first area if in use
@ -254,17 +271,27 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
ExaOffscreenArea *new_area = xalloc (sizeof (ExaOffscreenArea));
if (!new_area)
return NULL;
new_area->base_offset = area->base_offset + real_size;
new_area->base_offset = area->base_offset;
new_area->offset = new_area->base_offset;
new_area->align = 0;
new_area->size = area->size - real_size;
new_area->state = ExaOffscreenAvail;
new_area->save = NULL;
new_area->last_use = 0;
new_area->eviction_cost = 0;
new_area->next = area->next;
area->next = new_area;
new_area->next = area;
new_area->prev = area->prev;
if (area->prev->next)
area->prev->next = new_area;
else
pExaScr->info->offScreenAreas = new_area;
area->prev = new_area;
area->base_offset = new_area->base_offset + new_area->size;
area->size = real_size;
}
} else
pExaScr->numOffscreenAvailable--;
/*
* Mark this area as in use
*/
@ -277,6 +304,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
area->last_use = pExaScr->offScreenCounter++;
area->offset = (area->base_offset + align - 1);
area->offset -= area->offset % align;
area->align = align;
ExaOffscreenValidate (pScreen);
@ -391,7 +419,7 @@ exaEnableDisableFBAccess (int index, Bool enable)
/* merge the next free area into this one */
static void
ExaOffscreenMerge (ExaOffscreenArea *area)
ExaOffscreenMerge (ExaScreenPrivPtr pExaScr, ExaOffscreenArea *area)
{
ExaOffscreenArea *next = area->next;
@ -399,7 +427,13 @@ ExaOffscreenMerge (ExaOffscreenArea *area)
area->size += next->size;
/* frob pointer */
area->next = next->next;
if (area->next)
area->next->prev = area;
else
pExaScr->info->offScreenAreas->prev = area;
xfree (next);
pExaScr->numOffscreenAvailable--;
}
/**
@ -436,19 +470,19 @@ exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area)
if (area == pExaScr->info->offScreenAreas)
prev = NULL;
else
for (prev = pExaScr->info->offScreenAreas; prev; prev = prev->next)
if (prev->next == area)
break;
prev = area->prev;
pExaScr->numOffscreenAvailable++;
/* link with next area if free */
if (next && next->state == ExaOffscreenAvail)
ExaOffscreenMerge (area);
ExaOffscreenMerge (pExaScr, area);
/* link with prev area if free */
if (prev && prev->state == ExaOffscreenAvail)
{
area = prev;
ExaOffscreenMerge (area);
ExaOffscreenMerge (pExaScr, area);
}
ExaOffscreenValidate (pScreen);
@ -468,6 +502,167 @@ ExaOffscreenMarkUsed (PixmapPtr pPixmap)
pExaPixmap->area->last_use = pExaScr->offScreenCounter++;
}
/**
* Defragment offscreen memory by compacting allocated areas at the end of it,
* leaving the total amount of memory available as a single area at the
* beginning (when there are no pinned allocations).
*/
_X_HIDDEN ExaOffscreenArea*
ExaOffscreenDefragment (ScreenPtr pScreen)
{
ExaScreenPriv (pScreen);
ExaOffscreenArea *area, *largest_available = NULL;
int largest_size = 0;
PixmapPtr pDstPix;
ExaPixmapPrivPtr pExaDstPix;
pDstPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, 0, 0);
if (!pDstPix)
return NULL;
pExaDstPix = ExaGetPixmapPriv (pDstPix);
pExaDstPix->offscreen = TRUE;
for (area = pExaScr->info->offScreenAreas->prev;
area != pExaScr->info->offScreenAreas;
)
{
ExaOffscreenArea *prev = area->prev;
PixmapPtr pSrcPix;
ExaPixmapPrivPtr pExaSrcPix;
Bool save_offscreen;
int save_pitch;
if (area->state != ExaOffscreenAvail ||
prev->state == ExaOffscreenLocked ||
(prev->state == ExaOffscreenRemovable &&
prev->save != exaPixmapSave)) {
area = prev;
continue;
}
if (prev->state == ExaOffscreenAvail) {
if (area == largest_available) {
largest_available = prev;
largest_size += prev->size;
}
area = prev;
ExaOffscreenMerge (pExaScr, area);
continue;
}
if (area->size > largest_size) {
largest_available = area;
largest_size = area->size;
}
pSrcPix = prev->privData;
pExaSrcPix = ExaGetPixmapPriv (pSrcPix);
pExaDstPix->fb_ptr = pExaScr->info->memoryBase +
area->base_offset + area->size - prev->size + prev->base_offset -
prev->offset;
pExaDstPix->fb_ptr -= (unsigned long)pExaDstPix->fb_ptr % prev->align;
if (pExaDstPix->fb_ptr <= pExaSrcPix->fb_ptr) {
area = prev;
continue;
}
if (!(pExaScr->info->flags & EXA_SUPPORTS_OFFSCREEN_OVERLAPS) &&
(pExaSrcPix->fb_ptr + prev->size) > pExaDstPix->fb_ptr) {
area = prev;
continue;
}
save_offscreen = pExaSrcPix->offscreen;
save_pitch = pSrcPix->devKind;
pExaSrcPix->offscreen = TRUE;
pSrcPix->devKind = pExaSrcPix->fb_pitch;
pDstPix->drawable.width = pSrcPix->drawable.width;
pDstPix->devKind = pSrcPix->devKind;
pDstPix->drawable.height = pSrcPix->drawable.height;
pDstPix->drawable.depth = pSrcPix->drawable.depth;
pDstPix->drawable.bitsPerPixel = pSrcPix->drawable.bitsPerPixel;
if (!pExaScr->info->PrepareCopy (pSrcPix, pDstPix, -1, -1, GXcopy, ~0)) {
pExaSrcPix->offscreen = save_offscreen;
pSrcPix->devKind = save_pitch;
area = prev;
continue;
}
pExaScr->info->Copy (pDstPix, 0, 0, 0, 0, pDstPix->drawable.width,
pDstPix->drawable.height);
pExaScr->info->DoneCopy (pDstPix);
exaMarkSync (pScreen);
DBG_OFFSCREEN(("Before swap: prev=0x%08x-0x%08x-0x%08x area=0x%08x-0x%08x-0x%08x\n",
prev->base_offset, prev->offset, prev->base_offset + prev->size,
area->base_offset, area->offset, area->base_offset + area->size));
/* Calculate swapped area offsets and sizes */
area->base_offset = prev->base_offset;
area->offset = area->base_offset;
prev->offset += pExaDstPix->fb_ptr - pExaSrcPix->fb_ptr;
assert(prev->offset >= pExaScr->info->offScreenBase &&
prev->offset < pExaScr->info->memorySize);
prev->base_offset = prev->offset;
if (area->next)
prev->size = area->next->base_offset - prev->base_offset;
else
prev->size = pExaScr->info->memorySize - prev->base_offset;
area->size = prev->base_offset - area->base_offset;
DBG_OFFSCREEN(("After swap: area=0x%08x-0x%08x-0x%08x prev=0x%08x-0x%08x-0x%08x\n",
area->base_offset, area->offset, area->base_offset + area->size,
prev->base_offset, prev->offset, prev->base_offset + prev->size));
/* Swap areas in list */
if (area->next)
area->next->prev = prev;
else
pExaScr->info->offScreenAreas->prev = prev;
if (prev->prev->next)
prev->prev->next = area;
else
pExaScr->info->offScreenAreas = area;
prev->next = area->next;
area->next = prev;
area->prev = prev->prev;
prev->prev = area;
if (!area->prev->next)
pExaScr->info->offScreenAreas = area;
#if DEBUG_OFFSCREEN
if (prev->prev == prev || prev->next == prev)
ErrorF("Whoops, prev points to itself!\n");
if (area->prev == area || area->next == area)
ErrorF("Whoops, area points to itself!\n");
#endif
pExaSrcPix->fb_ptr = pExaDstPix->fb_ptr;
pExaSrcPix->offscreen = save_offscreen;
pSrcPix->devKind = save_pitch;
}
pDstPix->drawable.width = 0;
pDstPix->drawable.height = 0;
pDstPix->drawable.depth = 0;
pDstPix->drawable.bitsPerPixel = 0;
(*pScreen->DestroyPixmap) (pDstPix);
if (area->state == ExaOffscreenAvail && area->size > largest_size)
return area;
return largest_available;
}
/**
* exaOffscreenInit initializes the offscreen memory manager.
*
@ -491,15 +686,18 @@ exaOffscreenInit (ScreenPtr pScreen)
area->state = ExaOffscreenAvail;
area->base_offset = pExaScr->info->offScreenBase;
area->offset = area->base_offset;
area->align = 0;
area->size = pExaScr->info->memorySize - area->base_offset;
area->save = NULL;
area->next = NULL;
area->prev = area;
area->last_use = 0;
area->eviction_cost = 0;
/* Add it to the free areas */
pExaScr->info->offScreenAreas = area;
pExaScr->offScreenCounter = 1;
pExaScr->numOffscreenAvailable = 1;
ExaOffscreenValidate (pScreen);

18
exa/exa_priv.h
View File

@ -145,6 +145,8 @@ typedef struct {
typedef void (*EnableDisableFBAccessProcPtr)(int, Bool);
typedef struct {
ExaDriverPtr info;
ScreenBlockHandlerProcPtr SavedBlockHandler;
ScreenWakeupHandlerProcPtr SavedWakeupHandler;
CreateGCProcPtr SavedCreateGC;
CloseScreenProcPtr SavedCloseScreen;
GetImageProcPtr SavedGetImage;
@ -170,6 +172,9 @@ typedef struct {
unsigned disableFbCount;
Bool optimize_migration;
unsigned offScreenCounter;
unsigned numOffscreenAvailable;
CARD32 lastDefragment;
CARD32 nextDefragment;
/* Store all accessed pixmaps, so we can check for duplicates. */
PixmapPtr prepare_access[6];
@ -415,11 +420,12 @@ ExaCheckAddTraps (PicturePtr pPicture,
static _X_INLINE Bool
exaGCReadsDestination(DrawablePtr pDrawable, unsigned long planemask,
unsigned int fillStyle, unsigned char alu)
unsigned int fillStyle, unsigned char alu,
unsigned int clientClipType)
{
return ((alu != GXcopy && alu != GXclear &&alu != GXset &&
return ((alu != GXcopy && alu != GXclear && alu != GXset &&
alu != GXcopyInverted) || fillStyle == FillStippled ||
!EXA_PM_IS_SOLID(pDrawable, planemask));
clientClipType != CT_NONE || !EXA_PM_IS_SOLID(pDrawable, planemask));
}
void
@ -427,7 +433,8 @@ exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
Bool
exaFillRegionTiled (DrawablePtr pDrawable, RegionPtr pRegion, PixmapPtr pTile,
DDXPointPtr pPatOrg, CARD32 planemask, CARD32 alu);
DDXPointPtr pPatOrg, CARD32 planemask, CARD32 alu,
unsigned int clientClipType);
void
exaGetImage (DrawablePtr pDrawable, int x, int y, int w, int h,
@ -458,6 +465,9 @@ ExaOffscreenSwapOut (ScreenPtr pScreen);
void
ExaOffscreenSwapIn (ScreenPtr pScreen);
ExaOffscreenArea*
ExaOffscreenDefragment (ScreenPtr pScreen);
Bool
exaOffscreenInit(ScreenPtr pScreen);

2
exa/exa_render.c
View File

@ -945,7 +945,7 @@ exaComposite(CARD8 op,
ret = exaFillRegionTiled(pDst->pDrawable, &region,
(PixmapPtr)pSrc->pDrawable,
&patOrg, FB_ALLONES, GXcopy);
&patOrg, FB_ALLONES, GXcopy, CT_NONE);
REGION_UNINIT(pDst->pDrawable->pScreen, &region);

2
exa/exa_unaccel.c
View File

@ -106,7 +106,7 @@ ExaCheckPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth,
EXA_GC_PROLOGUE(pGC);
EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));
if (exaGCReadsDestination(pDrawable, pGC->planemask, pGC->fillStyle,
pGC->alu))
pGC->alu, pGC->clientClipType))
exaPrepareAccess (pDrawable, EXA_PREPARE_DEST);
else
exaPrepareAccessReg (pDrawable, EXA_PREPARE_DEST, pExaPixmap->pDamage ?

9
glx/glxext.c
View File

@ -36,6 +36,7 @@
#include "glxserver.h"
#include <windowstr.h>
#include <propertyst.h>
#include <registry.h>
#include "privates.h"
#include <os.h>
#include "g_disptab.h"
@ -126,6 +127,10 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
__GLXcontext *c;
for (c = glxAllContexts; c; c = c->next) {
if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) {
(*c->loseCurrent)(c);
__glXFlushContextCache();
}
if (c->drawPriv == glxPriv)
c->drawPriv = NULL;
if (c->readPriv == glxPriv)
@ -313,6 +318,10 @@ void GlxExtensionInit(void)
__glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone);
__glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone);
RegisterResourceName(__glXContextRes, "GLXContext");
RegisterResourceName(__glXDrawableRes, "GLXDrawable");
RegisterResourceName(__glXSwapBarrierRes, "GLXSwapBarrier");
if (!dixRequestPrivate(glxClientPrivateKey, sizeof (__GLXclientState)))
return;
if (!AddCallback (&ClientStateCallback, glxClientCallback, 0))

4
hw/kdrive/src/kinput.c
View File

@ -915,6 +915,8 @@ KdAddKeyboard (KdKeyboardInfo *ki)
return !Success;
}
ki->dixdev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
ki->dixdev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
RegisterOtherDevice(ki->dixdev);
#ifdef DEBUG
@ -984,6 +986,8 @@ KdAddPointer (KdPointerInfo *pi)
return BadDevice;
}
pi->dixdev->deviceGrab.ActivateGrab = ActivatePointerGrab;
pi->dixdev->deviceGrab.DeactivateGrab = DeactivatePointerGrab;
RegisterOtherDevice(pi->dixdev);
for (prev = &kdPointers; *prev; prev = &(*prev)->next);

3
hw/xfree86/common/compiler.h
View File

@ -357,7 +357,8 @@ static __inline__ void stw_u(unsigned long r5, unsigned short * r11)
# endif
}
# define write_mem_barrier() __asm__ __volatile__("wmb" : : : "memory")
# define mem_barrier() __asm__ __volatile__("mb" : : : "memory")
# define write_mem_barrier() __asm__ __volatile__("wmb" : : : "memory")
# elif defined(linux) && defined(__ia64__)

46
hw/xfree86/common/xf86Bus.c
View File

@ -639,9 +639,7 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
register xf86AccessPtr pAcc;
EntityAccessPtr tmp;
#ifdef DEBUG
ErrorF("Enable access %i\n",pScrn->scrnIndex);
#endif
DebugF("Enable access %i\n",pScrn->scrnIndex);
/* Entity is not under access control or currently enabled */
if (!pScrn->access) {
@ -844,10 +842,8 @@ checkConflictBlock(resRange *range, resPtr pRes)
case ResBlock:
if (range->rBegin < pRes->block_end &&
range->rEnd > pRes->block_begin) {
#ifdef DEBUG
ErrorF("b-b conflict w: %lx %lx\n",
DebugF("b-b conflict w: %lx %lx\n",
pRes->block_begin,pRes->block_end);
#endif
return pRes->block_end < range->rEnd ?
pRes->block_end : range->rEnd;
}
@ -856,12 +852,10 @@ checkConflictBlock(resRange *range, resPtr pRes)
if (pRes->sparse_base > range->rEnd) return 0;
val = (~pRes->sparse_mask | pRes->sparse_base) & getMask(range->rEnd);
#ifdef DEBUG
ErrorF("base = 0x%lx, mask = 0x%lx, begin = 0x%lx, end = 0x%lx ,"
DebugF("base = 0x%lx, mask = 0x%lx, begin = 0x%lx, end = 0x%lx ,"
"val = 0x%lx\n",
pRes->sparse_base, pRes->sparse_mask, range->rBegin,
range->rEnd, val);
#endif
i = sizeof(memType) * 8;
tmp = prev = pRes->sparse_base;
@ -873,11 +867,9 @@ checkConflictBlock(resRange *range, resPtr pRes)
prev = tmp;
}
if (tmp >= range->rBegin) {
#ifdef DEBUG
ErrorF("conflict found at: 0x%lx\n",tmp);
ErrorF("b-d conflict w: %lx %lx\n",
DebugF("conflict found at: 0x%lx\n",tmp);
DebugF("b-d conflict w: %lx %lx\n",
pRes->sparse_base,pRes->sparse_mask);
#endif
return tmp;
}
else
@ -902,10 +894,8 @@ checkConflictSparse(resRange *range, resPtr pRes)
case ResSparse:
tmp = pRes->sparse_mask & range->rMask;
if ((tmp & pRes->sparse_base) == (tmp & range->rBase)) {
#ifdef DEBUG
ErrorF("s-b conflict w: %lx %lx\n",
DebugF("s-b conflict w: %lx %lx\n",
pRes->sparse_base,pRes->sparse_mask);
#endif
return pRes->sparse_mask;
}
return 0;
@ -918,9 +908,7 @@ checkConflictSparse(resRange *range, resPtr pRes)
tmp = prev = range->rBase;
while (i) {
#ifdef DEBUG
ErrorF("tmp = 0x%lx\n",tmp);
#endif
DebugF("tmp = 0x%lx\n",tmp);
tmp |= 1<< (--i) & val;
if (tmp > pRes->block_end)
tmp = prev;
@ -947,11 +935,9 @@ checkConflictSparse(resRange *range, resPtr pRes)
m_mask = mask > m_mask ? mask : m_mask;
base = base + mask + 1;
}
#ifdef DEBUG
ErrorF("conflict found at: 0x%lx\n",tmp);
ErrorF("b-b conflict w: %lx %lx\n",
DebugF("conflict found at: 0x%lx\n",tmp);
DebugF("b-b conflict w: %lx %lx\n",
pRes->block_begin,pRes->block_end);
#endif
return ~m_mask;
}
}
@ -1557,12 +1543,10 @@ xf86EnterServerState(xf86State state)
* We take care not to call xf86BlockSIGIO() twice.
*/
SetSIGIOForState(state);
#ifdef DEBUG
if (state == SETUP)
ErrorF("Entering SETUP state\n");
DebugF("Entering SETUP state\n");
else
ErrorF("Entering OPERATING state\n");
#endif
DebugF("Entering OPERATING state\n");
/* When servicing a dumb framebuffer we don't need to do anything */
if (doFramebufferMode) return;
@ -1620,10 +1604,8 @@ xf86EnterServerState(xf86State state)
xf86Screens[i]->busAccess = NULL;
}
#ifdef DEBUG
if (xf86Screens[i]->busAccess)
ErrorF("Screen %i setting vga route\n",i);
#endif
DebugF("Screen %i setting vga route\n",i);
switch (rt) {
case MEM_IO:
xf86MsgVerb(X_INFO, 3, "Screen %i shares mem & io resources\n",i);
@ -1967,9 +1949,7 @@ xf86PostScreenInit(void)
return;
}
#ifdef DEBUG
ErrorF("PostScreenInit generation: %i\n",serverGeneration);
#endif
DebugF("PostScreenInit generation: %i\n",serverGeneration);
if (serverGeneration == 1) {
checkRoutingForScreens(OPERATING);
for (i=0; i<xf86NumEntities; i++) {

37
hw/xfree86/common/xf86Config.c
View File

@ -1090,8 +1090,8 @@ Bool xf86DRI2Enabled(void)
* 2. The "CorePointer" and "CoreKeyboard" InputDevices referred to by
* the active ServerLayout.
* 3. The first InputDevices marked as "CorePointer" and "CoreKeyboard".
* 4. The first InputDevices that use the 'mouse' and 'keyboard' or 'kbd'
* drivers.
* 4. The first InputDevices that use 'keyboard' or 'kbd' and a valid mouse
* driver (mouse, synaptics, evdev, vmmouse, void)
* 5. Default devices with an empty (default) configuration. These defaults
* will reference the 'mouse' and 'keyboard' drivers.
*/
@ -1110,6 +1110,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
int count = 0;
MessageType from = X_DEFAULT;
int found = 0;
const char *mousedrivers[] = { "mouse", "synaptics", "evdev", "vmmouse",
"void", NULL };
/*
* First check if a core pointer or core keyboard have been specified
@ -1219,13 +1221,15 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
}
}
/* 4. First pointer with 'mouse' as the driver. */
/* 4. First pointer with an allowed mouse driver. */
if (!foundPointer && !xf86Info.allowEmptyInput) {
const char **driver = mousedrivers;
confInput = xf86findInput(CONF_IMPLICIT_POINTER,
xf86configptr->conf_input_lst);
if (!confInput) {
confInput = xf86findInputByDriver("mouse",
while (*driver && !confInput) {
confInput = xf86findInputByDriver(*driver,
xf86configptr->conf_input_lst);
driver++;
}
if (confInput) {
foundPointer = TRUE;
@ -1280,10 +1284,13 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
* section ... deal.
*/
for (devs = servlayoutp->inputs; devs && *devs; devs++) {
if (!strcmp((*devs)->driver, "void") || !strcmp((*devs)->driver, "mouse") ||
!strcmp((*devs)->driver, "vmmouse") || !strcmp((*devs)->driver, "evdev") ||
!strcmp((*devs)->driver, "synaptics")) {
found = 1; break;
const char **driver = mousedrivers;
while(*driver) {
if (!strcmp((*devs)->driver, *driver)) {
found = 1;
break;
}
driver++;
}
}
if (!found && !xf86Info.allowEmptyInput) {
@ -1518,10 +1525,8 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
adjp = (XF86ConfAdjacencyPtr)adjp->list.next;
}
#ifdef DEBUG
ErrorF("Found %d screens in the layout section %s",
DebugF("Found %d screens in the layout section %s",
count, conf_layout->lay_identifier);
#endif
if (!count) /* alloc enough storage even if no screen is specified */
count = 1;
@ -1678,10 +1683,8 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
count++;
idp = (XF86ConfInactivePtr)idp->list.next;
}
#ifdef DEBUG
ErrorF("Found %d inactive devices in the layout section %s\n",
DebugF("Found %d inactive devices in the layout section %s\n",
count, conf_layout->lay_identifier);
#endif
gdp = xnfalloc((count + 1) * sizeof(GDevRec));
gdp[count].identifier = NULL;
idp = conf_layout->lay_inactive_lst;
@ -1703,10 +1706,8 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
count++;
irp = (XF86ConfInputrefPtr)irp->list.next;
}
#ifdef DEBUG
ErrorF("Found %d input devices in the layout section %s\n",
DebugF("Found %d input devices in the layout section %s\n",
count, conf_layout->lay_identifier);
#endif
indp = xnfcalloc((count + 1), sizeof(IDevPtr));
indp[count] = NULL;
irp = conf_layout->lay_input_lst;

20
hw/xfree86/common/xf86Events.c
View File

@ -183,9 +183,7 @@ ProcessInputEvents (void)
void
xf86ProcessActionEvent(ActionEvent action, void *arg)
{
#ifdef DEBUG
ErrorF("ProcessActionEvent(%d,%x)\n", (int) action, arg);
#endif
DebugF("ProcessActionEvent(%d,%x)\n", (int) action, arg);
switch (action) {
case ACTION_TERMINATE:
if (!xf86Info.dontZap) {
@ -429,9 +427,7 @@ xf86VTSwitch(void)
InputInfoPtr pInfo;
IHPtr ih;
#ifdef DEBUG
ErrorF("xf86VTSwitch()\n");
#endif
DebugF("xf86VTSwitch()\n");
#ifdef XFreeXDGA
if(!DGAVTSwitch())
@ -444,10 +440,8 @@ xf86VTSwitch(void)
*/
if (xf86Screens[0]->vtSema) {
#ifdef DEBUG
ErrorF("xf86VTSwitch: Leaving, xf86Exiting is %s\n",
DebugF("xf86VTSwitch: Leaving, xf86Exiting is %s\n",
BOOLTOSTRING((dispatchException & DE_TERMINATE) ? TRUE : FALSE));
#endif
#ifdef DPMSExtension
if (DPMSPowerLevel != DPMSModeOn)
DPMSSet(serverClient, DPMSModeOn);
@ -483,9 +477,7 @@ xf86VTSwitch(void)
* switch failed
*/
#ifdef DEBUG
ErrorF("xf86VTSwitch: Leave failed\n");
#endif
DebugF("xf86VTSwitch: Leave failed\n");
prevSIGIO = xf86BlockSIGIO();
xf86AccessEnter();
xf86EnterServerState(SETUP);
@ -534,9 +526,7 @@ xf86VTSwitch(void)
}
} else {
#ifdef DEBUG
ErrorF("xf86VTSwitch: Entering\n");
#endif
DebugF("xf86VTSwitch: Entering\n");
if (!xf86VTSwitchTo()) return;
prevSIGIO = xf86BlockSIGIO();

56
hw/xfree86/common/xf86Helper.c
View File

@ -212,15 +212,13 @@ xf86AllocateScreen(DriverPtr drv, int flags)
xf86Screens[i]->CurrentAccess = &xf86CurrentAccess;
xf86Screens[i]->resourceType = MEM_IO;
#ifdef DEBUG
/* OOps -- What's this ? */
ErrorF("xf86AllocateScreen - xf86Screens[%d]->pScreen = %p\n",
DebugF("xf86AllocateScreen - xf86Screens[%d]->pScreen = %p\n",
i, xf86Screens[i]->pScreen );
if ( NULL != xf86Screens[i]->pScreen ) {
ErrorF("xf86Screens[%d]->pScreen->CreateWindow = %p\n",
DebugF("xf86Screens[%d]->pScreen->CreateWindow = %p\n",
i, xf86Screens[i]->pScreen->CreateWindow );
}
#endif
xf86Screens[i]->DriverFunc = drv->driverFunc;
@ -919,11 +917,6 @@ Bool
xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma)
{
MessageType from = X_DEFAULT;
/* Pretend we succeeded if we support better a gamma system.
* This avoids a confusing message.
*/
if (xf86_crtc_supports_gamma(scrp))
return TRUE;
#if 0
xf86MonPtr DDC = (xf86MonPtr)(scrp->monitor->DDC);
#endif
@ -955,6 +948,11 @@ xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma)
scrp->gamma.green = 1.0;
scrp->gamma.blue = 1.0;
}
/* Pretend we succeeded if we support better a gamma system.
* This avoids a confusing message.
*/
if (xf86_crtc_supports_gamma(scrp))
return TRUE;
xf86DrvMsg(scrp->scrnIndex, from,
"Using gamma correction (%.1f, %.1f, %.1f)\n",
scrp->gamma.red, scrp->gamma.green, scrp->gamma.blue);
@ -1735,9 +1733,7 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
}
#ifdef DEBUG
ErrorF("%s instances found: %d\n", driverName, allocatedInstances);
#endif
DebugF("%s instances found: %d\n", driverName, allocatedInstances);
/*
* Check for devices that need duplicated instances. This is required
@ -1820,9 +1816,7 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
instances[i].dev = dev;
}
}
#ifdef DEBUG
ErrorF("%s instances found: %d\n", driverName, numClaimedInstances);
#endif
DebugF("%s instances found: %d\n", driverName, numClaimedInstances);
/*
* Now check that a chipset or chipID override in the device section
* is valid. Chipset has precedence over chipID.
@ -1926,11 +1920,9 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
if (instances[i].screen == 0 && !xf86CheckPciSlot( pPci ))
continue;
#ifdef DEBUG
ErrorF("%s: card at %d:%d:%d is claimed by a Device section\n",
DebugF("%s: card at %d:%d:%d is claimed by a Device section\n",
driverName, pPci->bus, pPci->dev, pPci->func);
#endif
/* Allocate an entry in the lists to be returned */
numFound++;
retEntities = xnfrealloc(retEntities, numFound * sizeof(int));
@ -2621,10 +2613,8 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
int i;
Bool existing = FALSE;
#ifdef DEBUG
ErrorF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n",
DebugF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n",
ScrnIndex, property, type, format, len, value);
#endif
if (ScrnIndex<0 || ScrnIndex>=xf86NumScreens) {
return(BadMatch);
@ -2660,15 +2650,11 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
pNewProp->size = len;
pNewProp->data = value;
#ifdef DEBUG
ErrorF("new property filled\n");
#endif
DebugF("new property filled\n");
if (NULL==xf86RegisteredPropertiesTable) {
#ifdef DEBUG
ErrorF("creating xf86RegisteredPropertiesTable[] size %d\n",
DebugF("creating xf86RegisteredPropertiesTable[] size %d\n",
xf86NumScreens);
#endif
if ( NULL==(xf86RegisteredPropertiesTable=(RootWinPropPtr*)xnfcalloc(sizeof(RootWinProp),xf86NumScreens) )) {
return(BadAlloc);
}
@ -2677,12 +2663,10 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
}
}
#ifdef DEBUG
ErrorF("xf86RegisteredPropertiesTable %p\n",
DebugF("xf86RegisteredPropertiesTable %p\n",
(void *)xf86RegisteredPropertiesTable);
ErrorF("xf86RegisteredPropertiesTable[%d] %p\n",
DebugF("xf86RegisteredPropertiesTable[%d] %p\n",
ScrnIndex, (void *)xf86RegisteredPropertiesTable[ScrnIndex]);
#endif
if (!existing) {
if ( xf86RegisteredPropertiesTable[ScrnIndex] == NULL) {
@ -2690,17 +2674,13 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
} else {
pRegProp = xf86RegisteredPropertiesTable[ScrnIndex];
while (pRegProp->next != NULL) {
#ifdef DEBUG
ErrorF("- next %p\n", (void *)pRegProp);
#endif
DebugF("- next %p\n", (void *)pRegProp);
pRegProp = pRegProp->next;
}
pRegProp->next = pNewProp;
}
}
#ifdef DEBUG
ErrorF("xf86RegisterRootWindowProperty succeeded\n");
#endif
DebugF("xf86RegisterRootWindowProperty succeeded\n");
return(Success);
}

18
hw/xfree86/common/xf86Init.c
View File

@ -316,9 +316,7 @@ xf86CreateRootWindow(WindowPtr pWin)
CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
#ifdef DEBUG
ErrorF("xf86CreateRootWindow(%p)\n", pWin);
#endif
DebugF("xf86CreateRootWindow(%p)\n", pWin);
if ( pScreen->CreateWindow != xf86CreateRootWindow ) {
/* Can't find hook we are hung on */
@ -365,9 +363,7 @@ xf86CreateRootWindow(WindowPtr pWin)
}
}
#ifdef DEBUG
ErrorF("xf86CreateRootWindow() returns %d\n", ret);
#endif
DebugF("xf86CreateRootWindow() returns %d\n", ret);
return (ret);
}
@ -471,10 +467,8 @@ probe_devices_from_device_sections(DriverPtr drvp)
if ( (devList[i]->screen == 0) && !xf86CheckPciSlot( pPci ) )
continue;
#ifdef DEBUG
ErrorF("%s: card at %d:%d:%d is claimed by a Device section\n",
DebugF("%s: card at %d:%d:%d is claimed by a Device section\n",
drvp->driverName, pPci->bus, pPci->dev, pPci->func);
#endif
/* Allocate an entry in the lists to be returned */
entry = xf86ClaimPciSlot(pPci, drvp, device_id,
@ -1246,12 +1240,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
FatalError("AddScreen/ScreenInit failed for driver %d\n", i);
}
#ifdef DEBUG
ErrorF("InitOutput - xf86Screens[%d]->pScreen = %p\n",
DebugF("InitOutput - xf86Screens[%d]->pScreen = %p\n",
i, xf86Screens[i]->pScreen );
ErrorF("xf86Screens[%d]->pScreen->CreateWindow = %p\n",
DebugF("xf86Screens[%d]->pScreen->CreateWindow = %p\n",
i, xf86Screens[i]->pScreen->CreateWindow );
#endif
dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,
xf86CreateRootWindowKey,

16
hw/xfree86/common/xf86Mode.c
View File

@ -654,10 +654,8 @@ xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor)
return MODE_ERROR;
}
#ifdef DEBUG
ErrorF("xf86CheckModeForMonitor(%p %s, %p %s)\n",
DebugF("xf86CheckModeForMonitor(%p %s, %p %s)\n",
mode, mode->name, monitor, monitor->id);
#endif
/* Some basic mode validity checks */
if (0 >= mode->HDisplay || mode->HDisplay > mode->HSyncStart ||
@ -808,10 +806,8 @@ xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
return MODE_ERROR;
}
#ifdef DEBUG
ErrorF("xf86InitialCheckModeForDriver(%p, %p %s, %p, 0x%x, %d, %d, %d)\n",
DebugF("xf86InitialCheckModeForDriver(%p, %p %s, %p, 0x%x, %d, %d, %d)\n",
scrp, mode, mode->name , clockRanges, strategy, maxPitch, virtualX, virtualY);
#endif
/* Some basic mode validity checks */
if (0 >= mode->HDisplay || mode->HDisplay > mode->HSyncStart ||
@ -1210,14 +1206,12 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
range vrefresh[MAX_VREFRESH];
Bool inferred_virtual = FALSE;
#ifdef DEBUG
ErrorF("xf86ValidateModes(%p, %p, %p, %p,\n\t\t %p, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x)\n",
DebugF("xf86ValidateModes(%p, %p, %p, %p,\n\t\t %p, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x)\n",
scrp, availModes, modeNames, clockRanges,
linePitches, minPitch, maxPitch, pitchInc,
minHeight, maxHeight, virtualX, virtualY,
apertureSize, strategy
);
#endif
/* Some sanity checking */
if (scrp == NULL || scrp->name == NULL || !scrp->monitor ||
@ -1860,15 +1854,13 @@ xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags)
do {
xf86SetModeCrtc(p, adjustFlags);
#ifdef DEBUG
ErrorF("%sMode %s: %d (%d) %d %d (%d) %d %d (%d) %d %d (%d) %d\n",
DebugF("%sMode %s: %d (%d) %d %d (%d) %d %d (%d) %d %d (%d) %d\n",
(p->type & M_T_DEFAULT) ? "Default " : "",
p->name, p->CrtcHDisplay, p->CrtcHBlankStart,
p->CrtcHSyncStart, p->CrtcHSyncEnd, p->CrtcHBlankEnd,
p->CrtcHTotal, p->CrtcVDisplay, p->CrtcVBlankStart,
p->CrtcVSyncStart, p->CrtcVSyncEnd, p->CrtcVBlankEnd,
p->CrtcVTotal);
#endif
p = p->next;
} while (p != NULL && p != scrp->modes);
}

18
hw/xfree86/common/xf86VidMode.c
View File

@ -56,12 +56,6 @@ static Bool VidModeClose(int i, ScreenPtr pScreen);
#endif
#ifdef DEBUG
# define DEBUG_P(x) ErrorF(x"\n");
#else
# define DEBUG_P(x) /**/
#endif
Bool
VidModeExtensionInit(ScreenPtr pScreen)
{
@ -69,7 +63,7 @@ VidModeExtensionInit(ScreenPtr pScreen)
VidModePtr pVidMode;
if (!xf86GetVidModeEnabled()) {
DEBUG_P("!xf86GetVidModeEnabled()");
DebugF("!xf86GetVidModeEnabled()\n");
return FALSE;
}
@ -77,7 +71,7 @@ VidModeExtensionInit(ScreenPtr pScreen)
if (!dixSetPrivate(&pScreen->devPrivates, VidModeKey,
xcalloc(sizeof(VidModeRec), 1))) {
DEBUG_P("xcalloc failed");
DebugF("xcalloc failed\n");
return FALSE;
}
@ -89,7 +83,7 @@ VidModeExtensionInit(ScreenPtr pScreen)
VidModeCount++;
return TRUE;
#else
DEBUG_P("no vidmode extension");
DebugF("no vidmode extension\n");
return FALSE;
#endif
}
@ -123,13 +117,13 @@ VidModeAvailable(int scrnIndex)
VidModePtr pVidMode;
if (VidModeKey == NULL) {
DEBUG_P("VidModeKey == NULL");
DebugF("VidModeKey == NULL\n");
return FALSE;
}
pScrn = xf86Screens[scrnIndex];
if (pScrn == NULL) {
DEBUG_P("pScrn == NULL");
DebugF("pScrn == NULL\n");
return FALSE;
}
@ -137,7 +131,7 @@ VidModeAvailable(int scrnIndex)
if (pVidMode)
return TRUE;
else {
DEBUG_P("pVidMode == NULL");
DebugF("pVidMode == NULL\n");
return FALSE;
}
}

36
hw/xfree86/common/xf86fbman.c
View File

@ -802,10 +802,10 @@ LinearRemoveCBWrapper(FBAreaPtr area)
xfree(pLink);
}
#ifdef DEBUG
static void
Dump(FBLinearLinkPtr pLink)
DumpDebug(FBLinearLinkPtr pLink)
{
#ifdef DEBUG
if (!pLink) ErrorF("MMmm, PLINK IS NULL!\n");
while (pLink) {
@ -817,8 +817,8 @@ Dump(FBLinearLinkPtr pLink)
pLink = pLink->next;
}
}
#endif
}
static FBLinearPtr
AllocateLinear(
@ -889,9 +889,7 @@ AllocateLinear(
linear->linear.RemoveLinearCallback = NULL;
linear->linear.devPrivate.ptr = NULL;
#ifdef DEBUG
Dump(offman->LinearAreas);
#endif
DumpDebug(offman->LinearAreas);
return &(linear->linear);
}
@ -916,15 +914,11 @@ localAllocateOffscreenLinear(
xf86FBScreenKey);
/* Try to allocate from linear memory first...... */
#ifdef DEBUG
ErrorF("ALLOCATING LINEAR\n");
#endif
DebugF("ALLOCATING LINEAR\n");
if ((linear = AllocateLinear(offman, length, gran, privData)))
return linear;
#ifdef DEBUG
ErrorF("NOPE, ALLOCATING AREA\n");
#endif
DebugF("NOPE, ALLOCATING AREA\n");
if(!(link = xalloc(sizeof(FBLinearLink))))
return NULL;
@ -978,9 +972,7 @@ localAllocateOffscreenLinear(
} else
xfree(link);
#ifdef DEBUG
Dump(offman->LinearAreas);
#endif
DumpDebug(offman->LinearAreas);
return linear;
}
@ -1005,17 +997,13 @@ localFreeOffscreenLinear(FBLinearPtr linear)
}
if(pLink->area) { /* really an XY area */
#ifdef DEBUG
ErrorF("FREEING AREA\n");
#endif
DebugF("FREEING AREA\n");
localFreeOffscreenArea(pLink->area);
if(pLinkPrev)
pLinkPrev->next = pLink->next;
else offman->LinearAreas = pLink->next;
xfree(pLink);
#ifdef DEBUG
Dump(offman->LinearAreas);
#endif
DumpDebug(offman->LinearAreas);
return;
}
@ -1037,10 +1025,8 @@ localFreeOffscreenLinear(FBLinearPtr linear)
}
}
#ifdef DEBUG
ErrorF("FREEING LINEAR\n");
Dump(offman->LinearAreas);
#endif
DebugF("FREEING LINEAR\n");
DumpDebug(offman->LinearAreas);
}

14
hw/xfree86/common/xf86sbusBus.c
View File

@ -435,9 +435,7 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
return actualcards;
}
#ifdef DEBUG
ErrorF("%s instances found: %d\n", driverName, allocatedInstances);
#endif
DebugF("%s instances found: %d\n", driverName, allocatedInstances);
for (i = 0; i < allocatedInstances; i++) {
char *promPath = NULL;
@ -494,9 +492,7 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
xfree(promPath);
}
#ifdef DEBUG
ErrorF("%s instances found: %d\n", driverName, numClaimedInstances);
#endif
DebugF("%s instances found: %d\n", driverName, numClaimedInstances);
/*
* Of the claimed instances, check that another driver hasn't already
@ -510,11 +506,9 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
if (!xf86CheckSbusSlot(psdp->fbNum))
continue;
#ifdef DEBUG
ErrorF("%s: card at fb%d %08x is claimed by a Device section\n",
DebugF("%s: card at fb%d %08x is claimed by a Device section\n",
driverName, psdp->fbNum, psdp->node.node);
#endif
/* Allocate an entry in the lists to be returned */
numFound++;
retEntities = xnfrealloc(retEntities, numFound * sizeof(int));

2
hw/xfree86/ddc/edid.h
View File

@ -533,7 +533,7 @@ struct detailed_monitor_section {
struct whitePoints wp[2]; /* 32 */
/* color management data */
struct cvt_timings cvt[4]; /* 64 */
/* established timings III */
Uchar est_iii[6]; /* 6 */
} section; /* max: 80 */
};

28
hw/xfree86/ddc/interpret_edid.c
View File

@ -3,22 +3,23 @@
* Copyright 2007 Red Hat, 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
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, and/or sell copies of the Software, and to permit persons to whom
* them Software is furnished to do so, subject to the following conditions:
* 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 (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS 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.
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS 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.
*
* interpret_edid.c: interpret a primary EDID block
*/
@ -284,6 +285,8 @@ get_std_timing_section(Uchar *c, struct std_timings *r,
}
}
static const unsigned char empty_block[18];
static void
get_dt_md_section(Uchar *c, struct edid_version *ver,
struct detailed_monitor_section *det_mon)
@ -327,6 +330,7 @@ get_dt_md_section(Uchar *c, struct edid_version *ver,
break;
case ADD_EST_TIMINGS:
det_mon[i].type = DS_EST_III;
memcpy(det_mon[i].section.est_iii, c + 6, 6);
break;
case ADD_DUMMY:
det_mon[i].type = DS_DUMMY;
@ -335,10 +339,10 @@ get_dt_md_section(Uchar *c, struct edid_version *ver,
det_mon[i].type = DS_UNKOWN;
break;
}
if (c[3] <= 0x0F) {
if (c[3] <= 0x0F && memcmp(c, empty_block, sizeof(empty_block))) {
det_mon[i].type = DS_VENDOR + c[3];
}
} else {
} else {
det_mon[i].type = DT;
get_detailed_timing_section(c,&det_mon[i].section.d_timings);
}

21
hw/xfree86/ddc/print_edid.c
View File

@ -3,22 +3,23 @@
* Copyright 2007 Red Hat, 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
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, and/or sell copies of the Software, and to permit persons to whom
* them Software is furnished to do so, subject to the following conditions:
* 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 (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS 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.
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS 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.
*
* print_edid.c: print out all information retrieved from display device
*/

2
hw/xfree86/dri2/dri2.c
View File

@ -257,6 +257,8 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height,
pPriv->buffers = buffers;
pPriv->bufferCount = *out_count;
pPriv->width = pDraw->width;
pPriv->height = pDraw->height;
*width = pPriv->width;
*height = pPriv->height;

8
hw/xfree86/modes/xf86Crtc.c
View File

@ -353,7 +353,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
}
/* Only upload when needed, to avoid unneeded delays. */
if (!crtc->active)
if (crtc->active)
crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
crtc->gamma_blue, crtc->gamma_size);
@ -2228,19 +2228,19 @@ xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green,
red[i] = i << 8;
else
red[i] = (CARD16)(pow((double)i/(double)(size - 1),
(double)gamma_red) * (double)(size - 1) * 256);
1. / (double)gamma_red) * (double)(size - 1) * 256);
if (gamma_green == 1.0)
green[i] = i << 8;
else
green[i] = (CARD16)(pow((double)i/(double)(size - 1),
(double)gamma_green) * (double)(size - 1) * 256);
1. / (double)gamma_green) * (double)(size - 1) * 256);
if (gamma_blue == 1.0)
blue[i] = i << 8;
else
blue[i] = (CARD16)(pow((double)i/(double)(size - 1),
(double)gamma_blue) * (double)(size - 1) * 256);
1. / (double)gamma_blue) * (double)(size - 1) * 256);
}
/* Default size is 256, so anything else is failure. */

92
hw/xfree86/modes/xf86EdidModes.c
View File

@ -160,6 +160,11 @@ static Bool quirk_detailed_v_in_cm (int scrnIndex, xf86MonPtr DDC)
DDC->vendor.prod_id == 47360)
return TRUE;
/* Bug #21750: Samsung Syncmaster 2333HD */
if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
DDC->vendor.prod_id == 1157)
return TRUE;
return FALSE;
}
@ -636,6 +641,85 @@ DDCModesFromCVT(int scrnIndex, struct cvt_timings *t)
}
#endif
static const struct {
short w;
short h;
short r;
short rb;
} EstIIIModes[] = {
/* byte 6 */
{ 640, 350, 85, 0 },
{ 640, 400, 85, 0 },
{ 720, 400, 85, 0 },
{ 640, 480, 85, 0 },
{ 848, 480, 60, 0 },
{ 800, 600, 85, 0 },
{ 1024, 768, 85, 0 },
{ 1152, 864, 75, 0 },
/* byte 7 */
{ 1280, 768, 60, 1 },
{ 1280, 768, 60, 0 },
{ 1280, 768, 75, 0 },
{ 1280, 768, 85, 0 },
{ 1280, 960, 60, 0 },
{ 1280, 960, 85, 0 },
{ 1280, 1024, 60, 0 },
{ 1280, 1024, 85, 0 },
/* byte 8 */
{ 1360, 768, 60, 0 },
{ 1440, 900, 60, 1 },
{ 1440, 900, 60, 0 },
{ 1440, 900, 75, 0 },
{ 1440, 900, 85, 0 },
{ 1400, 1050, 60, 1 },
{ 1400, 1050, 60, 0 },
{ 1400, 1050, 75, 0 },
/* byte 9 */
{ 1400, 1050, 85, 0 },
{ 1680, 1050, 60, 1 },
{ 1680, 1050, 60, 0 },
{ 1680, 1050, 75, 0 },
{ 1680, 1050, 85, 0 },
{ 1600, 1200, 60, 0 },
{ 1600, 1200, 65, 0 },
{ 1600, 1200, 70, 0 },
/* byte 10 */
{ 1600, 1200, 75, 0 },
{ 1600, 1200, 85, 0 },
{ 1792, 1344, 60, 0 },
{ 1792, 1344, 85, 0 },
{ 1856, 1392, 60, 0 },
{ 1856, 1392, 75, 0 },
{ 1920, 1200, 60, 1 },
{ 1920, 1200, 60, 0 },
/* byte 11 */
{ 1920, 1200, 75, 0 },
{ 1920, 1200, 85, 0 },
{ 1920, 1440, 60, 0 },
{ 1920, 1440, 75, 0 },
};
static DisplayModePtr
DDCModesFromEstIII(unsigned char *est)
{
DisplayModePtr modes = NULL;
int i, j, m;
for (i = 0; i < 6; i++) {
for (j = 7; j > 0; j--) {
if (est[i] & (1 << j)) {
m = (i * 8) + (7 - j);
modes = xf86ModesAdd(modes,
FindDMTMode(EstIIIModes[m].w,
EstIIIModes[m].h,
EstIIIModes[m].r,
EstIIIModes[m].rb));
}
}
}
return modes;
}
/*
* This is only valid when the sink claims to be continuous-frequency
@ -806,6 +890,7 @@ xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC)
for (i = 0; i < DET_TIMINGS; i++) {
struct detailed_monitor_section *det_mon = &DDC->det_mon[i];
Mode = NULL;
switch (det_mon->type) {
case DT:
Mode = DDCModeFromDetailedTiming(scrnIndex,
@ -813,22 +898,23 @@ xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC)
preferred,
quirks);
preferred = FALSE;
Modes = xf86ModesAdd(Modes, Mode);
break;
case DS_STD_TIMINGS:
Mode = DDCModesFromStandardTiming(det_mon->section.std_t,
quirks, timing_level, rb);
Modes = xf86ModesAdd(Modes, Mode);
break;
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)
case DS_CVT:
Mode = DDCModesFromCVT(scrnIndex, det_mon->section.cvt);
Modes = xf86ModesAdd(Modes, Mode);
break;
#endif
case DS_EST_III:
Mode = DDCModesFromEstIII(det_mon->section.est_iii);
break;
default:
break;
}
Modes = xf86ModesAdd(Modes, Mode);
}
/* Add established timings */

4
hw/xfree86/modes/xf86RandR12.c
View File

@ -1703,7 +1703,7 @@ gamma_to_ramp(float gamma, CARD16 *ramp, int size)
if (gamma == 1.0)
ramp[i] = i << 8;
else
ramp[i] = (CARD16)(pow((double)i / (double)(size - 1), gamma)
ramp[i] = (CARD16)(pow((double)i / (double)(size - 1), 1. / gamma)
* (double)(size - 1) * 256);
}
}
@ -1740,6 +1740,8 @@ xf86RandR12ChangeGamma(int scrnIndex, Gamma gamma)
xfree(points);
pScrn->gamma = gamma;
return Success;
}

3
hw/xfree86/os-support/bus/Pci.h
View File

@ -168,7 +168,8 @@
#endif /* !defined(DEBUGPCI) */
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
defined(__OpenBSD__) || defined(__NetBSD__) || \
defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
#define ARCH_PCI_INIT bsdPciInit
#endif

36
hw/xfree86/os-support/linux/int10/linux.c
View File

@ -115,9 +115,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
if ((!vidMem) || (!sysMem)) {
if ((fd = open(DEV_MEM, O_RDWR, 0)) >= 0) {
if (!sysMem) {
#ifdef DEBUG
ErrorF("Mapping sys bios area\n");
#endif
DebugF("Mapping sys bios area\n");
if ((sysMem = mmap((void *)(SYS_BIOS), BIOS_SIZE,
PROT_READ | PROT_EXEC,
MAP_SHARED | MAP_FIXED, fd, SYS_BIOS))
@ -128,9 +126,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
}
}
if (!vidMem) {
#ifdef DEBUG
ErrorF("Mapping VRAM area\n");
#endif
DebugF("Mapping VRAM area\n");
if ((vidMem = mmap((void *)(V_RAM), VRAM_SIZE,
PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_SHARED | MAP_FIXED, fd, V_RAM))
@ -162,9 +158,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
(pointer)xnfcalloc(1, ALLOC_ENTRIES(pagesize));
if (!xf86IsEntityPrimary(entityIndex)) {
#ifdef DEBUG
ErrorF("Mapping high memory area\n");
#endif
DebugF("Mapping high memory area\n");
if ((high_mem = shmget(counter++, HIGH_MEM_SIZE,
IPC_CREAT | SHM_R | SHM_W)) == -1) {
if (errno == ENOSYS)
@ -176,9 +170,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
goto error1;
}
} else {
#ifdef DEBUG
ErrorF("Mapping Video BIOS\n");
#endif
DebugF("Mapping Video BIOS\n");
videoBiosMapped = TRUE;
if ((fd = open(DEV_MEM, O_RDWR, 0)) >= 0) {
if ((vMem = mmap((void *)(V_BIOS), SYS_BIOS - V_BIOS,
@ -195,9 +187,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
}
((linuxInt10Priv*)pInt->private)->highMem = high_mem;
#ifdef DEBUG
ErrorF("Mapping 640kB area\n");
#endif
DebugF("Mapping 640kB area\n");
if ((low_mem = shmget(counter++, V_RAM,
IPC_CREAT | SHM_R | SHM_W)) == -1) {
xf86DrvMsg(screen, X_ERROR,
@ -229,16 +219,12 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
Int10Current = pInt;
#ifdef DEBUG
ErrorF("Mapping int area\n");
#endif
DebugF("Mapping int area\n");
if (xf86ReadBIOS(0, 0, (unsigned char *)0, LOW_PAGE_SIZE) < 0) {
xf86DrvMsg(screen, X_ERROR, "Cannot read int vect\n");
goto error3;
}
#ifdef DEBUG
ErrorF("done\n");
#endif
DebugF("done\n");
/*
* Read in everything between V_BIOS and SYS_BIOS as some system BIOSes
* have executable code there. Note that xf86ReadBIOS() can only bring in
@ -246,17 +232,13 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
*/
if (!videoBiosMapped) {
memset((pointer)V_BIOS, 0, SYS_BIOS - V_BIOS);
#ifdef DEBUG
ErrorF("Reading BIOS\n");
#endif
DebugF("Reading BIOS\n");
for (cs = V_BIOS; cs < SYS_BIOS; cs += V_BIOS_SIZE)
if (xf86ReadBIOS(cs, 0, (pointer)cs, V_BIOS_SIZE) < V_BIOS_SIZE)
xf86DrvMsg(screen, X_WARNING,
"Unable to retrieve all of segment 0x%06lX.\n",
(long)cs);
#ifdef DEBUG
ErrorF("done\n");
#endif
DebugF("done\n");
}
if (xf86IsEntityPrimary(entityIndex) && !(initPrimary(options))) {

4
hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
View File

@ -172,9 +172,7 @@ vm86_GP_fault(xf86Int10InfoPtr pInt)
break;
case 0xf4:
#ifdef DEBUG
ErrorF("hlt at %p\n", lina);
#endif
DebugF("hlt at %p\n", lina);
return FALSE;
case 0x0f:

14
hw/xfree86/os-support/linux/lnx_acpi.c
View File

@ -135,15 +135,11 @@ lnxACPIOpen(void)
int r = -1;
static int warned = 0;
#ifdef DEBUG
ErrorF("ACPI: OSPMOpen called\n");
#endif
DebugF("ACPI: OSPMOpen called\n");
if (ACPIihPtr || !xf86Info.pmFlag)
return NULL;
#ifdef DEBUG
ErrorF("ACPI: Opening device\n");
#endif
DebugF("ACPI: Opening device\n");
if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) > -1) {
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
@ -172,10 +168,8 @@ static void
lnxCloseACPI(void)
{
int fd;
#ifdef DEBUG
ErrorF("ACPI: Closing device\n");
#endif
DebugF("ACPI: Closing device\n");
if (ACPIihPtr) {
fd = xf86RemoveGeneralHandler(ACPIihPtr);
shutdown(fd, 2);

14
hw/xfree86/os-support/linux/lnx_apm.c
View File

@ -160,15 +160,11 @@ lnxAPMOpen(void)
{
int fd, pfd;
#ifdef DEBUG
ErrorF("APM: OSPMOpen called\n");
#endif
DebugF("APM: OSPMOpen called\n");
if (APMihPtr || !xf86Info.pmFlag)
return NULL;
#ifdef DEBUG
ErrorF("APM: Opening device\n");
#endif
DebugF("APM: Opening device\n");
if ((fd = open( APM_DEVICE, O_RDWR )) > -1) {
if (access( APM_PROC, R_OK ) ||
((pfd = open( APM_PROC, O_RDONLY)) == -1)) {
@ -191,10 +187,8 @@ static void
lnxCloseAPM(void)
{
int fd;
#ifdef DEBUG
ErrorF("APM: Closing device\n");
#endif
DebugF("APM: Closing device\n");
if (APMihPtr) {
fd = xf86RemoveGeneralHandler(APMihPtr);
close(fd);

12
hw/xfree86/os-support/linux/lnx_axp.c
View File

@ -69,21 +69,15 @@ lnxGetAXP(void)
switch (count) {
case 1:
sscanf(res, "cpu model : %s",cpu);
#ifdef DEBUG
ErrorF("CPU %s\n",cpu);
#endif
DebugF("CPU %s\n",cpu);
break;
case 5:
sscanf(res, "system type : %s",systype);
#ifdef DEBUG
ErrorF("system type : %s\n",systype);
#endif
DebugF("system type : %s\n",systype);
break;
case 6:
sscanf(res, "system variation : %s",sysvari);
#ifdef DEBUG
ErrorF("system variation: %s\n",sysvari);
#endif
DebugF("system variation: %s\n",sysvari);
break;
}
count++;

12
hw/xfree86/os-support/linux/lnx_font.c
View File

@ -65,9 +65,7 @@ getfont(int *width, int *height,
op.flags = 0;
SYSCALL(result = ioctl(xf86Info.consoleFd, KDFONTOP, &op));
#ifdef DEBUG
ErrorF("Console font read: h: %i count: %i\n",op.height,op.charcount);
#endif
DebugF("Console font read: h: %i count: %i\n",op.height,op.charcount);
if (!result) {
@ -130,9 +128,7 @@ lnx_savefont(void)
int fd;
int width = 32, height = 32, charcount = 2048;
#ifdef DEBUG
ErrorF("SAVE font\n");
#endif
DebugF("SAVE font\n");
#if CHECK_OS_VERSION
/* Check if the kernel has full support for this */
@ -247,9 +243,7 @@ lnx_restorefont(void)
{
if (lnxfont.data == NULL)
return FALSE;
#ifdef DEBUG
ErrorF("RESTORE font\n");
#endif
DebugF("RESTORE font\n");
#if 0
/* must wack the height to make the kernel reprogram the VGA registers */
if (!setfont(lnxfont.width, lnxfont.height + 1, lnxfont.charcount,

20
hw/xfree86/os-support/linux/lnx_video.c
View File

@ -292,9 +292,7 @@ mtrr_add_wc_region(int screenNum, unsigned long base, unsigned long size,
lbase = lbase >> 1, d_size <<= 1);
while (d_size > n_size)
d_size = d_size >> 1;
#ifdef DEBUG
ErrorF("WC_BASE: 0x%lx WC_END: 0x%lx\n",base,base+d_size-1);
#endif
DebugF("WC_BASE: 0x%lx WC_END: 0x%lx\n",base,base+d_size-1);
n_base += d_size;
n_size -= d_size;
if (n_size) {
@ -424,11 +422,9 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
realBase = Base & ~(getpagesize() - 1);
alignOff = Base - realBase;
#ifdef DEBUG
ErrorF("base: %lx, realBase: %lx, alignOff: %lx \n",
DebugF("base: %lx, realBase: %lx, alignOff: %lx \n",
Base,realBase,alignOff);
#endif
#if defined(__ia64__) || defined(__arm__) || defined(__s390__)
#ifndef MAP_WRITECOMBINED
#define MAP_WRITECOMBINED 0x00010000
@ -469,9 +465,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
" (0x%08lx,0x%lx) (%s)\n", Base, Size,
strerror(errno));
}
#ifdef DEBUG
ErrorF("base: %lx aligned base: %lx\n",base, base + alignOff);
#endif
DebugF("base: %lx aligned base: %lx\n",base, base + alignOff);
return (char *)base + alignOff;
}
#endif /* !(__sparc__) */
@ -481,10 +475,8 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
{
memType alignOff = (memType)Base
- ((memType)Base & ~(getpagesize() - 1));
#ifdef DEBUG
ErrorF("alignment offset: %lx\n",alignOff);
#endif
DebugF("alignment offset: %lx\n",alignOff);
munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
}

8
hw/xfree86/os-support/sco/sco_video.c
View File

@ -124,9 +124,7 @@ mapVidMemMMAP(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
realBase = Base & ~(getpagesize() - 1);
alignOff = Base - realBase;
#ifdef DEBUG
ErrorF("base: %lx, realBase: %lx, alignOff: %lx\n", Base,realBase,alignOff);
#endif
DebugF("base: %lx, realBase: %lx, alignOff: %lx\n", Base,realBase,alignOff);
base = mmap((caddr_t)0, Size + alignOff,
(flags & VIDMEM_READONLY) ? PROT_READ : (PROT_READ | PROT_WRITE),
@ -138,9 +136,7 @@ mapVidMemMMAP(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
return 0; /* NOTREACHED */
}
#ifdef DEBUG
ErrorF("base: %lx aligned base: %lx\n",base, base + alignOff);
#endif
DebugF("base: %lx aligned base: %lx\n",base, base + alignOff);
return (pointer)((char *)base + alignOff);
}

4
hw/xfree86/os-support/shared/bios_mmap.c
View File

@ -68,10 +68,8 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
close(fd);
return(-1);
}
#ifdef DEBUG
ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
DebugF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
Base, ptr[0] | (ptr[1] << 8));
#endif
(void)memcpy(Buf, (void *)(ptr + Offset), Len);
(void)munmap((caddr_t)ptr, mlen);
(void)close(fd);

21
hw/xfree86/os-support/shared/posix_tty.c
View File

@ -400,17 +400,14 @@ int
xf86ReadSerial (int fd, void *buf, int count)
{
int r;
#ifdef DEBUG
int i;
#endif
SYSCALL (r = read (fd, buf, count));
#ifdef DEBUG
ErrorF("ReadingSerial: 0x%x",
DebugF("ReadingSerial: 0x%x",
(unsigned char)*(((unsigned char *)buf)));
for (i = 1; i < r; i++)
ErrorF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i));
ErrorF("\n");
#endif
DebugF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i));
DebugF("\n");
return (r);
}
@ -418,14 +415,12 @@ int
xf86WriteSerial (int fd, const void *buf, int count)
{
int r;
#ifdef DEBUG
int i;
ErrorF("WritingSerial: 0x%x",(unsigned char)*(((unsigned char *)buf)));
DebugF("WritingSerial: 0x%x",(unsigned char)*(((unsigned char *)buf)));
for (i = 1; i < count; i++)
ErrorF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i));
ErrorF("\n");
#endif
DebugF("\n");
SYSCALL (r = write (fd, buf, count));
return (r);
}
@ -482,9 +477,7 @@ xf86FlushInput(int fd)
struct timeval timeout;
char c[4];
#ifdef DEBUG
ErrorF("FlushingSerial\n");
#endif
DebugF("FlushingSerial\n");
if (tcflush(fd, TCIFLUSH) == 0)
return 0;

3
hw/xfree86/os-support/shared/stdResource.c
View File

@ -43,7 +43,8 @@
/* Avoid Imakefile changes */
#include "bus/Pci.h"
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
defined(__NetBSD__) || defined(__OpenBSD__) || \
defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
#define xf86StdAccResFromOS xf86AccResFromOS
#endif

2
hw/xfree86/os-support/solaris/solaris-amd64.S
View File

@ -32,7 +32,7 @@
#define _ASM
#include <sys/asm_linkage.h>
#define FUNCTION_START(f,n) ENTRY(f)
#define FUNCTION_END(f) SET_SIZE(f)
#define FUNCTION_END(f) ret; SET_SIZE(f)
#endif
FUNCTION_START(inb,4)

2
hw/xfree86/os-support/solaris/solaris-ia32.S
View File

@ -32,7 +32,7 @@
#define _ASM
#include <sys/asm_linkage.h>
#define FUNCTION_START(f,n) ENTRY(f)
#define FUNCTION_END(f) SET_SIZE(f)
#define FUNCTION_END(f) ret; SET_SIZE(f)
#endif
FUNCTION_START(inb,4)

2
hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
View File

@ -33,7 +33,7 @@
#define _ASM
#include <sys/asm_linkage.h>
#define FUNCTION_START(f,n) ENTRY(f)
#define FUNCTION_END(f) SET_SIZE(f)
#define FUNCTION_END(f) retl; nop; SET_SIZE(f)
#endif
/* Converted from common/compiler.h gcc inline format to Sun cc inline

4
hw/xfree86/ramdac/TI.c
View File

@ -115,10 +115,8 @@ TIramdacCalculateMNPForClock(
VCO = 8.0 * IntRef * best_m / best_n;
ActualClock = VCO / ( 1 << p );
#ifdef DEBUG
ErrorF( "f_out=%ld f_vco=%.1f n=%d m=%d p=%d\n",
DebugF( "f_out=%ld f_vco=%.1f n=%d m=%d p=%d\n",
ActualClock, VCO, *rN, *rM, *rP);
#endif
return (ActualClock);
}

4
hw/xfree86/vbe/vbeModes.c
View File

@ -414,11 +414,9 @@ VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe)
data->block->PixelClock = best->Clock * 1000;
/* XXX May not have this. */
clock = VBEGetPixelClock(pVbe, data->mode, data->block->PixelClock);
#ifdef DEBUG
ErrorF("Setting clock %.2fMHz, closest is %.2fMHz\n",
DebugF("Setting clock %.2fMHz, closest is %.2fMHz\n",
(double)data->block->PixelClock / 1000000.0,
(double)clock / 1000000.0);
#endif
if (clock)
data->block->PixelClock = clock;
data->mode |= (1 << 11);

40
hw/xfree86/vgahw/vgaHW.c
View File

@ -1025,32 +1025,24 @@ vgaHWSaveMode(ScrnInfoPtr scrninfp, vgaRegPtr save)
for (i = 0; i < save->numCRTC; i++) {
save->CRTC[i] = hwp->readCrtc(hwp, i);
#ifdef DEBUG
ErrorF("CRTC[0x%02x] = 0x%02x\n", i, save->CRTC[i]);
#endif
DebugF("CRTC[0x%02x] = 0x%02x\n", i, save->CRTC[i]);
}
hwp->enablePalette(hwp);
for (i = 0; i < save->numAttribute; i++) {
save->Attribute[i] = hwp->readAttr(hwp, i);
#ifdef DEBUG
ErrorF("Attribute[0x%02x] = 0x%02x\n", i, save->Attribute[i]);
#endif
DebugF("Attribute[0x%02x] = 0x%02x\n", i, save->Attribute[i]);
}
hwp->disablePalette(hwp);
for (i = 0; i < save->numGraphics; i++) {
save->Graphics[i] = hwp->readGr(hwp, i);
#ifdef DEBUG
ErrorF("Graphics[0x%02x] = 0x%02x\n", i, save->Graphics[i]);
#endif
DebugF("Graphics[0x%02x] = 0x%02x\n", i, save->Graphics[i]);
}
for (i = 1; i < save->numSequencer; i++) {
save->Sequencer[i] = hwp->readSeq(hwp, i);
#ifdef DEBUG
ErrorF("Sequencer[0x%02x] = 0x%02x\n", i, save->Sequencer[i]);
#endif
DebugF("Sequencer[0x%02x] = 0x%02x\n", i, save->Sequencer[i]);
}
}
@ -1088,18 +1080,16 @@ vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save)
hwp->writeDacReadAddr(hwp, 0x00);
for (i = 0; i < 6; i++) {
save->DAC[i] = hwp->readDacData(hwp);
#ifdef DEBUG
switch (i % 3) {
case 0:
ErrorF("DAC[0x%02x] = 0x%02x, ", i / 3, save->DAC[i]);
DebugF("DAC[0x%02x] = 0x%02x, ", i / 3, save->DAC[i]);
break;
case 1:
ErrorF("0x%02x, ", save->DAC[i]);
DebugF("0x%02x, ", save->DAC[i]);
break;
case 2:
ErrorF("0x%02x\n", save->DAC[i]);
DebugF("0x%02x\n", save->DAC[i]);
}
#endif
}
/*
@ -1131,18 +1121,16 @@ vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save)
for (i = 6; i < 768; i++) {
save->DAC[i] = hwp->readDacData(hwp);
DACDelay(hwp);
#ifdef DEBUG
switch (i % 3) {
case 0:
ErrorF("DAC[0x%02x] = 0x%02x, ", i / 3, save->DAC[i]);
DebugF("DAC[0x%02x] = 0x%02x, ", i / 3, save->DAC[i]);
break;
case 1:
ErrorF("0x%02x, ", save->DAC[i]);
DebugF("0x%02x, ", save->DAC[i]);
break;
case 2:
ErrorF("0x%02x\n", save->DAC[i]);
DebugF("0x%02x\n", save->DAC[i]);
}
#endif
}
}
@ -1772,9 +1760,7 @@ vgaHWMapMem(ScrnInfoPtr scrp)
* XXX This is not correct but we do it
* for now.
*/
#ifdef DEBUG
ErrorF("Mapping VGAMem\n");
#endif
DebugF("Mapping VGAMem\n");
hwp->Base = xf86MapDomainMemory(scr_index, VIDMEM_MMIO_32BIT, hwp->dev,
hwp->MapPhys, hwp->MapSize);
return hwp->Base != NULL;
@ -1790,9 +1776,7 @@ vgaHWUnmapMem(ScrnInfoPtr scrp)
if (hwp->Base == NULL)
return;
#ifdef DEBUG
ErrorF("Unmapping VGAMem\n");
#endif
DebugF("Unmapping VGAMem\n");
xf86UnMapVidMem(scr_index, hwp->Base, hwp->MapSize);
hwp->Base = NULL;
}

15
hw/xfree86/xf8_16bpp/cfb8_16.h
View File

@ -4,9 +4,9 @@
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, 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 rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
@ -14,10 +14,11 @@
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS 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.
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS 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.
*/
#ifndef _CFB8_16_H

15
hw/xfree86/xf8_16bpp/xf8_16module.c
View File

@ -4,9 +4,9 @@
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, 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 rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
@ -14,10 +14,11 @@
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS 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.
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS 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.
*/
#ifdef HAVE_XORG_CONFIG_H

2
hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

127
hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib generated
View File

@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.050000190734863">
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10A222</string>
<string key="IBDocument.InterfaceBuilderVersion">708</string>
<string key="IBDocument.AppKitVersion">994.5</string>
<string key="IBDocument.HIToolboxVersion">404.00</string>
<string key="IBDocument.SystemVersion">10A314</string>
<string key="IBDocument.InterfaceBuilderVersion">718</string>
<string key="IBDocument.AppKitVersion">1013</string>
<string key="IBDocument.HIToolboxVersion">415.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">708</string>
<string key="NS.object.0">718</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="348"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -20,7 +19,7 @@
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
@ -194,7 +193,7 @@
</object>
<object class="NSMenuItem" id="868031522">
<reference key="NSMenu" ref="524015605"/>
<string type="base64-UTF8" key="NSTitle">UHJvZ3JhbW1hJ3M</string>
<string key="NSTitle">Programma's</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@ -202,7 +201,7 @@
<reference key="NSMixedImage" ref="351811234"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="981161348">
<string type="base64-UTF8" key="NSTitle">UHJvZ3JhbW1hJ3M</string>
<string key="NSTitle">Programma's</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="390088328">
@ -398,10 +397,10 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="941366957">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -461,9 +460,7 @@
<object class="NSTextFieldCell" key="NSCell" id="391919450">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">QWxzIHUgZGV6ZSBvcHRpZSBpbnNjaGFrZWx0LCBrYW4gaGV0IGdlYnJ1aWsgdmFuIHRvZXRzY29tYmlu
YXRpZXMgdm9vciBtZW51Y29tbWFkbydzIGNvbmZsaWN0ZXJlbiBtZXQgWDExLXByb2dyYW1tYSdzIGRp
ZSBkZSBNZXRhLW1vZGlmaWVyIGdlYnJ1aWtlbi4</string>
<string key="NSContents">Als u deze optie inschakelt, kan het gebruik van toetscombinaties voor menucommado's conflicteren met X11-programma's die de Meta-modifier gebruiken.</string>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
@ -475,9 +472,9 @@ ZSBkZSBNZXRhLW1vZGlmaWVyIGdlYnJ1aWtlbi4</string>
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="891756173">
<object class="NSColor" key="NSColor" id="925765112">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="930815747">
@ -619,9 +616,7 @@ ZW4uCg</string>
<object class="NSTextFieldCell" key="NSCell" id="624655599">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">Vm9vciBYMTEtZ2VsdWlkc3NpZ25hbGVuIHdvcmR0IGhldCB3YWFyc2NodXdpbmdzc2lnbmFhbCB2YW4g
aGV0IHN5c3RlZW0gZ2VicnVpa3QsIHpvYWxzIGluZ2VzdGVsZCBpbiBoZXQgdGFiYmxhZCAnR2VsdWlk
c2VmZmVjdGVuJyB2YW4gaGV0IHN5c3RlZW12b29ya2V1cmVucGFuZWVsICdHZWx1aWQnLg</string>
<string key="NSContents">Voor X11-geluidssignalen wordt het waarschuwingssignaal van het systeem gebruikt, zoals ingesteld in het tabblad 'Geluidseffecten' van het systeemvoorkeurenpaneel 'Geluid'.</string>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="1039016593"/>
@ -861,9 +856,7 @@ c2VmZmVjdGVuJyB2YW4gaGV0IHN5c3RlZW12b29ya2V1cmVucGFuZWVsICdHZWx1aWQnLg</string>
<object class="NSTextFieldCell" key="NSCell" id="572508492">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">SGllcm1lZSBzY2hha2VsdCB1IGhldCBtZW51b25kZXJkZWVsICJrb3BpZWVyIiBpbiBlbiBtYWFrdCB1
IHN5bmNocm9uaXNhdGllIG1vZ2VsaWprIHR1c3NlbiBoZXQga2xlbWJvcmQgdmFuIE9TIFggZW4gZGUg
Q0xJUEJPQVJELSBlbiBQUklNQVJZLWJ1ZmZlciB2YW4gWDExLg</string>
<string key="NSContents">Hiermee schakelt u het menuonderdeel "kopieer" in en maakt u synchronisatie mogelijk tussen het klembord van OS X en de CLIPBOARD- en PRIMARY-buffer van X11.</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="386152084"/>
<reference key="NSBackgroundColor" ref="57160303"/>
@ -983,8 +976,7 @@ Q0xJUEJPQVJELSBlbiBQUklNQVJZLWJ1ZmZlciB2YW4gWDExLg</string>
<object class="NSTextFieldCell" key="NSCell" id="994587858">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">VmFud2VnZSBiZXBlcmtpbmdlbiBpbiBoZXQgWDExLXByb3RvY29sIHdlcmt0IGRlemUgb3B0aWUgbW9n
ZWxpamsgbmlldCBhbHRpamQgaW4gYWxsZSBwcm9ncmFtbWEncy4</string>
<string key="NSContents">Vanwege beperkingen in het X11-protocol werkt deze optie mogelijk niet altijd in alle programma's.</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="522511724"/>
<reference key="NSBackgroundColor" ref="57160303"/>
@ -1114,7 +1106,7 @@ ZWxpamsgbmlldCBhbHRpamQgaW4gYWxsZSBwcm9ncmFtbWEncy4</string>
<object class="NSTextFieldCell" key="NSCell" id="989804990">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string key="NSContents">Indien ingeschakeld, wordt bij aanmaak van een nieuw X11-venster X11.app op de voorgrond geplaatst (in plaats van Finder.app, Terminal.app, enz.)</string>
<string key="NSContents">Indien ingeschakeld, wordt bij aanmaak van een nieuw X11-venster X11.app op de voorgrond geplaatst (in plaats van Finder.app, Terminal.app, enz.).</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="57161931"/>
<reference key="NSBackgroundColor" ref="57160303"/>
@ -1187,10 +1179,7 @@ ZWxpamsgbmlldCBhbHRpamQgaW4gYWxsZSBwcm9ncmFtbWEncy4</string>
<object class="NSTextFieldCell" key="NSCell" id="53243865">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">V2FubmVlciB1IFgxMSBzdGFydCwgd29yZGVuIGVyIFhhdXRob3JpdHktdG9lZ2FuZ3Njb250cm9sZXNs
ZXV0ZWxzIGFhbmdlbWFha3QuIEFscyBoZXQgSVAtYWRyZXMgdmFuIGhldCBzeXN0ZWVtIHdvcmR0IGdl
d2lqemlnZCwgd29yZGVuIGRlemUgdG9ldHNlbiBvbmdlbGRpZyB3YWFyZG9vciBoZXQgbW9nZWxpamsg
aXMgZGF0IFgxMS1wcm9ncmFtbWEncyBuaWV0IGt1bm5lbiB3b3JkZW4gZ2VzdGFydC4</string>
<string key="NSContents">Wanneer u X11 start, worden er Xauthority-toegangscontrolesleutels aangemaakt. Als het IP-adres van het systeem wordt gewijzigd, worden deze toetsen ongeldig waardoor het mogelijk is dat X11-programma's niet kunnen worden gestart.</string>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="168436707"/>
@ -1207,10 +1196,7 @@ aXMgZGF0IFgxMS1wcm9ncmFtbWEncyBuaWV0IGt1bm5lbiB3b3JkZW4gZ2VzdGFydC4</string>
<object class="NSTextFieldCell" key="NSCell" id="390084685">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">QWxzIHUgZGV6ZSBvcHRpZSBpbnNjaGFrZWx0LCBtb2V0ICdWb2VyIGlkZW50aXRlaXRzY29udHJvbGUg
dWl0IHZvb3IgdmVyYmluZGluZ2VuJyBvb2sgd29yZGVuIGluZ2VzY2hha2VsZCB0ZXIgYmV2ZWlsaWdp
bmcgdmFuIGhldCBzeXN0ZWVtLiBBbHMgZGV6ZSBvcHRpZSBpcyB1aXRnZXNjaGFrZWxkLCB3b3JkZW4g
dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<string key="NSContents">Als u deze optie inschakelt, moet 'Voer identiteitscontrole uit voor verbindingen' ook worden ingeschakeld ter beveiliging van het systeem. Als deze optie is uitgeschakeld, worden verbindingen van externe programma's niet toegestaan.</string>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="363817195"/>
@ -1255,11 +1241,10 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
</object>
</object>
<string key="NSFrameSize">{564, 308}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_prefs</string>
</object>
<object class="NSWindowTemplate" id="604417141">
@ -1272,7 +1257,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="85544634">
<nil key="NSNextResponder"/>
@ -1361,8 +1346,8 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<double key="NSMinWidth">62.730998992919922</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Naam</string>
<reference key="NSSupport" ref="26"/>
<object class="NSColor" key="NSBackgroundColor" id="113872566">
@ -1399,8 +1384,8 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Commando</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSBackgroundColor" ref="113872566"/>
@ -1426,8 +1411,8 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Toetsen</string>
<reference key="NSSupport" ref="26"/>
<object class="NSColor" key="NSBackgroundColor">
@ -1454,7 +1439,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
<reference key="NSColor" ref="891756173"/>
<reference key="NSColor" ref="925765112"/>
</object>
<reference key="NSTextColor" ref="930815747"/>
</object>
@ -1484,6 +1469,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<int key="NSDraggingSourceMaskForLocal">-1</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
<string key="NSFrame">{{1, 17}, {301, 198}}</string>
@ -1567,7 +1553,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_apps</string>
</object>
<object class="NSMenu" id="294137138">
@ -1587,7 +1573,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
</object>
<object class="NSMenuItem" id="511651072">
<reference key="NSMenu" ref="294137138"/>
<string type="base64-UTF8" key="NSTitle">UHJvZ3JhbW1hJ3M</string>
<string key="NSTitle">Programma's</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@ -1595,7 +1581,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<reference key="NSMixedImage" ref="351811234"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="48278059">
<string type="base64-UTF8" key="NSTitle">UHJvZ3JhbW1hJ3M</string>
<string key="NSTitle">Programma's</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="563798000">
@ -1611,7 +1597,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
</object>
<object class="NSMenuItem" id="1032342329">
<reference key="NSMenu" ref="48278059"/>
<string type="base64-UTF8" key="NSTitle">UGFzIGFhbuKApg</string>
<string key="NSTitle">Pas aan…</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@ -2186,28 +2172,26 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
<object class="NSArray" key="object" id="330408435">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="object" ref="0"/>
<reference key="children" ref="904585544"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="815810918"/>
<reference key="parent" ref="330408435"/>
<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="941939442"/>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="951368722"/>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
@ -2221,7 +2205,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<reference ref="868031522"/>
<reference ref="551174276"/>
</object>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">MainMenu</string>
</object>
<object class="IBObjectRecord">
@ -2466,7 +2450,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<object class="IBObjectRecord">
<int key="objectID">196</int>
<reference key="object" ref="485884620"/>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">X11Controller</string>
</object>
<object class="IBObjectRecord">
@ -2476,7 +2460,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="941366957"/>
</object>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">PrefsPanel</string>
</object>
<object class="IBObjectRecord">
@ -2740,7 +2724,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="85544634"/>
</object>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">EditPrograms</string>
</object>
<object class="IBObjectRecord">
@ -2763,7 +2747,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<reference ref="318286212"/>
<reference ref="511651072"/>
</object>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">DockMenu</string>
</object>
<object class="IBObjectRecord">
@ -3317,6 +3301,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-3.IBPluginDependency</string>
<string>-3.ImportedFromIB2</string>
<string>100292.IBPluginDependency</string>
<string>100293.IBPluginDependency</string>
@ -3606,6 +3591,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -3673,9 +3659,9 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{271, 666}, {301, 153}}</string>
<string>{{437, 672}, {564, 308}}</string>
<string>{{325, 672}, {564, 308}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{437, 672}, {564, 308}}</string>
<string>{{325, 672}, {564, 308}}</string>
<integer value="1"/>
<string>{{184, 290}, {481, 345}}</string>
<integer value="0"/>
@ -3896,9 +3882,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
@ -3906,9 +3890,7 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
@ -3946,6 +3928,15 @@ dmVyYmluZGluZ2VuIHZhbiBleHRlcm5lIHByb2dyYW1tYSdzIG5pZXQgdG9lZ2VzdGFhbi4</string>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../X11.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
</data>

BIN
hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib generated
View File

Binary file not shown.

2
hw/xquartz/bundle/Resources/French.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

2
hw/xquartz/bundle/Resources/German.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

317
hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib generated
View File

@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.05">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9C31</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
<string key="IBDocument.AppKitVersion">949.26</string>
<string key="IBDocument.HIToolboxVersion">352.00</string>
<string key="IBDocument.SystemVersion">10A222</string>
<string key="IBDocument.InterfaceBuilderVersion">708</string>
<string key="IBDocument.AppKitVersion">994.5</string>
<string key="IBDocument.HIToolboxVersion">404.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">708</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
@ -393,7 +397,7 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="941366957">
<nil key="NSNextResponder"/>
@ -428,7 +432,7 @@
<string key="NSContents">Drei Maustasten nachbilden</string>
<object class="NSFont" key="NSSupport" id="463863101">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.300000e+01</double>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="119157981"/>
@ -461,7 +465,7 @@ bsO8bGVpc3RlIGRpZSBYMTEtUHJvZ3JhbW1lIHN0w7ZyZW4sIGRpZSBNZXRhLVNvbmRlcnRhc3RlbiB2
ZXJ3ZW5kZW4uA</string>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.100000e+01</double>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<string key="NSPlaceholderString"/>
@ -470,9 +474,9 @@ ZXJ3ZW5kZW4uA</string>
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="764920908">
<object class="NSColor" key="NSColor" id="705970636">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
<bytes key="NSWhite">MC42NjY2NjY2NwA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="930815747">
@ -639,7 +643,7 @@ LCB3aWUgaW4gZGVyIFN5c3RlbWVpbnN0ZWxsdW5nIOKAnlRvbmVmZmVrdGXigJwgZmVzdGdlbGVndC4<
<int key="NSButtonFlags2">1</int>
<object class="NSFont" key="NSAlternateImage">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.300000e+01</double>
<double key="NSSize">13</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSAlternateContents"/>
@ -706,6 +710,7 @@ LCB3aWUgaW4gZGVyIFN5c3RlbWVpbnN0ZWxsdW5nIOKAnlRvbmVmZmVrdGXigJwgZmVzdGdlbGVndC4<
<reference key="NSTarget" ref="633115429"/>
</object>
</object>
<reference key="NSMenuFont" ref="463863101"/>
</object>
<int key="NSPreferredEdge">3</int>
<bool key="NSUsesItemFromMenu">YES</bool>
@ -1262,7 +1267,7 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_prefs</string>
</object>
<object class="NSWindowTemplate" id="604417141">
@ -1275,7 +1280,7 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="85544634">
<nil key="NSNextResponder"/>
@ -1360,9 +1365,9 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="938444323">
<double key="NSWidth">1.227310e+02</double>
<double key="NSMinWidth">6.273100e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<double key="NSWidth">122.73099999999999</double>
<double key="NSMinWidth">62.731000000000002</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
@ -1398,9 +1403,9 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<reference key="NSTableView" ref="905092943"/>
</object>
<object class="NSTableColumn" id="84282687">
<double key="NSWidth">1.000000e+02</double>
<double key="NSMinWidth">4.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<double key="NSWidth">100</double>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
@ -1425,9 +1430,9 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<reference key="NSTableView" ref="905092943"/>
</object>
<object class="NSTableColumn" id="242608782">
<double key="NSWidth">6.900000e+01</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<double key="NSWidth">69</double>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
@ -1447,7 +1452,7 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<string key="NSContents">Textzelle</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.200000e+01</double>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSPlaceholderString"/>
@ -1457,7 +1462,7 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
<reference key="NSColor" ref="764920908"/>
<reference key="NSColor" ref="705970636"/>
</object>
<reference key="NSTextColor" ref="930815747"/>
</object>
@ -1467,8 +1472,8 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<reference key="NSTableView" ref="905092943"/>
</object>
</object>
<double key="NSIntercellSpacingWidth">3.000000e+00</double>
<double key="NSIntercellSpacingHeight">2.000000e+00</double>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
<reference key="NSBackgroundColor" ref="822946413"/>
<object class="NSColor" key="NSGridColor">
<int key="NSColorSpace">6</int>
@ -1479,8 +1484,10 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<bytes key="NSWhite">MC41AA</bytes>
</object>
</object>
<double key="NSRowHeight">1.700000e+01</double>
<double key="NSRowHeight">17</double>
<int key="NSTvFlags">1379958784</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
<int key="NSColumnAutoresizingStyle">1</int>
<int key="NSDraggingSourceMaskForLocal">-1</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int>
@ -1501,7 +1508,7 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<reference key="NSSuperview" ref="1063387772"/>
<reference key="NSTarget" ref="1063387772"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">9.949238e-01</double>
<double key="NSPercent">0.99492380000000002</double>
</object>
<object class="NSScroller" id="17278747">
<reference key="NSNextResponder" ref="1063387772"/>
@ -1511,7 +1518,7 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="1063387772"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">6.885246e-01</double>
<double key="NSPercent">0.68852460000000004</double>
</object>
<object class="NSClipView" id="672307654">
<reference key="NSNextResponder" ref="1063387772"/>
@ -1568,7 +1575,7 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_apps</string>
</object>
<object class="NSMenu" id="294137138">
@ -3316,11 +3323,8 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.IBPluginDependency</string>
<string>-2.IBPluginDependency</string>
<string>-3.IBPluginDependency</string>
<string>-3.ImportedFromIB2</string>
<string>100292.IBPluginDependency</string>
<string>100293.IBPluginDependency</string>
@ -3375,7 +3379,6 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<string>169.editorWindowContentRectSynchronizationRect</string>
<string>19.IBPluginDependency</string>
<string>19.ImportedFromIB2</string>
<string>196.IBPluginDependency</string>
<string>196.ImportedFromIB2</string>
<string>200295.IBPluginDependency</string>
<string>200295.IBShouldRemoveOnLegacySave</string>
@ -3390,6 +3393,7 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<string>24.ImportedFromIB2</string>
<string>24.editorWindowContentRectSynchronizationRect</string>
<string>244.IBEditorWindowLastContentRect</string>
<string>244.IBPluginDependency</string>
<string>244.IBViewEditorWindowController.showingLayoutRectangles</string>
<string>244.IBWindowTemplateEditedContentRect</string>
<string>244.ImportedFromIB2</string>
@ -3409,6 +3413,7 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<string>272.IBPluginDependency</string>
<string>272.ImportedFromIB2</string>
<string>285.IBEditorWindowLastContentRect</string>
<string>285.IBPluginDependency</string>
<string>285.IBViewEditorWindowController.showingBoundsRectangles</string>
<string>285.IBViewEditorWindowController.showingLayoutRectangles</string>
<string>285.IBWindowTemplateEditedContentRect</string>
@ -3608,14 +3613,11 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1" id="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -3636,265 +3638,266 @@ dGVuIFByb2dyYW1tZW4gbmljaHQgZXJsYXVidC4</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{168, 821}, {113, 23}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{202, 626}, {154, 153}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{349, 858}, {315, 153}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{271, 666}, {301, 153}}</string>
<string>{{325, 198}, {613, 302}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO"/>
<string>{{325, 198}, {613, 302}}</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{184, 290}, {481, 345}}</string>
<integer value="0" id="8"/>
<reference ref="9"/>
<integer value="0"/>
<integer value="1"/>
<string>{3.40282e+38, 3.40282e+38}</string>
<string>{320, 240}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{58, 803}, {155, 33}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{100, 746}, {155, 33}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{68, 585}, {512, 271}}</string>
<reference ref="9"/>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<integer value="1"/>
<string>{{68, 585}, {512, 271}}</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{433, 406}, {486, 327}}</string>
<reference ref="8"/>
<reference ref="9"/>
<integer value="0"/>
<integer value="1"/>
<string>{3.40282e+38, 3.40282e+38}</string>
<string>{320, 240}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{145, 836}, {375, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{67, 819}, {336, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{20, 641}, {218, 203}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{79, 616}, {218, 203}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">

BIN
hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib generated
View File

Binary file not shown.

2
hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

2
hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>76</string>
<string>83</string>
</dict>
</plist>

2
hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

221
hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib generated
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.050000190734863">
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10A222</string>
<string key="IBDocument.InterfaceBuilderVersion">708</string>
<string key="IBDocument.AppKitVersion">994.5</string>
<string key="IBDocument.HIToolboxVersion">404.00</string>
<string key="IBDocument.SystemVersion">10A314</string>
<string key="IBDocument.InterfaceBuilderVersion">718</string>
<string key="IBDocument.AppKitVersion">1013</string>
<string key="IBDocument.HIToolboxVersion">415.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">708</string>
<string key="NS.object.0">718</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -19,7 +19,7 @@
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
@ -229,7 +229,7 @@
</object>
<object class="NSMenuItem" id="200491363">
<reference key="NSMenu" ref="524015605"/>
<string type="base64-UTF8" key="NSTitle">RWRpY2nDs24</string>
<string key="NSTitle">Edición</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@ -237,7 +237,7 @@
<reference key="NSMixedImage" ref="351811234"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="526778998">
<string type="base64-UTF8" key="NSTitle">RWRpY2nDs24</string>
<string key="NSTitle">Edición</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="185296989">
@ -314,7 +314,7 @@
</object>
<object class="NSMenuItem" id="369641893">
<reference key="NSMenu" ref="96874957"/>
<string type="base64-UTF8" key="NSTitle">UmVjb3JyZXIgdmVudGFuYXMgYWwgcmV2w6lzA</string>
<string key="NSTitle">Recorrer ventanas al revés</string>
<string key="NSKeyEquiv">~</string>
<int key="NSKeyEquivModMask">1179914</int>
<int key="NSMnemonicLoc">2147483647</int>
@ -397,10 +397,10 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="941366957">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -409,6 +409,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{13, 10}, {593, 292}}</string>
<reference key="NSSuperview" ref="941366957"/>
<reference key="NSWindow"/>
<object class="NSMutableArray" key="NSTabViewItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTabViewItem" id="287591690">
@ -425,11 +426,12 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{18, 210}, {402, 18}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="990762273">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string type="base64-UTF8" key="NSContents">U2ltdWxhciByYXTDs24gZGUgdHJlcyBib3RvbmVzA</string>
<string key="NSContents">Simular ratón de tres botones</string>
<object class="NSFont" key="NSSupport" id="463863101">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
@ -456,13 +458,12 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 40}, {501, 42}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="391919450">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">Q3VhbmRvIGVzdGEgb3BjacOzbiBlc3TDoSBhY3RpdmFkYSwgcHVlZGUgcXVlIGxvcyBlcXVpdmFsZW50
ZXMgZGUgdGVjbGFkbyBkZSBsYSBiYXJyYSBkZSBtZW7DunMgaW50ZXJmaWVyYW4gY29uIGxhcyBhcGxp
Y2FjaW9uZXMgWDExIHF1ZSB1c2VuIGVsIG1vZGlmaWNhZG9yIE1ldGEuA</string>
<string key="NSContents">Cuando esta opción está activada, puede que los equivalentes de teclado de la barra de menús interfieran con las aplicaciones X11 que usen el modificador Meta.</string>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
@ -474,16 +475,16 @@ Y2FjaW9uZXMgWDExIHF1ZSB1c2VuIGVsIG1vZGlmaWNhZG9yIE1ldGEuA</string>
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="92723341">
<object class="NSColor" key="NSColor" id="193651701">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="930815747">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
<object class="NSColor" key="NSColor" id="214098874">
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
@ -495,6 +496,7 @@ Y2FjaW9uZXMgWDExIHF1ZSB1c2VuIGVsIG1vZGlmaWNhZG9yIE1ldGEuA</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 170}, {501, 34}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="649334366">
<int key="NSCellFlags">67239424</int>
@ -513,6 +515,7 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
<int key="NSvFlags">256</int>
<string key="NSFrame">{{18, 88}, {402, 18}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="940564599">
<int key="NSCellFlags">67239424</int>
@ -535,12 +538,12 @@ IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA</strin
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 112}, {501, 28}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="666057093">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">UGVybWl0ZSBxdWUgbG9zIGNhbWJpb3MgZW4gZWwgbWVuw7ogZGUgdGVjbGFkbyByZWVtcGxhY2VuIGxh
IGRpc3RyaWJ1Y2nDs24gZGUgdGVjbGFzIGFjdHVhbCBkZSBYMTEuA</string>
<string key="NSContents">Permite que los cambios en el menú de teclado reemplacen la distribución de teclas actual de X11.</string>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="31160162"/>
@ -553,11 +556,12 @@ IGRpc3RyaWJ1Y2nDs24gZGUgdGVjbGFzIGFjdHVhbCBkZSBYMTEuA</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{18, 146}, {402, 18}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="967619578">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string type="base64-UTF8" key="NSContents">U2VndWlyIGxhIGRpc3RyaWJ1Y2nDs24gZGUgdGVjbGFkbyBkZWwgc2lzdGVtYQ</string>
<string key="NSContents">Seguir la distribución de teclado del sistema</string>
<reference key="NSSupport" ref="463863101"/>
<reference key="NSControlView" ref="179949713"/>
<int key="NSButtonFlags">1211912703</int>
@ -573,6 +577,7 @@ IGRpc3RyaWJ1Y2nDs24gZGUgdGVjbGFzIGFjdHVhbCBkZSBYMTEuA</string>
</object>
<string key="NSFrame">{{10, 33}, {573, 246}}</string>
<reference key="NSSuperview" ref="448510093"/>
<reference key="NSWindow"/>
</object>
<string key="NSLabel">Entrada</string>
<reference key="NSColor" ref="57160303"/>
@ -618,9 +623,7 @@ IGRpc3RyaWJ1Y2nDs24gZGUgdGVjbGFzIGFjdHVhbCBkZSBYMTEuA</string>
<object class="NSTextFieldCell" key="NSCell" id="624655599">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">TG9zIHNvbmlkb3MgZGUgWDExIHVzYXLDoW4gZWwgc29uaWRvIGRlIGFsZXJ0YSBlc3TDoW5kYXIgZGVs
IHNpc3RlbWEgZGVmaW5pZG8gZW4gZWwgcGFuZWwg4oCcRWZlY3RvcyBkZSBzb25pZG/igJ0gZGUgUHJl
ZmVyZW5jaWFzIGRlbCBTaXN0ZW1hLg</string>
<string key="NSContents">Los sonidos de X11 usarán el sonido de alerta estándar del sistema definido en la pestaña “Efectos de sonido” del panel Sonido de Preferencias del Sistema.</string>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="1039016593"/>
@ -654,7 +657,7 @@ ZmVyZW5jaWFzIGRlbCBTaXN0ZW1hLg</string>
<int key="NSPeriodicInterval">75</int>
<object class="NSMenuItem" key="NSMenuItem" id="616492372">
<reference key="NSMenu" ref="341113515"/>
<string key="NSTitle">Los de la pantalla</string>
<string key="NSTitle">Desde la pantalla</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@ -744,8 +747,7 @@ ZmVyZW5jaWFzIGRlbCBTaXN0ZW1hLg</string>
<object class="NSTextFieldCell" key="NSCell" id="311969422">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">RXN0YSBvcGNpw7NuIHNlcsOhIGVmZWN0aXZhIGxhIHByw7N4aW1hIHZleiBxdWUgc2UgaW5pY2llIFgx
MS4</string>
<string key="NSContents">Esta opción será efectiva la próxima vez que se inicie X11.</string>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="86150604"/>
@ -784,8 +786,7 @@ MS4</string>
<object class="NSButtonCell" key="NSCell" id="917248662">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string type="base64-UTF8" key="NSContents">TW9zdHJhIGJhcnJhIGRlIG1lbsO6cyBhdXRvbcOhdGljYW1lbnRlIGVuIGxhIG1vZGFsaWRhZCBkZSBw
YW50YWxsYSBjb21wbGV0YSA</string>
<string key="NSContents">Mostra barra de menús automáticamente en la modalidad de pantalla completa </string>
<reference key="NSSupport" ref="463863101"/>
<reference key="NSControlView" ref="57246850"/>
<int key="NSButtonFlags">1211912703</int>
@ -807,9 +808,7 @@ YW50YWxsYSBjb21wbGV0YSA</string>
<object class="NSTextFieldCell" key="NSCell" id="761107402">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">QWN0aXZhIGxhIHZlbnRhbmEgcmHDrXogZGUgWDExLiBVc2UgbGEgY29tYmluYWNpw7NuIGRlIHRlY2xh
cyBDb21hbmRvICsgT3BjacOzbiArIEEgcGFyYSBlbnRyYXIgbyBzYWxpciBkZSBsYSBtb2RhbGlkYWQg
ZGUgcGFudGFsbGEgY29tcGxldGEuA</string>
<string key="NSContents">Activa la ventana raíz de X11. Use la combinación de teclas Comando + Opción + A para entrar o salir de la modalidad de pantalla completa.</string>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="298603383"/>
@ -842,7 +841,7 @@ ZGUgcGFudGFsbGEgY29tcGxldGEuA</string>
<object class="NSButtonCell" key="NSCell" id="718083688">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string type="base64-UTF8" key="NSContents">QWN0aXZhciBzaW5jcm9uaXphY2nDs24</string>
<string key="NSContents">Activar sincronización</string>
<reference key="NSSupport" ref="463863101"/>
<reference key="NSControlView" ref="878106058"/>
<int key="NSButtonFlags">1211912703</int>
@ -864,9 +863,7 @@ ZGUgcGFudGFsbGEgY29tcGxldGEuA</string>
<object class="NSTextFieldCell" key="NSCell" id="572508492">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">QWN0aXZhIGVsIMOtdGVtIGRlIG1lbsO6ICJjb3BpYXIiIHkgcGVybWl0ZSBzaW5jcm9uaXphciBlbCBw
b3J0YXBhcGVsZXMgZGUgT1NYIHkgbG9zIGLDumZlcnMgQ0xJUEJPQVJEIHkgUFJJTUFSWSBkZSBYMTEu
A</string>
<string key="NSContents">Activa el ítem de menú “copiar” y permite sincronizar el portapapeles de OSX y los búfers CLIPBOARD y PRIMARY de X11.</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="386152084"/>
<reference key="NSBackgroundColor" ref="57160303"/>
@ -904,8 +901,7 @@ A</string>
<object class="NSButtonCell" key="NSCell" id="510771323">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string type="base64-UTF8" key="NSContents">QWN0dWFsaXphciBlbCBQUklNQVJZIChjbGljIGNvbiBlbCBib3TDs24gY2VudHJhbCkgY3VhbmRvIGNh
bWJpZSBlbCBwb3J0YXBhcGVsZXMuA</string>
<string key="NSContents">Actualizar el PRIMARY (clic con el botón central) cuando cambie el portapapeles.</string>
<reference key="NSSupport" ref="463863101"/>
<reference key="NSControlView" ref="765780304"/>
<int key="NSButtonFlags">1211912703</int>
@ -971,8 +967,7 @@ bWJpZSBlbCBwb3J0YXBhcGVsZXMuA</string>
<object class="NSTextFieldCell" key="NSCell" id="461823902">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">RGVzYWN0aXZlIGVzdGEgb3BjacOzbiBzaSBkZXNlYSB1c2FyIHhjbGlwYm9hcmQsIGtsaXBwZXIgbyBj
dWFscXVpZXIgb3RybyBnZXN0b3IgZGUgcG9ydGFwYXBlbGVzIGRlIFgxMS4</string>
<string key="NSContents">Desactive esta opción si desea usar xclipboard, klipper o cualquier otro gestor de portapapeles de X11.</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="620944856"/>
<reference key="NSBackgroundColor" ref="57160303"/>
@ -988,8 +983,7 @@ dWFscXVpZXIgb3RybyBnZXN0b3IgZGUgcG9ydGFwYXBlbGVzIGRlIFgxMS4</string>
<object class="NSTextFieldCell" key="NSCell" id="994587858">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">QSBjYXVzYSBkZSBsYXMgbGltaXRhY2lvbmVzIGRlbCBwcm90b2NvbG8gZGUgWDExLCBwdWVkZSBxdWUg
ZXN0YSBvcGNpw7NuIG5vIGZ1bmNpb25lIHNpZW1wcmUgZW4gYWxndW5hcyBhcGxpY2FjaW9uZXMuA</string>
<string key="NSContents">A causa de las limitaciones del protocolo de X11, puede que esta opción no funcione siempre en algunas aplicaciones.</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="522511724"/>
<reference key="NSBackgroundColor" ref="57160303"/>
@ -1043,9 +1037,7 @@ ZXN0YSBvcGNpw7NuIG5vIGZ1bmNpb25lIHNpZW1wcmUgZW4gYWxndW5hcyBhcGxpY2FjaW9uZXMuA</s
<object class="NSTextFieldCell" key="NSCell" id="399127858">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">Q3VhbmRvIGVzdMOhIGFjdGl2YWRhLCBhbCBoYWNlciBjbGljIGVuIHVuYSB2ZW50YW5hIGluYWN0aXZh
LCBsYSB2ZW50YW5hIHNlIGFjdGl2YSB5IGFkZW3DoXMgZWwgY2xpYyBkZWwgcmF0w7NuIHNlIHRyYW5z
bWl0ZSBhIGVsbGEuA</string>
<string key="NSContents">Cuando está activada, al hacer clic en una ventana inactiva, la ventana se activa y además el clic del ratón se transmite a ella.</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="290578835"/>
<reference key="NSBackgroundColor" ref="57160303"/>
@ -1061,7 +1053,7 @@ bWl0ZSBhIGVsbGEuA</string>
<object class="NSButtonCell" key="NSCell" id="959555182">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string type="base64-UTF8" key="NSContents">RW5mb2NhciBsYSBwb3NpY2nDs24gZGVsIHJhdMOzbg</string>
<string key="NSContents">Enfocar la posición del ratón</string>
<reference key="NSSupport" ref="463863101"/>
<reference key="NSControlView" ref="992839333"/>
<int key="NSButtonFlags">1211912703</int>
@ -1121,9 +1113,7 @@ bWl0ZSBhIGVsbGEuA</string>
<object class="NSTextFieldCell" key="NSCell" id="989804990">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">Q3VhbmRvIGVzdMOhIGFjdGl2YWRhLCBhbCBjcmVhciB1bmEgbnVldmEgdmVudGFuYSBkZSBYMTEgZWwg
YXJjaGl2byBYMTEuYXBwIHNlIHNpdMO6YSBlbiBwcmltZXIgcGxhbm8gKHBvciBlbmNpbWEgZGUgRmlu
ZGVyLmFwcCwgVGVybWluYWwuYXBwLCBldGMuKQ</string>
<string key="NSContents">Cuando está activada, al crear una nueva ventana de X11 el archivo X11.app se sitúa en primer plano (por encima de Finder.app, Terminal.app, etc.)</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="57161931"/>
<reference key="NSBackgroundColor" ref="57160303"/>
@ -1196,10 +1186,7 @@ ZGVyLmFwcCwgVGVybWluYWwuYXBwLCBldGMuKQ</string>
<object class="NSTextFieldCell" key="NSCell" id="53243865">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">QWwgaW5pY2lhciBYMTEgc2UgY3JlYXLDoW4gdW5hcyBjbGF2ZXMgZGUgY29udHJvbCBkZSBhY2Nlc28g
WGF1dGhvcml0eS4gU2kgbGEgZGlyZWNjacOzbiBJUCBkZWwgc2lzdGVtYSBjYW1iaWEsIGVzdGFzIGNs
YXZlcyBkZWphcsOhbiBkZSBzZXIgdsOhbGlkYXMsIGxvIHF1ZSBpbXBlZGlyw61hIHF1ZSBwdWRpZXNl
biBlamVjdXRhcnNlIGxhcyBhcGxpY2FjaW9uZXMgWDExLg</string>
<string key="NSContents">Al iniciar X11 se crearán unas claves de control de acceso Xauthority. Si la dirección IP del sistema cambia, estas claves dejarán de ser válidas, lo que impediría que pudiesen ejecutarse las aplicaciones X11.</string>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="168436707"/>
@ -1216,10 +1203,7 @@ biBlamVjdXRhcnNlIGxhcyBhcGxpY2FjaW9uZXMgWDExLg</string>
<object class="NSTextFieldCell" key="NSCell" id="390084685">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">U2kgZXN0YSBvcGNpw7NuIGVzdMOhIGFjdGl2YWRhLCBsYSBvcGNpw7NuIOKAnEF1dGVudGljYXIgY29u
ZXhpb25lc+KAnSB0YW1iacOpbiBkZWJlIGVzdGFybG8gcGFyYSBnYXJhbnRpemFyIGxhIHNlZ3VyaWRh
ZCBkZWwgc2lzdGVtYS4gU2kgZXN0w6EgZGVzYWN0aXZhZGEsIGxhcyBjb25leGlvbmVzIGRlIGFwbGlj
YWNpb25lcyByZW1vdGFzIG5vIGVzdMOhbiBwZXJtaXRpZGFzLg</string>
<string key="NSContents">Si esta opción está activada, la opción “Autenticar conexiones” también debe estarlo para garantizar la seguridad del sistema. Si está desactivada, las conexiones de aplicaciones remotas no están permitidas.</string>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="363817195"/>
@ -1236,8 +1220,7 @@ YWNpb25lcyByZW1vdGFzIG5vIGVzdMOhbiBwZXJtaXRpZGFzLg</string>
<object class="NSTextFieldCell" key="NSCell" id="283628678">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">RXN0YXMgb3BjaW9uZXMgc2Vyw6FuIGVmZWN0aXZhcyBsYSBwcsOzeGltYSB2ZXogcXVlIHNlIGluaWNp
ZSBYMTEuA</string>
<string key="NSContents">Estas opciones serán efectivas la próxima vez que se inicie X11.</string>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="223835729"/>
@ -1265,10 +1248,12 @@ ZSBYMTEuA</string>
</object>
</object>
<string key="NSFrameSize">{619, 308}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_prefs</string>
</object>
<object class="NSWindowTemplate" id="604417141">
@ -1276,15 +1261,15 @@ ZSBYMTEuA</string>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{302, 440}, {454, 271}}</string>
<int key="NSWTFlags">1350041600</int>
<string type="base64-UTF8" key="NSWindowTitle">TWVuw7ogZGUgYXBsaWNhY2lvbmVzIFgxMQ</string>
<string key="NSWindowTitle">Menú de aplicaciones X11</string>
<string key="NSWindowClass">NSPanel</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="85544634">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1293,6 +1278,7 @@ ZSBYMTEuA</string>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{340, 191}, {110, 32}}</string>
<reference key="NSSuperview" ref="85544634"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="143554520">
<int key="NSCellFlags">67239424</int>
@ -1316,6 +1302,7 @@ ZSBYMTEuA</string>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{340, 159}, {110, 32}}</string>
<reference key="NSSuperview" ref="85544634"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="8201128">
<int key="NSCellFlags">67239424</int>
@ -1349,12 +1336,14 @@ ZSBYMTEuA</string>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{301, 198}</string>
<reference key="NSSuperview" ref="580565898"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="792419186">
<reference key="NSNextResponder" ref="672307654"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{301, 17}</string>
<reference key="NSSuperview" ref="672307654"/>
<reference key="NSWindow"/>
<reference key="NSTableView" ref="905092943"/>
</object>
<object class="_NSCornerView" key="NSCornerView" id="898633680">
@ -1362,6 +1351,7 @@ ZSBYMTEuA</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{302, 0}, {16, 17}}</string>
<reference key="NSSuperview" ref="1063387772"/>
<reference key="NSWindow"/>
</object>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1370,19 +1360,22 @@ ZSBYMTEuA</string>
<double key="NSMinWidth">62.730998992919922</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Nombre</string>
<reference key="NSSupport" ref="26"/>
<object class="NSColor" key="NSBackgroundColor" id="113872566">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
</object>
<object class="NSColor" key="NSTextColor" id="249576247">
<object class="NSColor" key="NSTextColor" id="336770154">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">headerTextColor</string>
<reference key="NSColor" ref="214098874"/>
<string key="NSColorName">disabledControlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
</object>
</object>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="825378892">
@ -1405,16 +1398,16 @@ ZSBYMTEuA</string>
<string key="NSHeaderToolTip"/>
</object>
<object class="NSTableColumn" id="84282687">
<double key="NSWidth">99</double>
<double key="NSWidth">88</double>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Comando</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSBackgroundColor" ref="113872566"/>
<reference key="NSTextColor" ref="249576247"/>
<reference key="NSTextColor" ref="336770154"/>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="432610585">
<int key="NSCellFlags">338820672</int>
@ -1433,13 +1426,13 @@ ZSBYMTEuA</string>
<string key="NSHeaderToolTip"/>
</object>
<object class="NSTableColumn" id="242608782">
<double key="NSWidth">71</double>
<double key="NSWidth">82</double>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string type="base64-UTF8" key="NSContents">RnVuY2nDs24gcsOhcGlkYQ</string>
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Función rápida</string>
<reference key="NSSupport" ref="26"/>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
@ -1447,7 +1440,7 @@ ZSBYMTEuA</string>
<string key="NSColorName">headerColor</string>
<reference key="NSColor" ref="822946413"/>
</object>
<reference key="NSTextColor" ref="249576247"/>
<reference key="NSTextColor" ref="336770154"/>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="34714764">
<int key="NSCellFlags">338820672</int>
@ -1465,7 +1458,7 @@ ZSBYMTEuA</string>
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
<reference key="NSColor" ref="92723341"/>
<reference key="NSColor" ref="193651701"/>
</object>
<reference key="NSTextColor" ref="930815747"/>
</object>
@ -1496,10 +1489,12 @@ ZSBYMTEuA</string>
<int key="NSDraggingSourceMaskForLocal">-1</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
<string key="NSFrame">{{1, 17}, {301, 198}}</string>
<reference key="NSSuperview" ref="1063387772"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="905092943"/>
<reference key="NSDocView" ref="905092943"/>
<reference key="NSBGColor" ref="812484075"/>
@ -1510,6 +1505,7 @@ ZSBYMTEuA</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{302, 17}, {15, 198}}</string>
<reference key="NSSuperview" ref="1063387772"/>
<reference key="NSWindow"/>
<reference key="NSTarget" ref="1063387772"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.99492377042770386</double>
@ -1519,10 +1515,11 @@ ZSBYMTEuA</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{1, 215}, {301, 15}}</string>
<reference key="NSSuperview" ref="1063387772"/>
<reference key="NSWindow"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="1063387772"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.68852460384368896</double>
<double key="NSPercent">0.99668874172185429</double>
</object>
<object class="NSClipView" id="672307654">
<reference key="NSNextResponder" ref="1063387772"/>
@ -1533,6 +1530,7 @@ ZSBYMTEuA</string>
</object>
<string key="NSFrame">{{1, 0}, {301, 17}}</string>
<reference key="NSSuperview" ref="1063387772"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="792419186"/>
<reference key="NSDocView" ref="792419186"/>
<reference key="NSBGColor" ref="812484075"/>
@ -1542,6 +1540,7 @@ ZSBYMTEuA</string>
</object>
<string key="NSFrame">{{20, 20}, {318, 231}}</string>
<reference key="NSSuperview" ref="85544634"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="580565898"/>
<int key="NSsFlags">50</int>
<reference key="NSVScroller" ref="842897584"/>
@ -1556,11 +1555,12 @@ ZSBYMTEuA</string>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{340, 223}, {114, 32}}</string>
<reference key="NSSuperview" ref="85544634"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1025474039">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">137887744</int>
<string type="base64-UTF8" key="NSContents">QcOxYWRpciDDrXRlbQ</string>
<string key="NSContents">Añadir ítem</string>
<reference key="NSSupport" ref="463863101"/>
<reference key="NSControlView" ref="758204686"/>
<int key="NSButtonFlags">-2038284033</int>
@ -1576,14 +1576,16 @@ ZSBYMTEuA</string>
</object>
</object>
<string key="NSFrameSize">{454, 271}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_apps</string>
</object>
<object class="NSMenu" id="294137138">
<string type="base64-UTF8" key="NSTitle">TWVuw7o</string>
<string key="NSTitle">Menú</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="318286212">
@ -1623,7 +1625,7 @@ ZSBYMTEuA</string>
</object>
<object class="NSMenuItem" id="1032342329">
<reference key="NSMenu" ref="48278059"/>
<string type="base64-UTF8" key="NSTitle">UGVyc29uYWxpemFy4oCmA</string>
<string key="NSTitle">Personalizar…</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
@ -2198,28 +2200,26 @@ ZSBYMTEuA</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
<object class="NSArray" key="object" id="330408435">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="object" ref="0"/>
<reference key="children" ref="904585544"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="815810918"/>
<reference key="parent" ref="330408435"/>
<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="941939442"/>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="951368722"/>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
@ -2233,7 +2233,7 @@ ZSBYMTEuA</string>
<reference ref="868031522"/>
<reference ref="551174276"/>
</object>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">MainMenu</string>
</object>
<object class="IBObjectRecord">
@ -2478,7 +2478,7 @@ ZSBYMTEuA</string>
<object class="IBObjectRecord">
<int key="objectID">196</int>
<reference key="object" ref="485884620"/>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">X11Controller</string>
</object>
<object class="IBObjectRecord">
@ -2488,7 +2488,7 @@ ZSBYMTEuA</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="941366957"/>
</object>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">PrefsPanel</string>
</object>
<object class="IBObjectRecord">
@ -2752,7 +2752,7 @@ ZSBYMTEuA</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="85544634"/>
</object>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">EditPrograms</string>
</object>
<object class="IBObjectRecord">
@ -2775,7 +2775,7 @@ ZSBYMTEuA</string>
<reference ref="318286212"/>
<reference ref="511651072"/>
</object>
<reference key="parent" ref="330408435"/>
<reference key="parent" ref="0"/>
<string key="objectName">DockMenu</string>
</object>
<object class="IBObjectRecord">
@ -3329,6 +3329,7 @@ ZSBYMTEuA</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-3.IBPluginDependency</string>
<string>-3.ImportedFromIB2</string>
<string>100292.IBPluginDependency</string>
<string>100293.IBPluginDependency</string>
@ -3618,6 +3619,7 @@ ZSBYMTEuA</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -3685,10 +3687,10 @@ ZSBYMTEuA</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{271, 666}, {301, 153}}</string>
<string>{{438, 548}, {619, 308}}</string>
<string>{{300, 409}, {619, 308}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO"/>
<string>{{438, 548}, {619, 308}}</string>
<boolean value="YES"/>
<string>{{300, 409}, {619, 308}}</string>
<integer value="1"/>
<string>{{184, 290}, {481, 345}}</string>
<integer value="0"/>
@ -3705,11 +3707,11 @@ ZSBYMTEuA</string>
<string>{{100, 746}, {155, 33}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{68, 585}, {454, 271}}</string>
<string>{{68, 453}, {454, 271}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<integer value="1"/>
<string>{{68, 585}, {454, 271}}</string>
<string>{{68, 453}, {454, 271}}</string>
<integer value="1"/>
<string>{{433, 406}, {486, 327}}</string>
<integer value="0"/>
@ -3910,9 +3912,7 @@ ZSBYMTEuA</string>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
@ -3920,9 +3920,7 @@ ZSBYMTEuA</string>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
@ -3960,6 +3958,15 @@ ZSBYMTEuA</string>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../X11.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
</data>

BIN
hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib generated
View File

Binary file not shown.

2
hw/xquartz/bundle/Resources/da.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

2
hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib generated
View File

@ -626,7 +626,7 @@ ZXJzaWd0Lg</string>
<object class="NSPopUpButton" id="709074847">
<reference key="NSNextResponder" ref="515308735"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{74, 202}, {128, 26}}</string>
<string key="NSFrame">{{70, 202}, {128, 26}}</string>
<reference key="NSSuperview" ref="515308735"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="633115429">

BIN
hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib generated
View File

Binary file not shown.

2
hw/xquartz/bundle/Resources/fi.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

494
hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib generated
View File

@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.05">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9C31</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
<string key="IBDocument.AppKitVersion">949.26</string>
<string key="IBDocument.HIToolboxVersion">352.00</string>
<string key="IBDocument.SystemVersion">10A222</string>
<string key="IBDocument.InterfaceBuilderVersion">708</string>
<string key="IBDocument.AppKitVersion">994.5</string>
<string key="IBDocument.HIToolboxVersion">404.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">708</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
@ -393,7 +397,7 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="941366957">
<nil key="NSNextResponder"/>
@ -428,7 +432,7 @@
<string type="base64-UTF8" key="NSContents">RW11bG9pIGtvbG1lbsOkcHDDpGltaXN0w6QgaGlpcnTDpA</string>
<object class="NSFont" key="NSSupport" id="463863101">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.300000e+01</double>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="119157981"/>
@ -461,7 +465,7 @@ w6Rpcml0w6QgWDExLW9oamVsbWlhLCBqb3RrYSBrw6R5dHTDpHbDpHQgTWV0YS1tdXVudG9uw6RwcMOk
aW50w6QuA</string>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.100000e+01</double>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<string key="NSPlaceholderString"/>
@ -470,9 +474,9 @@ aW50w6QuA</string>
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="735589852">
<object class="NSColor" key="NSColor" id="402953799">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
<bytes key="NSWhite">MC42NjY2NjY2NwA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="930815747">
@ -639,7 +643,7 @@ ZXR1c3BhbmVlbGlzc2EuA</string>
<int key="NSButtonFlags2">1</int>
<object class="NSFont" key="NSAlternateImage">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.300000e+01</double>
<double key="NSSize">13</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSAlternateContents"/>
@ -706,6 +710,7 @@ ZXR1c3BhbmVlbGlzc2EuA</string>
<reference key="NSTarget" ref="633115429"/>
</object>
</object>
<reference key="NSMenuFont" ref="463863101"/>
</object>
<int key="NSPreferredEdge">3</int>
<bool key="NSUsesItemFromMenu">YES</bool>
@ -898,8 +903,8 @@ dXR0dXUuA</string>
<object class="NSButtonCell" key="NSCell" id="510771323">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string type="base64-UTF8" key="NSContents">UMOkaXZpdMOkIFgxMTpuIGVuc2lzaWphaW5lbiB2YWxpbnRhIChrZXNraW9zb2l0dXMpLCAKa3VuIE1h
YyBPUyBYOm4gbGVpa2Vww7Z5dMOkIG11dXR0dXUuA</string>
<string type="base64-UTF8" key="NSContents">UMOkaXZpdMOkIFgxMTpuIGVuc2lzaWphaW5lbiB2YWxpbnRhIChrZXNraW9zb2l0dXMpLCBrdW4gTWFj
IE9TIFg6biBsZWlrZXDDtnl0w6QgbXV1dHR1dS4</string>
<reference key="NSSupport" ref="463863101"/>
<reference key="NSControlView" ref="765780304"/>
<int key="NSButtonFlags">1211912703</int>
@ -1265,7 +1270,7 @@ ZXJyYW4uA</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_prefs</string>
</object>
<object class="NSWindowTemplate" id="604417141">
@ -1278,7 +1283,7 @@ ZXJyYW4uA</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="85544634">
<nil key="NSNextResponder"/>
@ -1363,9 +1368,9 @@ ZXJyYW4uA</string>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="938444323">
<double key="NSWidth">1.217310e+02</double>
<double key="NSMinWidth">6.273100e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<double key="NSWidth">121.73099999999999</double>
<double key="NSMinWidth">62.731000000000002</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
@ -1401,9 +1406,9 @@ ZXJyYW4uA</string>
<reference key="NSTableView" ref="905092943"/>
</object>
<object class="NSTableColumn" id="84282687">
<double key="NSWidth">9.900000e+01</double>
<double key="NSMinWidth">4.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<double key="NSWidth">99</double>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
@ -1428,9 +1433,9 @@ ZXJyYW4uA</string>
<reference key="NSTableView" ref="905092943"/>
</object>
<object class="NSTableColumn" id="242608782">
<double key="NSWidth">7.100000e+01</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<double key="NSWidth">71</double>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
@ -1450,7 +1455,7 @@ ZXJyYW4uA</string>
<string key="NSContents">Text Cell</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.200000e+01</double>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSPlaceholderString"/>
@ -1460,7 +1465,7 @@ ZXJyYW4uA</string>
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
<reference key="NSColor" ref="735589852"/>
<reference key="NSColor" ref="402953799"/>
</object>
<reference key="NSTextColor" ref="930815747"/>
</object>
@ -1470,8 +1475,8 @@ ZXJyYW4uA</string>
<reference key="NSTableView" ref="905092943"/>
</object>
</object>
<double key="NSIntercellSpacingWidth">3.000000e+00</double>
<double key="NSIntercellSpacingHeight">2.000000e+00</double>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
<reference key="NSBackgroundColor" ref="822946413"/>
<object class="NSColor" key="NSGridColor">
<int key="NSColorSpace">6</int>
@ -1482,8 +1487,10 @@ ZXJyYW4uA</string>
<bytes key="NSWhite">MC41AA</bytes>
</object>
</object>
<double key="NSRowHeight">1.700000e+01</double>
<double key="NSRowHeight">17</double>
<int key="NSTvFlags">1379958784</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
<int key="NSColumnAutoresizingStyle">1</int>
<int key="NSDraggingSourceMaskForLocal">-1</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int>
@ -1492,6 +1499,7 @@ ZXJyYW4uA</string>
</object>
<string key="NSFrame">{{1, 17}, {301, 198}}</string>
<reference key="NSSuperview" ref="1063387772"/>
<reference key="NSNextKeyView" ref="905092943"/>
<reference key="NSDocView" ref="905092943"/>
<reference key="NSBGColor" ref="812484075"/>
<int key="NScvFlags">4</int>
@ -1503,7 +1511,7 @@ ZXJyYW4uA</string>
<reference key="NSSuperview" ref="1063387772"/>
<reference key="NSTarget" ref="1063387772"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">9.949238e-01</double>
<double key="NSPercent">0.99492380000000002</double>
</object>
<object class="NSScroller" id="17278747">
<reference key="NSNextResponder" ref="1063387772"/>
@ -1513,7 +1521,7 @@ ZXJyYW4uA</string>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="1063387772"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">6.885246e-01</double>
<double key="NSPercent">0.68852460000000004</double>
</object>
<object class="NSClipView" id="672307654">
<reference key="NSNextResponder" ref="1063387772"/>
@ -1524,6 +1532,7 @@ ZXJyYW4uA</string>
</object>
<string key="NSFrame">{{1, 0}, {301, 17}}</string>
<reference key="NSSuperview" ref="1063387772"/>
<reference key="NSNextKeyView" ref="792419186"/>
<reference key="NSDocView" ref="792419186"/>
<reference key="NSBGColor" ref="812484075"/>
<int key="NScvFlags">4</int>
@ -1532,6 +1541,7 @@ ZXJyYW4uA</string>
</object>
<string key="NSFrame">{{20, 20}, {318, 231}}</string>
<reference key="NSSuperview" ref="85544634"/>
<reference key="NSNextKeyView" ref="580565898"/>
<int key="NSsFlags">50</int>
<reference key="NSVScroller" ref="842897584"/>
<reference key="NSHScroller" ref="17278747"/>
@ -1568,7 +1578,7 @@ ZXJyYW4uA</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_apps</string>
</object>
<object class="NSMenu" id="294137138">
@ -3316,11 +3326,8 @@ ZXJyYW4uA</string>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.IBPluginDependency</string>
<string>-2.IBPluginDependency</string>
<string>-3.IBPluginDependency</string>
<string>-3.ImportedFromIB2</string>
<string>100292.IBPluginDependency</string>
<string>100293.IBPluginDependency</string>
@ -3380,7 +3387,6 @@ ZXJyYW4uA</string>
<string>169.editorWindowContentRectSynchronizationRect</string>
<string>19.IBPluginDependency</string>
<string>19.ImportedFromIB2</string>
<string>196.IBPluginDependency</string>
<string>196.ImportedFromIB2</string>
<string>200295.IBPluginDependency</string>
<string>200295.IBPropertyAccessControl</string>
@ -3399,6 +3405,7 @@ ZXJyYW4uA</string>
<string>24.ImportedFromIB2</string>
<string>24.editorWindowContentRectSynchronizationRect</string>
<string>244.IBEditorWindowLastContentRect</string>
<string>244.IBPluginDependency</string>
<string>244.IBPropertyAccessControl</string>
<string>244.IBViewEditorWindowController.showingLayoutRectangles</string>
<string>244.IBWindowTemplateEditedContentRect</string>
@ -3420,6 +3427,7 @@ ZXJyYW4uA</string>
<string>272.IBPluginDependency</string>
<string>272.ImportedFromIB2</string>
<string>285.IBEditorWindowLastContentRect</string>
<string>285.IBPluginDependency</string>
<string>285.IBPropertyAccessControl</string>
<string>285.IBViewEditorWindowController.showingBoundsRectangles</string>
<string>285.IBViewEditorWindowController.showingLayoutRectangles</string>
@ -3693,21 +3701,18 @@ ZXJyYW4uA</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1" id="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="3" id="11"/>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -3722,349 +3727,350 @@ ZXJyYW4uA</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{168, 821}, {113, 23}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{202, 626}, {154, 153}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>{{349, 858}, {315, 153}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{271, 666}, {301, 153}}</string>
<string>{{706, 450}, {525, 323}}</string>
<reference ref="11"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="3"/>
<boolean value="NO"/>
<string>{{706, 450}, {525, 323}}</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{184, 290}, {481, 345}}</string>
<integer value="0" id="8"/>
<reference ref="9"/>
<integer value="0"/>
<integer value="1"/>
<string>{3.40282e+38, 3.40282e+38}</string>
<string>{320, 240}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{58, 803}, {155, 33}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{100, 746}, {155, 33}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{68, 585}, {469, 271}}</string>
<reference ref="11"/>
<reference ref="9"/>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="3"/>
<integer value="1"/>
<integer value="1"/>
<string>{{68, 585}, {469, 271}}</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{433, 406}, {486, 327}}</string>
<reference ref="8"/>
<reference ref="9"/>
<integer value="0"/>
<integer value="1"/>
<string>{3.40282e+38, 3.40282e+38}</string>
<string>{320, 240}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>{{145, 836}, {357, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{67, 819}, {336, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{84, 709}, {131, 33}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{20, 641}, {218, 203}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{79, 616}, {218, 203}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">

BIN
hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib generated
View File

Binary file not shown.

2
hw/xquartz/bundle/Resources/ko.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

34
hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib generated
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.050000190734863">
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.05">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10A222</string>
@ -12,7 +12,6 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="348"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -398,10 +397,10 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="941366957">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -475,9 +474,9 @@ mCDsnojsirXri4jri6QuA</string>
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="136819958">
<object class="NSColor" key="NSColor" id="241249183">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
<bytes key="NSWhite">MC42NjY2NjY2NwA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="930815747">
@ -1026,7 +1025,7 @@ teuLiOuLpC4gA</string>
<object class="NSButtonCell" key="NSCell" id="259618205">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string type="base64-UTF8" key="NSContents">67mE7Zmc7ISxIOyciOuPhOyasCDtgbTrpq0g66y07IucA</string>
<string type="base64-UTF8" key="NSContents">67mE7Zmc7ISxIOyciOuPhOyasCDtgbTrpq0</string>
<reference key="NSSupport" ref="463863101"/>
<reference key="NSControlView" ref="657659108"/>
<int key="NSButtonFlags">1211912703</int>
@ -1049,8 +1048,8 @@ teuLiOuLpC4gA</string>
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">7Zmc7ISx7ZmU65CY7JeI7J2EIOuVjCDruYTtmZzshLEg7JyI64+E7Jqw66W8IO2BtOumre2VmOuptCDr
p4jsmrDsiqQg7YG066at7J20IOu5hO2ZnOyEsSDsnIjrj4TsmrDrpbwg7Ya16rO87ZWY7JesIO2ZnOyE
se2ZlOuQnCDsnIjrj4TsmrDrpbwg7YG066at7ZWp64uI64ukLg</string>
p4jsmrDsiqQg7YG066at7J20IOu5hO2ZnOyEsSDsnIjrj4TsmrDroZwg7Ya16rO865CgIOu/kOunjCDs
lYTri4jrnbwg67mE7Zmc7ISxIOyciOuPhOyasOqwgCAg7Zmc7ISx7ZmU65Cp64uI64ukLg</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="290578835"/>
<reference key="NSBackgroundColor" ref="57160303"/>
@ -1128,8 +1127,8 @@ soPsnYAg7J2867aAIOyXreq4sOuKpeydhCDqsIDsp4Dqs6Ag7J6I7Iq164uI64ukLg</string>
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">7Zmc7ISx7ZmU65CY7JeI7J2EIOuVjCDsg4jroZzsmrQgWDExIOyciOuPhOyasOulvCDsg53shLHtlZjr
qbQoRmluZGVyLmFwcCDrsI8gVGVybWluYWwuYXBwIOuTsSDrjIDsi6ApIFgxMS5hcHDqsIAg66eoIOyV
nuycvOuhnCDsnbTrj5nrkKnri4jri6QuA</string>
qbQgKEZpbmRlci5hcHAg67CPIO2EsOuvuOuEkC5hcHAg65OxIOuMgOyLoCkgWDExLmFwcOydtCDrp6gg
7JWe7Jy866GcIOydtOuPmeuQqeuLiOuLpC4</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="57161931"/>
<reference key="NSBackgroundColor" ref="57160303"/>
@ -1222,8 +1221,8 @@ nbQg7Jyg7Zqo7ZWY7KeAIOyViuqyjCDrkJjslrQgWDExIOydkeyaqSDtlITroZzqt7jrnqjsnbQg7Iuk
<object class="NSTextFieldCell" key="NSCell" id="390084685">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">7Zmc7ISx7ZmU65CY66m0LCDsi5zsiqTthZwg67O07JWI7J2EIO2ZleyduO2VmOq4sCDsnITtlbQg7J24
7KadIOyXsOqysOuPhCDtmZzshLHtmZTrkJjslrTslbwg7ZWp64uI64ukLiDruYTtmZzshLHtmZTrkJjr
<string type="base64-UTF8" key="NSContents">7Zmc7ISx7ZmU65CY66m0LCDsi5zsiqTthZwg67O07JWI7J2EIO2ZleyduO2VmOq4sCDsnITtlbQg7Jew
6rKwIOyduOymneuPhCDtmZzshLHtmZTrkJjslrTslbwg7ZWp64uI64ukLiDruYTtmZzshLHtmZTrkJjr
qbQsIOybkOqyqSDsnZHsmqkg7ZSE66Gc6re4656oIOyXsOqysOydtCDtl4jsmqnrkJjsp4Ag7JWK7Iq1
64uI64ukLg</string>
<reference key="NSSupport" ref="26"/>
@ -1271,11 +1270,10 @@ i6QuA</string>
</object>
</object>
<string key="NSFrameSize">{484, 308}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_prefs</string>
</object>
<object class="NSWindowTemplate" id="604417141">
@ -1288,7 +1286,7 @@ i6QuA</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="85544634">
<nil key="NSNextResponder"/>
@ -1470,7 +1468,7 @@ i6QuA</string>
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
<reference key="NSColor" ref="136819958"/>
<reference key="NSColor" ref="241249183"/>
</object>
<reference key="NSTextColor" ref="930815747"/>
</object>
@ -1583,7 +1581,7 @@ i6QuA</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 938}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_apps</string>
</object>
<object class="NSMenu" id="294137138">

BIN
hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib generated
View File

Binary file not shown.

2
hw/xquartz/bundle/Resources/no.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

2
hw/xquartz/bundle/Resources/pl.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

435
hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib generated
View File

@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.05">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9C31</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
<string key="IBDocument.AppKitVersion">949.26</string>
<string key="IBDocument.HIToolboxVersion">352.00</string>
<string key="IBDocument.SystemVersion">10A222</string>
<string key="IBDocument.InterfaceBuilderVersion">708</string>
<string key="IBDocument.AppKitVersion">994.5</string>
<string key="IBDocument.HIToolboxVersion">404.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">708</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
@ -393,7 +397,7 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="941366957">
<nil key="NSNextResponder"/>
@ -428,7 +432,7 @@
<string key="NSContents">Emuluj mysz z trzema przyciskami</string>
<object class="NSFont" key="NSSupport" id="463863101">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.300000e+01</double>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="119157981"/>
@ -460,7 +464,7 @@
b2xpZG93YcSHIHogcHJvZ3JhbWFtaSBYMTEgdcW8eXdhasSFY3ltaSBtb2R5ZmlrYXRvcmEgTWV0YS4</string>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.100000e+01</double>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<string key="NSPlaceholderString"/>
@ -469,9 +473,9 @@ b2xpZG93YcSHIHogcHJvZ3JhbWFtaSBYMTEgdcW8eXdhasSFY3ltaSBtb2R5ZmlrYXRvcmEgTWV0YS4<
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="876771927">
<object class="NSColor" key="NSColor" id="905683795">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
<bytes key="NSWhite">MC42NjY2NjY2NwA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="930815747">
@ -638,7 +642,7 @@ eSBkxbp3acSZa293ZS4</string>
<int key="NSButtonFlags2">1</int>
<object class="NSFont" key="NSAlternateImage">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.300000e+01</double>
<double key="NSSize">13</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSAlternateContents"/>
@ -705,6 +709,7 @@ eSBkxbp3acSZa293ZS4</string>
<reference key="NSTarget" ref="633115429"/>
</object>
</object>
<reference key="NSMenuFont" ref="463863101"/>
</object>
<int key="NSPreferredEdge">3</int>
<bool key="NSUsesItemFromMenu">YES</bool>
@ -1209,10 +1214,10 @@ Lg</string>
<object class="NSTextFieldCell" key="NSCell" id="390084685">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">R2R5IHfFgsSFY3pvbmUsIHcgY2VsdSB6YXBld25pZW5pYSBiZXpwaWVjemXFhHN0d2Egd8WCxIVjem9u
YSBtdXNpIGJ5xIcgdGFrxbxlIG9wY2phIFV3aWVyenl0ZWxuaWFqIHBvxYLEhWN6ZW5pYS4gR2R5IHd5
xYLEhWN6b25lLCBwb8WCxIVjemVuaWEgemUgemRhbG55Y2ggcHJvZ3JhbcOzdyBuaWUgc8SFIGRvendv
bG9uZS4</string>
<string type="base64-UTF8" key="NSContents">R2R5IHBvbGUgamVzdCB6YXpuYWN6b25lLCBkbGEgYmV6cGllY3plxYRzdHdhIHfFgsSFY3pvbmEgbXVz
aSBiecSHIHRha8W8ZSBvcGNqYSBVd2llcnp5dGVsbmlhaiBwb8WCxIVjemVuaWEuIEdkeSBwb2xlIG5p
ZSBqZXN0IHphem5hY3pvbmUsIHBvxYLEhWN6ZW5pYSB6ZSB6ZGFsbnljaCBwcm9ncmFtw7N3IG5pZSBz
xIUgZG96d29sb25lLg</string>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="363817195"/>
@ -1260,7 +1265,7 @@ bG9uZS4</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_prefs</string>
</object>
<object class="NSWindowTemplate" id="604417141">
@ -1273,7 +1278,7 @@ bG9uZS4</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="85544634">
<nil key="NSNextResponder"/>
@ -1358,9 +1363,9 @@ bG9uZS4</string>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="938444323">
<double key="NSWidth">1.227310e+02</double>
<double key="NSMinWidth">6.273100e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<double key="NSWidth">122.73099999999999</double>
<double key="NSMinWidth">62.731000000000002</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
@ -1397,9 +1402,9 @@ bG9uZS4</string>
<string key="NSHeaderToolTip"/>
</object>
<object class="NSTableColumn" id="84282687">
<double key="NSWidth">1.000000e+02</double>
<double key="NSMinWidth">4.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<double key="NSWidth">100</double>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
@ -1425,9 +1430,9 @@ bG9uZS4</string>
<string key="NSHeaderToolTip"/>
</object>
<object class="NSTableColumn" id="242608782">
<double key="NSWidth">6.900000e+01</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<double key="NSWidth">69</double>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
@ -1447,7 +1452,7 @@ bG9uZS4</string>
<string type="base64-UTF8" key="NSContents">S29tw7Nya2EgdGVrc3Rvd2E</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.200000e+01</double>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSPlaceholderString"/>
@ -1457,7 +1462,7 @@ bG9uZS4</string>
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
<reference key="NSColor" ref="876771927"/>
<reference key="NSColor" ref="905683795"/>
</object>
<reference key="NSTextColor" ref="930815747"/>
</object>
@ -1468,8 +1473,8 @@ bG9uZS4</string>
<string key="NSHeaderToolTip"/>
</object>
</object>
<double key="NSIntercellSpacingWidth">3.000000e+00</double>
<double key="NSIntercellSpacingHeight">2.000000e+00</double>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
<reference key="NSBackgroundColor" ref="822946413"/>
<object class="NSColor" key="NSGridColor">
<int key="NSColorSpace">6</int>
@ -1480,8 +1485,10 @@ bG9uZS4</string>
<bytes key="NSWhite">MC41AA</bytes>
</object>
</object>
<double key="NSRowHeight">1.700000e+01</double>
<double key="NSRowHeight">17</double>
<int key="NSTvFlags">1379958784</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
<int key="NSColumnAutoresizingStyle">1</int>
<int key="NSDraggingSourceMaskForLocal">-1</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int>
@ -1502,7 +1509,7 @@ bG9uZS4</string>
<reference key="NSSuperview" ref="1063387772"/>
<reference key="NSTarget" ref="1063387772"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">9.949238e-01</double>
<double key="NSPercent">0.99492380000000002</double>
</object>
<object class="NSScroller" id="17278747">
<reference key="NSNextResponder" ref="1063387772"/>
@ -1512,7 +1519,7 @@ bG9uZS4</string>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="1063387772"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">6.885246e-01</double>
<double key="NSPercent">0.68852460000000004</double>
</object>
<object class="NSClipView" id="672307654">
<reference key="NSNextResponder" ref="1063387772"/>
@ -1569,7 +1576,7 @@ bG9uZS4</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{320, 262}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">x11_apps</string>
</object>
<object class="NSMenu" id="294137138">
@ -3317,11 +3324,8 @@ bG9uZS4</string>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.IBPluginDependency</string>
<string>-2.IBPluginDependency</string>
<string>-3.IBPluginDependency</string>
<string>-3.ImportedFromIB2</string>
<string>100292.IBPluginDependency</string>
<string>100293.IBPluginDependency</string>
@ -3378,7 +3382,6 @@ bG9uZS4</string>
<string>169.editorWindowContentRectSynchronizationRect</string>
<string>19.IBPluginDependency</string>
<string>19.ImportedFromIB2</string>
<string>196.IBPluginDependency</string>
<string>196.ImportedFromIB2</string>
<string>200295.IBPluginDependency</string>
<string>200295.IBShouldRemoveOnLegacySave</string>
@ -3393,6 +3396,7 @@ bG9uZS4</string>
<string>24.ImportedFromIB2</string>
<string>24.editorWindowContentRectSynchronizationRect</string>
<string>244.IBEditorWindowLastContentRect</string>
<string>244.IBPluginDependency</string>
<string>244.IBPropertyAccessControl</string>
<string>244.IBViewEditorWindowController.showingLayoutRectangles</string>
<string>244.IBWindowTemplateEditedContentRect</string>
@ -3414,6 +3418,7 @@ bG9uZS4</string>
<string>272.IBPluginDependency</string>
<string>272.ImportedFromIB2</string>
<string>285.IBEditorWindowLastContentRect</string>
<string>285.IBPluginDependency</string>
<string>285.IBViewEditorWindowController.showingBoundsRectangles</string>
<string>285.IBViewEditorWindowController.showingLayoutRectangles</string>
<string>285.IBWindowTemplateEditedContentRect</string>
@ -3665,14 +3670,11 @@ bG9uZS4</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1" id="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -3691,323 +3693,324 @@ bG9uZS4</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="3" id="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{168, 821}, {113, 23}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{202, 626}, {154, 153}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{349, 858}, {315, 153}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{271, 666}, {301, 153}}</string>
<string>{{437, 548}, {584, 308}}</string>
<reference ref="11"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="3"/>
<boolean value="NO"/>
<string>{{437, 548}, {584, 308}}</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{184, 290}, {481, 345}}</string>
<integer value="0" id="8"/>
<reference ref="9"/>
<integer value="0"/>
<integer value="1"/>
<string>{3.40282e+38, 3.40282e+38}</string>
<string>{320, 240}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{58, 803}, {155, 33}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{100, 746}, {155, 33}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{68, 585}, {454, 271}}</string>
<reference ref="9"/>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<integer value="1"/>
<string>{{68, 585}, {454, 271}}</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{433, 406}, {486, 327}}</string>
<reference ref="8"/>
<reference ref="9"/>
<integer value="0"/>
<integer value="1"/>
<string>{3.40282e+38, 3.40282e+38}</string>
<string>{320, 240}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{145, 836}, {333, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{67, 819}, {336, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<integer value="3"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>{{523, 716}, {155, 83}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="11"/>
<reference ref="9"/>
<integer value="3"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{20, 641}, {218, 203}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>{{79, 616}, {218, 203}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1"/>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">

BIN
hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib generated
View File

Binary file not shown.

2
hw/xquartz/bundle/Resources/pt.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

44
hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib generated
View File

@ -450,7 +450,7 @@
<object class="NSTextField" id="443008216">
<reference key="NSNextResponder" ref="596750588"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 67}, {559, 28}}</string>
<string key="NSFrame">{{36, 60}, {548, 31}}</string>
<reference key="NSSuperview" ref="596750588"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="391919450">
@ -487,7 +487,7 @@
<object class="NSTextField" id="282885445">
<reference key="NSNextResponder" ref="596750588"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 170}, {559, 37}}</string>
<string key="NSFrame">{{36, 162}, {548, 42}}</string>
<reference key="NSSuperview" ref="596750588"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="649334366">
@ -506,7 +506,7 @@ ZS4KA</string>
<object class="NSButton" id="842100515">
<reference key="NSNextResponder" ref="596750588"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{18, 98}, {402, 18}}</string>
<string key="NSFrame">{{18, 97}, {402, 18}}</string>
<reference key="NSSuperview" ref="596750588"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="940564599">
@ -528,7 +528,7 @@ ZS4KA</string>
<object class="NSTextField" id="31160162">
<reference key="NSNextResponder" ref="596750588"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 118}, {525, 25}}</string>
<string key="NSFrame">{{36, 126}, {548, 14}}</string>
<reference key="NSSuperview" ref="596750588"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="666057093">
@ -585,7 +585,7 @@ IG1hcGEgZG8gdGVjbGFkbyBhdHVhbCBkbyBYMTEuA</string>
<object class="NSButton" id="418227126">
<reference key="NSNextResponder" ref="515308735"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{18, 78}, {402, 18}}</string>
<string key="NSFrame">{{18, 70}, {402, 18}}</string>
<reference key="NSSuperview" ref="515308735"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1016069354">
@ -607,7 +607,7 @@ IG1hcGEgZG8gdGVjbGFkbyBhdHVhbCBkbyBYMTEuA</string>
<object class="NSTextField" id="1039016593">
<reference key="NSNextResponder" ref="515308735"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 44}, {539, 28}}</string>
<string key="NSFrame">{{36, 36}, {548, 28}}</string>
<reference key="NSSuperview" ref="515308735"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="624655599">
@ -715,7 +715,7 @@ cm9zLg</string>
<object class="NSTextField" id="201731424">
<reference key="NSNextResponder" ref="515308735"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 205}, {50, 20}}</string>
<string key="NSFrame">{{17, 191}, {45, 34}}</string>
<reference key="NSSuperview" ref="515308735"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="930265681">
@ -772,7 +772,7 @@ YW1lbnRlLg</string>
<object class="NSButton" id="57246850">
<reference key="NSNextResponder" ref="515308735"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{37, 98}, {409, 23}}</string>
<string key="NSFrame">{{37, 97}, {409, 23}}</string>
<reference key="NSSuperview" ref="515308735"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="917248662">
@ -794,7 +794,7 @@ YW1lbnRlLg</string>
<object class="NSTextField" id="298603383">
<reference key="NSNextResponder" ref="515308735"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 120}, {539, 23}}</string>
<string key="NSFrame">{{36, 126}, {548, 17}}</string>
<reference key="NSSuperview" ref="515308735"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="761107402">
@ -850,7 +850,7 @@ YXJhIGRpZ2l0YXIgZSBzYWlyIGRvIG1vZG8gdGVsYSBjaGVpYS4</string>
<object class="NSTextField" id="386152084">
<reference key="NSNextResponder" ref="408298283"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 188}, {536, 32}}</string>
<string key="NSFrame">{{36, 188}, {536, 28}}</string>
<reference key="NSSuperview" ref="408298283"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="572508492">
@ -868,7 +868,7 @@ b3MgYnVmZmVycyBQUklOQ0lQQUlTIGRvIFgxMS4</string>
<object class="NSButton" id="477050998">
<reference key="NSNextResponder" ref="408298283"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{34, 107}, {511, 23}}</string>
<string key="NSFrame">{{37, 96}, {511, 23}}</string>
<reference key="NSSuperview" ref="408298283"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="501304422">
@ -891,7 +891,7 @@ bSBmb3IgYWx0ZXJhZGEuA</string>
<object class="NSButton" id="765780304">
<reference key="NSNextResponder" ref="408298283"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{34, 87}, {501, 18}}</string>
<string key="NSFrame">{{37, 71}, {501, 23}}</string>
<reference key="NSSuperview" ref="408298283"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="510771323">
@ -914,7 +914,7 @@ ZW0gZm9yIGFsdGVyYWRhLg</string>
<object class="NSButton" id="1002778833">
<reference key="NSNextResponder" ref="408298283"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{34, 62}, {553, 23}}</string>
<string key="NSFrame">{{37, 46}, {553, 23}}</string>
<reference key="NSSuperview" ref="408298283"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="897099877">
@ -937,7 +937,7 @@ eHRvIGZvciBzZWxlY2lvbmFkby4</string>
<object class="NSButton" id="487809555">
<reference key="NSNextResponder" ref="408298283"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{34, 165}, {511, 23}}</string>
<string key="NSFrame">{{37, 159}, {511, 23}}</string>
<reference key="NSSuperview" ref="408298283"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="619977658">
@ -960,7 +960,7 @@ QSBmb3IgYWx0ZXJhZGEuA</string>
<object class="NSTextField" id="620944856">
<reference key="NSNextResponder" ref="408298283"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{48, 134}, {524, 28}}</string>
<string key="NSFrame">{{55, 125}, {529, 28}}</string>
<reference key="NSSuperview" ref="408298283"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="461823902">
@ -978,7 +978,7 @@ YSBkbyBYMTEuA</string>
<object class="NSTextField" id="522511724">
<reference key="NSNextResponder" ref="408298283"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{48, 28}, {536, 28}}</string>
<string key="NSFrame">{{55, 14}, {526, 28}}</string>
<reference key="NSSuperview" ref="408298283"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="994587858">
@ -1011,7 +1011,7 @@ o28gbmVtIHNlbXByZSBmdW5jaW9uZSBlbSBhbGd1bnMgYXBsaWNhdGl2b3MuA</string>
<object class="NSButton" id="657659108">
<reference key="NSNextResponder" ref="184765684"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{15, 212}, {402, 18}}</string>
<string key="NSFrame">{{18, 212}, {402, 18}}</string>
<reference key="NSSuperview" ref="184765684"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="259618205">
@ -1033,7 +1033,7 @@ o28gbmVtIHNlbXByZSBmdW5jaW9uZSBlbSBhbGd1bnMgYXBsaWNhdGl2b3MuA</string>
<object class="NSTextField" id="290578835">
<reference key="NSNextResponder" ref="184765684"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{31, 175}, {542, 31}}</string>
<string key="NSFrame">{{36, 175}, {542, 31}}</string>
<reference key="NSSuperview" ref="184765684"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="399127858">
@ -1051,7 +1051,7 @@ ZG8gcGFyYSBlc3NhIGphbmVsYSwgYSBxdWFsIHRhbWLDqW0gw6kgYXRpdmFkYS4</string>
<object class="NSButton" id="992839333">
<reference key="NSNextResponder" ref="184765684"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{15, 151}, {402, 18}}</string>
<string key="NSFrame">{{18, 151}, {402, 18}}</string>
<reference key="NSSuperview" ref="184765684"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="959555182">
@ -1073,7 +1073,7 @@ ZG8gcGFyYSBlc3NhIGphbmVsYSwgYSBxdWFsIHRhbWLDqW0gw6kgYXRpdmFkYS4</string>
<object class="NSTextField" id="138261120">
<reference key="NSNextResponder" ref="184765684"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{31, 126}, {441, 21}}</string>
<string key="NSFrame">{{36, 128}, {441, 17}}</string>
<reference key="NSSuperview" ref="184765684"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="183409141">
@ -1090,7 +1090,7 @@ dW5zIGluY29udmVuaWVudGVzLg</string>
<object class="NSButton" id="128352289">
<reference key="NSNextResponder" ref="184765684"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{15, 107}, {402, 18}}</string>
<string key="NSFrame">{{18, 107}, {402, 18}}</string>
<reference key="NSSuperview" ref="184765684"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="556463187">
@ -1112,7 +1112,7 @@ dW5zIGluY29udmVuaWVudGVzLg</string>
<object class="NSTextField" id="57161931">
<reference key="NSNextResponder" ref="184765684"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{31, 59}, {542, 42}}</string>
<string key="NSFrame">{{36, 73}, {542, 28}}</string>
<reference key="NSSuperview" ref="184765684"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="989804990">

BIN
hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib generated
View File

Binary file not shown.

2
hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

1968
hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib generated
View File

File diff suppressed because it is too large Load Diff

BIN
hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib generated
View File

Binary file not shown.

2
hw/xquartz/bundle/Resources/ru.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

2
hw/xquartz/bundle/Resources/sv.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

602
hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib generated
View File

File diff suppressed because it is too large Load Diff

BIN
hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib generated
View File

Binary file not shown.

2
hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>75.1</string>
<string>83</string>
</dict>
</plist>

2
hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist
View File

@ -9,6 +9,6 @@
<key>LprojRevisionLevel</key>
<string>1</string>
<key>LprojVersion</key>
<string>73</string>
<string>83</string>
</dict>
</plist>

20
hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib generated
View File

@ -396,7 +396,7 @@
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{320, 240}</string>
<object class="NSView" key="NSWindowView" id="941366957">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -405,6 +405,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{13, 10}, {458, 292}}</string>
<reference key="NSSuperview" ref="941366957"/>
<reference key="NSWindow"/>
<object class="NSMutableArray" key="NSTabViewItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTabViewItem" id="287591690">
@ -421,6 +422,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{18, 210}, {402, 18}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="990762273">
<int key="NSCellFlags">67239424</int>
@ -452,6 +454,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 92}, {399, 14}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="391919450">
<int key="NSCellFlags">67239424</int>
@ -469,7 +472,7 @@
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="7507385">
<object class="NSColor" key="NSColor" id="281801621">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
</object>
@ -488,8 +491,9 @@
<object class="NSTextField" id="282885445">
<reference key="NSNextResponder" ref="596750588"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 162}, {385, 42}}</string>
<string key="NSFrame">{{36, 176}, {385, 28}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="649334366">
<int key="NSCellFlags">67239424</int>
@ -508,6 +512,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{18, 112}, {402, 18}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="940564599">
<int key="NSCellFlags">67239424</int>
@ -530,6 +535,7 @@ vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 141}, {385, 14}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="666057093">
<int key="NSCellFlags">67239424</int>
@ -548,6 +554,7 @@ h4njgII</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{18, 161}, {402, 18}}</string>
<reference key="NSSuperview" ref="596750588"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="967619578">
<int key="NSCellFlags">67239424</int>
@ -568,6 +575,7 @@ h4njgII</string>
</object>
<string key="NSFrame">{{10, 33}, {438, 246}}</string>
<reference key="NSSuperview" ref="448510093"/>
<reference key="NSWindow"/>
</object>
<string type="base64-UTF8" key="NSLabel">6Ly45YWlA</string>
<reference key="NSColor" ref="57160303"/>
@ -1113,7 +1121,7 @@ uOWPjeeahOaViOaenOOAgg</string>
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">55W25ZWT55So5pmC77yM5paw5bu655qEIFgxMSDoppbnqpflsIfmnIPkvb8gWDExLmFwcO+8iOiAjOS4
jeaYryBGaW5kZXIuYXBw44CBVGVybWluYWwuYXBwIOetie+8ieenu+iHs+acgOWJjeOAgg</string>
jeaYryBGaW5kZXIuYXBw44CB57WC56uv5qmfLmFwcCDnrYnvvInnp7voh7PmnIDliY3jgII</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="57161931"/>
<reference key="NSBackgroundColor" ref="57160303"/>
@ -1252,6 +1260,8 @@ s7vntbHnmoQgSVAg5L2N5Z2A5pu05YuV77yM6YCZ5Lqb6Y215bCH5pyD54Sh5pWI77yM6YCZ5Y+v6IO9
</object>
</object>
<string key="NSFrameSize">{484, 308}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{320, 262}</string>
@ -1450,7 +1460,7 @@ s7vntbHnmoQgSVAg5L2N5Z2A5pu05YuV77yM6YCZ5Lqb6Y215bCH5pyD54Sh5pWI77yM6YCZ5Y+v6IO9
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
<reference key="NSColor" ref="7507385"/>
<reference key="NSColor" ref="281801621"/>
</object>
<reference key="NSTextColor" ref="930815747"/>
</object>

BIN
hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib generated
View File

Binary file not shown.

3
hw/xquartz/pbproxy/app-main.m
View File

@ -50,6 +50,9 @@ static void signal_handler (int sig) {
}
int main (int argc, const char *argv[]) {
const char *s;
int i;
#ifdef DEBUG
printf("pid: %u\n", getpid());
#endif

Some files were not shown because too many files have changed in this diff Show More