diff -Nru xorg-server-1.20.9/aclocal.m4 xorg-server-1.20.13/aclocal.m4 --- xorg-server-1.20.9/aclocal.m4 2020-08-25 15:40:03.000000000 +0000 +++ xorg-server-1.20.13/aclocal.m4 2021-07-29 18:48:25.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -793,7 +793,7 @@ # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.19.2]) +m4_define([vers_have], [1.19.3]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -813,7 +813,7 @@ # such as man pages and config files AC_DEFUN([XORG_PROG_RAWCPP],[ AC_REQUIRE([AC_PROG_CPP]) -AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], +AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}], [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) # Check for flag to avoid builtin definitions - assumes unix is predefined, @@ -2848,7 +2848,7 @@ ]) # XTRANS_SECURE_RPC_FLAGS -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2863,7 +2863,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -2879,14 +2879,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2906,7 +2906,7 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2958,7 +2958,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2989,7 +2989,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3180,7 +3180,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3219,7 +3219,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -3246,7 +3248,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3443,7 +3445,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3464,7 +3466,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3485,7 +3487,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3528,7 +3530,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3549,12 +3551,7 @@ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -3567,7 +3564,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3596,7 +3593,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3643,7 +3640,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3662,7 +3659,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3743,7 +3740,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3803,7 +3800,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3831,7 +3828,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3850,7 +3847,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru xorg-server-1.20.9/ChangeLog xorg-server-1.20.13/ChangeLog --- xorg-server-1.20.9/ChangeLog 2020-08-25 15:40:19.000000000 +0000 +++ xorg-server-1.20.13/ChangeLog 2021-07-29 18:48:47.000000000 +0000 @@ -1,3 +1,1413 @@ +commit 86a72cb1927dd91132d231bb7920b651704601ef +Author: Matt Turner +Date: Thu Jul 29 11:23:15 2021 -0700 + + xserver 1.20.13 + + Signed-off-by: Matt Turner + +commit f85e4edba489316950fc3422f39e3c2ef8fb1ac5 +Author: Łukasz Spintzyk +Date: Thu Jul 22 13:12:05 2021 +0200 + + modesetting: unflip not possible when glamor is not set + + This is fixing crashes of xfce when running under qemu + + (cherry picked from commit 8836b9d243444031b6396d39d345f2f83b5fa6a9) + +commit b03d7184b7906121a432b05473675937ab6c0f1e +Author: Łukasz Spintzyk +Date: Mon Jul 19 14:25:28 2021 +0200 + + present: fallback get_crtc to return crtc belonging to screen with present extension + + Since crtc can belong to secondary output that may not have present + extension enabled we should fallback to first enabled crtc or fake crtc. + + Fix for issue xorg/xserver#1195 + + (cherry picked from commit d6c02ffd9c910637f6b3b7249507998e9e45f93c) + +commit b88ad0b342c954109bfd4b1d32c04ff55545cb0f +Author: Matt Turner +Date: Thu Jul 8 12:15:21 2021 -0700 + + xserver 1.20.12 + + Signed-off-by: Matt Turner + +commit 8dea50223b9b9495aa2e2f4e6aef2a842c0e0a2f +Author: Matt Turner +Date: Thu Jul 8 12:15:13 2021 -0700 + + Build xz tarballs instead of bzip2 + + Signed-off-by: Matt Turner + +commit b7adbac7d14bca3b0790fd7d1a706be28d954af5 +Author: orbea +Date: Wed Jun 23 05:50:21 2021 -0700 + + hw/dmx/config: Link directly with libdmxconfig.a + + When building xserver with slibtool (https://dev.midipix.org/cross/slibtool) + the build will fail. + + /usr/bin/ld: cannot find -ldmxconfig + + This is because xserver creates libdmxconfig.a internally and then links with + the linker flag -ldmxconfig. However according to automake documentation the + -lfoo linker flags should only be used for external dependencies and all + internal libraries should be linked with the libtool archive file (.la) or + the static archive (.a) when the former is not available. + + GNU libtool is far more permissive and happens to silently obscure this issue + while slibtool fails because it instead sees '-L./.libs -ldmxconfig'. + + Signed-off-by: Matt Turner + (cherry picked from commit 2531ee02450e3be3549daa09407557c3addeba02) + +commit e49738f0c9d4370c7a7e6e86c2c74151aa2e33fa +Author: Zoltán Böszörményi +Date: Mon Jun 21 12:12:41 2021 +0200 + + xfree86: Fix NULL pointer dereference crash + + screenp->displays[count] (passed to configDisplay() in + configScreen()) is NULL if there is no Virtual setting + in the configuration. + + Fixes: f8a6be04d0c7e6a99824ff888ad6c010960c5c21 ("xfree86: Change + displays array to pointers array to fix invalid pointer issues + after table reallocation") + + Signed-off-by: Zoltán Böszörményi + (cherry picked from commit ef89b6648e2a806237a6d2fa598e1b9c83f128b4) + +commit 9a59631a490876eae57f813e3a274c46d35d5287 +Author: Olivier Fourdan +Date: Fri Jun 18 14:52:55 2021 +0200 + + glx: Fix use after free in MakeCurrent + + The fix from commit c468d34c7 - "glx: Set ContextTag for all contexts" + is actually incomplete, it correctly sets the context tag for direct + contexts as well, but would fail to mark the context's currentClient. + + As a result, when the context is destroyed, it would be freed + immediately rather than being just scheduled for deletion, even though + it is still current for some client. leading to a use-after-free. + + Make sure to also set the context's currentClient for direct contexts as + well, not just indirect ones. + + Signed-off-by: Olivier Fourdan + Fixes: c468d34c7 - "glx: Set ContextTag for all contexts" + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1186 + Reviewed-by: Adam Jackson + (cherry picked from commit aad61e8e03311eb8bae4f7db59e65634733eadc2) + +commit 1fc0ca6e680fbc50b7a4b60b8797d0fce69cf6fb +Author: Łukasz Spintzyk +Date: Wed Jun 23 15:26:23 2021 +0200 + + xfree86: Fix out of array bound access to xf86Entities + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit d66b7ec12986efd4f32fcc84cdaacbd04ec98ccb) + +commit a4210fe07a8bd5fd4851ffa202ecffca1cc8062c +Author: Łukasz Spintzyk +Date: Tue Jun 8 20:02:21 2021 +0200 + + xfree86: Change displays array to pointers array to fix invalid pointer issues after table reallocation + + There are rare cases when xf86SetDepthBpp is resizing displays array in confScreen. + As that array is shared between set of ScrnInfoRec's then realloc might invalidate chached DispPtr display values in + otheres ScrnInfoRec objects. + + If we will change displays array as an array of pointers to DispRec then cached DispRec pointers in ScrnInfoRec + won't be invalid after reallocation of displays array. + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit f8a6be04d0c7e6a99824ff888ad6c010960c5c21) + +commit 22449f6300aad600cc49024640651a46a128e3ad +Author: Jose Maria Casanova Crespo +Date: Tue Jun 8 14:52:17 2021 +0200 + + glamor: Avoid using GL_QUADS on V3D + + Like in 0e3f1252dacdc3194 ("glamor: Avoid using GL_QUADS on VC4") + this will avoid mesa to fallback doing conversion for QUADS primitives. + + Signed-off-by: Jose Maria Casanova Crespo + Reviewed-by: Emma Anholt + (cherry picked from commit 9adb13e296baead53112a268ddfd291195742c71) + +commit d16f6403153596b62c555fb511881289f59f9e81 +Author: Ville Syrjälä +Date: Tue Sep 3 16:44:56 2019 +0300 + + modesetting: Fix possible_crtcs + + Populate outout possible_crtcs as the union of possible_crtcs from + the encoders rather than the intersection. Otherwise we're easily left + with possible_crtcs==0 when all the possible encoders have + non-overlapping possible_crtcs. + + No idea what the magic 0x7f is about, but keep it around in case + it matters. + + Signed-off-by: Ville Syrjälä + (cherry picked from commit 0e4bd71d02d09c320e76280ae8f14df169387507) + +commit f1e76731a02e77c73521134933e424a17df40a1c +Author: Ville Syrjälä +Date: Tue Aug 20 17:46:09 2019 +0300 + + modesetting: Update props for dynamically added outputs + + Dynamically added outputs should have their properties + properly updated as well. Otherwise we're left with an output + with many of its propeties not exposed. + + Signed-off-by: Ville Syrjälä + Reviewed-by: Michel Dänzer + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1143 + (cherry picked from commit 0c5179c280a193a1dbbe29160906087f06eae6f2) + +commit 7bf4777116b9b6d416914561015662f494bb4184 +Author: Jeremy Huddleston Sequoia +Date: Mon Mar 8 21:02:40 2021 -0800 + + xquartz: Ensure the mouse pointer is shown when switching to a native macOS alert or window + + Fixes: https://github.com/XQuartz/XQuartz/issues/100 + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 4ae36f418ed683532b0b6991e4a1e7d56740b845) + +commit 3ef6e7b766a9f20b208b50203ad6b45f65fbc29e +Author: Jeremy Huddleston Sequoia +Date: Fri Mar 5 22:57:24 2021 -0800 + + xquartz: Fix appFlags build failure with macOS 10.15+ SDKs + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit e59848548a462f1a0ac751bb8bb6afe56258cf4e) + +commit 2a83c840c8f38281b7f93b5522e20a71f6723b08 +Author: Olivier Fourdan +Date: Thu Jun 3 17:51:01 2021 +0200 + + glx: Set ContextTag for all contexts + + Currently, xorgGlxMakeCurrent() would set the context tag only for + indirect GLX contexts. + + However, several other places expect to find a context for the tag or + they would raise a GLXBadContextTag error, such as WaitGL() or WaitX(). + + Set the context tag for direct contexts as well, to avoid raising an + error and possibly killing the client. + + Thanks to Erik Kurzinger for spotting the issue. + + Signed-off-by: Olivier Fourdan + Reviewed-by: Adam Jackson + (cherry picked from commit c468d34c7208c9041f9c077b54a00ae9cccad6a3) + +commit 394b6cc1cf614ba7b13db7976b0739035da86d28 +Author: Erik Kurzinger +Date: Thu Dec 10 14:24:32 2020 -0800 + + glx: don't create implicit GLXWindow if one already exists + + If a GLXMakeCurrent request specifies an X window as its drawable, + __glXGetDrawable will implicitly create a GLXWindow for it. However, + the client may have already explicitly created a GLXWindow for that X + window. If that happens, two __glXDrawableRes resources will be added + to the window. + + If the explicitly-created GLXWindow is later destroyed by the client, + DrawableGone will call FreeResourceByType on the X window, but this + will actually free the resource for the implicitly-created GLXWindow, + since that one would be at the head of the list. + + Then if the X window is destroyed after that, the resource for the + explicitly-created GLXWindow will be freed. But that GLXWindow was + already destroyed above. This crashes the server when it tries to call + the destroyed GLXWindow's destructor. It also means the + implicitly-created GLXWindow would have been leaked since the + FreeResourceByType call mentioned above skips calling the destructor. + + To fix this, if __glXGetDrawable is given an X window, it should check + if there is already a GLXWindow associated with it, and only create an + implicit one if there is not. + + Signed-off-by: Erik Kurzinger + Reviewed-by: Adam Jackson + (cherry picked from commit b7a85e44da91d1663d5b4eabac06327c92a80f91) + +commit 0086535e7a331f81823a0f4e578bc3346ee1c312 +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:32:01 2020 +0200 + + modesetting: Remove few common functions from ms namespace + + A lot of that code is the same as in xf86-amdgpu and xf86-nouveau drivers. By removing that functions from + ms namespace we can move that code to common implementation. + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit 5be3b80b8d084ca5721be8791910d5827d1b6014) + +commit 321964443be6b6daae0f7c1097a34106782ae338 +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:31:53 2020 +0200 + + modesetting: remove unnecessary ms_covering_xf86_crtc dup of ms_covering_randr_crtc + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit c282be503e267afdd050df837d4cf61e0e7287b7) + +commit 52eb801d048f63952ca48487d86ba089dfcbe131 +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:31:47 2020 +0200 + + modesetting: Find crtc on slave outputs as fallback instead of returning primary crtc + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit b923364c5ec8251e81b4aa5fd451d9d7bb038009) + +commit c7a2da7b994cdf829d805944c80f9fefd9246109 +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:31:34 2020 +0200 + + present: fix msc offset calculation in screen mode + + Instead of getting the current msc value from the window crtc, + which not exist take the last saved msc value saved in + the window_priv struct + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit d2dce22b6775c772282ac2c0e224ef9685ab34fa) + +commit 31544e68e605f0595e700bf4ce468b16e7b195ac +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:31:25 2020 +0200 + + present: Use crtc's screen present operation for syncing + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit 908deb0895f9fe345d70be933d251ea10511d30a) + +commit 464cbee1c625d60ac9e18b7f4e3d53bc83b0d585 +Author: Łukasz Spintzyk +Date: Fri Sep 18 14:29:25 2020 +0200 + + modesetting: Initialize present extension despite glamor is disabled + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit d03c0de77ba36bb5221d00ac84dcdd6aae0df453) + +commit 4e11bd390a28144fac03dc21a6caf0800596e2fa +Author: Łukasz Spintzyk +Date: Tue Jun 8 18:53:07 2021 +0200 + + modesetting: Disable reverse prime offload mode for displays running on evdi,udl + + This mode for displays running on evdi/udl as side effect of failed glamor_egl_init + reverse_prime_offload_mode was initialized to FALSE + + After Mesa upgrade to 21.0.0 GL_RENDERER is not llvmpipe that results in successful glamor_egl_init + and reverse_prime_offload_mode enabled. + + This commit is explicitly disabling reverse_prime_offload_mode for evdi and udl drivers + + Signed-off-by: Łukasz Spintzyk + (cherry picked from commit 7e7c147105ac704a7b33bdee0f85dc9ccdd8f747) + +commit 6272529339f975777f22bb0e6162ac43480ae257 +Author: Olivier Fourdan +Date: Mon Feb 15 11:33:56 2021 +0100 + + dix: Guard against non-existing PtrFeedbackPtr + + Trying to change the pointer control settings on a device without + PtrFeedbackPtr would be a bug and a crash in the Xserver. + + Guard against that case by returning early with a BadImplementation + error, that might kill the X11 client but the Xserver would survive. + + Signed-off-by: Olivier Fourdan + Reviewed-by: Peter Hutterer + Related: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1137 + (cherry picked from commit dee2bb033e78e2f4aae7f5708c3d4fc74a9957de) + +commit d41b43345cde2330648ad1890fb95bdbd5362f7f +Author: Olivier Fourdan +Date: Mon Feb 15 11:23:59 2021 +0100 + + xwayland: Add PtrFeedback to the touch device + + Trying to change the acceleration/threshold on Xwayland cannot work, and + the corresponding handler xwl_pointer_control() is a no-op. + + Yet, an X11 client trying to change those on the touch device may + possibly cause a crash because the touch device in Xwayland doesn't set + that. + + Initialize the touch device's PtrFeedback to make sure that just cannot + happen. + + Signed-off-by: Olivier Fourdan + Reviewed-by: Peter Hutterer + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1137 + (cherry picked from commit ab76272a7d2bff997985893c89147412a7360310) + +commit 23a53f0d5460eb45f05b0b370dfcec712652598c +Author: Vasily Khoruzhick +Date: Fri Mar 20 20:36:25 2020 -0700 + + glx: fixup symbol name for get_extensions function + + glxProbeDriver() concatenates __DRI_DRIVER_GET_EXTENSIONS with driver name + to get symbol name for get_extension function. Unfortunately that doesn't + work for drivers that have hyphen in their name, e.g. sun4i-drm -- + get_extensions() for these uses underscore instead. + + As result dlsym() doesn't find get_extension() function and AIGLX + initialization fails resulting in following message in Xorg.0.log: + + (EE) AIGLX error: sun4i-drm does not export required DRI extension + + Replace all non-alpha-numeric characters with underscore to fix the issue. + + Signed-off-by: Vasily Khoruzhick + (cherry picked from commit b56e501092169a9c0a60663d832ee71898a8bc4b) + +commit 6b767cdf6574081164aa6c6a7b617cda579b84c6 +Author: Matt Turner +Date: Tue Apr 13 10:01:34 2021 -0400 + + xserver 1.20.11 + + Signed-off-by: Matt Turner + +commit a1a1aa2c14636284669b28a956d756d5705dcf15 +Author: Matthieu Herrb +Date: Sun Mar 21 18:38:57 2021 +0100 + + Fix XChangeFeedbackControl() request underflow + + CVE-2021-3472 / ZDI-CAN-1259 + + This vulnerability was discovered by: + Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + + Signed-off-by: Matthieu Herrb + +commit 8890c44a75304097667ac7d42e83e2d78b105cb5 +Author: Jeremy Huddleston Sequoia +Date: Sun Feb 21 21:49:58 2021 -0800 + + xquartz: Remove a check for NSAppKitVersionNumber >= NSAppKitVersionNumber10_7 + + This check is always true on our supported systems. + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 5ae47a9d579e8cb0fbe938455faea53ed75d7098) + +commit 3c3680c366f78168e828e4a35d41a048c6e2bb54 +Author: Jeremy Huddleston Sequoia +Date: Sun Feb 21 21:49:14 2021 -0800 + + xquartz: Don't include strndup.c any more since we no longer support 10.8 and older + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit b960675257d301605def6008bddcccb0980a3c4c) + +commit e1fdc856aedfcb4788011415930a0c6861df5123 +Author: Jeremy Huddleston Sequoia +Date: Sun Feb 21 20:58:42 2021 -0800 + + xquartz: Add a launch trampoline to better integrate with modern versions of macOS + + Fixes: https://github.com/XQuartz/XQuartz/issues/6 + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 694724e42c4a3eadb32891220084b03504f9586b) + +commit 8f8e9c53e71ca58e8c23482d8f37687840371cda +Author: Jeremy Huddleston Sequoia +Date: Fri Feb 19 23:16:56 2021 -0800 + + xquartz: Don't process AppKit events if we haven't finished initializing + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 25035229b73742f9e6a96ac3e535b30b5c6196a8) + +commit aa6f84021aaae145f54ebf98787e363e1c2022c6 +Author: Jeremy Huddleston Sequoia +Date: Sat Feb 20 17:24:14 2021 -0800 + + xquartz: Allocate each fbconfig separately + + A change during the 1.20 development cycle resulted in fbconfigs being walked + and deallocated individually during __glXScreenDestroy. This change + now avoids a use-after-free caused by that change. + + ==50859==ERROR: AddressSanitizer: heap-use-after-free on address 0x00010d3819c8 at pc 0x0001009d4230 bp 0x00016feca7a0 sp 0x00016feca798 + READ of size 8 at 0x00010d3819c8 thread T5 + #0 0x1009d422c in __glXScreenDestroy glxscreens.c:448 + #1 0x10091cc98 in __glXAquaScreenDestroy indirect.c:510 + #2 0x1009d2734 in glxCloseScreen glxscreens.c:169 + #3 0x100740a24 in dix_main main.c:325 + #4 0x10023ed50 in server_thread quartzStartup.c:65 + #5 0x199ae7fd0 in _pthread_start+0x13c (libsystem_pthread.dylib:arm64e+0x6fd0) + #6 0x199ae2d38 in thread_start+0x4 (libsystem_pthread.dylib:arm64e+0x1d38) + + 0x00010d3819c8 is located 200 bytes inside of 12800-byte region [0x00010d381900,0x00010d384b00) + freed by thread T5 here: + #0 0x101477ba8 in wrap_free+0x98 (libclang_rt.asan_osx_dynamic.dylib:arm64e+0x3fba8) + #1 0x1009d4240 in __glXScreenDestroy glxscreens.c:449 + #2 0x10091cc98 in __glXAquaScreenDestroy indirect.c:510 + #3 0x1009d2734 in glxCloseScreen glxscreens.c:169 + #4 0x100740a24 in dix_main main.c:325 + #5 0x10023ed50 in server_thread quartzStartup.c:65 + #6 0x199ae7fd0 in _pthread_start+0x13c (libsystem_pthread.dylib:arm64e+0x6fd0) + #7 0x199ae2d38 in thread_start+0x4 (libsystem_pthread.dylib:arm64e+0x1d38) + + previously allocated by thread T5 here: + #0 0x101477e38 in wrap_calloc+0x9c (libclang_rt.asan_osx_dynamic.dylib:arm64e+0x3fe38) + #1 0x100925a40 in __glXAquaCreateVisualConfigs visualConfigs.c:116 + #2 0x10091cb24 in __glXAquaScreenProbe+0x224 (X11.bin:arm64+0x100730b24) + #3 0x1009cd840 in xorgGlxServerInit glxext.c:528 + #4 0x10074539c in _CallCallbacks dixutils.c:743 + #5 0x100932a70 in CallCallbacks callback.h:83 + #6 0x100932478 in GlxExtensionInit vndext.c:244 + #7 0x10020a364 in InitExtensions miinitext.c:267 + #8 0x10073fe7c in dix_main main.c:197 + #9 0x10023ed50 in server_thread quartzStartup.c:65 + #10 0x199ae7fd0 in _pthread_start+0x13c (libsystem_pthread.dylib:arm64e+0x6fd0) + #11 0x199ae2d38 in thread_start+0x4 (libsystem_pthread.dylib:arm64e+0x1d38) + + Regressed-in: 4b0a3cbab131eb453e2b3fc0337121969258a7be + CC: Giuseppe Bilotta + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 487286d47260782d331229af10df17711cbca1ea) + +commit 7aa51bb5728f001bdffdca7f669db1678d903160 +Author: Jeremy Huddleston Sequoia +Date: Sat Feb 20 15:17:18 2021 -0800 + + xquartz: Fix a compiler warning about const incompatible pointer assignment + + driWrap.c:541:30: error: assigning to 'GCOps *' (aka 'struct _GCOps *') from 'const GCOps *' (aka 'const struct _GCOps *') discards + qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] + pGCPriv->originalOps = pGC->ops; + ^ ~~~~~~~~ + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 6a83fb51b7a8b2e167e7d6380229b69e5452f91f) + +commit d751c46bd7ce1f350df04cfc9ec9f3ba73058ccd +Author: Jeremy Huddleston Sequoia +Date: Thu Feb 18 23:16:15 2021 -0800 + + xquartz: Fix build with sparkle enabled + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit a3ddcdd56c246e2226c7cdf372c2a1294eb6d888) + +commit 03c2e12a82e772461e069addbafdecdfff029ca5 +Author: Jeremy Huddleston Sequoia +Date: Thu Feb 18 12:43:53 2021 -0800 + + xquartz: Silence a compiler warning about missing internal methods on NSApplication + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 279bcbd9cf9e557a6789d6e4cede8e8799c3788e) + +commit fcbd57367ef2daa125d7acbbf00953477f9dc5cc +Author: Jeremy Huddleston Sequoia +Date: Thu Feb 18 22:19:21 2021 -0800 + + xquartz: Rewrite Window menu handling to not depend on X11App.windowsMenu.numberOfItems being correct in -awakeFromNib + + Fixes: https://github.com/XQuartz/XQuartz/issues/56 + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit fe89c70e472a9da0541b798eea60c5362b49a99d) + +commit b27c6602b39e02aa7ef25ea03b59ef499fc3dc1e +Author: Jeremy Huddleston Sequoia +Date: Thu Feb 18 15:41:29 2021 -0800 + + xquartz: Convert X11Controller ivars into @properties + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 41aed8f69634ec61ea0e40fff1cfdaf868be843e) + +commit 625c7e4deced7e57a724b05750a92586a2785ff0 +Author: Jeremy Huddleston Sequoia +Date: Thu Feb 18 14:39:46 2021 -0800 + + xquartz: Convert X11Application ivars into @properties + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit c2750e1fab774c8e6675ecf284124ff55b5be9cf) + +commit 3017fec60581c1ab32ad3d6768baf04179fda5e2 +Author: Jeremy Huddleston Sequoia +Date: Thu Feb 18 14:47:50 2021 -0800 + + xquartz: Fold quartzCommon.h into quartz.h + + Everything declared in it comes from quartz.c, so match reality. + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit f51b97b0de2e562e341f2d72c5f00a74c71a159f) + +commit bdaff44f98587fd0112f3d86a461ee3ce190277c +Author: Jeremy Huddleston Sequoia +Date: Thu Feb 18 13:00:43 2021 -0800 + + xquartz: Fold away some unnecessary hops to X11Controller through X11Application + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 4b4500c48f06e7ef41cd94f417e49b3f4f1412ae) + +commit 7d22031a6bd949f9357904310422901515a5ace7 +Author: Jeremy Huddleston Sequoia +Date: Thu Feb 18 09:41:30 2021 -0800 + + xquartz: Fold away array_with_strings_and_numbers and simplify with more modern Objective-C + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 39c0e1c0ab6a0a89a71f26446973c779ca7fd927) + +commit 937b63ff44edecc58ef020a0bfa453d98332482c +Author: Jeremy Huddleston Sequoia +Date: Thu Feb 18 09:33:56 2021 -0800 + + xqaurtz: Remove message_kit_thread() and use dispatch instead + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 87f8fe1f74f10faf0ffc84f03539799ad4c2465e) + +commit e531d3a4cbca1a689189fe512fed7d7aeb84de34 +Author: Jeremy Huddleston Sequoia +Date: Wed Feb 17 23:58:53 2021 -0800 + + xquartz: Use objc_autoreleasePoolPush / objc_autoreleasePoolPop directly in QuartzBlockHandler + + It violates @autoreleasepool best practices, and this helps collapse quartzCocoa.m into quartz.c + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 94e4e173486c2a94ddcfd2d0515e1ee6731f6656) + +commit 08cf6c90fdc31a563843dceeae3caeb8840951da +Author: Jeremy Huddleston Sequoia +Date: Wed Feb 17 22:04:55 2021 -0800 + + xquartz: Minor code modernization -- @autoreleasepool adoption + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit fba421f700498fa382089df47942df36a2d75ce6) + +commit 26e0c59a970229b343d00e6343436cbde2ce6354 +Author: Jeremy Huddleston Sequoia +Date: Wed Feb 17 20:55:06 2021 -0800 + + xquartz: Remove some dead code for compatibility with older nibs + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 318f8a4a8a47a0ce4bbbf4290469e933602c9b30) + +commit 2853f38965f521cafb8991737db1c655960acc72 +Author: Jeremy Huddleston Sequoia +Date: Thu Feb 18 16:05:34 2021 -0800 + + xquartz: Remove a workaround for AppKit versions older than Lion + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 72a39dccf99191fbfbb4b399c446fd017d55f24e) + +commit 1edc9b980b49e6f9c79f90b7045f9f94c5553247 +Author: Jeremy Huddleston Sequoia +Date: Thu Feb 18 22:26:08 2021 -0800 + + xquartz: Apply spell check fixes from master for easier cherry-picking of changes in xquartz + + See also: 23e83724df4809fd7857cc609c33ce7e8d3021a4 + Signed-off-by: Jeremy Huddleston Sequoia + +commit 67f25cc1870a587f0e687da9f1281031b6543533 +Author: Jeremy Huddleston Sequoia +Date: Wed Feb 17 15:45:45 2021 -0800 + + xquartz: Fix applications menu table background color for dark mode + + Fixes: https://github.com/XQuartz/XQuartz/issues/32 + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 7e2875035800887f3f41f75cba4299088daf939a) + +commit 4028c2ad14a71e6b0c8a892a154f1a50736f2dd5 +Author: Jeremy Huddleston Sequoia +Date: Wed Feb 17 15:16:26 2021 -0800 + + xquartz: Apply Xcode 12.4 automatic updates to nibs + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 85beee9885a8e65960fbbde2de9aa28598b4d6ae) + +commit ff1c8e2f72a7dc978187a46e089577b09c009c27 +Author: Jeremy Huddleston Sequoia +Date: Wed Feb 17 13:38:31 2021 -0800 + + xquartz: Update the about box copyright to 2021 + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 4e892aa6e132447e43d7bae7e3aca4f1fb172f93) + +commit a16df6028458597c1ab722c7fe3464e6dd315b43 +Author: Jeremy Huddleston Sequoia +Date: Mon Feb 1 16:27:38 2021 -0800 + + xquartz: Ensure we call into TIS on the main thread + + There is a place where this code was called on the main thread. + + We're using a rather nasty anti-pattern to just call a block inline rather + than synchonously calling it on the main thread if we're already on the main + thread. This code could use a good overhaul, but I don't have time to rip + it apart right now. This will address the immediate issue. + + Fixes: https://github.com/XQuartz/XQuartz/issues/40 + Fixes: https://github.com/XQuartz/XQuartz/issues/48 + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit c9a3b14c1472632afaff340f73a77a2b961f195a) + +commit 2087b7782cde6e6a6c5b4786c2c1f136ee18bb51 +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 15:03:46 2021 -0800 + + xquartz: Ensure that NSRunAlertPanel() is run on the main thread + + Fixes: https://github.com/XQuartz/XQuartz/issues/30 + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 520e7a1310ddc25b30bcaa0ea3eeaa6c4d137c8c) + +commit 2fe5bf4badb21479511479914def04bf29312e4d +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 13:46:02 2021 -0800 + + xquartz: Remove support for older versions of libXplugin + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 7d0bb7ed061458698ff27856976939b261e73b23) + +commit bc1a2a0d830c76b03c5210b4059aea0f0470f095 +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 13:43:01 2021 -0800 + + xquartz: Remove unused include of AvailabilityMacros.h from various sources + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 5e7c0762e6fdaefc9b8257c0f875432b1877c49e) + +commit 393da8b4390f63e6b634a51f733f1b129626ee1a +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 13:40:48 2021 -0800 + + xquartz: Remove support for building for i386 + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 59f22341a8b4cd468d6f37fb17dd7fde347e430b) + +commit 43aaa10931b4d3a43c2c575cfd120bea442581ea +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 13:35:17 2021 -0800 + + xquartz: Remove support for Mountain Lion and earlier versions of macOS + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit aea15a76593f98205e44f20632178dc384c02d57) + +commit fb492686d70fc3166c005c273a587dc7dd4da651 +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 13:33:22 2021 -0800 + + xquartz: Remove support for Lion and earlier versions of macOS + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit c0b2d3e099a60f55b18ca9c30373000f12d40fe2) + +commit 34784415ad7c369b93cee1deeea98e8610f133f2 +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 13:29:52 2021 -0800 + + xquartz: Remove support for SnowLeopard and earlier versions of macOS + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit cc9cf6f085be6e8264f925a11d67a12ad47a042b) + +commit d3f81ecaf99c804728b206155875c52e41f0723b +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 13:09:50 2021 -0800 + + xquartz: Remove check for libdispatch now that we don't support pre-SnowLeopard + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit f699aac2ea2cf6a3e2d3bdcb2d8179e103de1d4e) + +commit 739c5bd32f5683c1e03c96700f5bb499517b3eaf +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 13:23:18 2021 -0800 + + xquartz: Remove support for Leopard and earlier versions of macOS + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 5ad49102722274f53b9b011082d9e0f202fcd9a4) + +commit 2d7eb824996e51875a5bc8b76c159bb52249690c +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 13:18:35 2021 -0800 + + xquartz: Remove support for Tiger and earlier versions of macOS + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 6e6db055f8b517ae9d63351d4c00fd480cb6b54a) + +commit 080f9eb76a13252f0fc132192ab99232df0e0d92 +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 13:12:34 2021 -0800 + + os: Remove support for Tiger and earlier versions of macOS + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 20b86c4060c1d4fbc099675d5100fe17e4ac0147) + +commit be9d2fd871139ec491806c0843af59cbac65fc84 +Author: Jeremy Huddleston Sequoia +Date: Wed Jan 27 13:25:54 2021 -0800 + + xquartz: Remove support for Panther and earlier versions of macOS + + Signed-off-by: Jeremy Huddleston Sequoia + (cherry picked from commit 74aef85bd88a1fdb22d445ad14975232a7bebdd7) + +commit d39eb58409a4452353c73d362d847f9262181e10 +Author: Jim DeLaHunt +Date: Mon Dec 11 00:08:52 2017 -0800 + + Fix typo "XQaurtz" in Xquartz.man + + (cherry picked from commit 0e272ac458fbd530787273073473e566b0ac306e) + +commit 1f2b73176f25567e28ac227faffd9311d6b65dff +Author: Christopher Chavez +Date: Sat Apr 25 05:09:51 2020 +0000 + + XQuartz: recognize F16-F20 and Menu keys + + Signed-off-by: Christopher Chavez + (cherry picked from commit 462beb5338a44390e2fff03096942b035b509830) + +commit ecc4ebf5355503268fc04923115b15b8d2e5d338 +Author: Jon Turney +Date: Thu Apr 18 11:37:32 2019 +0100 + + xquartz: Add stub ddxInputThread() + + Omitted from 4ad21c32 + + (cherry picked from commit f013979507da96377fad0e58b0699d9de051bb39) + +commit f5df31c76118816124be323a3caed22f42cdb50c +Author: Fabrice Fontaine +Date: Thu Dec 10 22:32:59 2020 +0100 + + meson.build: KMS support also depends on dri2 + + Kernel modesettings support also depends on dri2, see + ./hw/xfree86/drivers/modesetting/meson.build + + So update meson.build to reflect the changes made in configure.ac by + commit 9c81b8f5b5d7bc987f73e8ef01a81e61205e58ee + + Signed-off-by: Fabrice Fontaine + (cherry picked from commit 5d73a8b59e0d01d1ee4cb484e4b43563cec2eee9) + +commit b09f5f42dcc58cf73ae5ca85a65018aaee72e06f +Author: Mariusz Ceier +Date: Wed Dec 2 12:29:15 2020 +0100 + + xwayland: Replace LogMessage with LogMessageVerb + + LogMessage logs only when the XLOG_VERBOSITY is >= 1, but by default + XLOG_VERBOSITY is 0. + + Signed-off-by: Mariusz Ceier + (cherry picked from commit 95539ab37baa1292d1f2daaa552f9741b0364cad) + +commit c17872d50215938b1a5d899d50907ced01b28eb9 +Author: Michal Srb +Date: Thu Jun 21 13:44:04 2018 +0200 + + xkb: Fix heap overflow caused by optimized away min. + + Calling strlen on char[4] that does not need to contain '\0' is wrong and X + server may end up running into uninitialized memory. + + In addition GCC 8 is clever enough that it knows that strlen on char[4] can + return 0, 1, 2, 3 or cause undefined behavior. With this knowledge it can + optimize away the min(..., 4). In reality it can cause the memcpy to be called + with bigger size than 4 and overflow the destination buffer. + + Fixes: 83913de25d35 (xkb: Silence some compiler warnings) + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/288 + Signed-off-by: Matt Turner + (cherry picked from commit 74627d13c75cab7aa73c0e713feae0934e780ba0) + +commit bc111a2e67e16d4e6d4f3196ab86c22c1e278c45 +Author: Matt Turner +Date: Tue Dec 1 10:55:00 2020 -0500 + + xserver 1.20.10 + + Signed-off-by: Matt Turner + +commit 06d1a032ee491547f7037c3ff042065dc2aeaa99 +Author: Matthieu Herrb +Date: Thu Nov 12 19:15:07 2020 +0100 + + Check SetMap request length carefully. + + Avoid out of bounds memory accesses on too short request. + + ZDI-CAN 11572 / CVE-2020-14360 + + This vulnerability was discovered by: + Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + + Signed-off-by: Matthieu Herrb + (cherry picked from commit 446ff2d3177087b8173fa779fa5b77a2a128988b) + +commit 7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b +Author: Matthieu Herrb +Date: Sun Oct 11 17:05:09 2020 +0200 + + Fix XkbSetDeviceInfo() and SetDeviceIndicators() heap overflows + + ZDI-CAN 11389 / CVE-2020-25712 + + This vulnerability was discovered by: + Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + + Signed-off-by: Matthieu Herrb + (cherry picked from commit 87c64fc5b0db9f62f4e361444f4b60501ebf67b9) + +commit 440ed5948ba5818abf5ea5fdc5a9d98514658fd3 +Author: Michel Dänzer +Date: Tue Dec 1 11:25:31 2020 +0100 + + present/wnmd: Translate update region to screen space + + The region as passed in is in the source pixmap's coordinate space, so + intersecting it with the clipList (which is in screen space) resulted in + disappointment. + + Fixes Firefox popups such as the hamburger menu when using the EGL + backend. + + v2: + * Drop vblank->x/y_off from RegionTranslate call, since they're always + 0 here (present_wnmd_check_flip rejects flips for x/y_off != 0). + + Reported-by: Robert Mader + Tested-by: Robert Mader + Reviewed-by: Olivier Fourdan + Tested-by: Joakim Tjernlund # v1 + (cherry picked from commit 466b8b43fb355c6040cee45406860b8b8c04e948) + +commit 54f9af1c61bd10e2e65cbb17069e0c9ec1f9a2c5 +Author: Kishore Kadiyala +Date: Tue Dec 1 11:13:51 2020 +0100 + + modesetting: keep going if a modeset fails on EnterVT + + There was a time when setting a mode on a CRTC would not depend on the + associated connector's state. If a mode had been set successfully once, + it would mean it would work later on. + + This changed with the introduction of new connectors type that now + require a link training sequence (DP, HDMI 2.0), and that means that + some events may have happened while the X server was not master that + would then prevent the mode from successfully be restored to its + previous state. + + This patch relaxes the requirement that all modes should be restored on + EnterVT, or the entire X-Server would go down by allowing modesets to + fail (with some warnings). If a modeset fails, the CRTC will be + disabled, and a RandR event will be sent for the desktop environment to + fix the situation as well as possible. + + Additional patches might be needed to make sure that the user would + never be left with all screens black in some scenarios. + + v2 (Martin Peres): + - whitespace fixes + - remove the uevent handling (it is done in a previous patch) + - improve the commit message + - reduce the size of the patch by not changing lines needlessly + - return FALSE if one modeset fails in ignore mode + - add comments/todos to explain why we do things + - disable the CRTCs that failed the modeset + + Signed-off-by: Kishore Kadiyala + Signed-off-by: Martin Peres + Reviewed-by: Daniel Vetter + Tested-by: Kishore Kadiyala + Closes: #1010 + (cherry picked from commit efb3abddd49fb75bd6d0e31046fed43d258c93da) + +commit bd0f53725b581e4698f5f3ec366a9507bd2556e2 +Author: Martin Peres +Date: Tue Dec 1 11:10:34 2020 +0100 + + modesetting: check the kms state on EnterVT + + Normally, we would receive a uevent coming from Linux's DRM subsystem, + which would trigger the check for disappearing/appearing resources. + However, this event is not received when X is not master (another VT + is selected), and so the userspace / desktop environment would not be + notified about the changes that happened while X wasn't master. + + To fix the issue, this patch forces a refresh on EnterVT by splitting + the kms-checking code from the uevent handling into its own (exported) + function called drmmode_update_kms_state. This function is then called + from both the uevent-handling function, and on EnterVT right before + restoring the modes. + + Signed-off-by: Martin Peres + Reviewed-by: Daniel Vetter + Acked-by: Kishore Kadiyala + Tested-by: Kishore Kadiyala + (cherry picked from commit 293cf660c95d7ba36510bcc4114d7fd5c5f3801c) + +commit 5c400cae1f9817045378966effa6bca91e45aead +Author: Olivier Fourdan +Date: Tue Oct 27 16:33:55 2020 +0100 + + configure: Build hashtable for Xres and glvnd + + With autoconf, hashtable support is built along with Xres support. + + Yet, glvnd also use it, so when disabling Xres from configure, the + build will fail at link time because hashtable functions are not + available. + + Untie the build of hashtable from Xres support, just like meson build + does. + + Signed-off-by: Olivier Fourdan + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1091 + (cherry picked from commit 899cebb76ab7754fea49f7babcd64a7e94052cc8) + +commit 253569a3d281996d7c84041020e14313756900da +Author: Olivier Fourdan +Date: Thu Nov 5 18:35:54 2020 +0100 + + xwayland: Create an xwl_window for toplevel only + + One general assumption in Xwayland is that the xwl_window remains the + same for all the child windows of the toplevel window. + + When mapping a new X11 window, ensure_surface_for_window() checks for an + existing xwl_window by using xwl_window_get() which will just check for + the registered xwl_window for the window. + + That means that a client mapping a child window of an existing window + with a xwl_window will get another different xwl_window. + + If an X11 client issues a Present request on the parent window, hence + placed underneath its child window of the same size, the Wayland + compositor may not send the frame callback event for the parent's + Wayland surface which is reckoned to be not visible, obscured behind + the other Wayland surface for the child X11 window. + + That bug affects some games running in wine which may get 1 fps because + the repaint occurs only on timeout with a long interval (as with, e.g. + https://bugs.winehq.org/show_bug.cgi?id=47066) + + Fix ensure_surface_for_window() by using xwl_window_from_window() which + will walk the window tree, so that a child window won't get another + xwl_window than its parent. + + https://gitlab.freedesktop.org/xorg/xserver/-/issues/1099 + See-also: https://bugs.winehq.org/show_bug.cgi?id=47066 + Signed-off-by: Olivier Fourdan + Reviewed-by: Michel Dänzer + (cherry picked from commit 606ba7fc51e5420646f75c4e672fbe61eb7c7e6e) + +commit 0811a9ff783c252b3e4d558bf31c6b066b0633e1 +Author: Olivier Fourdan +Date: Mon Nov 2 15:44:31 2020 +0100 + + xwayland: non-rootless requires the wl_shell protocol + + When running non-rootless, Xwayland requires that the Wayland compositor + supports the wl_shell protocol. + + Check for wl_shell protocol support at startup and exit cleanly if + missing rather than segfaulting later in ensure_surface_for_window() + while trying to use wl_shell_get_shell_surface(). + + Signed-off-by: Olivier Fourdan + Reviewed-by: Michel Dänzer + Reviewed-by: Simon Ser + (cherry picked from commit ffd02d9b26bd560849c407a6dd4f5c4d7d2c1736) + +commit b3ae038c32870a4a1bb42b6e1cf2ebedc8b7bc8d +Author: Alex Goins +Date: Mon Oct 5 18:19:52 2020 -0500 + + glamor: Update pixmap's devKind when making it exportable + + When making a pixmap exportable, glamor will currently create a temporary + exported pixmap backed by a GBM bo, with the devKind updated to the stride of + the bo. However, when the backing of the exported pixmap is swapped into the + original, the devKind of the original is not updated. + + Some GBM bos may get implicitly padded, in which case the devKind of the pixmap + will not match the stride of the backing bo. For example, an 800x600 pixmap will + have a devKind of 3200, but the bo's stride will be 3328. This can cause + corruption with PRIME, when the sink uses the wrong stride to display the shared + pixmap. + + This commit changes glamor_make_pixmap_exportable() to update the devKind of the + original pixmap after it swaps exported pixmap's backing into it, keeping + everything consistent. + + Fixes issue #1018. + + Signed-off-by: Alex Goins + Signed-off-by: Aaron Plattner + Reviewed-by: Michel Dänzer + (cherry picked from commit 7a7e55c5c1d6461a9f4d9a4e0129c1c6e1fd3d66) + +commit d6c389cb87b220f7005cebf483708267b5f4a1c3 +Author: Bernhard Übelacker +Date: Sun Sep 27 18:03:48 2020 +0200 + + os: Fix instruction pointer written in xorg_backtrace + + The address retrieved in "pip.start_ip" is not necessarily the same + address as unw_get_proc_name finds as nearest symbol and returns in "off". + Therefore using "pip.start_ip + off" is not reliable, at least + visible in the binaries from the Debian repository. + + Bug-Debian: https://bugs.debian.org/971088 + + Signed-off-by: Bernhard Übelacker + (cherry picked from commit c15dd0ba4893f79f7181e783cb1ba404edca917a) + +commit c3e4c1a0fd5d4d6015e9e6317b758018317e56d1 +Author: Michel Dänzer +Date: Tue Jul 28 18:40:47 2020 +0200 + + present/wnmd: Execute copies at target_msc-1 already + + It always takes one update cycle for the copy to become visible on the + host windowing system, so waiting for the target MSC resulted in 1 cycle + delay. + + We re-use the idle list for copies which were executed but need their + completion event sent. + + Fixes black seams when resizing the "Builder" sub-window of + + GDK_BACKEND=x11 gtk4-demo + + on Xwayland (see + https://gitlab.gnome.org/GNOME/mutter/-/issues/1290#note_873557). + + Unfortunately, this cannot completely fix the seams with apps which + queue up multiple frames in advance, since there's always at least one + queued frame corresponding to the old window size. But it should at + least help a little in that case as well. + + v2: + * Bug fix: Don't update exec_msc in present_wnmd_check_flip_window. + (Roman Gilg) + * Use exec_msc = target_msc - 1 instead of exec_msc--, and add a + comment, for clarity. + v3: + * Drop exec_msc = target_msc again in present_wnmd_execute. + * present_execute_copy should never set vblank->queued in + present_wnmd_execute now, so replace that branch with an assertion. + (Roman Gilg) + + Reviewed-by: Roman Gilg + Tested-by: Roman Gilg + (cherry picked from commit 1cccb486d48a5d2e7649836b993805bb65dc09e3) + [Since present_wnmd_event_notify hasn't been split up on the 1.20 + branch, it needs to check vblank->flip. Doing the same in + present_wnmd_free_idle_vblanks to be safe, though I'm not sure it's + actually possible to hit non-flips there.] + +commit 96ef31e0f20fcffb2edfe4cb9510f994c188785f +Author: Michel Dänzer +Date: Tue Jul 28 18:53:45 2020 +0200 + + present/wnmd: Move up present_wnmd_queue_vblank + + Allowing it to be called from more functions than before. No functional + change. + + Reviewed-by: Roman Gilg + Tested-by: Roman Gilg + (cherry picked from commit d14ea667feccf085c7d66a7c63f380975e07af66) + +commit 669e40390c3679b649db33f0aa4ae4cfdd17e2a9 +Author: Michel Dänzer +Date: Fri Sep 11 17:00:35 2020 +0200 + + present: Add present_vblank::exec_msc field + + For tracking the MSC when the present can be executed separately from + the target MSC. + + Allows removing the requeue field instead, plus more later. + + v2: + * Rename wait_msc → exec_msc (Roman Gilg) + * Use exec_msc = target_msc instead of exec_msc++, for clarity. + * Bug fix: Set exec_msc = target_msc also if present_flip returned + false in present_execute. + v3: + * Set exec_msc = target_msc also if present_wnmd_flip returned + false in present_wnmd_execute, for consistency. + v4: + * Specifically check for exec_msc == crtc_msc + 1 in + present_execute_wait/copy, to avoid re-introducing + https://bugs.freedesktop.org/show_bug.cgi?id=94596 . + + Reviewed-by: Roman Gilg + Tested-by: Roman Gilg + (cherry picked from commit b0b3159abd8001fa3f6dfc44a288a95a62aa5cf6) + +commit dae234efdb7bba75744aa1697386df3c0db5348a +Author: Michel Dänzer +Date: Fri Sep 11 17:00:18 2020 +0200 + + present: Move flip target_msc adjustment out of present_vblank_create + + Preparation for different handling between SCMD & WNMD. No functional + change intended. + + Reviewed-by: Roman Gilg + Tested-by: Roman Gilg + (cherry picked from commit 4c92dea952f7fed19857904f0f552900257ef4b9) + +commit 1930ed233fdec5d22e4fc192769a0126faabb3ea +Author: Olivier Fourdan +Date: Mon Sep 14 15:39:10 2020 +0200 + + xwayland: Remove pending stream reference when freeing + + The EGLStream backend keeps a queue of pending streams for each Xwayland + window. + + However, when this pending queue is freed, the corresponding private + data may not be cleared (typically if the pixmap for this window has + changed before the compositor finished attaching the consumer for the + window's pixmap's original eglstream), leading to a use-after-free and a + crash when trying to use that data as the window pixmap. + + Make sure to clear the private data when the pending stream is freed. + + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1055 + Signed-off-by: Olivier Fourdan + Tested-by: Karol Szuster + Reviewed-by: Adam Jackson + (cherry picked from commit a5f439dcd21b4fda093cb382bb1a758b434a1444) + +commit 1ac389dda89b2882c80767c91bbe88e01818491c +Author: Greg V +Date: Tue Sep 15 17:41:04 2020 +0300 + + xwayland: use drmGetNodeTypeFromFd for checking if a node is a render one + + Major/minor numbers are a.. major (ha) source of pain in FreeBSD porting. + In this case, Xwayland was thinking that /dev/dri/card0 is already a render node, + because the st_rdev on FreeBSD was passing the Linux-style check, + and because of the assumption, acceleration would fail because + various ioctls like AMDGPU_INFO would be denied on the non-render node. + + Switch to libdrm's function that already works correctly on all platforms. + + Signed-off-by: Greg V + Reviewed-by: Emmanuel Vadot + (cherry picked from commit 239ebdc9e447d4f836d0c2aa6068c6064fffb46c) + +commit d108c2c82cba242ea5998d7c91254d90d3a5db71 +Author: Olivier Fourdan +Date: Fri Sep 11 11:30:18 2020 +0200 + + xwayland: Do not discard frame callbacks on allow commits + + Currently, when a X11 client (usually the X11 window manager from a + Wayland compositor) changes the value of the X11 property + `_XWAYLAND_ALLOW_COMMITS` from `false` to `true`, all pending frame + callbacks on the window are discarded so that the commit occurs + immediately. + + Weston uses that mechanism to prevent the content of the window from + showing before it's ready when mapping the window initially, but + discarding the pending frame callbacks has no effect on the initial + mapping of the X11 window since at that point there cannot be any frame + callback on a surface which hasn't been committed yet anyway. + + However, discarding pending frame callbacks can be problematic if we + were to use the same `_XWAYLAND_ALLOW_COMMITS` mechanism to prevent + damages to be posted before the X11 toplevel is updated completely + (including the window decorations from the X11 window manager). + + Remove the portion of code discarding the pending frame callback, + Xwayland should always wait for a pending frame callback if there's one + before posting new damages. + + Signed-off-by: Olivier Fourdan + Reviewed-by: Pekka Paalanen + Reviewed-by: Michel Dänzer + https://gitlab.freedesktop.org/xorg/xserver/merge_requests/333 + (cherry picked from commit 66da95a172c4941b75ffedcdaa0138c0a48f11fb) + +commit 174cb91d82d643f78d8ba2b9999312b9d7dea98c +Author: Michel Dänzer +Date: Mon Sep 7 18:40:34 2020 +0200 + + present/wnmd: Remove dead check from present_wnmd_check_flip + + present_wnmd_toplvl_pixmap_window returns a window with the same window + pixmap, so the check could never fail. + + Reviewed-by: Roman Gilg + (cherry picked from commit b6b1161fd7ac409156fb69439897bcabdeacf393) + +commit 51ee6e5ceb0cacc8e2fa225ad5391ffb159e36a0 +Author: Michel Dänzer +Date: Mon Sep 7 18:39:17 2020 +0200 + + xwayland: Check window pixmap in xwl_present_check_flip2 + + We can only flip if the window pixmap matches that of the toplevel + window. Doing so regardless could cause the toplevel window pixmap to + get destroyed while it was still referenced by the window, resulting in + use-after-free and likely a crash. + + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1033 + Reviewed-by: Olivier Fourdan + Reviewed-by: Roman Gilg + (cherry picked from commit 4c25356d6cd908c5030c70e712076dff318ac00d) + +commit f4006d795cb199bf7deeb00f542c592db6a5becb +Author: Michel Dänzer +Date: Mon Sep 7 18:35:10 2020 +0200 + + present/wnmd: Can't use page flipping for windows clipped by children + + Noticed this was missing while working on the following fix. + + v2: + * Dropped present_wnmd_can_window_flip hunk (that function is never + called, will be cleaned up in a follow-up MR). + + Reviewed-by: Olivier Fourdan # v1 + Reviewed-by: Roman Gilg + (cherry picked from commit 7ac303c7b1e3b1be79ba3648e217798683e65a99) + +commit 1e84fda2020b12a83c6b9c6d31ab84f993c6176c +Author: Michel Dänzer +Date: Tue Sep 1 11:24:57 2020 +0200 + + xfree86: Take second reference for SavedCursor in xf86CursorSetCursor + + The same pointer is kept in CurrentCursor as well, therefore two + RefCursor calls are needed. + + Fixes use-after-free after switching VTs. + + Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067 + (cherry picked from commit 919f1f46fc67dae93b2b3f278fcbfc77af34ec58) + +commit 8c3c8bda2c44fb3d62b954b02b08e3b1771ef5bc +Author: Michel Dänzer +Date: Tue Aug 25 17:26:56 2020 +0200 + + glamor: Fix glamor_poly_fill_rect_gl xRectangle::width/height handling + + (Using GLSL 1.30 or newer) + + The width/height members of xRectangle are unsigned, but they were + being interpreted as signed when converting to floating point for the + vertex shader, producing incorrect drawing for values > 32767. + + v2: + * Use separate GL_UNSIGNED_SHORT vertex attribute for width/height. + (Eric Anholt) + + Reviewed-by: Eric Anholt + (cherry picked from commit 032af35657aa95c6bbdb74ff8c72e535b9b56cfa) + +commit b28c882889cbea9be3748d3dee1b21ba6eb90b66 +Author: Arthur Williams +Date: Fri Sep 25 04:52:57 2020 +0000 + + include: Increase the number of max. input devices to 256. + + Extending the decade old f0124ed93, to increase the number of input + devices from 40 to 256. 40 translates at most 9 MD, while 256 will allow + 63 MD. It is an arbitrary number, but people are hitting the current + limit under reasonable conditions. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64793 + Signed-off-by: Arthur Williams + + (cherry picked from commit fe439596b99db65bbae35eff1ea0b79db167f8d6) + +commit af4c84ce8855e84c0ad89b929bc972e884f0b8e3 +Author: Olivier Fourdan +Date: Tue Sep 8 10:03:33 2020 +0200 + + Revert "linux: Make platform device probe less fragile" + + This reverts commit 74b7427c41b4e4104af7abf70a996c086d3d7628. + + https://gitlab.freedesktop.org/xorg/xserver/-/issues/1068 + +commit 39cb95e959fab97a7e255dda1a1599b096fb0f7e +Author: Olivier Fourdan +Date: Tue Sep 8 10:03:11 2020 +0200 + + Revert "linux: Fix platform device PCI detection for complex bus topologies" + + This reverts commit 5c96eb5f44e62a4cfe835023cde304eb5795b8fd. + + https://gitlab.freedesktop.org/xorg/xserver/-/issues/1068 + +commit 4b6fce5975c2f931a0478cf4deeec97529b05eb6 +Author: Olivier Fourdan +Date: Tue Sep 8 10:01:55 2020 +0200 + + Revert "linux: Fix platform device probe for DT-based PCI" + + This reverts commit 249a12c54a9316b089bd22683c011519348496df. + + https://gitlab.freedesktop.org/xorg/xserver/-/issues/1068 + commit afb77415e1fb862c322754230f63bb70fd596943 Author: Matt Turner Date: Tue Aug 25 08:23:42 2020 -0700 diff -Nru xorg-server-1.20.9/compile xorg-server-1.20.13/compile --- xorg-server-1.20.9/compile 2020-08-25 15:40:05.000000000 +0000 +++ xorg-server-1.20.13/compile 2021-07-29 18:48:28.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -Nru xorg-server-1.20.9/composite/Makefile.in xorg-server-1.20.13/composite/Makefile.in --- xorg-server-1.20.9/composite/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/composite/Makefile.in 2021-07-29 18:48:28.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -562,6 +562,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/config/Makefile.in xorg-server-1.20.13/config/Makefile.in --- xorg-server-1.20.9/config/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/config/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -582,6 +582,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/config/udev.c xorg-server-1.20.13/config/udev.c --- xorg-server-1.20.9/config/udev.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/config/udev.c 2021-07-29 18:48:13.000000000 +0000 @@ -56,7 +56,7 @@ #ifdef CONFIG_UDEV_KMS static void -config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path, const char *syspath, +config_udev_odev_setup_attribs(const char *path, const char *syspath, int major, int minor, config_odev_probe_proc_ptr probe_callback); #endif @@ -128,7 +128,7 @@ LogMessage(X_INFO, "config/udev: Adding drm device (%s)\n", path); - config_udev_odev_setup_attribs(udev_device, path, syspath, major(devnum), + config_udev_odev_setup_attribs(path, syspath, major(devnum), minor(devnum), NewGPUDeviceRequest); return; } @@ -322,7 +322,7 @@ LogMessage(X_INFO, "config/udev: removing GPU device %s %s\n", syspath, path); - config_udev_odev_setup_attribs(device, path, syspath, major(devnum), + config_udev_odev_setup_attribs(path, syspath, major(devnum), minor(devnum), DeleteGPUDeviceRequest); /* Retry vtenter after a drm node removal */ systemd_logind_vtenter(); @@ -464,50 +464,18 @@ #ifdef CONFIG_UDEV_KMS -/* Find the last occurrence of the needle in haystack */ -static char *strrstr(const char *haystack, const char *needle) -{ - char *prev, *last, *tmp; - - prev = strstr(haystack, needle); - if (!prev) - return NULL; - - last = prev; - tmp = prev + 1; - - while (tmp) { - last = strstr(tmp, needle); - if (!last) - return prev; - else { - prev = last; - tmp = prev + 1; - } - } - - return last; -} - static void -config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path, const char *syspath, +config_udev_odev_setup_attribs(const char *path, const char *syspath, int major, int minor, config_odev_probe_proc_ptr probe_callback) { struct OdevAttributes *attribs = config_odev_allocate_attributes(); - const char *value, *str; attribs->path = XNFstrdup(path); attribs->syspath = XNFstrdup(syspath); attribs->major = major; attribs->minor = minor; - value = udev_device_get_property_value(udev_device, "ID_PATH"); - if (value && (str = strrstr(value, "pci-"))) { - attribs->busid = XNFstrdup(str); - attribs->busid[3] = ':'; - } - /* ownership of attribs is passed to probe layer */ probe_callback(attribs); } @@ -548,7 +516,7 @@ else if (!check_seat(udev_device)) goto no_probe; - config_udev_odev_setup_attribs(udev_device, path, syspath, major(devnum), + config_udev_odev_setup_attribs(path, syspath, major(devnum), minor(devnum), probe_callback); no_probe: udev_device_unref(udev_device); diff -Nru xorg-server-1.20.9/config.guess xorg-server-1.20.13/config.guess --- xorg-server-1.20.9/config.guess 2020-08-25 15:40:05.000000000 +0000 +++ xorg-server-1.20.13/config.guess 2021-07-29 18:48:28.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2020 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2020-04-26' +timestamp='2021-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,12 +27,12 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2020 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -103,7 +103,7 @@ test "$tmp" && return 0 : "${TMPDIR=/tmp}" # shellcheck disable=SC2039 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } @@ -131,16 +131,14 @@ PATH=$PATH:/.attbin ; export PATH fi -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown +UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown +UNAME_SYSTEM=$( (uname -s) 2>/dev/null) || UNAME_SYSTEM=unknown +UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown set_cc_for_build cat <<-EOF > "$dummy.c" @@ -149,17 +147,29 @@ LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu fi ;; esac @@ -179,19 +189,20 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \ "/sbin/$sysctl" 2>/dev/null || \ "/usr/sbin/$sysctl" 2>/dev/null || \ - echo unknown)` + echo unknown)) case "$UNAME_MACHINE_ARCH" in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,') + endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p') machine="${arch}${endian}"-unknown ;; *) machine="$UNAME_MACHINE_ARCH"-unknown ;; @@ -222,7 +233,7 @@ case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + abi=$(echo "$UNAME_MACHINE_ARCH" | sed -e "$expr") ;; esac # The OS release @@ -235,7 +246,7 @@ release='-gnu' ;; *) - release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=$(echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2) ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: @@ -244,15 +255,15 @@ echo "$machine-${os}${release}${abi-}" exit ;; *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//') echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//') echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//') echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" exit ;; *:MidnightBSD:*:*) @@ -288,17 +299,17 @@ alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $3}') ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $4}') ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1) case "$ALPHA_CPU_TYPE" in "EV4 (21064)") UNAME_MACHINE=alpha ;; @@ -336,7 +347,7 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" + echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -370,7 +381,7 @@ exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then + if test "$( (/bin/universe) 2>/dev/null)" = att ; then echo pyramid-pyramid-sysv3 else echo pyramid-pyramid-bsd @@ -383,17 +394,17 @@ echo sparc-icl-nx6 exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in + case $(/usr/bin/uname -p) in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) echo i386-pc-auroraux"$UNAME_RELEASE" @@ -404,7 +415,7 @@ # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -412,30 +423,30 @@ SUN_ARCH=x86_64 fi fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case "$(/usr/bin/arch -k)" in Series*|S4*) - UNAME_RELEASE=`uname -v` + UNAME_RELEASE=$(uname -v) ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" + echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')" exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=$( (sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null) test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case "$(/bin/arch)" in sun3) echo m68k-sun-sunos"$UNAME_RELEASE" ;; @@ -515,8 +526,8 @@ } EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && - dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`"$dummy" "$dummyarg"` && + dummyarg=$(echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p') && + SYSTEM_NAME=$("$dummy" "$dummyarg") && { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos"$UNAME_RELEASE" exit ;; @@ -543,11 +554,11 @@ exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + UNAME_PROCESSOR=$(/usr/bin/uname -p) + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then echo m88k-dg-dgux"$UNAME_RELEASE" else @@ -571,17 +582,17 @@ echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" + echo mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix exit ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if test -x /usr/bin/oslevel ; then + IBM_REV=$(/usr/bin/oslevel) else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi @@ -601,7 +612,7 @@ exit(0); } EOF - if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") then echo "$SYSTEM_NAME" else @@ -614,15 +625,15 @@ fi exit ;; *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }') if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + if test -x /usr/bin/lslpp ; then + IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/) else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi @@ -650,14 +661,14 @@ echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + if test -x /usr/bin/getconf; then + sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null) + sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null) case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 @@ -669,7 +680,7 @@ esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then + if test "$HP_ARCH" = ""; then set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -704,11 +715,11 @@ exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy") test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then set_cc_for_build @@ -732,7 +743,7 @@ echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) @@ -762,7 +773,7 @@ exit (0); } EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; @@ -782,7 +793,7 @@ echo hppa1.0-hp-osf exit ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then + if test -x /usr/sbin/sysversion ; then echo "$UNAME_MACHINE"-unknown-osf1mk else echo "$UNAME_MACHINE"-unknown-osf1 @@ -831,14 +842,14 @@ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` + FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz) + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ /_/') echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/') echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -851,25 +862,25 @@ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) set_cc_for_build if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf fi exit ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` + UNAME_PROCESSOR=$(/usr/bin/uname -p) case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; i*:CYGWIN*:*) echo "$UNAME_MACHINE"-pc-cygwin @@ -905,15 +916,15 @@ echo x86_64-pc-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" + echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" + echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC" exit ;; *:Minix:*:*) echo "$UNAME_MACHINE"-unknown-minix @@ -926,7 +937,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in + case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -985,6 +996,9 @@ k1om:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m32r*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; @@ -1035,7 +1049,7 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')" test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) @@ -1055,7 +1069,7 @@ exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; *) echo hppa-unknown-linux-"$LIBC" ;; @@ -1073,7 +1087,7 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-"$LIBC" exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) @@ -1097,7 +1111,7 @@ x86_64:Linux:*:*) set_cc_for_build LIBCABI=$LIBC - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_X32 >/dev/null @@ -1145,7 +1159,7 @@ echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; i*86:*:4.*:*) - UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` + UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//') if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else @@ -1154,7 +1168,7 @@ exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in + case $(/bin/uname -X | grep "^Machine") in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; @@ -1163,10 +1177,10 @@ exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //')) (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 @@ -1216,7 +1230,7 @@ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1227,7 +1241,7 @@ NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1260,7 +1274,7 @@ exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=$( (uname -p) 2>/dev/null) echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv @@ -1294,7 +1308,7 @@ echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then + if test -d /usr/nec; then echo mips-nec-sysv"$UNAME_RELEASE" else echo mips-unknown-sysv"$UNAME_RELEASE" @@ -1342,8 +1356,11 @@ *:Rhapsody:*:*) echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; + arm64:Darwin:*:*) + echo aarch64-apple-darwin"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) case $UNAME_PROCESSOR in unknown) UNAME_PROCESSOR=powerpc ;; esac @@ -1356,7 +1373,7 @@ else set_cc_for_build fi - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -1380,7 +1397,7 @@ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc @@ -1448,10 +1465,10 @@ echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=$( (uname -p) 2>/dev/null) case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1461,7 +1478,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" + echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')" exit ;; i*86:rdos:*:*) echo "$UNAME_MACHINE"-pc-rdos @@ -1519,7 +1536,7 @@ #define __ARCHITECTURE__ "m68k" #endif int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + version=$( (hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null); if (version < 4) printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); else @@ -1611,7 +1628,7 @@ } EOF -$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` && +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) && { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. @@ -1636,14 +1653,14 @@ operating system you are using. If your script is old, overwrite *all* copies of config.guess and config.sub with the latest versions from: - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess + https://git.savannah.gnu.org/cgit/config.git/plain/config.guess and - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + https://git.savannah.gnu.org/cgit/config.git/plain/config.sub EOF -year=`echo $timestamp | sed 's,-.*,,'` +year=$(echo $timestamp | sed 's,-.*,,') # shellcheck disable=SC2003 -if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then +if test "$(expr "$(date +%Y)" - "$year")" -lt 3 ; then cat >&2 </dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` +uname -m = $( (uname -m) 2>/dev/null || echo unknown) +uname -r = $( (uname -r) 2>/dev/null || echo unknown) +uname -s = $( (uname -s) 2>/dev/null || echo unknown) +uname -v = $( (uname -v) 2>/dev/null || echo unknown) + +/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null) +/bin/uname -X = $( (/bin/uname -X) 2>/dev/null) + +hostinfo = $( (hostinfo) 2>/dev/null) +/bin/universe = $( (/bin/universe) 2>/dev/null) +/usr/bin/arch -k = $( (/usr/bin/arch -k) 2>/dev/null) +/bin/arch = $( (/bin/arch) 2>/dev/null) +/usr/bin/oslevel = $( (/usr/bin/oslevel) 2>/dev/null) +/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null) UNAME_MACHINE = "$UNAME_MACHINE" UNAME_RELEASE = "$UNAME_RELEASE" diff -Nru xorg-server-1.20.9/config.sub xorg-server-1.20.13/config.sub --- xorg-server-1.20.9/config.sub 2020-08-25 15:40:05.000000000 +0000 +++ xorg-server-1.20.13/config.sub 2021-07-29 18:48:28.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2020 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2020-06-20' +timestamp='2021-01-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -50,7 +50,7 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS @@ -67,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2020 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,28 +124,27 @@ ;; *-*-*-*) basic_machine=$field1-$field2 - os=$field3-$field4 + basic_os=$field3-$field4 ;; *-*-*) # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two # parts maybe_os=$field2-$field3 case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ - | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ + nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | storm-chaos* | os2-emx* | rtmk-nova*) basic_machine=$field1 - os=$maybe_os + basic_os=$maybe_os ;; android-linux) basic_machine=$field1-unknown - os=linux-android + basic_os=linux-android ;; *) basic_machine=$field1-$field2 - os=$field3 + basic_os=$field3 ;; esac ;; @@ -154,7 +153,7 @@ case $field1-$field2 in decstation-3100) basic_machine=mips-dec - os= + basic_os= ;; *-*) # Second component is usually, but not always the OS @@ -162,7 +161,7 @@ # Prevent following clause from handling this valid os sun*os*) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; # Manufacturers dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ @@ -175,11 +174,11 @@ | microblaze* | sim | cisco \ | oki | wec | wrs | winbond) basic_machine=$field1-$field2 - os= + basic_os= ;; *) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; esac ;; @@ -191,451 +190,451 @@ case $field1 in 386bsd) basic_machine=i386-pc - os=bsd + basic_os=bsd ;; a29khif) basic_machine=a29k-amd - os=udi + basic_os=udi ;; adobe68k) basic_machine=m68010-adobe - os=scout + basic_os=scout ;; alliant) basic_machine=fx80-alliant - os= + basic_os= ;; altos | altos3068) basic_machine=m68k-altos - os= + basic_os= ;; am29k) basic_machine=a29k-none - os=bsd + basic_os=bsd ;; amdahl) basic_machine=580-amdahl - os=sysv + basic_os=sysv ;; amiga) basic_machine=m68k-unknown - os= + basic_os= ;; amigaos | amigados) basic_machine=m68k-unknown - os=amigaos + basic_os=amigaos ;; amigaunix | amix) basic_machine=m68k-unknown - os=sysv4 + basic_os=sysv4 ;; apollo68) basic_machine=m68k-apollo - os=sysv + basic_os=sysv ;; apollo68bsd) basic_machine=m68k-apollo - os=bsd + basic_os=bsd ;; aros) basic_machine=i386-pc - os=aros + basic_os=aros ;; aux) basic_machine=m68k-apple - os=aux + basic_os=aux ;; balance) basic_machine=ns32k-sequent - os=dynix + basic_os=dynix ;; blackfin) basic_machine=bfin-unknown - os=linux + basic_os=linux ;; cegcc) basic_machine=arm-unknown - os=cegcc + basic_os=cegcc ;; convex-c1) basic_machine=c1-convex - os=bsd + basic_os=bsd ;; convex-c2) basic_machine=c2-convex - os=bsd + basic_os=bsd ;; convex-c32) basic_machine=c32-convex - os=bsd + basic_os=bsd ;; convex-c34) basic_machine=c34-convex - os=bsd + basic_os=bsd ;; convex-c38) basic_machine=c38-convex - os=bsd + basic_os=bsd ;; cray) basic_machine=j90-cray - os=unicos + basic_os=unicos ;; crds | unos) basic_machine=m68k-crds - os= + basic_os= ;; da30) basic_machine=m68k-da30 - os= + basic_os= ;; decstation | pmax | pmin | dec3100 | decstatn) basic_machine=mips-dec - os= + basic_os= ;; delta88) basic_machine=m88k-motorola - os=sysv3 + basic_os=sysv3 ;; dicos) basic_machine=i686-pc - os=dicos + basic_os=dicos ;; djgpp) basic_machine=i586-pc - os=msdosdjgpp + basic_os=msdosdjgpp ;; ebmon29k) basic_machine=a29k-amd - os=ebmon + basic_os=ebmon ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson - os=ose + basic_os=ose ;; gmicro) basic_machine=tron-gmicro - os=sysv + basic_os=sysv ;; go32) basic_machine=i386-pc - os=go32 + basic_os=go32 ;; h8300hms) basic_machine=h8300-hitachi - os=hms + basic_os=hms ;; h8300xray) basic_machine=h8300-hitachi - os=xray + basic_os=xray ;; h8500hms) basic_machine=h8500-hitachi - os=hms + basic_os=hms ;; harris) basic_machine=m88k-harris - os=sysv3 + basic_os=sysv3 ;; hp300 | hp300hpux) basic_machine=m68k-hp - os=hpux + basic_os=hpux ;; hp300bsd) basic_machine=m68k-hp - os=bsd + basic_os=bsd ;; hppaosf) basic_machine=hppa1.1-hp - os=osf + basic_os=osf ;; hppro) basic_machine=hppa1.1-hp - os=proelf + basic_os=proelf ;; i386mach) basic_machine=i386-mach - os=mach + basic_os=mach ;; isi68 | isi) basic_machine=m68k-isi - os=sysv + basic_os=sysv ;; m68knommu) basic_machine=m68k-unknown - os=linux + basic_os=linux ;; magnum | m3230) basic_machine=mips-mips - os=sysv + basic_os=sysv ;; merlin) basic_machine=ns32k-utek - os=sysv + basic_os=sysv ;; mingw64) basic_machine=x86_64-pc - os=mingw64 + basic_os=mingw64 ;; mingw32) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; mingw32ce) basic_machine=arm-unknown - os=mingw32ce + basic_os=mingw32ce ;; monitor) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; morphos) basic_machine=powerpc-unknown - os=morphos + basic_os=morphos ;; moxiebox) basic_machine=moxie-unknown - os=moxiebox + basic_os=moxiebox ;; msdos) basic_machine=i386-pc - os=msdos + basic_os=msdos ;; msys) basic_machine=i686-pc - os=msys + basic_os=msys ;; mvs) basic_machine=i370-ibm - os=mvs + basic_os=mvs ;; nacl) basic_machine=le32-unknown - os=nacl + basic_os=nacl ;; ncr3000) basic_machine=i486-ncr - os=sysv4 + basic_os=sysv4 ;; netbsd386) basic_machine=i386-pc - os=netbsd + basic_os=netbsd ;; netwinder) basic_machine=armv4l-rebel - os=linux + basic_os=linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony - os=newsos + basic_os=newsos ;; news1000) basic_machine=m68030-sony - os=newsos + basic_os=newsos ;; necv70) basic_machine=v70-nec - os=sysv + basic_os=sysv ;; nh3000) basic_machine=m68k-harris - os=cxux + basic_os=cxux ;; nh[45]000) basic_machine=m88k-harris - os=cxux + basic_os=cxux ;; nindy960) basic_machine=i960-intel - os=nindy + basic_os=nindy ;; mon960) basic_machine=i960-intel - os=mon960 + basic_os=mon960 ;; nonstopux) basic_machine=mips-compaq - os=nonstopux + basic_os=nonstopux ;; os400) basic_machine=powerpc-ibm - os=os400 + basic_os=os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson - os=ose + basic_os=ose ;; os68k) basic_machine=m68k-none - os=os68k + basic_os=os68k ;; paragon) basic_machine=i860-intel - os=osf + basic_os=osf ;; parisc) basic_machine=hppa-unknown - os=linux + basic_os=linux ;; psp) basic_machine=mipsallegrexel-sony - os=psp + basic_os=psp ;; pw32) basic_machine=i586-unknown - os=pw32 + basic_os=pw32 ;; rdos | rdos64) basic_machine=x86_64-pc - os=rdos + basic_os=rdos ;; rdos32) basic_machine=i386-pc - os=rdos + basic_os=rdos ;; rom68k) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; sa29200) basic_machine=a29k-amd - os=udi + basic_os=udi ;; sei) basic_machine=mips-sei - os=seiux + basic_os=seiux ;; sequent) basic_machine=i386-sequent - os= + basic_os= ;; sps7) basic_machine=m68k-bull - os=sysv2 + basic_os=sysv2 ;; st2000) basic_machine=m68k-tandem - os= + basic_os= ;; stratus) basic_machine=i860-stratus - os=sysv4 + basic_os=sysv4 ;; sun2) basic_machine=m68000-sun - os= + basic_os= ;; sun2os3) basic_machine=m68000-sun - os=sunos3 + basic_os=sunos3 ;; sun2os4) basic_machine=m68000-sun - os=sunos4 + basic_os=sunos4 ;; sun3) basic_machine=m68k-sun - os= + basic_os= ;; sun3os3) basic_machine=m68k-sun - os=sunos3 + basic_os=sunos3 ;; sun3os4) basic_machine=m68k-sun - os=sunos4 + basic_os=sunos4 ;; sun4) basic_machine=sparc-sun - os= + basic_os= ;; sun4os3) basic_machine=sparc-sun - os=sunos3 + basic_os=sunos3 ;; sun4os4) basic_machine=sparc-sun - os=sunos4 + basic_os=sunos4 ;; sun4sol2) basic_machine=sparc-sun - os=solaris2 + basic_os=solaris2 ;; sun386 | sun386i | roadrunner) basic_machine=i386-sun - os= + basic_os= ;; sv1) basic_machine=sv1-cray - os=unicos + basic_os=unicos ;; symmetry) basic_machine=i386-sequent - os=dynix + basic_os=dynix ;; t3e) basic_machine=alphaev5-cray - os=unicos + basic_os=unicos ;; t90) basic_machine=t90-cray - os=unicos + basic_os=unicos ;; toad1) basic_machine=pdp10-xkl - os=tops20 + basic_os=tops20 ;; tpf) basic_machine=s390x-ibm - os=tpf + basic_os=tpf ;; udi29k) basic_machine=a29k-amd - os=udi + basic_os=udi ;; ultra3) basic_machine=a29k-nyu - os=sym1 + basic_os=sym1 ;; v810 | necv810) basic_machine=v810-nec - os=none + basic_os=none ;; vaxv) basic_machine=vax-dec - os=sysv + basic_os=sysv ;; vms) basic_machine=vax-dec - os=vms + basic_os=vms ;; vsta) basic_machine=i386-pc - os=vsta + basic_os=vsta ;; vxworks960) basic_machine=i960-wrs - os=vxworks + basic_os=vxworks ;; vxworks68) basic_machine=m68k-wrs - os=vxworks + basic_os=vxworks ;; vxworks29k) basic_machine=a29k-wrs - os=vxworks + basic_os=vxworks ;; xbox) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; ymp) basic_machine=ymp-cray - os=unicos + basic_os=unicos ;; *) basic_machine=$1 - os= + basic_os= ;; esac ;; @@ -687,17 +686,17 @@ bluegene*) cpu=powerpc vendor=ibm - os=cnk + basic_os=cnk ;; decsystem10* | dec10*) cpu=pdp10 vendor=dec - os=tops10 + basic_os=tops10 ;; decsystem20* | dec20*) cpu=pdp10 vendor=dec - os=tops20 + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) @@ -707,7 +706,7 @@ dpx2*) cpu=m68k vendor=bull - os=sysv3 + basic_os=sysv3 ;; encore | umax | mmax) cpu=ns32k @@ -716,7 +715,7 @@ elxsi) cpu=elxsi vendor=elxsi - os=${os:-bsd} + basic_os=${basic_os:-bsd} ;; fx2800) cpu=i860 @@ -729,7 +728,7 @@ h3050r* | hiux*) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) cpu=hppa1.0 @@ -770,38 +769,38 @@ vendor=hp ;; i*86v32) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv32 + basic_os=sysv32 ;; i*86v4*) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv4 + basic_os=sysv4 ;; i*86v) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv + basic_os=sysv ;; i*86sol2) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=solaris2 + basic_os=solaris2 ;; j90 | j90-cray) cpu=j90 vendor=cray - os=${os:-unicos} + basic_os=${basic_os:-unicos} ;; iris | iris4d) cpu=mips vendor=sgi - case $os in + case $basic_os in irix*) ;; *) - os=irix4 + basic_os=irix4 ;; esac ;; @@ -812,7 +811,7 @@ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) cpu=m68k vendor=atari - os=mint + basic_os=mint ;; mipsEE* | ee) cpu=mips64r5900el @@ -838,21 +837,21 @@ news-3600 | risc-news) cpu=mips vendor=sony - os=newsos + basic_os=newsos ;; next | m*-next) cpu=m68k vendor=next - case $os in + case $basic_os in openstep*) ;; nextstep*) ;; ns2*) - os=nextstep2 + basic_os=nextstep2 ;; *) - os=nextstep3 + basic_os=nextstep3 ;; esac ;; @@ -863,12 +862,12 @@ op50n-* | op60c-*) cpu=hppa1.1 vendor=oki - os=proelf + basic_os=proelf ;; pa-hitachi) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; pbd) cpu=sparc @@ -905,12 +904,12 @@ sde) cpu=mipsisa32 vendor=sde - os=${os:-elf} + basic_os=${basic_os:-elf} ;; simso-wrs) cpu=sparclite vendor=wrs - os=vxworks + basic_os=vxworks ;; tower | tower-32) cpu=m68k @@ -927,7 +926,7 @@ w89k-*) cpu=hppa1.1 vendor=winbond - os=proelf + basic_os=proelf ;; none) cpu=none @@ -939,7 +938,7 @@ ;; leon-*|leon[3-9]-*) cpu=sparc - vendor=`echo "$basic_machine" | sed 's/-.*//'` + vendor=$(echo "$basic_machine" | sed 's/-.*//') ;; *-*) @@ -980,11 +979,11 @@ # some cases the only manufacturer, in others, it is the most popular. craynv-unknown) vendor=cray - os=${os:-unicosmp} + basic_os=${basic_os:-unicosmp} ;; c90-unknown | c90-cray) vendor=cray - os=${os:-unicos} + basic_os=${Basic_os:-unicos} ;; fx80-unknown) vendor=alliant @@ -1028,7 +1027,7 @@ dpx20-unknown | dpx20-bull) cpu=rs6000 vendor=bull - os=${os:-bosx} + basic_os=${basic_os:-bosx} ;; # Here we normalize CPU types irrespective of the vendor @@ -1037,7 +1036,7 @@ ;; blackfin-*) cpu=bfin - os=linux + basic_os=linux ;; c54x-*) cpu=tic54x @@ -1050,7 +1049,7 @@ ;; e500v[12]-*) cpu=powerpc - os=$os"spe" + basic_os=${basic_os}"spe" ;; mips3*-*) cpu=mips64 @@ -1060,7 +1059,7 @@ ;; m68knommu-*) cpu=m68k - os=linux + basic_os=linux ;; m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) cpu=s12z @@ -1070,7 +1069,7 @@ ;; parisc-*) cpu=hppa - os=linux + basic_os=linux ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 @@ -1106,7 +1105,7 @@ cpu=mipsisa64sb1el ;; sh5e[lb]-*) - cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` + cpu=$(echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/') ;; spur-*) cpu=spur @@ -1124,13 +1123,16 @@ cpu=x86_64 ;; xscale-* | xscalee[bl]-*) - cpu=`echo "$cpu" | sed 's/^xscale/arm/'` + cpu=$(echo "$cpu" | sed 's/^xscale/arm/') + ;; + arm64-*) + cpu=aarch64 ;; # Recognize the canonical CPU Types that limit and/or modify the # company names they are paired with. cr16-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; crisv32-* | etraxfs*-*) cpu=crisv32 @@ -1141,7 +1143,7 @@ vendor=axis ;; crx-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; neo-tandem) cpu=neo @@ -1168,7 +1170,7 @@ vendor=sony ;; tile*-*) - os=${os:-linux-gnu} + basic_os=${basic_os:-linux-gnu} ;; *) @@ -1185,7 +1187,7 @@ | am33_2.0 \ | amdgcn \ | arc | arceb \ - | arm | arm[lb]e | arme[lb] | armv* \ + | arm | arm[lb]e | arme[lb] | armv* \ | avr | avr32 \ | asmjs \ | ba \ @@ -1204,6 +1206,7 @@ | k1om \ | le32 | le64 \ | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1248,7 +1251,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ | pru \ | pyramid \ - | riscv | riscv32 | riscv64 \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ | rl78 | romp | rs6000 | rx \ | s390 | s390x \ | score \ @@ -1260,6 +1263,7 @@ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ | spu \ | tahoe \ + | thumbv7* \ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ | tron \ | ubicom32 \ @@ -1297,8 +1301,47 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x$os != x ] +if test x$basic_os != x then + +# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|') + ;; + os2-emx) + kernel=os2 + os=$(echo $basic_os | sed -e 's|os2-emx|emx|') + ;; + nto-qnx*) + kernel=nto + os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|') + ;; + *-*) + # shellcheck disable=SC2162 + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1552,6 +1520,7 @@ # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. +kernel= case $cpu-$vendor in score-*) os=elf @@ -1563,7 +1532,8 @@ os=riscix1.2 ;; arm*-rebel) - os=linux + kernel=linux + os=gnu ;; arm*-semi) os=aout @@ -1729,84 +1699,173 @@ os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-abi", so those need to count as OSes. + musl* | newlib* | uclibc*) + ;; + # Likewise for "kernel-libc" + eabi* | gnueabi*) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* | irx* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. case $vendor in unknown) - case $os in - riscix*) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - sunos*) + *-sunos*) vendor=sun ;; - cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - beos*) + *-beos*) vendor=be ;; - hpux*) + *-hpux*) vendor=hp ;; - mpeix*) + *-mpeix*) vendor=hp ;; - hiux*) + *-hiux*) vendor=hitachi ;; - unos*) + *-unos*) vendor=crds ;; - dgux*) + *-dgux*) vendor=dg ;; - luna*) + *-luna*) vendor=omron ;; - genix*) + *-genix*) vendor=ns ;; - clix*) + *-clix*) vendor=intergraph ;; - mvs* | opened*) + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) vendor=ibm ;; - os400*) + s390-* | s390x-*) vendor=ibm ;; - ptx*) + *-ptx*) vendor=sequent ;; - tpf*) + *-tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - aux*) + *-aux*) vendor=apple ;; - hms*) + *-hms*) vendor=hitachi ;; - mpw* | macos*) + *-mpw* | *-macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - vos*) + *-vos*) vendor=stratus ;; esac ;; esac -echo "$cpu-$vendor-$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: diff -Nru xorg-server-1.20.9/configure xorg-server-1.20.13/configure --- xorg-server-1.20.9/configure 2020-08-25 15:40:04.000000000 +0000 +++ xorg-server-1.20.13/configure 2021-07-29 18:48:26.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xorg-server 1.20.9. +# Generated by GNU Autoconf 2.69 for xorg-server 1.20.13. # # Report bugs to . # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.20.9' -PACKAGE_STRING='xorg-server 1.20.9' +PACKAGE_VERSION='1.20.13' +PACKAGE_STRING='xorg-server 1.20.13' PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues' PACKAGE_URL='' @@ -947,6 +947,8 @@ PRESENT_TRUE GLX_SYS_LIBS GLX_DEFINES +HASHTABLE_FALSE +HASHTABLE_TRUE GLX_FALSE GLX_TRUE GL_LIBS @@ -1236,6 +1238,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -1530,6 +1533,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1782,6 +1786,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1919,7 +1932,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -2032,7 +2045,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-server 1.20.9 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.20.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2072,6 +2085,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2102,7 +2116,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.20.9:";; + short | recursive ) echo "Configuration of xorg-server 1.20.13:";; esac cat <<\_ACEOF @@ -2293,10 +2307,10 @@ org.x) --with-bundle-version=VERSION Version to use for X11.app's CFBundleVersion - (default: 1.20.9) + (default: 1.20.13) --with-bundle-version-string=VERSION Version to use for X11.app's - CFBundleShortVersionString (default: 1.20.9) + CFBundleShortVersionString (default: 1.20.13) --with-sparkle-feed-url=URL URL for the Sparkle feed (default: https://www.xquartz.org/releases/sparkle/release.xml) @@ -2553,7 +2567,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.20.9 +xorg-server configure 1.20.13 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3262,7 +3276,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 1.20.9, which was +It was created by xorg-server $as_me 1.20.13, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3610,8 +3624,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -RELEASE_DATE="2020-08-25" -RELEASE_NAME="Chicken Parmigiana" +RELEASE_DATE="2021-07-29" +RELEASE_NAME="Lemon Pepper Chicken" am__api_version='1.16' @@ -3819,12 +3833,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -4129,7 +4138,7 @@ # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.20.9' + VERSION='1.20.13' cat >>confdefs.h <<_ACEOF @@ -16493,7 +16502,7 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[012][,.]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -21696,10 +21705,9 @@ -for ac_prog in cpp -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cpp", so it can be a program name with args. +set dummy ${ac_tool_prefix}cpp; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_RAWCPP+:} false; then : @@ -21739,9 +21747,63 @@ fi - test -n "$RAWCPP" && break +fi +if test -z "$ac_cv_path_RAWCPP"; then + ac_pt_RAWCPP=$RAWCPP + # Extract the first word of "cpp", so it can be a program name with args. +set dummy cpp; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_RAWCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_RAWCPP in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_RAWCPP="$ac_pt_RAWCPP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_RAWCPP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done -test -n "$RAWCPP" || RAWCPP="${CPP}" + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_RAWCPP=$ac_cv_path_ac_pt_RAWCPP +if test -n "$ac_pt_RAWCPP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_RAWCPP" >&5 +$as_echo "$ac_pt_RAWCPP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_RAWCPP" = x; then + RAWCPP="${CPP}" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RAWCPP=$ac_pt_RAWCPP + fi +else + RAWCPP="$ac_cv_path_RAWCPP" +fi # Check for flag to avoid builtin definitions - assumes unix is predefined, @@ -23711,7 +23773,7 @@ if test "${with_bundle_version+set}" = set; then : withval=$with_bundle_version; BUNDLE_VERSION="${withval}" else - BUNDLE_VERSION="1.20.9" + BUNDLE_VERSION="1.20.13" fi @@ -24705,14 +24767,6 @@ fi fi - ac_fn_c_check_func "$LINENO" "dispatch_async" "ac_cv_func_dispatch_async" -if test "x$ac_cv_func_dispatch_async" = xyes; then : - -$as_echo "#define HAVE_LIBDISPATCH 1" >>confdefs.h - -fi - - if test "x$XQUARTZ" = xyes ; then XQUARTZ=yes XVFB=no @@ -26331,6 +26385,7 @@ SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $SCRNSAVERPROTO" fi +HASHTABLE=no if test "x$RES" = xyes; then RES_TRUE= RES_FALSE='#' @@ -26343,6 +26398,7 @@ $as_echo "#define RES 1" >>confdefs.h + HASHTABLE=yes REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO" SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $RESOURCEPROTO" fi @@ -27094,6 +27150,7 @@ $as_echo "#define GLXEXT 1" >>confdefs.h + HASHTABLE=yes GLX_LIBS='$(top_builddir)/glx/libglx.la $(top_builddir)/glx/libglxvnd.la' GLX_SYS_LIBS="$GLX_SYS_LIBS $GL_LIBS" else @@ -27108,6 +27165,15 @@ fi + if test "x$HASHTABLE" = xyes; then + HASHTABLE_TRUE= + HASHTABLE_FALSE='#' +else + HASHTABLE_TRUE='#' + HASHTABLE_FALSE= +fi + + @@ -31233,7 +31299,7 @@ fi DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC" XDMX_CFLAGS="$DMXMODULES_CFLAGS" - XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $RANDR_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB" + XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $RANDR_LIB $RENDER_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB" XDMX_SYS_LIBS="$DMXMODULES_LIBS" @@ -32959,6 +33025,10 @@ as_fn_error $? "conditional \"GLX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HASHTABLE_TRUE}" && test -z "${HASHTABLE_FALSE}"; then + as_fn_error $? "conditional \"HASHTABLE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${PRESENT_TRUE}" && test -z "${PRESENT_FALSE}"; then as_fn_error $? "conditional \"PRESENT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -33548,7 +33618,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-server $as_me 1.20.9, which was +This file was extended by xorg-server $as_me 1.20.13, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -33614,7 +33684,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xorg-server config.status 1.20.9 +xorg-server config.status 1.20.13 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -34823,7 +34893,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -Nru xorg-server-1.20.9/configure.ac xorg-server-1.20.13/configure.ac --- xorg-server-1.20.9/configure.ac 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/configure.ac 2021-07-29 18:48:13.000000000 +0000 @@ -26,12 +26,12 @@ dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.20.9, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) -RELEASE_DATE="2020-08-25" -RELEASE_NAME="Chicken Parmigiana" +AC_INIT([xorg-server], 1.20.13, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) +RELEASE_DATE="2021-07-29" +RELEASE_NAME="Lemon Pepper Chicken" AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-xz]) AC_USE_SYSTEM_EXTENSIONS # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS @@ -694,10 +694,6 @@ fi fi - AC_CHECK_FUNC(dispatch_async, - AC_DEFINE([HAVE_LIBDISPATCH], 1, [Define to 1 if you have the libdispatch (GCD) available]), - []) - if test "x$XQUARTZ" = xyes ; then XQUARTZ=yes XVFB=no @@ -1064,9 +1060,11 @@ SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $SCRNSAVERPROTO" fi +HASHTABLE=no AM_CONDITIONAL(RES, [test "x$RES" = xyes]) if test "x$RES" = xyes; then AC_DEFINE(RES, 1, [Support X resource extension]) + HASHTABLE=yes REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO" SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $RESOURCEPROTO" fi @@ -1250,6 +1248,7 @@ PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL) AC_SUBST(XLIB_CFLAGS) AC_DEFINE(GLXEXT, 1, [Build GLX extension]) + HASHTABLE=yes GLX_LIBS='$(top_builddir)/glx/libglx.la $(top_builddir)/glx/libglxvnd.la' GLX_SYS_LIBS="$GLX_SYS_LIBS $GL_LIBS" else @@ -1257,6 +1256,8 @@ fi AM_CONDITIONAL(GLX, test "x$GLX" = xyes) +AM_CONDITIONAL(HASHTABLE, test "x$HASHTABLE" = xyes) + AC_SUBST([GLX_DEFINES]) AC_SUBST([GLX_SYS_LIBS]) @@ -2235,7 +2236,7 @@ fi DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC" XDMX_CFLAGS="$DMXMODULES_CFLAGS" - XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $RANDR_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB" + XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $RANDR_LIB $RENDER_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB" XDMX_SYS_LIBS="$DMXMODULES_LIBS" AC_SUBST([XDMX_CFLAGS]) AC_SUBST([XDMX_LIBS]) diff -Nru xorg-server-1.20.9/damageext/Makefile.in xorg-server-1.20.13/damageext/Makefile.in --- xorg-server-1.20.9/damageext/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/damageext/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -527,6 +527,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/dbe/Makefile.in xorg-server-1.20.13/dbe/Makefile.in --- xorg-server-1.20.9/dbe/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/dbe/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -559,6 +559,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/debian/changelog xorg-server-1.20.13/debian/changelog --- xorg-server-1.20.9/debian/changelog 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/changelog 2021-12-14 18:08:29.000000000 +0000 @@ -1,32 +1,146 @@ -xorg-server (2:1.20.9-2ubuntu1.2~20.04.2) focal-security; urgency=medium +xorg-server (2:1.20.13-1ubuntu1~20.04.2) focal-security; urgency=medium - * SECURITY UPDATE: XChangeFeedbackControl Integer Underflow - - debian/patches/CVE-2021-3472.patch: add check to Xi/chgfctl.c. + * SECURITY UPDATE: SProcRenderCompositeGlyphs out-of-bounds access + - debian/patches/CVE-2021-4008.patch: check lengths in render/render.c. + - CVE-2021-4008 + * SECURITY UPDATE: SProcXFixesCreatePointerBarrier out-of-bounds access + - debian/patches/CVE-2021-4009.patch: use sizes in xfixes/cursor.c. + - CVE-2021-4009 + * SECURITY UPDATE: SProcScreenSaverSuspend out-of-bounds access + - debian/patches/CVE-2021-4010.patch: fix logic in Xext/saver.c. + - CVE-2021-4010 + * SECURITY UPDATE: SwapCreateRegister out-of-bounds access + - debian/patches/CVE-2021-4011.patch: fix length in record/record.c. + - CVE-2021-4011 + + -- Marc Deslauriers Tue, 14 Dec 2021 09:14:13 -0500 + +xorg-server (2:1.20.13-1ubuntu1~20.04.1) focal; urgency=medium + + * Backport to focal. (LP: #1947820, LP: #1949553) + - don't disable building xwayland + + -- Timo Aaltonen Thu, 18 Nov 2021 14:55:16 +0200 + +xorg-server (2:1.20.13-1ubuntu1) impish; urgency=medium + + * Merge from Debian. + * modesetting-disable-reverse-prime-offload-udl.diff: Dropped, + upstream. + + -- Timo Aaltonen Tue, 10 Aug 2021 12:32:48 +0300 + +xorg-server (2:1.20.13-1) experimental; urgency=medium + + * New upstream release. + + -- Timo Aaltonen Tue, 10 Aug 2021 12:27:00 +0300 + +xorg-server (2:1.20.11-1ubuntu2) impish; urgency=medium + + * modesetting-disable-reverse-prime-offload-udl.diff: Fix a regression + on displaylink devices after mesa update. (LP: #1931547) + + -- Timo Aaltonen Tue, 06 Jul 2021 13:17:51 +0300 + +xorg-server (2:1.20.11-1ubuntu1) hirsute; urgency=medium + + * Merge from Debian. + + -- Timo Aaltonen Tue, 13 Apr 2021 19:15:17 +0300 + +xorg-server (2:1.20.11-1) unstable; urgency=medium + + * New upstream release. - CVE-2021-3472 + * Add signing key for Matt Turner. - -- Marc Deslauriers Thu, 08 Apr 2021 08:29:22 -0400 + -- Timo Aaltonen Tue, 13 Apr 2021 19:07:31 +0300 -xorg-server (2:1.20.9-2ubuntu1.2~20.04.1) focal-security; urgency=medium +xorg-server (2:1.20.10-3ubuntu7) hirsute; urgency=medium - * Backport to focal; Reintroduce CVE fixes from focal 1.20.8-2ubuntu2.6 - / groovy 1.20.9-2ubuntu1.1. + * 300-mi-sprite-SaveUnderCursor2.patch: Drop duplicate entries. - -- Timo Aaltonen Sun, 17 Jan 2021 11:13:31 +0200 + -- Timo Aaltonen Fri, 09 Apr 2021 13:30:53 +0300 -xorg-server (2:1.20.9-2ubuntu1.2) groovy; urgency=medium +xorg-server (2:1.20.10-3ubuntu6) hirsute; urgency=medium - * fix-gtf-detection-for-edid-14.diff: Fix a regression in detecting - modes of an EDID 1.4 monitor. (LP: #1883497) + * 300-mi-sprite-SaveUnderCursor2.patch: Fix cursor bleeding issue + (LP: #1911479). + The new function, miDCSaveUnderCursor2, is required by Xilinx armsoc driver - -- Timo Aaltonen Mon, 30 Nov 2020 13:53:47 +0200 + -- Ethan Hsieh Fri, 19 Mar 2021 12:55:11 +0000 + +xorg-server (2:1.20.10-3ubuntu5) hirsute; urgency=medium + + * Disable building xwayland. + + -- Timo Aaltonen Fri, 26 Mar 2021 15:16:17 +0200 -xorg-server (2:1.20.9-2ubuntu1.1~20.04.1) focal; urgency=medium +xorg-server (2:1.20.10-3ubuntu4) hirsute; urgency=medium - * Backport to focal. (LP: #1902244) + * Disable building with lto, it's a 20+GB link not yet investigated. - -- Timo Aaltonen Fri, 18 Dec 2020 15:08:03 +0200 + -- Matthias Klose Fri, 26 Mar 2021 13:37:55 +0100 -xorg-server (2:1.20.9-2ubuntu1.1) groovy-security; urgency=medium +xorg-server (2:1.20.10-3ubuntu3) hirsute; urgency=medium + + * Stop building the udeb on request. + + -- Matthias Klose Mon, 22 Feb 2021 11:54:42 +0100 + +xorg-server (2:1.20.10-3ubuntu1) hirsute; urgency=medium + + * Merge from Debian. + * patches: Drop upstreamed patches. + + -- Timo Aaltonen Wed, 17 Feb 2021 12:30:29 +0200 + +xorg-server (2:1.20.10-3) unstable; urgency=medium + + [ Julien Cristau ] + * Drop workaround for mips* FTBFS added in 2:1.20.10-1, shouldn't be + necessary anymore with the change in 2:1.20.10-2. + + [ Sven Joachim ] + * Recommend default-logind | logind rather than libpam-systemd in + xserver-xorg-core (Closes: #923198). + * Use mktemp rather than tempfile in xserver-xorg-legacy.postinst + (Closes: #979751). + * Use dpkg-vendor to get the vendor name, drop lsb-release from + Build-Depends. + + [ Vagrant Cascadian ] + * Avoid embedding the running kernel version (Closes: #976898). + + -- Timo Aaltonen Wed, 17 Feb 2021 11:17:43 +0200 + +xorg-server (2:1.20.10-2) unstable; urgency=medium + + * Stop defining inb/outb on mips, to fix FTBFS in some drivers with GCC 10 + (closes: #978670). + + -- Julien Cristau Wed, 06 Jan 2021 10:33:33 +0100 + +xorg-server (2:1.20.10-1) unstable; urgency=medium + + [ Timo Aaltonen ] + * New upstream release. + - CVE-2020-14360, CVE-2020-25712 (Closes: #976216) + * Drop patches: + - 0001-Revert-*: Reverted upstream in this version + - revert-hw-xfree86-avoid-cursor-use-after-free.diff: Issue fixed in this version + - revert-disabling-xss-for-rootless-xwayland.diff: Was resolved upstream as + being a client bug + * control: Add libnvidia-egl-wayland-dev to build-depends, enables + EGLStream support in xwayland. + + [ Adrian Bunk ] + * rules: Add a workaround to fix build on mips*. (Closes: #975579) + + -- Timo Aaltonen Wed, 02 Dec 2020 12:41:35 +0200 + +xorg-server (2:1.20.9-2ubuntu3) hirsute; urgency=medium * SECURITY UPDATE: out of bounds memory accesses on too short request - debian/patches/CVE-2020-14360.patch: check SetMap request length @@ -36,7 +150,14 @@ - debian/patches/CVE-2020-25712.patch: add bounds checks in xkb/xkb.c. - CVE-2020-25712 - -- Marc Deslauriers Mon, 30 Nov 2020 12:53:48 -0500 + -- Marc Deslauriers Wed, 02 Dec 2020 09:16:47 -0500 + +xorg-server (2:1.20.9-2ubuntu2) hirsute; urgency=medium + + * fix-gtf-detection-for-edid-14.diff: Fix a regression in detecting + modes of an EDID 1.4 monitor. (LP: #1897530) + + -- Timo Aaltonen Mon, 30 Nov 2020 13:53:47 +0200 xorg-server (2:1.20.9-2ubuntu1) groovy; urgency=medium diff -Nru xorg-server-1.20.9/debian/control xorg-server-1.20.13/debian/control --- xorg-server-1.20.9/debian/control 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/control 2021-12-14 18:08:29.000000000 +0000 @@ -7,7 +7,6 @@ debhelper-compat (= 12), po-debconf, quilt, - lsb-release, pkg-config, bison, flex, @@ -73,6 +72,7 @@ # arc4random_buf(), getpeereid() libbsd-dev, # xwayland + libnvidia-egl-wayland-dev, libwayland-dev [linux-any], wayland-protocols (>= 1.10) [linux-any], #logind @@ -100,7 +100,7 @@ ${misc:Depends}, Recommends: libgl1-mesa-dri (>= 7.10.2-4), - libpam-systemd, + default-logind | logind, Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable Breaks: libgl1-mesa-dri (<< 18.0.5), @@ -130,6 +130,7 @@ Package: xserver-xorg-core-udeb Package-Type: udeb +Build-Profiles: Section: debian-installer # exclude sparc because of linker errors Architecture: any diff -Nru xorg-server-1.20.9/debian/patches/0001-Revert-linux-Fix-platform-device-PCI-detection-for-c.patch xorg-server-1.20.13/debian/patches/0001-Revert-linux-Fix-platform-device-PCI-detection-for-c.patch --- xorg-server-1.20.9/debian/patches/0001-Revert-linux-Fix-platform-device-PCI-detection-for-c.patch 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/0001-Revert-linux-Fix-platform-device-PCI-detection-for-c.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -From 39cb95e959fab97a7e255dda1a1599b096fb0f7e Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Tue, 8 Sep 2020 10:03:11 +0200 -Subject: [PATCH] Revert "linux: Fix platform device PCI detection for complex - bus topologies" - -This reverts commit 5c96eb5f44e62a4cfe835023cde304eb5795b8fd. - -https://gitlab.freedesktop.org/xorg/xserver/-/issues/1068 ---- - config/udev.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config/udev.c b/config/udev.c -index 14409549b..8c6c4b666 100644 ---- a/config/udev.c -+++ b/config/udev.c -@@ -470,7 +470,7 @@ config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path - config_odev_probe_proc_ptr probe_callback) - { - struct OdevAttributes *attribs = config_odev_allocate_attributes(); -- const char *value, *str; -+ const char *value; - - attribs->path = XNFstrdup(path); - attribs->syspath = XNFstrdup(syspath); -@@ -478,8 +478,8 @@ config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path - attribs->minor = minor; - - value = udev_device_get_property_value(udev_device, "ID_PATH"); -- if (value && (str = strstr(value, "pci-"))) { -- attribs->busid = XNFstrdup(str); -+ if (value && !strncmp(value, "pci-", 4)) { -+ attribs->busid = XNFstrdup(value); - attribs->busid[3] = ':'; - } - --- -2.27.0 - diff -Nru xorg-server-1.20.9/debian/patches/0001-Revert-linux-Fix-platform-device-probe-for-DT-based-.patch xorg-server-1.20.13/debian/patches/0001-Revert-linux-Fix-platform-device-probe-for-DT-based-.patch --- xorg-server-1.20.9/debian/patches/0001-Revert-linux-Fix-platform-device-probe-for-DT-based-.patch 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/0001-Revert-linux-Fix-platform-device-probe-for-DT-based-.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -From 4b6fce5975c2f931a0478cf4deeec97529b05eb6 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Tue, 8 Sep 2020 10:01:55 +0200 -Subject: [PATCH] Revert "linux: Fix platform device probe for DT-based PCI" - -This reverts commit 249a12c54a9316b089bd22683c011519348496df. - -https://gitlab.freedesktop.org/xorg/xserver/-/issues/1068 ---- - config/udev.c | 27 +-------------------------- - 1 file changed, 1 insertion(+), 26 deletions(-) - -diff --git a/config/udev.c b/config/udev.c -index b00d90237..14409549b 100644 ---- a/config/udev.c -+++ b/config/udev.c -@@ -464,31 +464,6 @@ config_udev_fini(void) - - #ifdef CONFIG_UDEV_KMS - --/* Find the last occurrence of the needle in haystack */ --static char *strrstr(const char *haystack, const char *needle) --{ -- char *prev, *last, *tmp; -- -- prev = strstr(haystack, needle); -- if (!prev) -- return NULL; -- -- last = prev; -- tmp = prev + 1; -- -- while (tmp) { -- last = strstr(tmp, needle); -- if (!last) -- return prev; -- else { -- prev = last; -- tmp = prev + 1; -- } -- } -- -- return last; --} -- - static void - config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path, const char *syspath, - int major, int minor, -@@ -503,7 +478,7 @@ config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path - attribs->minor = minor; - - value = udev_device_get_property_value(udev_device, "ID_PATH"); -- if (value && (str = strrstr(value, "pci-"))) { -+ if (value && (str = strstr(value, "pci-"))) { - attribs->busid = XNFstrdup(str); - attribs->busid[3] = ':'; - } --- -2.27.0 - diff -Nru xorg-server-1.20.9/debian/patches/0001-Revert-linux-Make-platform-device-probe-less-fragile.patch xorg-server-1.20.13/debian/patches/0001-Revert-linux-Make-platform-device-probe-less-fragile.patch --- xorg-server-1.20.9/debian/patches/0001-Revert-linux-Make-platform-device-probe-less-fragile.patch 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/0001-Revert-linux-Make-platform-device-probe-less-fragile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,132 +0,0 @@ -From af4c84ce8855e84c0ad89b929bc972e884f0b8e3 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Tue, 8 Sep 2020 10:03:33 +0200 -Subject: [PATCH] Revert "linux: Make platform device probe less fragile" - -This reverts commit 74b7427c41b4e4104af7abf70a996c086d3d7628. - -https://gitlab.freedesktop.org/xorg/xserver/-/issues/1068 ---- - config/udev.c | 17 +++++------------ - hw/xfree86/os-support/linux/lnx_platform.c | 20 ++++++++++++++++++-- - 2 files changed, 23 insertions(+), 14 deletions(-) - -diff --git a/config/udev.c b/config/udev.c -index 8c6c4b666..3a73189e2 100644 ---- a/config/udev.c -+++ b/config/udev.c -@@ -56,7 +56,7 @@ static struct udev_monitor *udev_monitor; - - #ifdef CONFIG_UDEV_KMS - static void --config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path, const char *syspath, -+config_udev_odev_setup_attribs(const char *path, const char *syspath, - int major, int minor, - config_odev_probe_proc_ptr probe_callback); - #endif -@@ -128,7 +128,7 @@ device_added(struct udev_device *udev_device) - - LogMessage(X_INFO, "config/udev: Adding drm device (%s)\n", path); - -- config_udev_odev_setup_attribs(udev_device, path, syspath, major(devnum), -+ config_udev_odev_setup_attribs(path, syspath, major(devnum), - minor(devnum), NewGPUDeviceRequest); - return; - } -@@ -322,7 +322,7 @@ device_removed(struct udev_device *device) - - LogMessage(X_INFO, "config/udev: removing GPU device %s %s\n", - syspath, path); -- config_udev_odev_setup_attribs(device, path, syspath, major(devnum), -+ config_udev_odev_setup_attribs(path, syspath, major(devnum), - minor(devnum), DeleteGPUDeviceRequest); - /* Retry vtenter after a drm node removal */ - systemd_logind_vtenter(); -@@ -465,24 +465,17 @@ config_udev_fini(void) - #ifdef CONFIG_UDEV_KMS - - static void --config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path, const char *syspath, -+config_udev_odev_setup_attribs(const char *path, const char *syspath, - int major, int minor, - config_odev_probe_proc_ptr probe_callback) - { - struct OdevAttributes *attribs = config_odev_allocate_attributes(); -- const char *value; - - attribs->path = XNFstrdup(path); - attribs->syspath = XNFstrdup(syspath); - attribs->major = major; - attribs->minor = minor; - -- value = udev_device_get_property_value(udev_device, "ID_PATH"); -- if (value && !strncmp(value, "pci-", 4)) { -- attribs->busid = XNFstrdup(value); -- attribs->busid[3] = ':'; -- } -- - /* ownership of attribs is passed to probe layer */ - probe_callback(attribs); - } -@@ -523,7 +516,7 @@ config_udev_odev_probe(config_odev_probe_proc_ptr probe_callback) - else if (!check_seat(udev_device)) - goto no_probe; - -- config_udev_odev_setup_attribs(udev_device, path, syspath, major(devnum), -+ config_udev_odev_setup_attribs(path, syspath, major(devnum), - minor(devnum), probe_callback); - no_probe: - udev_device_unref(udev_device); -diff --git a/hw/xfree86/os-support/linux/lnx_platform.c b/hw/xfree86/os-support/linux/lnx_platform.c -index e62306219..70374ace8 100644 ---- a/hw/xfree86/os-support/linux/lnx_platform.c -+++ b/hw/xfree86/os-support/linux/lnx_platform.c -@@ -23,13 +23,13 @@ - static Bool - get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index) - { -+ drmSetVersion sv; - drmVersionPtr v; -+ char *buf; - int fd; - int err = 0; - Bool paused, server_fd = FALSE; - -- LogMessage(X_INFO, "Platform probe for %s\n", attribs->syspath); -- - fd = systemd_logind_take_fd(attribs->major, attribs->minor, path, &paused); - if (fd != -1) { - if (paused) { -@@ -48,6 +48,18 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index) - if (fd == -1) - return FALSE; - -+ sv.drm_di_major = 1; -+ sv.drm_di_minor = 4; -+ sv.drm_dd_major = -1; /* Don't care */ -+ sv.drm_dd_minor = -1; /* Don't care */ -+ -+ err = drmSetInterfaceVersion(fd, &sv); -+ if (err) { -+ xf86Msg(X_ERROR, "%s: failed to set DRM interface version 1.4: %s\n", -+ path, strerror(-err)); -+ goto out; -+ } -+ - /* for a delayed probe we've already added the device */ - if (delayed_index == -1) { - xf86_add_platform_device(attribs, FALSE); -@@ -57,6 +69,10 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index) - if (server_fd) - xf86_platform_devices[delayed_index].flags |= XF86_PDEV_SERVER_FD; - -+ buf = drmGetBusid(fd); -+ xf86_platform_odev_attributes(delayed_index)->busid = XNFstrdup(buf); -+ drmFreeBusid(buf); -+ - v = drmGetVersion(fd); - if (!v) { - xf86Msg(X_ERROR, "%s: failed to query DRM version\n", path); --- -2.27.0 - diff -Nru xorg-server-1.20.9/debian/patches/04_compiler_h_inb_outb_mips.diff xorg-server-1.20.13/debian/patches/04_compiler_h_inb_outb_mips.diff --- xorg-server-1.20.9/debian/patches/04_compiler_h_inb_outb_mips.diff 1970-01-01 00:00:00.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/04_compiler_h_inb_outb_mips.diff 2021-12-14 18:08:29.000000000 +0000 @@ -0,0 +1,60 @@ +From 5e9b9d11ce1662d0de6dd8b5e79e5f8870f7a397 Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Wed, 6 Jan 2021 10:20:53 +0100 +Subject: [PATCH] compiler.h: don't define inb/outb and friends on mips + +The definition relies on IOPortBase, which is only ever set in +hw/xfree86/os-support/bsd/arm_video.c + +This caused build failures on linux/mips with GCC 10, because anything +including compiler.h would get its own definition of IOPortBase. +--- + hw/xfree86/common/compiler.h | 8 ++------ + hw/xfree86/os-support/bsd/arm_video.c | 3 +++ + 2 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h +index 2b2008b3f4..eb788d3fd7 100644 +--- a/hw/xfree86/common/compiler.h ++++ b/hw/xfree86/common/compiler.h +@@ -518,14 +518,10 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset, + barrier(); + } + +-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) +-#if defined(__arm32__) || defined(__mips64) ++#elif defined(__arm32__) && !defined(__linux__) + #define PORT_SIZE long +-#else +-#define PORT_SIZE short +-#endif + +-_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ ++extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ + + static __inline__ void + outb(unsigned PORT_SIZE port, unsigned char val) +diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c +index dd1020e33f..180d70543f 100644 +--- a/hw/xfree86/os-support/bsd/arm_video.c ++++ b/hw/xfree86/os-support/bsd/arm_video.c +@@ -65,6 +65,7 @@ + #include "xf86Priv.h" + #include "xf86_OSlib.h" + #include "xf86OSpriv.h" ++#include "compiler.h" + + #if defined(__NetBSD__) && !defined(MAP_FILE) + #define MAP_FLAGS MAP_SHARED +@@ -162,6 +163,8 @@ xf86DisableIO() + + #if defined(USE_ARC_MMAP) || defined(__arm32__) + ++unsigned int IOPortBase; ++ + Bool + xf86EnableIO() + { +-- +2.29.2 + diff -Nru xorg-server-1.20.9/debian/patches/300-mi-sprite-SaveUnderCursor2.patch xorg-server-1.20.13/debian/patches/300-mi-sprite-SaveUnderCursor2.patch --- xorg-server-1.20.9/debian/patches/300-mi-sprite-SaveUnderCursor2.patch 1970-01-01 00:00:00.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/300-mi-sprite-SaveUnderCursor2.patch 2021-12-14 18:08:29.000000000 +0000 @@ -0,0 +1,59 @@ +From 905bdb14876be1f01a444f473b0c20c651e169ba Mon Sep 17 00:00:00 2001 +From: Hyun Kwon +Date: Mon, 25 Sep 2017 15:42:23 -0700 +Subject: [PATCH] mi: sprite: SaveUnderCursor2 + +There is cursor bleeding for the devices which try to acclerate the +Desktop environment using low powered ARM Mali GPUs. The area under +the cusrsor is not updated for every swap call within the armsoc, +resulting in the block artifact. + +Expose miDCSaveUnderCursor2 API, so that other graphics layer like +armsoc can inoke and save the area under the cursor before actually +performing a swap between the backbuffer and the frontbuffer. + +Signed-off-by: Hyun Kwon +Signed-off-by: Madhurkiran Harikrishnan +--- + mi/mipointer.h | 2 ++ + mi/misprite.c | 17 +++++++++++++++++ + 2 files changed, 19 insertions(+) + +diff --git a/mi/mipointer.h b/mi/mipointer.h +index 7ce6409..107b24f 100644 +--- a/mi/mipointer.h ++++ b/mi/mipointer.h +@@ -127,4 +127,6 @@ extern _X_EXPORT DevPrivateKeyRec miPointerScreenKeyRec; + + #define miPointerScreenKey (&miPointerScreenKeyRec) + ++extern _X_EXPORT void miDCSaveUnderCursor2(ScreenPtr pScreen); ++ + #endif /* MIPOINTER_H */ +diff --git a/mi/misprite.c b/mi/misprite.c +index add2c55..46ce9f0 100644 +--- a/mi/misprite.c ++++ b/mi/misprite.c +@@ -955,3 +955,20 @@ miSpriteComputeSaved(DeviceIntPtr pDev, ScreenPtr pScreen) + pCursorInfo->saved.x2 = pCursorInfo->saved.x1 + w + wpad * 2; + pCursorInfo->saved.y2 = pCursorInfo->saved.y1 + h + hpad * 2; + } ++ ++void ++miDCSaveUnderCursor2(ScreenPtr pScreen) ++{ ++ DeviceIntPtr pDev; ++ miCursorInfoPtr pCursorInfo; ++ ++ for (pDev = inputInfo.devices; pDev; pDev = pDev->next) { ++ if (DevHasCursor(pDev)) { ++ pCursorInfo = GetSprite(pDev); ++ if (pCursorInfo && pCursorInfo->isUp ++ && pCursorInfo->pScreen == pScreen) { ++ miSpriteSaveUnderCursor(pDev, pScreen); ++ } ++ } ++ } ++} +-- +2.7.4 diff -Nru xorg-server-1.20.9/debian/patches/CVE-2020-14360.patch xorg-server-1.20.13/debian/patches/CVE-2020-14360.patch --- xorg-server-1.20.9/debian/patches/CVE-2020-14360.patch 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/CVE-2020-14360.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,125 +0,0 @@ -From 7544e6321bf6110f10446866d1c777853ee01147 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb -Date: Thu, 12 Nov 2020 19:15:07 +0100 -Subject: [PATCH xserver 2/2] Check SetMap request length carefully. - -Avoid out of bounds memory accesses on too short request. - -ZDI-CAN 11572 / CVE-2020-14360 - -This vulnerability was discovered by: -Jan-Niklas Sohn working with Trend Micro Zero Day Initiative - -Signed-off-by: Matthieu Herrb ---- - xkb/xkb.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 92 insertions(+) - ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -2382,6 +2382,93 @@ SetVirtualModMap(XkbSrvInfoPtr xkbi, - return (char *) wire; - } - -+#define _add_check_len(new) \ -+ if (len > UINT32_MAX - (new) || len > req_len - (new)) goto bad; \ -+ else len += new -+ -+/** -+ * Check the length of the SetMap request -+ */ -+static int -+_XkbSetMapCheckLength(xkbSetMapReq *req) -+{ -+ size_t len = sz_xkbSetMapReq, req_len = req->length << 2; -+ xkbKeyTypeWireDesc *keytype; -+ xkbSymMapWireDesc *symmap; -+ BOOL preserve; -+ int i, map_count, nSyms; -+ -+ if (req_len < len) -+ goto bad; -+ /* types */ -+ if (req->present & XkbKeyTypesMask) { -+ keytype = (xkbKeyTypeWireDesc *)(req + 1); -+ for (i = 0; i < req->nTypes; i++) { -+ _add_check_len(XkbPaddedSize(sz_xkbKeyTypeWireDesc)); -+ if (req->flags & XkbSetMapResizeTypes) { -+ _add_check_len(keytype->nMapEntries -+ * sz_xkbKTSetMapEntryWireDesc); -+ preserve = keytype->preserve; -+ map_count = keytype->nMapEntries; -+ if (preserve) { -+ _add_check_len(map_count * sz_xkbModsWireDesc); -+ } -+ keytype += 1; -+ keytype = (xkbKeyTypeWireDesc *) -+ ((xkbKTSetMapEntryWireDesc *)keytype + map_count); -+ if (preserve) -+ keytype = (xkbKeyTypeWireDesc *) -+ ((xkbModsWireDesc *)keytype + map_count); -+ } -+ } -+ } -+ /* syms */ -+ if (req->present & XkbKeySymsMask) { -+ symmap = (xkbSymMapWireDesc *)((char *)req + len); -+ for (i = 0; i < req->nKeySyms; i++) { -+ _add_check_len(sz_xkbSymMapWireDesc); -+ nSyms = symmap->nSyms; -+ _add_check_len(nSyms*sizeof(CARD32)); -+ symmap += 1; -+ symmap = (xkbSymMapWireDesc *)((CARD32 *)symmap + nSyms); -+ } -+ } -+ /* actions */ -+ if (req->present & XkbKeyActionsMask) { -+ _add_check_len(req->totalActs * sz_xkbActionWireDesc -+ + XkbPaddedSize(req->nKeyActs)); -+ } -+ /* behaviours */ -+ if (req->present & XkbKeyBehaviorsMask) { -+ _add_check_len(req->totalKeyBehaviors * sz_xkbBehaviorWireDesc); -+ } -+ /* vmods */ -+ if (req->present & XkbVirtualModsMask) { -+ _add_check_len(XkbPaddedSize(Ones(req->virtualMods))); -+ } -+ /* explicit */ -+ if (req->present & XkbExplicitComponentsMask) { -+ /* two bytes per non-zero explicit componen */ -+ _add_check_len(XkbPaddedSize(req->totalKeyExplicit * sizeof(CARD16))); -+ } -+ /* modmap */ -+ if (req->present & XkbModifierMapMask) { -+ /* two bytes per non-zero modmap component */ -+ _add_check_len(XkbPaddedSize(req->totalModMapKeys * sizeof(CARD16))); -+ } -+ /* vmodmap */ -+ if (req->present & XkbVirtualModMapMask) { -+ _add_check_len(req->totalVModMapKeys * sz_xkbVModMapWireDesc); -+ } -+ if (len == req_len) -+ return Success; -+bad: -+ ErrorF("[xkb] BOGUS LENGTH in SetMap: expected %ld got %ld\n", -+ len, req_len); -+ return BadLength; -+} -+ -+ - /** - * Check if the given request can be applied to the given device but don't - * actually do anything.. -@@ -2639,6 +2726,11 @@ ProcXkbSetMap(ClientPtr client) - CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixManageAccess); - CHK_MASK_LEGAL(0x01, stuff->present, XkbAllMapComponentsMask); - -+ /* first verify the request length carefully */ -+ rc = _XkbSetMapCheckLength(stuff); -+ if (rc != Success) -+ return rc; -+ - tmp = (char *) &stuff[1]; - - /* Check if we can to the SetMap on the requested device. If this diff -Nru xorg-server-1.20.9/debian/patches/CVE-2020-25712.patch xorg-server-1.20.13/debian/patches/CVE-2020-25712.patch --- xorg-server-1.20.9/debian/patches/CVE-2020-25712.patch 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/CVE-2020-25712.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -From cd5547444de39e3ebde1e8b88342fa8e0113040b Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb -Date: Sun, 11 Oct 2020 17:05:09 +0200 -Subject: [PATCH xserver 1/2] Fix XkbSetDeviceInfo() and SetDeviceIndicators() - heap overflows - -ZDI-CAN 11389 / CVE-2020-25712 - -This vulnerability was discovered by: -Jan-Niklas Sohn working with Trend Micro Zero Day Initiative - -Signed-off-by: Matthieu Herrb ---- - xkb/xkb.c | 26 +++++++++++++++++++++++--- - 1 file changed, 23 insertions(+), 3 deletions(-) - ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -6625,7 +6625,9 @@ SetDeviceIndicators(char *wire, - unsigned changed, - int num, - int *status_rtrn, -- ClientPtr client, xkbExtensionDeviceNotify * ev) -+ ClientPtr client, -+ xkbExtensionDeviceNotify * ev, -+ xkbSetDeviceInfoReq * stuff) - { - xkbDeviceLedsWireDesc *ledWire; - int i; -@@ -6646,6 +6648,11 @@ SetDeviceIndicators(char *wire, - xkbIndicatorMapWireDesc *mapWire; - XkbSrvLedInfoPtr sli; - -+ if (!_XkbCheckRequestBounds(client, stuff, ledWire, ledWire + 1)) { -+ *status_rtrn = BadLength; -+ return (char *) ledWire; -+ } -+ - namec = mapc = statec = 0; - sli = XkbFindSrvLedInfo(dev, ledWire->ledClass, ledWire->ledID, - XkbXI_IndicatorMapsMask); -@@ -6664,6 +6671,10 @@ SetDeviceIndicators(char *wire, - memset((char *) sli->names, 0, XkbNumIndicators * sizeof(Atom)); - for (n = 0, bit = 1; n < XkbNumIndicators; n++, bit <<= 1) { - if (ledWire->namesPresent & bit) { -+ if (!_XkbCheckRequestBounds(client, stuff, atomWire, atomWire + 1)) { -+ *status_rtrn = BadLength; -+ return (char *) atomWire; -+ } - sli->names[n] = (Atom) *atomWire; - if (sli->names[n] == None) - ledWire->namesPresent &= ~bit; -@@ -6681,6 +6692,10 @@ SetDeviceIndicators(char *wire, - if (ledWire->mapsPresent) { - for (n = 0, bit = 1; n < XkbNumIndicators; n++, bit <<= 1) { - if (ledWire->mapsPresent & bit) { -+ if (!_XkbCheckRequestBounds(client, stuff, mapWire, mapWire + 1)) { -+ *status_rtrn = BadLength; -+ return (char *) mapWire; -+ } - sli->maps[n].flags = mapWire->flags; - sli->maps[n].which_groups = mapWire->whichGroups; - sli->maps[n].groups = mapWire->groups; -@@ -6760,7 +6775,7 @@ _XkbSetDeviceInfoCheck(ClientPtr client, - ed.deviceID = dev->id; - wire = (char *) &stuff[1]; - if (stuff->change & XkbXI_ButtonActionsMask) { -- int nBtns, sz, i; -+ int nBtns, sz, i; - XkbAction *acts; - DeviceIntPtr kbd; - -@@ -6772,7 +6787,11 @@ _XkbSetDeviceInfoCheck(ClientPtr client, - return BadAlloc; - dev->button->xkb_acts = acts; - } -+ if (stuff->firstBtn + stuff->nBtns > nBtns) -+ return BadValue; - sz = stuff->nBtns * SIZEOF(xkbActionWireDesc); -+ if (!_XkbCheckRequestBounds(client, stuff, wire, (char *) wire + sz)) -+ return BadLength; - memcpy((char *) &acts[stuff->firstBtn], (char *) wire, sz); - wire += sz; - ed.reason |= XkbXI_ButtonActionsMask; -@@ -6793,7 +6812,8 @@ _XkbSetDeviceInfoCheck(ClientPtr client, - int status = Success; - - wire = SetDeviceIndicators(wire, dev, stuff->change, -- stuff->nDeviceLedFBs, &status, client, &ed); -+ stuff->nDeviceLedFBs, &status, client, &ed, -+ stuff); - if (status != Success) - return status; - } diff -Nru xorg-server-1.20.9/debian/patches/CVE-2021-3472.patch xorg-server-1.20.13/debian/patches/CVE-2021-3472.patch --- xorg-server-1.20.9/debian/patches/CVE-2021-3472.patch 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/CVE-2021-3472.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -From 00f8ce4dbeeb99ff8e5e9211d08058b11a1ac3c0 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb -Date: Sun, 21 Mar 2021 18:38:57 +0100 -Subject: [PATCH xserver] Fix XChangeFeedbackControl() request underflow - -CVE-2021-3472 / ZDI-CAN-1259 - -This vulnerability was discovered by: -Jan-Niklas Sohn working with Trend Micro Zero Day Initiative - -Signed-off-by: Matthieu Herrb ---- - Xi/chgfctl.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c -index 1de4da9ef..7a597e43d 100644 ---- a/Xi/chgfctl.c -+++ b/Xi/chgfctl.c -@@ -464,8 +464,11 @@ ProcXChangeFeedbackControl(ClientPtr client) - break; - case StringFeedbackClass: - { -- xStringFeedbackCtl *f = ((xStringFeedbackCtl *) &stuff[1]); -+ xStringFeedbackCtl *f; - -+ REQUEST_AT_LEAST_EXTRA_SIZE(xChangeFeedbackControlReq, -+ sizeof(xStringFeedbackCtl)); -+ f = ((xStringFeedbackCtl *) &stuff[1]); - if (client->swapped) { - if (len < bytes_to_int32(sizeof(xStringFeedbackCtl))) - return BadLength; --- -2.31.0 diff -Nru xorg-server-1.20.9/debian/patches/CVE-2021-4008.patch xorg-server-1.20.13/debian/patches/CVE-2021-4008.patch --- xorg-server-1.20.9/debian/patches/CVE-2021-4008.patch 1970-01-01 00:00:00.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/CVE-2021-4008.patch 2021-12-14 18:08:29.000000000 +0000 @@ -0,0 +1,52 @@ +From ebce7e2d80e7c80e1dda60f2f0bc886f1106ba60 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:03 +0200 +Subject: [PATCH] render: Fix out of bounds access in + SProcRenderCompositeGlyphs() + +ZDI-CAN-14192, CVE-2021-4008 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + render/render.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/render/render.c b/render/render.c +index c376090ca..456f156d4 100644 +--- a/render/render.c ++++ b/render/render.c +@@ -2309,6 +2309,9 @@ SProcRenderCompositeGlyphs(ClientPtr client) + + i = elt->len; + if (i == 0xff) { ++ if (buffer + 4 > end) { ++ return BadLength; ++ } + swapl((int *) buffer); + buffer += 4; + } +@@ -2319,12 +2322,18 @@ SProcRenderCompositeGlyphs(ClientPtr client) + buffer += i; + break; + case 2: ++ if (buffer + i * 2 > end) { ++ return BadLength; ++ } + while (i--) { + swaps((short *) buffer); + buffer += 2; + } + break; + case 4: ++ if (buffer + i * 4 > end) { ++ return BadLength; ++ } + while (i--) { + swapl((int *) buffer); + buffer += 4; +-- +GitLab + diff -Nru xorg-server-1.20.9/debian/patches/CVE-2021-4009.patch xorg-server-1.20.13/debian/patches/CVE-2021-4009.patch --- xorg-server-1.20.9/debian/patches/CVE-2021-4009.patch 1970-01-01 00:00:00.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/CVE-2021-4009.patch 2021-12-14 18:08:29.000000000 +0000 @@ -0,0 +1,43 @@ +From b5196750099ae6ae582e1f46bd0a6dad29550e02 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:01 +0200 +Subject: [PATCH] xfixes: Fix out of bounds access in + *ProcXFixesCreatePointerBarrier() + +ZDI-CAN-14950, CVE-2021-4009 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + xfixes/cursor.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/xfixes/cursor.c b/xfixes/cursor.c +index 60580b88f..c5d4554b2 100644 +--- a/xfixes/cursor.c ++++ b/xfixes/cursor.c +@@ -1010,7 +1010,8 @@ ProcXFixesCreatePointerBarrier(ClientPtr client) + { + REQUEST(xXFixesCreatePointerBarrierReq); + +- REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices)); ++ REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, ++ pad_to_int32(stuff->num_devices * sizeof(CARD16))); + LEGAL_NEW_RESOURCE(stuff->barrier, client); + + return XICreatePointerBarrier(client, stuff); +@@ -1027,7 +1028,8 @@ SProcXFixesCreatePointerBarrier(ClientPtr client) + + swaps(&stuff->length); + swaps(&stuff->num_devices); +- REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices)); ++ REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, ++ pad_to_int32(stuff->num_devices * sizeof(CARD16))); + + swapl(&stuff->barrier); + swapl(&stuff->window); +-- +GitLab + diff -Nru xorg-server-1.20.9/debian/patches/CVE-2021-4010.patch xorg-server-1.20.13/debian/patches/CVE-2021-4010.patch --- xorg-server-1.20.9/debian/patches/CVE-2021-4010.patch 1970-01-01 00:00:00.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/CVE-2021-4010.patch 2021-12-14 18:08:29.000000000 +0000 @@ -0,0 +1,32 @@ +From 6c4c53010772e3cb4cb8acd54950c8eec9c00d21 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:02 +0200 +Subject: [PATCH] Xext: Fix out of bounds access in SProcScreenSaverSuspend() + +ZDI-CAN-14951, CVE-2021-4010 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + Xext/saver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Xext/saver.c b/Xext/saver.c +index 1d7e3cadf..f813ba08d 100644 +--- a/Xext/saver.c ++++ b/Xext/saver.c +@@ -1351,8 +1351,8 @@ SProcScreenSaverSuspend(ClientPtr client) + REQUEST(xScreenSaverSuspendReq); + + swaps(&stuff->length); +- swapl(&stuff->suspend); + REQUEST_SIZE_MATCH(xScreenSaverSuspendReq); ++ swapl(&stuff->suspend); + return ProcScreenSaverSuspend(client); + } + +-- +GitLab + diff -Nru xorg-server-1.20.9/debian/patches/CVE-2021-4011.patch xorg-server-1.20.13/debian/patches/CVE-2021-4011.patch --- xorg-server-1.20.9/debian/patches/CVE-2021-4011.patch 1970-01-01 00:00:00.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/CVE-2021-4011.patch 2021-12-14 18:08:29.000000000 +0000 @@ -0,0 +1,28 @@ +From e56f61c79fc3cee26d83cda0f84ae56d5979f768 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:00 +0200 +Subject: [PATCH] record: Fix out of bounds access in SwapCreateRegister() + +ZDI-CAN-14952, CVE-2021-4011 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + record/record.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/record/record.c ++++ b/record/record.c +@@ -2515,8 +2515,8 @@ SwapCreateRegister(ClientPtr client, xRe + swapl(pClientID); + } + if (stuff->nRanges > +- client->req_len - bytes_to_int32(sz_xRecordRegisterClientsReq) +- - stuff->nClients) ++ (client->req_len - bytes_to_int32(sz_xRecordRegisterClientsReq) ++ - stuff->nClients) / bytes_to_int32(sz_xRecordRange)) + return BadLength; + RecordSwapRanges((xRecordRange *) pClientID, stuff->nRanges); + return Success; diff -Nru xorg-server-1.20.9/debian/patches/modesetting-check-the-kms-state-on-EnterVT.patch xorg-server-1.20.13/debian/patches/modesetting-check-the-kms-state-on-EnterVT.patch --- xorg-server-1.20.9/debian/patches/modesetting-check-the-kms-state-on-EnterVT.patch 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/modesetting-check-the-kms-state-on-EnterVT.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -From 293cf660c95d7ba36510bcc4114d7fd5c5f3801c Mon Sep 17 00:00:00 2001 -From: Martin Peres -Date: Fri, 24 Apr 2020 18:06:16 +0300 -Subject: [PATCH 1/2] modesetting: check the kms state on EnterVT - -Normally, we would receive a uevent coming from Linux's DRM subsystem, -which would trigger the check for disappearing/appearing resources. -However, this event is not received when X is not master (another VT -is selected), and so the userspace / desktop environment would not be -notified about the changes that happened while X wasn't master. - -To fix the issue, this patch forces a refresh on EnterVT by splitting -the kms-checking code from the uevent handling into its own (exported) -function called drmmode_update_kms_state. This function is then called -from both the uevent-handling function, and on EnterVT right before -restoring the modes. - -Signed-off-by: Martin Peres -Reviewed-by: Daniel Vetter -Acked-by: Kishore Kadiyala -Tested-by: Kishore Kadiyala ---- - hw/xfree86/drivers/modesetting/driver.c | 2 ++ - .../drivers/modesetting/drmmode_display.c | 34 ++++++++++++------- - .../drivers/modesetting/drmmode_display.h | 1 + - 3 files changed, 24 insertions(+), 13 deletions(-) - -diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c -index 12e58e4f6..cf9d3ca12 100644 ---- a/hw/xfree86/drivers/modesetting/driver.c -+++ b/hw/xfree86/drivers/modesetting/driver.c -@@ -2014,6 +2014,8 @@ EnterVT(ScrnInfoPtr pScrn) - - SetMaster(pScrn); - -+ drmmode_update_kms_state(&ms->drmmode); -+ - if (!drmmode_set_desired_modes(pScrn, &ms->drmmode, TRUE)) - return FALSE; - -diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c -index 5dbfa4149..f4a174e76 100644 ---- a/hw/xfree86/drivers/modesetting/drmmode_display.c -+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c -@@ -3721,30 +3721,19 @@ drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn) - return TRUE; - } - --#ifdef CONFIG_UDEV_KMS -- - #define DRM_MODE_LINK_STATUS_GOOD 0 - #define DRM_MODE_LINK_STATUS_BAD 1 - --static void --drmmode_handle_uevents(int fd, void *closure) -+void -+drmmode_update_kms_state(drmmode_ptr drmmode) - { -- drmmode_ptr drmmode = closure; - ScrnInfoPtr scrn = drmmode->scrn; -- struct udev_device *dev; - drmModeResPtr mode_res; - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); - int i, j; - Bool found = FALSE; - Bool changed = FALSE; - -- while ((dev = udev_monitor_receive_device(drmmode->uevent_monitor))) { -- udev_device_unref(dev); -- found = TRUE; -- } -- if (!found) -- return; -- - /* Try to re-set the mode on all the connectors with a BAD link-state: - * This may happen if a link degrades and a new modeset is necessary, using - * different link-training parameters. If the kernel found that the current -@@ -3859,6 +3848,25 @@ out: - #undef DRM_MODE_LINK_STATUS_BAD - #undef DRM_MODE_LINK_STATUS_GOOD - -+#ifdef CONFIG_UDEV_KMS -+ -+static void -+drmmode_handle_uevents(int fd, void *closure) -+{ -+ drmmode_ptr drmmode = closure; -+ struct udev_device *dev; -+ Bool found = FALSE; -+ -+ while ((dev = udev_monitor_receive_device(drmmode->uevent_monitor))) { -+ udev_device_unref(dev); -+ found = TRUE; -+ } -+ if (!found) -+ return; -+ -+ drmmode_update_kms_state(drmmode); -+} -+ - #endif - - void -diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.h b/hw/xfree86/drivers/modesetting/drmmode_display.h -index 6360dd048..205d1011f 100644 ---- a/hw/xfree86/drivers/modesetting/drmmode_display.h -+++ b/hw/xfree86/drivers/modesetting/drmmode_display.h -@@ -283,6 +283,7 @@ void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y); - extern Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw); - extern Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn); - -+extern void drmmode_update_kms_state(drmmode_ptr drmmode); - extern void drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode); - extern void drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode); - --- -2.27.0 - diff -Nru xorg-server-1.20.9/debian/patches/modesetting-keep-going-if-a-modeset-fails-on-EnterVT.patch xorg-server-1.20.13/debian/patches/modesetting-keep-going-if-a-modeset-fails-on-EnterVT.patch --- xorg-server-1.20.9/debian/patches/modesetting-keep-going-if-a-modeset-fails-on-EnterVT.patch 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/modesetting-keep-going-if-a-modeset-fails-on-EnterVT.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,155 +0,0 @@ -From efb3abddd49fb75bd6d0e31046fed43d258c93da Mon Sep 17 00:00:00 2001 -From: Kishore Kadiyala -Date: Sat, 19 Sep 2020 01:28:14 +0530 -Subject: [PATCH 2/2] modesetting: keep going if a modeset fails on EnterVT - -There was a time when setting a mode on a CRTC would not depend on the -associated connector's state. If a mode had been set successfully once, -it would mean it would work later on. - -This changed with the introduction of new connectors type that now -require a link training sequence (DP, HDMI 2.0), and that means that -some events may have happened while the X server was not master that -would then prevent the mode from successfully be restored to its -previous state. - -This patch relaxes the requirement that all modes should be restored on -EnterVT, or the entire X-Server would go down by allowing modesets to -fail (with some warnings). If a modeset fails, the CRTC will be -disabled, and a RandR event will be sent for the desktop environment to -fix the situation as well as possible. - -Additional patches might be needed to make sure that the user would -never be left with all screens black in some scenarios. - -v2 (Martin Peres): - - whitespace fixes - - remove the uevent handling (it is done in a previous patch) - - improve the commit message - - reduce the size of the patch by not changing lines needlessly - - return FALSE if one modeset fails in ignore mode - - add comments/todos to explain why we do things - - disable the CRTCs that failed the modeset - -Signed-off-by: Kishore Kadiyala -Signed-off-by: Martin Peres -Reviewed-by: Daniel Vetter -Tested-by: Kishore Kadiyala -Closes: #1010 ---- - hw/xfree86/drivers/modesetting/driver.c | 23 +++++++++++++++---- - .../drivers/modesetting/drmmode_display.c | 19 +++++++++++---- - .../drivers/modesetting/drmmode_display.h | 3 ++- - 3 files changed, 36 insertions(+), 9 deletions(-) - -diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c -index cf9d3ca12..6549ef8e1 100644 ---- a/hw/xfree86/drivers/modesetting/driver.c -+++ b/hw/xfree86/drivers/modesetting/driver.c -@@ -712,7 +712,7 @@ msBlockHandler_oneshot(ScreenPtr pScreen, void *pTimeout) - - msBlockHandler(pScreen, pTimeout); - -- drmmode_set_desired_modes(pScrn, &ms->drmmode, TRUE); -+ drmmode_set_desired_modes(pScrn, &ms->drmmode, TRUE, FALSE); - } - - Bool -@@ -1530,7 +1530,7 @@ CreateScreenResources(ScreenPtr pScreen) - ret = pScreen->CreateScreenResources(pScreen); - pScreen->CreateScreenResources = CreateScreenResources; - -- if (!drmmode_set_desired_modes(pScrn, &ms->drmmode, pScrn->is_gpu)) -+ if (!drmmode_set_desired_modes(pScrn, &ms->drmmode, pScrn->is_gpu, FALSE)) - return FALSE; - - if (!drmmode_glamor_handle_new_screen_pixmap(&ms->drmmode)) -@@ -2016,8 +2016,23 @@ EnterVT(ScrnInfoPtr pScrn) - - drmmode_update_kms_state(&ms->drmmode); - -- if (!drmmode_set_desired_modes(pScrn, &ms->drmmode, TRUE)) -- return FALSE; -+ /* allow not all modes to be set successfully since some events might have -+ * happened while not being master that could prevent the previous -+ * configuration from being re-applied. -+ */ -+ if (!drmmode_set_desired_modes(pScrn, &ms->drmmode, TRUE, TRUE)) { -+ xf86DisableUnusedFunctions(pScrn); -+ -+ /* TODO: check that at least one screen is on, to allow the user to fix -+ * their setup if all modeset failed... -+ */ -+ -+ /* Tell the desktop environment that something changed, so that they -+ * can hopefully correct the situation -+ */ -+ RRSetChanged(xf86ScrnToScreen(pScrn)); -+ RRTellChanged(xf86ScrnToScreen(pScrn)); -+ } - - return TRUE; - } -diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c -index f4a174e76..d74f62ab6 100644 ---- a/hw/xfree86/drivers/modesetting/drmmode_display.c -+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c -@@ -3571,9 +3571,11 @@ drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y) - } - - Bool --drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw) -+drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw, -+ Bool ign_err) - { - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); -+ Bool success = TRUE; - int c; - - for (c = 0; c < config->num_crtc; c++) { -@@ -3621,8 +3623,17 @@ drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw) - if (set_hw) { - if (!crtc->funcs-> - set_mode_major(crtc, &crtc->desiredMode, crtc->desiredRotation, -- crtc->desiredX, crtc->desiredY)) -- return FALSE; -+ crtc->desiredX, crtc->desiredY)) { -+ if (!ign_err) -+ return FALSE; -+ else { -+ success = FALSE; -+ crtc->enabled = FALSE; -+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -+ "Failed to set the desired mode on connector %s\n", -+ output->name); -+ } -+ } - } else { - crtc->mode = crtc->desiredMode; - crtc->rotation = crtc->desiredRotation; -@@ -3636,7 +3647,7 @@ drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw) - /* Validate leases on VT re-entry */ - drmmode_validate_leases(pScrn); - -- return TRUE; -+ return success; - } - - static void -diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.h b/hw/xfree86/drivers/modesetting/drmmode_display.h -index 205d1011f..ce85546bf 100644 ---- a/hw/xfree86/drivers/modesetting/drmmode_display.h -+++ b/hw/xfree86/drivers/modesetting/drmmode_display.h -@@ -280,7 +280,8 @@ void drmmode_DisableSharedPixmapFlipping(xf86CrtcPtr crtc, drmmode_ptr drmmode); - extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp); - extern Bool drmmode_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode); - void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y); --extern Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw); -+extern Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, -+ Bool set_hw, Bool ign_err); - extern Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn); - - extern void drmmode_update_kms_state(drmmode_ptr drmmode); --- -2.27.0 - diff -Nru xorg-server-1.20.9/debian/patches/revert-disabling-xss-for-rootless-xwayland.diff xorg-server-1.20.13/debian/patches/revert-disabling-xss-for-rootless-xwayland.diff --- xorg-server-1.20.9/debian/patches/revert-disabling-xss-for-rootless-xwayland.diff 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/revert-disabling-xss-for-rootless-xwayland.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -commit 1a3092be2784822b99c1fe7fcba8665f6e40381c -Author: Timo Aaltonen -Date: Mon Aug 31 17:30:04 2020 +0300 - - Revert "xwayland: Disable the MIT-SCREEN-SAVER extension when rootless" - - This reverts commit 3059a2e62ae7ef665a537ee0fc2ec24beccf17ae. - -diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c -index d02934cd5..317b81690 100644 ---- a/hw/xwayland/xwayland.c -+++ b/hw/xwayland/xwayland.c -@@ -1132,19 +1132,6 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv) - for (i = 1; i < argc; i++) { - if (strcmp(argv[i], "-rootless") == 0) { - xwl_screen->rootless = 1; -- -- /* Disable the XSS extension on Xwayland rootless. -- * -- * Xwayland is just a Wayland client, no X11 screensaver -- * should be expected to work reliably on Xwayland rootless. -- */ --#ifdef SCREENSAVER -- noScreenSaverExtension = TRUE; --#endif -- ScreenSaverTime = 0; -- ScreenSaverInterval = 0; -- defaultScreenSaverTime = 0; -- defaultScreenSaverInterval = 0; - } - else if (strcmp(argv[i], "-wm") == 0) { - xwl_screen->wm_fd = atoi(argv[i + 1]); diff -Nru xorg-server-1.20.9/debian/patches/revert-hw-xfree86-avoid-cursor-use-after-free.diff xorg-server-1.20.13/debian/patches/revert-hw-xfree86-avoid-cursor-use-after-free.diff --- xorg-server-1.20.9/debian/patches/revert-hw-xfree86-avoid-cursor-use-after-free.diff 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/revert-hw-xfree86-avoid-cursor-use-after-free.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -commit 7f4916e16c964fd2f4828ea541b121dcd84bcebb -Author: Timo Aaltonen -Date: Mon Aug 31 13:32:54 2020 +0300 - - Revert "hw/xfree86: Avoid cursor use after free" - - This reverts commit c726ceacc1a39c56d2b054ac5f35798d0c3640d7. - -diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c -index ee1d98916..afcce5353 100644 ---- a/hw/xfree86/ramdac/xf86CursorRD.c -+++ b/hw/xfree86/ramdac/xf86CursorRD.c -@@ -212,7 +212,7 @@ xf86CursorEnableDisableFBAccess(ScrnInfoPtr pScrn, Bool enable) - xf86CursorScreenKey); - - if (!enable && ScreenPriv->CurrentCursor != NullCursor) { -- CursorPtr currentCursor = RefCursor(ScreenPriv->CurrentCursor); -+ CursorPtr currentCursor = ScreenPriv->CurrentCursor; - - xf86CursorSetCursor(pDev, pScreen, NullCursor, ScreenPriv->x, - ScreenPriv->y); -@@ -231,7 +231,6 @@ xf86CursorEnableDisableFBAccess(ScrnInfoPtr pScrn, Bool enable) - */ - xf86CursorSetCursor(pDev, pScreen, ScreenPriv->SavedCursor, - ScreenPriv->x, ScreenPriv->y); -- UnrefCursor(ScreenPriv->SavedCursor); - ScreenPriv->SavedCursor = NULL; - } - } diff -Nru xorg-server-1.20.9/debian/patches/series xorg-server-1.20.13/debian/patches/series --- xorg-server-1.20.9/debian/patches/series 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/patches/series 2021-12-14 18:08:29.000000000 +0000 @@ -3,18 +3,15 @@ 001_fedora_extramodes.patch 02_kbsd-input-devd.diff 03_static-nettle.diff +04_compiler_h_inb_outb_mips.diff 05_Revert-Unload-submodules.diff 06_use-intel-only-on-pre-gen4.diff 07_use-modesetting-driver-by-default-on-GeForce.diff -revert-hw-xfree86-avoid-cursor-use-after-free.diff -revert-disabling-xss-for-rootless-xwayland.diff -0001-Revert-linux-Fix-platform-device-probe-for-DT-based-.patch -0001-Revert-linux-Fix-platform-device-PCI-detection-for-c.patch -0001-Revert-linux-Make-platform-device-probe-less-fragile.patch ## Ubuntu patches, not upstreamable 168_glibc_trace_to_stderr.patch 226_fall_back_to_autoconfiguration.patch +300-mi-sprite-SaveUnderCursor2.patch ## send upstream xfree86-no-xv-for-gpuscreens.patch @@ -32,9 +29,8 @@ dri2-use-va-gl-for-intel.diff dri2-set-fallback-names-amd-intel.diff randr-auto-bind-of-gpu-is-a-config-change.diff -modesetting-check-the-kms-state-on-EnterVT.patch -modesetting-keep-going-if-a-modeset-fails-on-EnterVT.patch -CVE-2020-14360.patch -CVE-2020-25712.patch fix-gtf-detection-for-edid-14.diff -CVE-2021-3472.patch +CVE-2021-4008.patch +CVE-2021-4009.patch +CVE-2021-4010.patch +CVE-2021-4011.patch diff -Nru xorg-server-1.20.9/debian/rules xorg-server-1.20.13/debian/rules --- xorg-server-1.20.9/debian/rules 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/rules 2021-12-14 18:08:29.000000000 +0000 @@ -4,6 +4,10 @@ include /usr/share/dpkg/architecture.mk +ifeq (,$(filter noudeb, $(DEB_BUILD_PROFILES))) + with_udeb = yes +endif + ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386) skip_packages = -Nxdmx-tools endif @@ -34,14 +38,18 @@ $(confflags) \ $(confflags_main) \ $(vars) +ifeq ($(with_udeb),yes) dh_auto_configure --builddirectory=debian/build/udeb -- \ $(confflags) \ $(confflags_udeb) \ $(vars) +endif override_dh_auto_build: dh_auto_build --builddirectory=debian/build/main +ifeq ($(with_udeb),yes) dh_auto_build --builddirectory=debian/build/udeb +endif override_dh_auto_test: dh_auto_test -- -j1 VERBOSE=1 @@ -49,12 +57,15 @@ override_dh_auto_install: dh_auto_install --builddirectory=debian/build/main \ --destdir=debian/tmp/main +ifeq ($(with_udeb),yes) dh_auto_install --builddirectory=debian/build/udeb \ --destdir=debian/tmp/udeb +endif # oh, yuck. find debian/tmp/*/usr/lib/xorg -type f -name '*.la' -delete +ifeq ($(with_udeb),yes) # remove modules not needed in d-i rm -rf debian/tmp/udeb/usr/lib/xorg/modules/multimedia rm -f debian/tmp/udeb/usr/lib/xorg/modules/libxaa.so @@ -70,6 +81,7 @@ rm -rf debian/tmp/udeb/usr/share/aclocal rm -rf debian/tmp/udeb/usr/share/man rm -rf debian/tmp/udeb/usr/lib/*/pkgconfig +endif install -m 755 debian/local/xvfb-run debian/tmp/main/usr/bin # Make sure Xvfb at least starts up @@ -80,8 +92,10 @@ ifneq ($(DEB_HOST_ARCH_OS), linux) install -d debian/tmp/main/usr/share/X11/xorg.conf.d install -m 644 debian/local/10-*.conf debian/tmp/main/usr/share/X11/xorg.conf.d + ifeq ($(with_udeb),yes) install -d debian/tmp/udeb/usr/share/X11/xorg.conf.d install -m 644 debian/local/10-*.conf debian/tmp/udeb/usr/share/X11/xorg.conf.d + endif endif # Only read the first line, the rest of the file is used to determine @@ -113,7 +127,9 @@ chmod ug+s $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap override_dh_install: +ifeq ($(with_udeb),yes) dh_install -pxserver-xorg-core-udeb --sourcedir=debian/tmp/udeb +endif dh_install --remaining-packages --sourcedir=debian/tmp/main install -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg # Extract only the major ABI version: @@ -126,8 +142,10 @@ test -n "$$abi_xinput"; echo inputabi=xorg-input-abi-$$abi_xinput >> debian/xserver-xorg-core.substvars && \ echo "xorg-input-abi-$$abi_xinput, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/xinputdep +ifeq ($(with_udeb),yes) # The udeb uses the same substvars: cp debian/xserver-xorg-core.substvars debian/xserver-xorg-core-udeb.substvars +endif # save the configure flags so that packages like vnc, tightvnc, tigervnc # know how the package was built. @@ -139,8 +157,10 @@ ifeq ($(DEB_HOST_ARCH_OS), linux) install -d debian/xserver-xorg-core/lib/udev/rules.d install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core/lib/udev/rules.d + ifeq ($(with_udeb),yes) install -d debian/xserver-xorg-core-udeb/lib/udev/rules.d install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core-udeb/lib/udev/rules.d + endif endif override_dh_missing-indep: diff -Nru xorg-server-1.20.9/debian/rules.flags xorg-server-1.20.13/debian/rules.flags --- xorg-server-1.20.9/debian/rules.flags 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/rules.flags 2021-12-14 18:08:29.000000000 +0000 @@ -1,6 +1,6 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) -VENDOR = $(shell lsb_release -i -s) +VENDOR = $(shell dpkg-vendor --query Vendor) SUPPORT = For technical support please see http://www.ubuntu.com/support SOURCE_NAME := xorg-server @@ -18,6 +18,7 @@ --disable-strict-compilation \ --disable-debug \ --with-int10=x86emu \ + --with-os-name="$(DEB_HOST_ARCH_OS)" \ --with-os-vendor="$(VENDOR)" \ --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(SUPPORT))" \ --with-xkb-path=/usr/share/X11/xkb \ @@ -159,4 +160,4 @@ confflags += --enable-unit-tests endif -vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic" DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags --export=configure) LIBS="$(libs)" +vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie optimize=-lto" DEB_LDFLAGS_MAINT_APPEND="-Wl,-Bsymbolic" DEB_CPPFLAGS_MAINT_APPEND="-DPRE_RELEASE=0 $(cppflags)" dpkg-buildflags --export=configure) LIBS="$(libs)" diff -Nru xorg-server-1.20.9/debian/upstream/signing-key.asc xorg-server-1.20.13/debian/upstream/signing-key.asc --- xorg-server-1.20.9/debian/upstream/signing-key.asc 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/upstream/signing-key.asc 2021-12-14 18:08:29.000000000 +0000 @@ -443,3 +443,208 @@ sPnZULvcd/Rv0rq7QloCOPVJxUDz/Xvm6CWBhR9rhQdLTxRlyMWofCQ82Q== =VZ/9 -----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBE6HVy4BEADACp0EU6HZ4KyFx/qfhzNarCfnlyEoCFY08k516UaHrUOrYWPp +ukoahcceA/M3H/xM0CGIn6uiuG/Cq7+qODAZNBsr6haIbDaqSUt+953b5qCSbD65 +LBR8TXvW+9KkXPhXTKi/osYBdmsbFLeVLqU5Kd4QJqWKRLtuo0ENbFkQPVypEJk8 +Ozg2zZ2yeSQAy0pgeFh8lezI7A23yj229kFq0EEfeqHpgifIzR2hNIhS5pTSOt8V +RDapO3FpOmxPPUMsaJ1KATD92+SgbZW8evW7ffz4QUiQiFsfTSOTCaTFu8qpu6Fb +a9u/u6mTrJQGRdqDcFp3iWjEUOVr0gUdLSr3zey152PBRaC26/eLqH8PFgCerBkn +o9vso0Vr+Kh63OOQeDHATZGy7tMHbWW5AEXVkTpNoSRYr48pd6u9Z1TfWVcovNAZ +tWiFVKKxniTa4MZY2czOSyh2YahCbEt3P0DoNihy3YHhTvW1k0Os2x5yCsfpGzp3 +U8x1apfQqAyRNIa9SptLpQ7xF+lv52D9kp3XdkWXw1BFY+nmm/FqoC4tKU8AmbuB +n3SX/sYjq3Z6aLoBOmZ849G0Zp1xEYHCbfWBxvqhIc6dlPc3Y9uYV01+FlTzX9Mh +THa8p6oABrXbWRJpkOvaVbdDhXON+02Jlvawy3T3rwVkuEfEZu8akv7miwARAQAB +tCBNYXR0IFR1cm5lciA8bWF0dHN0ODhAZ21haWwuY29tPokCWAQTAQgAQgIbAwYL +CQgHAwIGFQgCCQoLBBYCAwECHgECF4ACGQEWIQQ7tjnlb4YfouhlBWkP3Wgtl0yn +KgUCYAS3AAUJFSl12wAKCRAP3Wgtl0ynKtWrEACJ80y/7+TsPU/EBviQM9SWyQpy +chWYM6XMQoyE8MweujhwlAtVr6QTm/dD87m50rw2MAILyyijrj/WGpgSGz999PRT +zJEGB0OG8mhx4SOPWis+aUwSgdCaS7phPsbqzIh4qfUuG53v1Eg5cZ2yHxBdHbrq ++YDsFq6Kq2bmIRIhuz7xLg/VicVom+lKOqeWMTQCX6NFeRn98AS/VM18dvNZbMye +DlRvqRzDi9pl6+FbHzi7ZosP1q0y8pezlVkZE7C6ESfpoxn/jWcoRp/TXGf3lkz2 +W3jqbIr0qb+lq1TxMHQGGhhVGBY/slD8YLnr1bAdSxr1Mia6vqyR3Cn2QmlFIxrh +ZZek+SroxGJBQdXUhru+RP7AKrx+SvXXNHMaCFXcEiJ+3rQiF8vQhb/tgphj0ThD +ioSTtuQ5W2rqLcwxVikqBDCtvk6X8HkEzkgbgHjYI3BgV6Re2mzA3YUolganxmrI +ldVR9R1yZkdchQbIcfZ7qjdF/td8rPAm0JH4ScEhQHwL/KxDnjZkQs7nbL3wj84B +vU+Y24abcnQx70tM7kSnlZBMqhuQDiCWMadr5HIB0CusN4FNrwjiA0d6deAQzcf4 +rRWmm/vkptvcygs1itvLwi+q5dC3cAiWAUACQ65qJs2ptRpMNiMTYVGk5j/2Vf1m +adw1Nxg/3f339vCLAbQhTWF0dCBUdXJuZXIgPG1hdHRzdDg4QGdlbnRvby5vcmc+ +iQJVBBMBCAA/AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgBYhBDu2OeVvhh+i +6GUFaQ/daC2XTKcqBQJgBLcFBQkVKXXbAAoJEA/daC2XTKcqdiEQAKT7WGDB2f4d +rI4HScQSZbI4YWcSqSfBz+dHEn3op1z6hbLNyhlmP2/OoZ2bJL/mKuFhA53++ZEZ +8qqMPvZdJ8mcdoqbB2snaj2OBjMDYP32dprKvg0YzKajnWKJdR9iR0Fa4JwRclI1 +VENoNgGit7DXbLdRTt/FmPcG+urPmWGue2DRKoKS1vJrmqY06Nq9W3Hz+1yqGHUr +1b3yZTiy3aHlEbxGpcYcUL3Altce03UrLVO820NtDKsPgPUzUpSCI7LSAFkxGKkt +2GuI2MDIANMcfwLiX6X9PZS1PaJkvVJhH60J9N8Oo8+XBXM9LdL34tLHvHlif4i+ +qH+Zjg25Z2j1js8Fbs9YPtT1jlBbQUVgnDQNuSmZHMnUU9pjuJ2wL3HH2gUKPwxD +m4ydb20hbZKVu10nWDlO096Qx0yl7UyCVsbSIGYpZXC7ikrTR+jlWBMK1aTSdN0w +YWEDDjbJ2g6jqyX6z6ei+8MRQADTeCbtJAgvLrF8E4XOiQZZ8+lwQpw8bnorvePE +6hBMXVJKgWyxYJlgphaB+dfEUj/4YNK2jrSmrZFRGKHUooby+gJ3ghwGcnacenwr +Jm518iqkf+u0+SVveyoul69UDo9w7HUPNHS7NbSG8XEp0IgVe+eQ+PtlBYAPts74 +3N7dZPcrITQ2hmUz059w17aodgUq5BMvtCNNYXR0IFR1cm5lciA8bWF0dC50dXJu +ZXJAaW50ZWwuY29tPokCZQQwAQgATxYhBDu2OeVvhh+i6GUFaQ/daC2XTKcqBQJf +uu40MR0gTm8gbG9uZ2VyIGFuIEludGVsIGVtcGxveWVlIGFzIG9mIE5vdmVtYmVy +IDIwMjAACgkQD91oLZdMpyr+exAAjn+PslziDgcQs6O+HURYum25o4sYDFKuQIJD +3IHoA9RJbbIFcuT/lokTxfGnTG3xOdDSI4gcB+cf+brrQ92ivrCnVlQKMjRkZwf1 +7ECVXVyuvugbMPWQIXZ6ojrQ2BQCYmhbVsRc9Ac7QbnFj5AAoWa7cOkTnIuh3cGO +I+Sbexui7GINfL2+Nq3uiZK6cZt0kLMH8P2Pn/3YB6WUUuEGLpGz62p+BCPJNCW6 +E84s5zuDZamPbbNWrPeIEULNIjbrjoH4KiKG5q4krGASSecvvTjBKnmN37H4U1uF +FgEDULkyS3ZcJfirnRPHJ71QzgLjBAJac7al3WS+7cAGBa/CaDqt3NFTWwXkRlZ2 +24tHgRCi+nalOzn8ugqnTj1UKe656QFcDzzmd6Uv/16IW5H82pTQUI36ZtbtQl2e +m3jWg/8vkk1IbOSU8YsqXIZ8i+phA+LJCONTf8ewIFrwkY31ro5Xh7njcsbZUaVZ +aNOIyX1j4AvuFY8EU6SUhM+neG4yb5wsozzVHYMsSCo5S7aA7qRCetwrPUTb+q2Q +SQVrmdFr3GxYbqghkM/LzcSC44TM+rpwVKkgszJaR9CszVCfQV5ogQrgcdoqyUeG +X/WrI8cq8xPNV/gJ6gJOu64NCwarZWDkey8jha1l0TO+pHoCSYWHcfqaxHIhatEu +ojPV4hO0Jk1hdHQgVHVybmVyIDxtYXR0c3Q4OEBmcmVlZGVza3RvcC5vcmc+iQJW +BBMBCABAAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AWIQQ7tjnlb4Yfouhl +BWkP3Wgtl0ynKgUCYAS3BQUJFSl12wAKCRAP3Wgtl0ynKrV6D/9HFFisHoHoKGzd +hHIDJpto5pRYFLRPQg3FuxiJgXmNnP9wUa59ELMNtk16HZEgQedqcoolM3GA16Nj +CA2rtu6mvhqoZs7l6zdSSBSR4Y3RpI7NqkfavEoOv4NNGanUmlEkB2u+7fsDBYUN +tYkh17Huppye0vENtrmDc6XDULCoQ1qwUH6gTHhsZagV+MjyxL8iW3aH+aTWeQFu +g7oVXVGviSiWbkUXB0N4dXX0UYZiiTTOBkX2WrQJZBrMP93HFhe3GzHFHQlXEZYu +8ZEut2i+9NgTqfbWlmfKP1t2E5Q90ouMeqh/wtcVm/Cv9G3tuP2P8urOsLBMM+Dj +R0nIz9mS7261Jf8QV3AMT9uA8a1VZkSe5bKNfDZkJ5HTNhUu+uK/aDY1WfTOLZeU +RGkdEtOsnI88pCZq1NxhBRuUg662LDGVifsNBMAXPOypD4Y6a9UolOaGxkXduPqA +4deWvWZ8k0jKLQQVoVTU1OmeRcpMzKbSFWLpf2+KJUslUnWy+GVnZ29hcduwcXqN +me8tS85bjTJJcvKbMoU78v5JlimN5CxuowHHtAgE+2SFaCyDU/zxoNgtnttT0Fm/ +Vy2mqf06yA1Ee8wH7TVeg10NHBY5f8qlSx3QnEt20mLejiMgr8xwc2c7yq7/mj3P +t9TB344+q9wLmfLeX8uGpRGrLnYTYLQhTWF0dCBUdXJuZXIgPG1zdHVybmVyQGdv +b2dsZS5jb20+iQJUBBMBCAA+AhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4BAheAFiEE +O7Y55W+GH6LoZQVpD91oLZdMpyoFAmAEtwUFCRUpddsACgkQD91oLZdMpyrEFxAA +vgEGRDrWkCvu02ylK7id7hqqdN42/MDwEMGJxLhAVa5zu5llAODlUDRZ6Diiib2T +1uECQMNhGHc7m2QmJhNzvBjojX9nkVS47CmsqA0av5Cv0DYe9vIy4csTa17QwFyL +0CY2AFrrY8sHo5IKzfhEWCZM3CZiaaJQF4gqGKtYg8q0DVvoNyzD4fcgwEGGfqQJ +Lt+u6ciKAx6Tl6UgNR1kHyAHM4LVKU81h/Qe1zOLp73YC0oaxBJy6vbnjIyRL+HJ ++fJV/NnGLv8wL0nuA7pTBbEdAd7ruxQJe96hx5dn/jY/Lx57QXtN592yKkp04SAw +Jk/h1mHe7y1DiDlo2iMm2ogVCKh9XK0x6sdRfS+oOY0n113/iFDXNivRzhXt9laR +cgXgVDGSb/tZQgLUPmNEM4xoqXzmDtjROh3JE93dqUBZmnolRss7LsAPN8X1wH9X +QNtPcVQQbaMU8HrMqzGVbq5izfzsUU0sLni/WRlgOziE8//7u4wmlUjsXXNbVC7y +1HqF/LV9+CQ4KJassjX8PHCbparrcI653xoGIARuz6nA22cZfyhyC2ABxikt5eO5 +WStgkjENsFaVwRoam8cdwkEs58dRSN0MFDgWoVUt9Qw2UHpLZGcFyedP61DwI1CM +K126e8LNtgDAZM8yCh29WB3x4+fjudSA4z9Jhw930s64MwRbVtM4FgkrBgEEAdpH +DwEBB0BZ1luE4xeMobpJZcLnvHqW5ln69aBBrxQM36SiV0h6JIkCXwQoAQgASRYh +BDu2OeVvhh+i6GUFaQ/daC2XTKcqBQJgKb7nKx0BU3VwZXJzZWRlZCBieSBuaXN0 +cDI1Ni8weEY0NUMyNDMxRUY4QjVBNjYACgkQD91oLZdMpyo90A//U1pUOobwqUZB +KrFjtJmw2w2bohtCrSscARPi7HIBpnafbIjD1rMwnQ9xuFYAEI0aF31culnVAy5Z +HXnygRvLR1UaLh7oAOCVNrOPTfTgIh3ugNacK1AGC2HMgQz08qb+Bx8eZLnM9o4f +CnETFAHQWGyixJDKuTczeRRL3OHH76m3Lflg+Udci/s91cHL68hUkQhgHN02zy/z +Ib9tCD12p0vplm4d5/yH0D9fJTFGH6DXVMDF02CDz08Sh/JUsdc0BjH/PcKZE3z8 +r6p+l0oNydIRsASxZfoyG6CHMbsxone7duDOkRjKwUCz2Of8SdroZrSdlXXBnZ7W +UpcqBjkjrNgDDn42rakFvymmtZVLWh3lwEK1vT6m9gmXvNOZe5w+ysqHwq6ZO4Ru +ol6es0QvWQ/qFRX+Py7oJnZZUX6YBbrB9OuQfJQZTxnSQ3H/xAA7mMlRspo7l8v9 +wX+N2fPrNorjkENTPgQFFFQpzDGZjC2TBQ6D3EPcMInu8FMkAckX2QhO8n9CKm0e +aITX5sVadQL9uVIO3AFRTRmzaFwDLND18H/VZjpIKXt6mC3V5748SUyS7+XU5kB2 +uOE+49hjcqCEaFZHbXfazM/7yyn9qiINHZqcra3MNluXR91pNY3wLF8RmR4A3duV +pOQzTHSX5zwHoWwRQ1sw+RCRz1r6BW+JAxQEGAEIACYCGwIWIQQ7tjnlb4Yfouhl +BWkP3Wgtl0ynKgUCYAS3UwUJCFn5ygDiwBYgBBkWCAB9FiEEs5abTw75fXIeY469 +nIJaZgXUC74FAltW0zhfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl +bnBncC5maWZ0aGhvcnNlbWFuLm5ldEIzOTY5QjRGMEVGOTdENzIxRTYzOEVCRDlD +ODI1QTY2MDVENDBCQkUACgkQnIJaZgXUC778XgD9GjetiAlsrlPf923+y8JEwKlr +C72kQYZBqZzFW/sEnowA/jsf8UuvIn4sfyyvPuPlIVqVh6T/TgL+y/FKAG0hpysN +CRAP3Wgtl0ynKpHwD/9K6vW4tx8tKt6aZp0SvBlhUfBKgDSIQYESqoG3zylvymSU +V45B2zgjaSdp5hBDZEtG1Fz8AUB4F7VGy37e+GrqIzNZEgDaGpz5C4x2JPZsquPT +1l/ket+kh0LhlckT/TZPLrtMJTRFnw4VHQkSX7grhvKnFKEjZ/IXe5d5bmIvbTlz +GozRCx529u9DAXN0FbO41zPot+cmVdObIa9Cc+ZS3BENCR645YztE2ypoxsXBCNB +7fveQDUG7zV2ahfEUFyD5n+XttyDwqnyn6vtKO0myaguqzTAwFIqt5pWgYJDUfFu +Jc9nVuOTnC7tqu2SzzVvD61egEtwsLFO6f2wtSUP7yGgVpHjQpoUxMn1o5MqFHNh +CqCZLjNIgzAEEgHPMOMvb3zrfQlx084DTIBnAgJ/0HNjq5nWO2x8DMBhPXDUz7CX +pkVHQ+uN6QjMwL5dzMV1HnZbhLSFhUy6PF5oje05xupQ1DsHfhOG5gqf17ofchLh +L3z5/0mSEKOJDYmvs0YlbUCFi4D9I/Q7Hs3G+/J/1t7MiC8e71rOyjHguWOqyQHw +wdeIwl4nUvxcYik2PGfRmQ2m37bIU6d4IXxCQb6l9rgftwf1LNXmXcvmqUKPO7FQ +dAAzXTyAHK2MogJdn01o/GI7TRLyCbE8ezLCveSu8Ef6h/0vSzE9zmLbJad0uLkC +DQROh1cuARAAq+XB6l6oZuSYo5MdyEdjVyc73kEeeU4FuJ+VT5pu8pLNHjOb9Agx +xyfsTSEawC+sNKd20Pa9KxUcZsIMiSXRY2uv7Pxog/kWs6QPIsg7ysI2v4LEq3hy +Xu+nFDQI/8Sur8zqN4a8HAV9vJBwzUz8/rFUkCTUACPS2zfxzYNQ7PXUVCYwPLRn +BvzfaZ9c7qUzOcqRZ0CX1CqXW87hwfldafjlX3ueqeyDV8gryxOi/cOvb1GJblUq +4+5CBPWkjO88Kw305//URvyfCAdI/3HYKpQdKyiYFBu9mgkjBt5ZbZzOLLb+MqVu +wGcb/13hfYrJL2M4iCc9Qt/Q2gSTqqCGpl6HURxx6BurpV0rDPhMjeVxf2kSdT2f +IB4gBy8REts1bBYgAx3olyuIn9IGSUFQUSf2ifhB/t7Hrcqg7EOOPnN7ZNi7Lt2p +mtwirSqaiwxXw5xpjVvPt4VB2cVPoeDWr7I58qm2ee3QAk12BEv/vaExTlrcKsXW +y1cyC2Ut/PbyLzX5Qj3CZEEU268V99O1LwzqxHJtturVYcnScLldJ05+NNFGMcuj +I2gnJ1VEwtpxTxFKl1E/uv7FiMOlpSYia7OL5lgX9ib8+3tGIqCuO1eqPJLsX12S +YTtW3fGM+fjmXB+SRi6b7XoVBM8iE1ZuaqcWzdZvuk3oz+BzxVtfOQ8AEQEAAYkC +PAQYAQgAJgIbDBYhBDu2OeVvhh+i6GUFaQ/daC2XTKcqBQJgBLcoBQkVKXXWAAoJ +EA/daC2XTKcqq2gQALklGvNvjJGz+C1SbVAOdIbJv1KFsLKeA4hqVNP99057I2GO +EGfyeUbSFTjTeRKmjDP2iFlqLPaqgciLcJpT3J5sCO+g4qPdP+S3I3ZL15tvg2lv +dARiHKGLs3JZU9jhisuBV9YncdxNrKyC6kktiMzbuI1yF8krLN2wImqPTB1xkqhj +A0UlO9YsapYVF+ULHZ3ovljF9cC05HmPMJkW7peANE9/x+2/oUEKfjpJkmg1Lbh3 +bxLmnDEmkSAOHZsysIzkJLLF0Aehjx8HeMyCezCgcQIztnyQ/DQJs2BzL7xxnGES +1akVxBEDvqzGAyUaE99miwwvIINeRlE7Ypy62RikrrV9akTlF9hqirM0l0PgZaYm +BL0BuLlo5nS/+C1ZdcfWi60g+kFJJaESfDQPrrqXPB5cUKbthsZSzP1pOkFWtLWV +Z7MLogKio1dC9tXGsgXxgVwWCTxBz9AC69Eimk+XvEva1dHoVgP7K0evwefwzCCh +z5NM/Qaq5JvpcmF7NsKk5VFPAKmqO5bfqv7kqmkHICl23JmA18QnXEeWqKyjhxD4 +CuVZTHsfhm6/ZWjku1via01H8sSWdoy54KNG+o+C/PsZV88k5xh4Q3eCAbhKTCtI +TcEDfWh747iZQEQqEwrbB/W22qXpFEYhQVWi5Y5wdU2Onzs3OKz74WabHKdTuDgE +W3PBDBIKKwYBBAGXVQEFAQEHQHJzyBXmAHLsRI9rvIjq8QjS2th0emMplesdMYD5 +Na9oAwEIB4kCPAQYAQgAJgIbDBYhBDu2OeVvhh+i6GUFaQ/daC2XTKcqBQJgBLdT +BQkIPQv2AAoJEA/daC2XTKcqifUP/j3okRd2BtwrQ8du8pl3ilmmMcSP7h2mSWcv +Nx82eEurQRjJISrS9lSOTJ8kOMatkDRGM9gO2NHuI4VAX8PuFYCY5+yWN8eEdgT/ +VrQgGBbjMl7amiG0QaRH4DLFSDtHSU9zZyUSkupVbvw+wEyfYZVzZTMhi6v2E7SC +dH+/cyF6PsR+whRp5y+zNaSTWA2fBF0fU6qYV5oy8XgBVj4PnX6w8kaI2VvzO2Iz +ApF8bsUGw+5uNLYyWW/yaAurtMUDgMiMKJ1sBmta5iHuovLLjD2ZtRbu4cLMBfTC +DLe41YtFC7loeK16Rzv6BfV/dw+FBhMm10qChd7Viryy8HwxTdmGpgs50IgnZVkb +JN+OuDw8jpCtH2fBFYQK+f0P1q6H6GbZCnNdQKl/yTXiixlA0F9VY1EDAYbiB+U/ +vOQ5zUompSivqHyd1VESfLsmmVLUB3OZ5KTHVT/mfjhsthChvf4HbYOpfpvvEpD6 +G/d1MiQtg0Bfm1V2gIsWOp1BqUz346YuYBTUxFtgiEjMnkjq5zcpte567rsSfmXj +Gei1W6qqWHIQYg7nW+GcDsCxsSOIaTZE1CHlRvNDu2GovwJUDK9aDvBF3zCRI9kE +DTlS2gZz2LMSHTFjdinnWZCWOxS+useZpNL6ffBepCWMk2zZT/7s065ulM1T28EN +gq12oDCauFIEYCm+mxMIKoZIzj0DAQcCAwTUBOFEjrepjmk+zptop4vat1tmwDJw +JyhXn+H54/z6SF596cbXxXrZMjAmzu2p827SyjhkqK3LlTSug4/TgiBPiQJWBCgB +CABAFiEEO7Y55W+GH6LoZQVpD91oLZdMpyoFAmArH+4iHQFTdXBlcnNlZGVkIGJ5 +IDB4RUQyRUQxOUY4NUIzNjgyQwAKCRAP3Wgtl0ynKuQ/EACGp3HF5BHUP1CzooFY +PfYZ2dvJIh1gk1l3x6oXznNoL0blgV7buVEfx3wOwbTNkOD1ti4subsnzomr7bVI +iO4PWEfEsN3Rwx6UbZTC1brczXr34nsCX9lo8MUQOamq6QWLxO8mRVi5t5sCSgoR +0daiEedsgd80t7mbomdDRRjf5bPJCaWJFSYTOTr9+RqC0cioX3wyZU2O+/uBvr1g +qEltUpTL915GeU7L+uA4s655pD6J42mM4Hpw+rVjQ8mSVcR0g/fnQjGjEOyhe4Bi +I8Jwcaq+z0W0vwlylrgC4r493fRvSBJSI4mfNLJCdtd7p4lRE6URcKJb7mPsWt4M +WHpsozmcCAawzo+I+sAk/UXKAbmrlcqG2gk7KcV1WgofPm8oF8b2tNSjsa3qFUcZ +mEVjhpcj/iUiwctKjYOwJUH6olrXPG0I+/N+/2x3Me94iF9SQ4rHaj4+PWoqpiqK +P5nARXb++szZWVeSPlzZKSQBAH4RTFyYPrVtocRXGrVbWe7c0PpWnMEVzxfK1kfk +gs+vt98jYNmCayesV3N/S5dop7aoB7ZqfeGXAh29mVkkszdEr4LFAc+4VMI8gS4w +DYfQ1Kd3jQIDAAmuAkxCDoka0XHK2T9J7nlfc7I86mXWLHPsxgqCWhmEyhv96yw+ +etC9itZwcL8YnzsOcyqjaldMZ4kDFAQYAQgAJhYhBDu2OeVvhh+i6GUFaQ/daC2X +TKcqBQJgKb6bAhsCBQkDh/1sAOIJEA/daC2XTKcqwBYgBBkTCAB9FiEEVTuaH3KL +6lX4Y18H9FwkMe+LWmYFAmApvptfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlv +bnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU1M0I5QTFGNzI4QkVBNTVGODYz +NUYwN0Y0NUMyNDMxRUY4QjVBNjYACgkQ9FwkMe+LWmZ9qgD+LDoNHHjUtt57Nn5M +RNn6Hhk+cx5w9IquQWwQK/iTcOwBANsy31Qt109SOQycoSVblX6FDVea8cGI5S7B +e/Z54D2tClwQAIf2mFJt+r/OO4rwF4Ql+QqShcVwDbsuyo6xXlNDb5fcgqOkHQGS +pHMgsAJVt+LHXHYO5xofbPVA79OAOnKqZ2rpihnXDVBdKZ+06ml4DEz6tWJ5W+7f +8fISHmLVamFmk7PZPqQLqnjAXyY2O1zBDJxJTfY2TfAic803NycpEal0/+xqc5PC +t30KbGgAf2lW0WiayCJZQGw9goCPv8OFAxvZwGFM3bnZENIsy8YANoqcx6QJIwtD +lPII/gbub68d2Buul1Qj8i69D9TDl6PNpRFMmoq3n6zQTzUphi7y4FcaG58vA1N8 +gaHXqigSRjrB6AaSZG9Te/mSJZW7Pn6CZrbiDtnUtqfhRYs0wHNDFhAsVngAA6Jx +VukRvSjUtO8oFbxrXF7m1Dah2hHj/qWeBBBTR5OHbDuQmQDGVcX05I3Q0mctY1Hw +T7ucpmjUiFiXYTCI3g8OiSCc9qrxgF4zWwjqVuwFvlGkKhH/7IpfFFRgkR3nt021 +xnqZxC/23BH2mXDjPvUWuguCRP/YLrl8Tpn+jeHscKOOFvCClDQnxBgyBqWCZTKR +blWJ3vPZl8zHJ7AiNJLZJZE98bmQ9To6+M24NoY9I6QNBQFDpT0f1vcu7Za1VqLk +9zBT4blK6SkrxFwE3hLQH1QulbXYKIJ1j4GD7L4xBN0PFIQjjq1Dw6W7uQENBGAq ++3ABCACmXnZUBQd5ybaGKpt4CpIAqknCap1Bt90DAJtIMdMhMTuIP9YNxmxovdNp +X4FOan5LpqqDWOxb+GD68fr03jFNFpPGWLGdL/ngSgwCTiKqBxgixMqkBPb0PtyN +RyL13z7w0QgHXu8PvXe3GMszr+lX/U3Y10+YpJ5oilIvIgsz8B1FBglULFqdOgEX +dyHC3wHj+dh/Luwcx6pauaTkeWwAwDg630lKxsKNOz/ORbayDAycrUN8ZNRfy13I +eMz1CB6ZUjeDI8L6t5SfGHJ5o17F1KEcvwBeErfecRLtnCEA9IRk3KcjrRb8n7fe +gz/y3lDzg4M6w7NhJ6XH9W4xhzrJABEBAAGJA9IEGAEIACYWIQQ7tjnlb4Yfouhl +BWkP3Wgtl0ynKgUCYCr7cAIbAgUJA4bAQwGgCRAP3Wgtl0ynKsDUIAQZAQgAfRYh +BL7vSUtbKR6zAKJ/E+0u0Z+Fs2gsBQJgKvtwXxSAAAAAAC4AKGlzc3Vlci1mcHJA +bm90YXRpb25zLm9wZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCRUVGNDk0QjVCMjkx +RUIzMDBBMjdGMTNFRDJFRDE5Rjg1QjM2ODJDAAoJEO0u0Z+Fs2gslqAH/RmXBFn3 +UrNkq2NTC0v1XcYRU/N47rHXprCQz3UMjTylJLv0onsK4gn+P+vY+/ndpC4Jte47 +aLCcWr+Qdd7F5FTSOhFsl+TbbrkKmvJP7ApeeA5LoCFEY8zZzwzf4IaziL0xi/6h +DOCC0NCm0NOMnjDfYwfxoE4PDzRnBryOn5/0bD1mgIKKIwd5LgA4R6fsPG4NhKgF +9M8qDthOVwExm1F6vlgxFCIiO8ColuG/YZBN/h+ij5LSE0dgjKEhk9EQGJA+WNqE +H9vrZ12HHWz6fLBE5iTBXeLKy8UQA0wWR+7Kx8W+7u9jJKKEVgdaLbZqucZ63QPR +Lr8KRdL+SpgaV8cyhhAArKxA8KqsXJ5wf2PCQY8qTTx5lxl6NzvDmq7+SBKL8whz +cLJNWLZ+Tc+XlZUUsv3ujohjAgIia+9a8IcGih5Vg+xyRQbqgNNPcJ0rZ2fUb26s +K+ngiWiCJi2J2nIMLTR81ToI58AEwLXrgoSMisrUTtUSmBNRU5TbOU72eySLioKD +Z9OCKZYT7kQFTJwkXMI3JBfV+bdBLfKXavQA7F+SElKPUGmqGfhSFFs63jNe4MAH +2TddOUNocgfYYkJaI03JOohI38fubX2BgfVt0rAfG/RyFb6bShiC0TATyH04rdFn ++mnJO+81K8cYBvmsBrupoJz36NksBW5hiVuBdZKzG11YkwQHMEvq4lmMw4ifwr9/ +6LJudze2lGTAiBg3QsSnJ/BmzLtewQY1+v41ERa3L1qVOdcA+eSRMO4xJe5KKnLO +mH8JRWKDAF3fpI92ZkFZlNViRa2n/98UFMV9Yc8EOerRDOqpdfxaPJgrGH1az88R +MAf444sEnUL9tBUjIMwELQreK0CU5frVrC/lClPCre5xU4YswIPgburs9GP3umn4 +ODByFEiWwb92zDjCpGxZjdJXouGWzlEryRWEiXHt/sFILZfBulUkVgwv5fLDBXc6 +76qS3VJ3Bs9OlB0zmpT7l8NdQh77UdPTRy469+7JMtpKd1nTo9ECa0/mX0vQnKc= +=q+02 +-----END PGP PUBLIC KEY BLOCK----- diff -Nru xorg-server-1.20.9/debian/xserver-xorg-legacy.postinst xorg-server-1.20.13/debian/xserver-xorg-legacy.postinst --- xorg-server-1.20.9/debian/xserver-xorg-legacy.postinst 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/debian/xserver-xorg-legacy.postinst 2021-12-14 18:08:29.000000000 +0000 @@ -27,7 +27,8 @@ ALLOWED_USERS="$RET" fi if [ -n "$ALLOWED_USERS" ]; then - NEW_XWRAPPER_CONFIG=$(tempfile -m 644) + NEW_XWRAPPER_CONFIG=$(mktemp) + chmod 644 "$NEW_XWRAPPER_CONFIG" if ! [ -e "$XWRAPPER_CONFIG" ]; then cat >>"$NEW_XWRAPPER_CONFIG" << EOF # Xwrapper.config (Debian X Window System server wrapper configuration file) diff -Nru xorg-server-1.20.9/depcomp xorg-server-1.20.13/depcomp --- xorg-server-1.20.9/depcomp 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/depcomp 2021-07-29 18:48:33.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru xorg-server-1.20.9/dix/devices.c xorg-server-1.20.13/dix/devices.c --- xorg-server-1.20.9/dix/devices.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/dix/devices.c 2021-07-29 18:48:13.000000000 +0000 @@ -2261,6 +2261,9 @@ REQUEST(xChangePointerControlReq); REQUEST_SIZE_MATCH(xChangePointerControlReq); + /* If the device has no PtrFeedbackPtr, the xserver has a bug */ + BUG_RETURN_VAL (!mouse->ptrfeed, BadImplementation); + ctrl = mouse->ptrfeed->ctrl; if ((stuff->doAccel != xTrue) && (stuff->doAccel != xFalse)) { client->errorValue = stuff->doAccel; diff -Nru xorg-server-1.20.9/dix/Makefile.in xorg-server-1.20.13/dix/Makefile.in --- xorg-server-1.20.9/dix/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/dix/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -590,6 +590,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -907,7 +908,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1073,7 +1075,7 @@ uninstall-am: uninstall-dist_miscconfigDATA -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-generic clean-libtool clean-noinstLTLIBRARIES \ diff -Nru xorg-server-1.20.9/doc/dtrace/Makefile.in xorg-server-1.20.13/doc/dtrace/Makefile.in --- xorg-server-1.20.9/doc/dtrace/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/doc/dtrace/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -531,6 +531,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/doc/Makefile.in xorg-server-1.20.13/doc/Makefile.in --- xorg-server-1.20.9/doc/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/doc/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -560,6 +560,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/dri3/Makefile.in xorg-server-1.20.13/dri3/Makefile.in --- xorg-server-1.20.9/dri3/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/dri3/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -558,6 +558,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/exa/Makefile.in xorg-server-1.20.13/exa/Makefile.in --- xorg-server-1.20.9/exa/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/exa/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -567,6 +567,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/fb/Makefile.in xorg-server-1.20.13/fb/Makefile.in --- xorg-server-1.20.9/fb/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/fb/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -640,6 +640,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/glamor/glamor.c xorg-server-1.20.13/glamor/glamor.c --- xorg-server-1.20.9/glamor/glamor.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/glamor/glamor.c 2021-07-29 18:48:14.000000000 +0000 @@ -654,7 +654,8 @@ * cached IB. */ if (strstr((char *)glGetString(GL_VENDOR), "Broadcom") && - strstr((char *)glGetString(GL_RENDERER), "VC4")) + (strstr((char *)glGetString(GL_RENDERER), "VC4") || + strstr((char *)glGetString(GL_RENDERER), "V3D"))) glamor_priv->use_quads = FALSE; glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &glamor_priv->max_fbo_size); diff -Nru xorg-server-1.20.9/glamor/glamor_egl.c xorg-server-1.20.13/glamor/glamor_egl.c --- xorg-server-1.20.9/glamor/glamor_egl.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/glamor/glamor_egl.c 2021-07-29 18:48:14.000000000 +0000 @@ -350,6 +350,9 @@ */ glamor_egl_exchange_buffers(pixmap, exported); + /* Swap the devKind into the original pixmap, reflecting the bo's stride */ + screen->ModifyPixmapHeader(pixmap, 0, 0, 0, 0, exported->devKind, NULL); + screen->DestroyPixmap(exported); return TRUE; diff -Nru xorg-server-1.20.9/glamor/glamor_rects.c xorg-server-1.20.13/glamor/glamor_rects.c --- xorg-server-1.20.9/glamor/glamor_rects.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/glamor/glamor_rects.c 2021-07-29 18:48:14.000000000 +0000 @@ -27,8 +27,10 @@ static const glamor_facet glamor_facet_polyfillrect_130 = { .name = "poly_fill_rect", .version = 130, - .vs_vars = "attribute vec4 primitive;\n", - .vs_exec = (" vec2 pos = primitive.zw * vec2(gl_VertexID&1, (gl_VertexID&2)>>1);\n" + .source_name = "size", + .vs_vars = "attribute vec2 primitive;\n" + "attribute vec2 size;\n", + .vs_exec = (" vec2 pos = size * vec2(gl_VertexID&1, (gl_VertexID&2)>>1);\n" GLAMOR_POS(gl_Position, (primitive.xy + pos))), }; @@ -81,9 +83,14 @@ glEnableVertexAttribArray(GLAMOR_VERTEX_POS); glVertexAttribDivisor(GLAMOR_VERTEX_POS, 1); - glVertexAttribPointer(GLAMOR_VERTEX_POS, 4, GL_SHORT, GL_FALSE, + glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_SHORT, GL_FALSE, 4 * sizeof (short), vbo_offset); + glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); + glVertexAttribDivisor(GLAMOR_VERTEX_SOURCE, 1); + glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_UNSIGNED_SHORT, GL_FALSE, + 4 * sizeof (short), vbo_offset + 2 * sizeof (short)); + memcpy(v, prect, nrect * sizeof (xRectangle)); glamor_put_vbo_space(screen); @@ -156,8 +163,11 @@ bail: glDisable(GL_SCISSOR_TEST); - if (glamor_priv->glsl_version >= 130) + if (glamor_priv->glsl_version >= 130) { + glVertexAttribDivisor(GLAMOR_VERTEX_SOURCE, 0); + glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glVertexAttribDivisor(GLAMOR_VERTEX_POS, 0); + } glDisableVertexAttribArray(GLAMOR_VERTEX_POS); return ret; diff -Nru xorg-server-1.20.9/glamor/Makefile.in xorg-server-1.20.13/glamor/Makefile.in --- xorg-server-1.20.9/glamor/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/glamor/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -612,6 +612,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/glx/glxcmds.c xorg-server-1.20.13/glx/glxcmds.c --- xorg-server-1.20.9/glx/glxcmds.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/glx/glxcmds.c 2021-07-29 18:48:14.000000000 +0000 @@ -473,8 +473,15 @@ __GLXscreen *pGlxScreen; int rc; - if (validGlxDrawable(client, drawId, GLX_DRAWABLE_ANY, - DixWriteAccess, &pGlxDraw, &rc)) { + rc = dixLookupResourceByType((void **)&pGlxDraw, drawId, + __glXDrawableRes, client, DixWriteAccess); + if (rc == Success && + /* If pGlxDraw->drawId == drawId, drawId is a valid GLX drawable. + * Otherwise, if pGlxDraw->type == GLX_DRAWABLE_WINDOW, drawId is + * an X window, but the client has already created a GLXWindow + * associated with it, so we don't want to create another one. */ + (pGlxDraw->drawId == drawId || + pGlxDraw->type == GLX_DRAWABLE_WINDOW)) { if (glxc != NULL && glxc->config != NULL && glxc->config != pGlxDraw->config) { @@ -641,10 +648,11 @@ glxc->readPriv = NULL; return __glXError(GLXBadContext); } + } + glxServer.setContextTagPrivate(client, newContextTag, glxc); + if (glxc) glxc->currentClient = client; - glxServer.setContextTagPrivate(client, newContextTag, glxc); - } if (prevglxc) { prevglxc->currentClient = NULL; diff -Nru xorg-server-1.20.9/glx/glxdricommon.c xorg-server-1.20.13/glx/glxdricommon.c --- xorg-server-1.20.9/glx/glxdricommon.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/glx/glxdricommon.c 2021-07-29 18:48:14.000000000 +0000 @@ -27,6 +27,7 @@ #include #endif +#include #include #include #include @@ -322,6 +323,15 @@ __DRI_DRIVER_GET_EXTENSIONS, driverName) != -1) { const __DRIextension **(*get_extensions)(void); + for (i = 0; i < strlen(get_extensions_name); i++) { + /* Replace all non-alphanumeric characters with underscore, + * since they are not allowed in C symbol names. That fixes up + * symbol name for drivers with '-drm' suffix + */ + if (!isalnum(get_extensions_name[i])) + get_extensions_name[i] = '_'; + } + get_extensions = dlsym(driver, get_extensions_name); if (get_extensions) extensions = get_extensions(); diff -Nru xorg-server-1.20.9/glx/Makefile.am xorg-server-1.20.13/glx/Makefile.am --- xorg-server-1.20.9/glx/Makefile.am 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/glx/Makefile.am 2021-07-29 18:48:14.000000000 +0000 @@ -81,7 +81,7 @@ unpack.h \ xfont.c -libglx_la_LIBADD = $(DLOPEN_LIBS) +libglx_la_LIBADD = $(DLOPEN_LIBS) $(top_builddir)/Xext/libhashtable.la libglxvnd_la_SOURCES = \ vndcmds.c \ @@ -90,4 +90,6 @@ vndservervendor.h \ vndservervendor.c +libglxvnd_la_LIBADD = $(top_builddir)/Xext/libhashtable.la + EXTRA_DIST = vnd_dispatch_stubs.c diff -Nru xorg-server-1.20.9/glx/Makefile.in xorg-server-1.20.13/glx/Makefile.in --- xorg-server-1.20.9/glx/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/glx/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -113,7 +113,8 @@ CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = -libglx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libglx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(top_builddir)/Xext/libhashtable.la am__objects_1 = indirect_dispatch.lo indirect_dispatch_swap.lo \ indirect_reqsize.lo indirect_size_get.lo indirect_table.lo am_libglx_la_OBJECTS = $(am__objects_1) clientinfo.lo createcontext.lo \ @@ -134,7 +135,7 @@ am_libglxdri_la_OBJECTS = $(am__objects_2) libglxdri_la_OBJECTS = $(am_libglxdri_la_OBJECTS) @DRI2_TRUE@am_libglxdri_la_rpath = -libglxvnd_la_LIBADD = +libglxvnd_la_DEPENDENCIES = $(top_builddir)/Xext/libhashtable.la am_libglxvnd_la_OBJECTS = vndcmds.lo vndext.lo vndservermapping.lo \ vndservervendor.lo libglxvnd_la_OBJECTS = $(am_libglxvnd_la_OBJECTS) @@ -599,6 +600,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -683,7 +685,7 @@ unpack.h \ xfont.c -libglx_la_LIBADD = $(DLOPEN_LIBS) +libglx_la_LIBADD = $(DLOPEN_LIBS) $(top_builddir)/Xext/libhashtable.la libglxvnd_la_SOURCES = \ vndcmds.c \ vndext.c \ @@ -691,6 +693,7 @@ vndservervendor.h \ vndservervendor.c +libglxvnd_la_LIBADD = $(top_builddir)/Xext/libhashtable.la EXTRA_DIST = vnd_dispatch_stubs.c all: all-am diff -Nru xorg-server-1.20.9/hw/dmx/config/Makefile.am xorg-server-1.20.13/hw/dmx/config/Makefile.am --- xorg-server-1.20.9/hw/dmx/config/Makefile.am 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/config/Makefile.am 2021-07-29 18:48:14.000000000 +0000 @@ -38,23 +38,20 @@ bin_PROGRAMS = xdmxconfig vdltodmx dmxtodmx -xdmxconfig_DEPENDENCIES = libdmxconfig.a xdmxconfig_SOURCES = \ xdmxconfig.c \ $(top_srcdir)/hw/dmx/dmxlog.c \ Canvas.c \ Canvas.h \ CanvasP.h -xdmxconfig_LDADD = -L. -ldmxconfig @XDMXCONFIG_DEP_LIBS@ +xdmxconfig_LDADD = libdmxconfig.a @XDMXCONFIG_DEP_LIBS@ xdmxconfig_CFLAGS = $(AM_CFLAGS) @XDMXCONFIG_DEP_CFLAGS@ -vdltodmx_DEPENDENCIES = libdmxconfig.a vdltodmx_SOURCES = vdltodmx.c -vdltodmx_LDADD = -L. -ldmxconfig +vdltodmx_LDADD = libdmxconfig.a -dmxtodmx_DEPENDENCIES = libdmxconfig.a dmxtodmx_SOURCES = dmxtodmx.c -dmxtodmx_LDADD = -L. -ldmxconfig +dmxtodmx_LDADD = libdmxconfig.a EXTRA_DIST = \ test-a.in test-a.out \ diff -Nru xorg-server-1.20.9/hw/dmx/config/Makefile.in xorg-server-1.20.13/hw/dmx/config/Makefile.in --- xorg-server-1.20.9/hw/dmx/config/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/config/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -127,15 +127,18 @@ libdmxconfig_a_OBJECTS = $(am_libdmxconfig_a_OBJECTS) am_dmxtodmx_OBJECTS = dmxtodmx.$(OBJEXT) dmxtodmx_OBJECTS = $(am_dmxtodmx_OBJECTS) +dmxtodmx_DEPENDENCIES = libdmxconfig.a AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = am_vdltodmx_OBJECTS = vdltodmx.$(OBJEXT) vdltodmx_OBJECTS = $(am_vdltodmx_OBJECTS) +vdltodmx_DEPENDENCIES = libdmxconfig.a am_xdmxconfig_OBJECTS = xdmxconfig-xdmxconfig.$(OBJEXT) \ xdmxconfig-dmxlog.$(OBJEXT) xdmxconfig-Canvas.$(OBJEXT) xdmxconfig_OBJECTS = $(am_xdmxconfig_OBJECTS) +xdmxconfig_DEPENDENCIES = libdmxconfig.a xdmxconfig_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(xdmxconfig_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -618,6 +621,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -655,7 +659,6 @@ $(GLX_DEFS) \ @DMXMODULES_CFLAGS@ -xdmxconfig_DEPENDENCIES = libdmxconfig.a xdmxconfig_SOURCES = \ xdmxconfig.c \ $(top_srcdir)/hw/dmx/dmxlog.c \ @@ -663,14 +666,12 @@ Canvas.h \ CanvasP.h -xdmxconfig_LDADD = -L. -ldmxconfig @XDMXCONFIG_DEP_LIBS@ +xdmxconfig_LDADD = libdmxconfig.a @XDMXCONFIG_DEP_LIBS@ xdmxconfig_CFLAGS = $(AM_CFLAGS) @XDMXCONFIG_DEP_CFLAGS@ -vdltodmx_DEPENDENCIES = libdmxconfig.a vdltodmx_SOURCES = vdltodmx.c -vdltodmx_LDADD = -L. -ldmxconfig -dmxtodmx_DEPENDENCIES = libdmxconfig.a +vdltodmx_LDADD = libdmxconfig.a dmxtodmx_SOURCES = dmxtodmx.c -dmxtodmx_LDADD = -L. -ldmxconfig +dmxtodmx_LDADD = libdmxconfig.a EXTRA_DIST = \ test-a.in test-a.out \ test-b.in test-b.out \ @@ -1071,7 +1072,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -1199,7 +1201,7 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: $(am__recursive_targets) all check install install-am \ - install-strip + install-exec install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles check check-am clean clean-binPROGRAMS \ diff -Nru xorg-server-1.20.9/hw/dmx/config/man/Makefile.in xorg-server-1.20.13/hw/dmx/config/man/Makefile.in --- xorg-server-1.20.9/hw/dmx/config/man/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/config/man/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -539,6 +539,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/dmx/config/parser.c xorg-server-1.20.13/hw/dmx/config/parser.c --- xorg-server-1.20.9/hw/dmx/config/parser.c 2020-08-25 15:40:20.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/config/parser.c 2021-07-29 18:48:49.000000000 +0000 @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.1. */ +/* A Bison parser, made by GNU Bison 3.7.6. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -33,6 +34,10 @@ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local variables, as they might otherwise be expanded by user macros. @@ -40,11 +45,11 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* Identify Bison output. */ -#define YYBISON 1 +/* Identify Bison output, and Bison version. */ +#define YYBISON 30706 -/* Bison version. */ -#define YYBISON_VERSION "3.1" +/* Bison version string. */ +#define YYBISON_VERSION "3.7.6" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -61,8 +66,8 @@ -/* Copy the first part of user declarations. */ -#line 35 "parser.y" /* yacc.c:339 */ +/* First part of user prologue. */ +#line 35 "parser.y" #ifdef HAVE_DMX_CONFIG_H #include @@ -84,26 +89,31 @@ pt->next = t; \ } -#line 88 "parser.c" /* yacc.c:339 */ +#line 93 "parser.c" +# ifndef YY_CAST +# ifdef __cplusplus +# define YY_CAST(Type, Val) static_cast (Val) +# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast (Val) +# else +# define YY_CAST(Type, Val) ((Type) (Val)) +# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val)) +# endif +# endif # ifndef YY_NULLPTR -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif # else -# define YY_NULLPTR 0 +# define YY_NULLPTR ((void*)0) # endif # endif -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 -#endif - -/* In a future release of Bison, this section will be replaced - by #include "y.tab.h". */ +/* Use api.header.include to #include this header + instead of duplicating it here. */ #ifndef YY_YY_PARSER_H_INCLUDED # define YY_YY_PARSER_H_INCLUDED /* Debug traces. */ @@ -114,25 +124,34 @@ extern int yydebug; #endif -/* Token type. */ +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE enum yytokentype { - T_VIRTUAL = 258, - T_DISPLAY = 259, - T_WALL = 260, - T_OPTION = 261, - T_PARAM = 262, - T_STRING = 263, - T_DIMENSION = 264, - T_OFFSET = 265, - T_ORIGIN = 266, - T_COMMENT = 267, - T_LINE_COMMENT = 268 + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + T_VIRTUAL = 258, /* T_VIRTUAL */ + T_DISPLAY = 259, /* T_DISPLAY */ + T_WALL = 260, /* T_WALL */ + T_OPTION = 261, /* T_OPTION */ + T_PARAM = 262, /* T_PARAM */ + T_STRING = 263, /* T_STRING */ + T_DIMENSION = 264, /* T_DIMENSION */ + T_OFFSET = 265, /* T_OFFSET */ + T_ORIGIN = 266, /* T_ORIGIN */ + T_COMMENT = 267, /* T_COMMENT */ + T_LINE_COMMENT = 268 /* T_LINE_COMMENT */ }; + typedef enum yytokentype yytoken_kind_t; #endif -/* Tokens. */ +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 #define T_VIRTUAL 258 #define T_DISPLAY 259 #define T_WALL 260 @@ -147,10 +166,9 @@ /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED - union YYSTYPE { -#line 57 "parser.y" /* yacc.c:355 */ +#line 57 "parser.y" DMXConfigTokenPtr token; DMXConfigStringPtr string; @@ -167,9 +185,9 @@ DMXConfigVirtualPtr virtual; DMXConfigEntryPtr entry; -#line 171 "parser.c" /* yacc.c:355 */ -}; +#line 189 "parser.c" +}; typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -181,37 +199,144 @@ int yyparse (void); #endif /* !YY_YY_PARSER_H_INCLUDED */ +/* Symbol kind. */ +enum yysymbol_kind_t +{ + YYSYMBOL_YYEMPTY = -2, + YYSYMBOL_YYEOF = 0, /* "end of file" */ + YYSYMBOL_YYerror = 1, /* error */ + YYSYMBOL_YYUNDEF = 2, /* "invalid token" */ + YYSYMBOL_3_ = 3, /* '{' */ + YYSYMBOL_4_ = 4, /* '}' */ + YYSYMBOL_5_ = 5, /* ';' */ + YYSYMBOL_6_ = 6, /* '/' */ + YYSYMBOL_T_VIRTUAL = 7, /* T_VIRTUAL */ + YYSYMBOL_T_DISPLAY = 8, /* T_DISPLAY */ + YYSYMBOL_T_WALL = 9, /* T_WALL */ + YYSYMBOL_T_OPTION = 10, /* T_OPTION */ + YYSYMBOL_T_PARAM = 11, /* T_PARAM */ + YYSYMBOL_T_STRING = 12, /* T_STRING */ + YYSYMBOL_T_DIMENSION = 13, /* T_DIMENSION */ + YYSYMBOL_T_OFFSET = 14, /* T_OFFSET */ + YYSYMBOL_T_ORIGIN = 15, /* T_ORIGIN */ + YYSYMBOL_T_COMMENT = 16, /* T_COMMENT */ + YYSYMBOL_T_LINE_COMMENT = 17, /* T_LINE_COMMENT */ + YYSYMBOL_YYACCEPT = 18, /* $accept */ + YYSYMBOL_Program = 19, /* Program */ + YYSYMBOL_EntryList = 20, /* EntryList */ + YYSYMBOL_Entry = 21, /* Entry */ + YYSYMBOL_Virtual = 22, /* Virtual */ + YYSYMBOL_SubList = 23, /* SubList */ + YYSYMBOL_Sub = 24, /* Sub */ + YYSYMBOL_OptionEntry = 25, /* OptionEntry */ + YYSYMBOL_ParamEntry = 26, /* ParamEntry */ + YYSYMBOL_ParamList = 27, /* ParamList */ + YYSYMBOL_Param = 28, /* Param */ + YYSYMBOL_PartialDim = 29, /* PartialDim */ + YYSYMBOL_FullDim = 30, /* FullDim */ + YYSYMBOL_DisplayEntry = 31, /* DisplayEntry */ + YYSYMBOL_WallEntry = 32, /* WallEntry */ + YYSYMBOL_Display = 33, /* Display */ + YYSYMBOL_Name = 34, /* Name */ + YYSYMBOL_Dimension = 35, /* Dimension */ + YYSYMBOL_Offset = 36, /* Offset */ + YYSYMBOL_Origin = 37, /* Origin */ + YYSYMBOL_Terminal = 38, /* Terminal */ + YYSYMBOL_Open = 39, /* Open */ + YYSYMBOL_Close = 40, /* Close */ + YYSYMBOL_Wall = 41, /* Wall */ + YYSYMBOL_NameList = 42 /* NameList */ +}; +typedef enum yysymbol_kind_t yysymbol_kind_t; + -/* Copy the second part of user declarations. */ -#line 188 "parser.c" /* yacc.c:358 */ #ifdef short # undef short #endif -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; +/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure + and (if available) are included + so that the code can choose integer types of a good width. */ + +#ifndef __PTRDIFF_MAX__ +# include /* INFRINGES ON USER NAME SPACE */ +# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_STDINT_H +# endif #endif -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; +/* Narrow types that promote to a signed type and that can represent a + signed or unsigned integer of at least N bits. In tables they can + save space and decrease cache pressure. Promoting to a signed type + helps avoid bugs in integer arithmetic. */ + +#ifdef __INT_LEAST8_MAX__ +typedef __INT_LEAST8_TYPE__ yytype_int8; +#elif defined YY_STDINT_H +typedef int_least8_t yytype_int8; #else typedef signed char yytype_int8; #endif -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; +#ifdef __INT_LEAST16_MAX__ +typedef __INT_LEAST16_TYPE__ yytype_int16; +#elif defined YY_STDINT_H +typedef int_least16_t yytype_int16; #else -typedef unsigned short yytype_uint16; +typedef short yytype_int16; #endif -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; +/* Work around bug in HP-UX 11.23, which defines these macros + incorrectly for preprocessor constants. This workaround can likely + be removed in 2023, as HPE has promised support for HP-UX 11.23 + (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of + . */ +#ifdef __hpux +# undef UINT_LEAST8_MAX +# undef UINT_LEAST16_MAX +# define UINT_LEAST8_MAX 255 +# define UINT_LEAST16_MAX 65535 +#endif + +#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST8_TYPE__ yytype_uint8; +#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST8_MAX <= INT_MAX) +typedef uint_least8_t yytype_uint8; +#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX +typedef unsigned char yytype_uint8; #else -typedef short yytype_int16; +typedef short yytype_uint8; +#endif + +#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST16_TYPE__ yytype_uint16; +#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST16_MAX <= INT_MAX) +typedef uint_least16_t yytype_uint16; +#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX +typedef unsigned short yytype_uint16; +#else +typedef int yytype_uint16; +#endif + +#ifndef YYPTRDIFF_T +# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__ +# define YYPTRDIFF_T __PTRDIFF_TYPE__ +# define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__ +# elif defined PTRDIFF_MAX +# ifndef ptrdiff_t +# include /* INFRINGES ON USER NAME SPACE */ +# endif +# define YYPTRDIFF_T ptrdiff_t +# define YYPTRDIFF_MAXIMUM PTRDIFF_MAX +# else +# define YYPTRDIFF_T long +# define YYPTRDIFF_MAXIMUM LONG_MAX +# endif #endif #ifndef YYSIZE_T @@ -219,7 +344,7 @@ # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T +# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -227,7 +352,20 @@ # endif #endif -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +#define YYSIZE_MAXIMUM \ + YY_CAST (YYPTRDIFF_T, \ + (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \ + ? YYPTRDIFF_MAXIMUM \ + : YY_CAST (YYSIZE_T, -1))) + +#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) + + +/* Stored state numbers (used for stacks). */ +typedef yytype_int8 yy_state_t; + +/* State numbers in computations. */ +typedef int yy_state_fast_t; #ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS @@ -241,47 +379,37 @@ # endif #endif -#ifndef YY_ATTRIBUTE -# if (defined __GNUC__ \ - && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ - || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C -# define YY_ATTRIBUTE(Spec) __attribute__(Spec) -# else -# define YY_ATTRIBUTE(Spec) /* empty */ -# endif -#endif #ifndef YY_ATTRIBUTE_PURE -# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define YY_ATTRIBUTE_PURE +# endif #endif #ifndef YY_ATTRIBUTE_UNUSED -# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) -#endif - -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# if defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) +# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) # else -# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) +# define YY_ATTRIBUTE_UNUSED # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(E) ((void) (E)) +# define YY_USE(E) ((void) (E)) #else -# define YYUSE(E) /* empty */ +# define YY_USE(E) /* empty */ #endif #if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ _Pragma ("GCC diagnostic pop") #else # define YY_INITIAL_VALUE(Value) Value @@ -294,8 +422,22 @@ # define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif +#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__ +# define YY_IGNORE_USELESS_CAST_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"") +# define YY_IGNORE_USELESS_CAST_END \ + _Pragma ("GCC diagnostic pop") +#endif +#ifndef YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_END +#endif + + +#define YY_ASSERT(E) ((void) (0 && (E))) -#if ! defined yyoverflow || YYERROR_VERBOSE +#if !defined yyoverflow /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -360,8 +502,7 @@ # endif # endif # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - +#endif /* !defined yyoverflow */ #if (! defined yyoverflow \ && (! defined __cplusplus \ @@ -370,17 +511,17 @@ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss_alloc; + yy_state_t yyss_alloc; YYSTYPE yyvs_alloc; }; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) # define YYCOPY_NEEDED 1 @@ -393,11 +534,11 @@ # define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ - YYSIZE_T yynewbytes; \ + YYPTRDIFF_T yynewbytes; \ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ + yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / YYSIZEOF (*yyptr); \ } \ while (0) @@ -409,12 +550,12 @@ # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ # define YYCOPY(Dst, Src, Count) \ - __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) + __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src))) # else # define YYCOPY(Dst, Src, Count) \ do \ { \ - YYSIZE_T yyi; \ + YYPTRDIFF_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ @@ -437,17 +578,20 @@ /* YYNSTATES -- Number of states. */ #define YYNSTATES 95 -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ -#define YYUNDEFTOK 2 +/* YYMAXUTOK -- Last valid token kind. */ #define YYMAXUTOK 268 -#define YYTRANSLATE(YYX) \ - ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ +#define YYTRANSLATE(YYX) \ + (0 <= (YYX) && (YYX) <= YYMAXUTOK \ + ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ + : YYSYMBOL_YYUNDEF) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ -static const yytype_uint8 yytranslate[] = + as returned by yylex. */ +static const yytype_int8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -491,39 +635,53 @@ }; #endif -#if YYDEBUG || YYERROR_VERBOSE || 0 +/** Accessing symbol of state STATE. */ +#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) + +#if YYDEBUG || 0 +/* The user-facing name of the symbol whose (internal) number is + YYSYMBOL. No bounds checking. */ +static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; + /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "'{'", "'}'", "';'", "'/'", "T_VIRTUAL", - "T_DISPLAY", "T_WALL", "T_OPTION", "T_PARAM", "T_STRING", "T_DIMENSION", - "T_OFFSET", "T_ORIGIN", "T_COMMENT", "T_LINE_COMMENT", "$accept", - "Program", "EntryList", "Entry", "Virtual", "SubList", "Sub", - "OptionEntry", "ParamEntry", "ParamList", "Param", "PartialDim", - "FullDim", "DisplayEntry", "WallEntry", "Display", "Name", "Dimension", - "Offset", "Origin", "Terminal", "Open", "Close", "Wall", "NameList", YY_NULLPTR + "\"end of file\"", "error", "\"invalid token\"", "'{'", "'}'", "';'", + "'/'", "T_VIRTUAL", "T_DISPLAY", "T_WALL", "T_OPTION", "T_PARAM", + "T_STRING", "T_DIMENSION", "T_OFFSET", "T_ORIGIN", "T_COMMENT", + "T_LINE_COMMENT", "$accept", "Program", "EntryList", "Entry", "Virtual", + "SubList", "Sub", "OptionEntry", "ParamEntry", "ParamList", "Param", + "PartialDim", "FullDim", "DisplayEntry", "WallEntry", "Display", "Name", + "Dimension", "Offset", "Origin", "Terminal", "Open", "Close", "Wall", + "NameList", YY_NULLPTR }; + +static const char * +yysymbol_name (yysymbol_kind_t yysymbol) +{ + return yytname[yysymbol]; +} #endif -# ifdef YYPRINT +#ifdef YYPRINT /* YYTOKNUM[NUM] -- (External) token number corresponding to the (internal) symbol number NUM (which must be that of a token). */ -static const yytype_uint16 yytoknum[] = +static const yytype_int16 yytoknum[] = { 0, 256, 257, 123, 125, 59, 47, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268 }; -# endif +#endif -#define YYPACT_NINF -32 +#define YYPACT_NINF (-32) -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-32))) +#define yypact_value_is_default(Yyn) \ + ((Yyn) == YYPACT_NINF) -#define YYTABLE_NINF -1 +#define YYTABLE_NINF (-1) -#define yytable_value_is_error(Yytable_value) \ +#define yytable_value_is_error(Yyn) \ 0 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -545,7 +703,7 @@ /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. Performed when YYTABLE does not specify something else to do. Zero means the default is an error. */ -static const yytype_uint8 yydefact[] = +static const yytype_int8 yydefact[] = { 0, 0, 6, 0, 2, 3, 5, 52, 42, 44, 0, 0, 0, 1, 4, 53, 43, 45, 0, 0, @@ -570,7 +728,7 @@ /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 3, 4, 5, 6, 26, 27, 28, 29, 62, + 0, 3, 4, 5, 6, 26, 27, 28, 29, 62, 63, 49, 50, 30, 31, 32, 39, 52, 53, 72, 54, 12, 45, 33, 64 }; @@ -578,7 +736,7 @@ /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule whose number is the opposite. If YYTABLE_NINF, syntax error. */ -static const yytype_uint8 yytable[] = +static const yytype_int8 yytable[] = { 10, 40, 42, 11, 1, 58, 59, 44, 7, 9, 48, 56, 18, 61, 2, 65, 44, 44, 9, 68, @@ -593,7 +751,7 @@ 8, 9, 48, 14, 82, 77, 74 }; -static const yytype_uint8 yycheck[] = +static const yytype_int8 yycheck[] = { 1, 23, 24, 1, 7, 35, 36, 26, 3, 13, 14, 33, 10, 40, 17, 42, 35, 36, 13, 47, @@ -610,7 +768,7 @@ /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = +static const yytype_int8 yystos[] = { 0, 7, 17, 19, 20, 21, 22, 3, 12, 13, 34, 35, 39, 0, 21, 16, 16, 16, 35, 39, @@ -625,7 +783,7 @@ }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = +static const yytype_int8 yyr1[] = { 0, 18, 19, 20, 20, 21, 21, 22, 22, 22, 22, 23, 23, 24, 24, 24, 24, 24, 25, 26, @@ -636,7 +794,7 @@ }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = +static const yytype_int8 yyr2[] = { 0, 2, 1, 1, 2, 1, 1, 4, 5, 5, 6, 1, 2, 1, 1, 1, 1, 1, 3, 3, @@ -647,10 +805,10 @@ }; +enum { YYENOMEM = -2 }; + #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab @@ -659,27 +817,26 @@ #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (0) - -/* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 - +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) + +/* Backward compatibility with an undocumented macro. + Use YYerror or YYUNDEF. */ +#define YYERRCODE YYUNDEF /* Enable debugging if requested. */ @@ -697,54 +854,58 @@ } while (0) /* This macro is provided for backward compatibility. */ -#ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif +# ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ yy_symbol_print (stderr, \ - Type, Value); \ + Kind, Value); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) -/*----------------------------------------. -| Print this symbol's value on YYOUTPUT. | -`----------------------------------------*/ +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_value_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { - FILE *yyo = yyoutput; - YYUSE (yyo); + FILE *yyoutput = yyo; + YY_USE (yyoutput); if (!yyvaluep) return; # ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); + if (yykind < YYNTOKENS) + YYPRINT (yyo, yytoknum[yykind], *yyvaluep); # endif - YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YY_USE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { - YYFPRINTF (yyoutput, "%s %s (", - yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); + YYFPRINTF (yyo, "%s %s (", + yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); + yy_symbol_value_print (yyo, yykind, yyvaluep); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -753,7 +914,7 @@ `------------------------------------------------------------------*/ static void -yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop) { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -776,21 +937,21 @@ `------------------------------------------------*/ static void -yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) +yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, + int yyrule) { - unsigned long yylno = yyrline[yyrule]; + int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n", yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, - yystos[yyssp[yyi + 1 - yynrhs]], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); + YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), + &yyvsp[(yyi + 1) - (yynrhs)]); YYFPRINTF (stderr, "\n"); } } @@ -805,8 +966,8 @@ multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDPRINTF(Args) ((void) 0) +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -829,250 +990,30 @@ #endif -#if YYERROR_VERBOSE - -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -static YYSIZE_T -yystrlen (const char *yystr) -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -static char * -yystpcpy (char *yydest, const char *yysrc) -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message - about the unexpected token YYTOKEN for the state stack whose top is - YYSSP. - - Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is - not large enough to hold the message. In that case, also set - *YYMSG_ALLOC to the required number of bytes. Return 2 if the - required number of bytes is too large to store. */ -static int -yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - yytype_int16 *yyssp, int yytoken) -{ - YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); - YYSIZE_T yysize = yysize0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - /* Internationalized format string. */ - const char *yyformat = YY_NULLPTR; - /* Arguments of yyformat. */ - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - /* Number of reported tokens (one for the "unexpected", one per - "expected"). */ - int yycount = 0; - - /* There are many possibilities here to consider: - - If this state is a consistent state with a default action, then - the only way this function was invoked is if the default action - is an error action. In that case, don't check for expected - tokens because there are none. - - The only way there can be no lookahead present (in yychar) is if - this state is a consistent state with a default action. Thus, - detecting the absence of a lookahead is sufficient to determine - that there is no unexpected or expected token to report. In that - case, just report a simple "syntax error". - - Don't assume there isn't a lookahead just because this state is a - consistent state with a default action. There might have been a - previous inconsistent state, consistent state with a non-default - action, or user semantic action that manipulated yychar. - - Of course, the expected token list depends on states to have - correct lookahead information, and it depends on the parser not - to perform extra reductions after fetching a lookahead from the - scanner and before detecting a syntax error. Thus, state merging - (from LALR or IELR) and default reductions corrupt the expected - token list. However, the list is correct for canonical LR with - one exception: it will still contain any token that will not be - accepted due to an error action in a later state. - */ - if (yytoken != YYEMPTY) - { - int yyn = yypact[*yyssp]; - yyarg[yycount++] = yytname[yytoken]; - if (!yypact_value_is_default (yyn)) - { - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for - this state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yyx; - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR - && !yytable_value_is_error (yytable[yyx + yyn])) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - break; - } - yyarg[yycount++] = yytname[yyx]; - { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - } - } - } - } - - switch (yycount) - { -# define YYCASE_(N, S) \ - case N: \ - yyformat = S; \ - break - default: /* Avoid compiler warnings. */ - YYCASE_(0, YY_("syntax error")); - YYCASE_(1, YY_("syntax error, unexpected %s")); - YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); - YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); - YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); - YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -# undef YYCASE_ - } - { - YYSIZE_T yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - } - if (*yymsg_alloc < yysize) - { - *yymsg_alloc = 2 * yysize; - if (! (yysize <= *yymsg_alloc - && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) - *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return 1; - } - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - { - char *yyp = *yymsg; - int yyi = 0; - while ((*yyp = *yyformat) != '\0') - if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyformat += 2; - } - else - { - yyp++; - yyformat++; - } - } - return 0; -} -#endif /* YYERROR_VERBOSE */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +yydestruct (const char *yymsg, + yysymbol_kind_t yykind, YYSTYPE *yyvaluep) { - YYUSE (yyvaluep); + YY_USE (yyvaluep); if (!yymsg) yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YYUSE (yytype); + YY_USE (yykind); YY_IGNORE_MAYBE_UNINITIALIZED_END } - - -/* The lookahead symbol. */ +/* Lookahead token kind. */ int yychar; /* The semantic value of the lookahead symbol. */ @@ -1081,6 +1022,8 @@ int yynerrs; + + /*----------. | yyparse. | `----------*/ @@ -1088,43 +1031,36 @@ int yyparse (void) { - int yystate; + yy_state_fast_t yystate = 0; /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - - /* The stacks and their tools: - 'yyss': related to states. - 'yyvs': related to semantic values. + int yyerrstatus = 0; - Refer to the stacks through separate pointers, to allow yyoverflow + /* Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss; - yytype_int16 *yyssp; + /* Their size. */ + YYPTRDIFF_T yystacksize = YYINITDEPTH; - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs; - YYSTYPE *yyvsp; + /* The state stack: array, bottom, top. */ + yy_state_t yyssa[YYINITDEPTH]; + yy_state_t *yyss = yyssa; + yy_state_t *yyssp = yyss; - YYSIZE_T yystacksize; + /* The semantic value stack: array, bottom, top. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp = yyvs; int yyn; + /* The return value of yyparse. */ int yyresult; - /* Lookahead token as an internal (translated) token number. */ - int yytoken = 0; + /* Lookahead symbol kind. */ + yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif + #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) @@ -1132,58 +1068,60 @@ Keep to zero when no symbol should be popped. */ int yylen = 0; - yyssp = yyss = yyssa; - yyvsp = yyvs = yyvsa; - yystacksize = YYINITDEPTH; - YYDPRINTF ((stderr, "Starting parse\n")); - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; + +/*--------------------------------------------------------------------. +| yysetstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + YY_ASSERT (0 <= yystate && yystate < YYNSTATES); + YY_IGNORE_USELESS_CAST_BEGIN + *yyssp = YY_CAST (yy_state_t, yystate); + YY_IGNORE_USELESS_CAST_END + YY_STACK_PRINT (yyss, yyssp); if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + goto yyexhaustedlab; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYPTRDIFF_T yysize = yyssp - yyss + 1; -#ifdef yyoverflow +# if defined yyoverflow { /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into memory. */ + yy_state_t *yyss1 = yyss; YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), + &yyss1, yysize * YYSIZEOF (*yyssp), + &yyvs1, yysize * YYSIZEOF (*yyvsp), &yystacksize); - yyss = yyss1; yyvs = yyvs1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) goto yyexhaustedlab; @@ -1192,9 +1130,10 @@ yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; + yy_state_t *yyss1 = yyss; union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + YY_CAST (union yyalloc *, + YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); if (! yyptr) goto yyexhaustedlab; YYSTACK_RELOCATE (yyss_alloc, yyss); @@ -1204,30 +1143,30 @@ YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long) yystacksize)); + YY_IGNORE_USELESS_CAST_BEGIN + YYDPRINTF ((stderr, "Stack size increased to %ld\n", + YY_CAST (long, yystacksize))); + YY_IGNORE_USELESS_CAST_END if (yyss + yystacksize - 1 <= yyssp) YYABORT; } - - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ if (yystate == YYFINAL) YYACCEPT; goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a lookahead token if we need one and don't already have one. */ @@ -1238,18 +1177,29 @@ /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, "Reading a token: ")); + YYDPRINTF ((stderr, "Reading a token\n")); yychar = yylex (); } if (yychar <= YYEOF) { - yychar = yytoken = YYEOF; + yychar = YYEOF; + yytoken = YYSYMBOL_YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } + else if (yychar == YYerror) + { + /* The scanner already issued an error message, process directly + to error recovery. But do not keep the error token as + lookahead, it is too special and may lead us to an endless + loop in error recovery. */ + yychar = YYUNDEF; + yytoken = YYSYMBOL_YYerror; + goto yyerrlab1; + } else { yytoken = YYTRANSLATE (yychar); @@ -1277,15 +1227,13 @@ /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token. */ - yychar = YYEMPTY; - yystate = yyn; YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; YY_IGNORE_MAYBE_UNINITIALIZED_END + /* Discard the shifted token. */ + yychar = YYEMPTY; goto yynewstate; @@ -1300,7 +1248,7 @@ /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ @@ -1320,280 +1268,281 @@ YY_REDUCE_PRINT (yyn); switch (yyn) { - case 2: -#line 96 "parser.y" /* yacc.c:1651 */ - { dmxConfigEntry = (yyvsp[0].entry); } -#line 1327 "parser.c" /* yacc.c:1651 */ + case 2: /* Program: EntryList */ +#line 96 "parser.y" + { dmxConfigEntry = (yyvsp[0].entry); } +#line 1275 "parser.c" break; - case 4: -#line 100 "parser.y" /* yacc.c:1651 */ - { APPEND(DMXConfigEntryPtr,(yyvsp[-1].entry),(yyvsp[0].entry)); (yyval.entry) = (yyvsp[-1].entry); } -#line 1333 "parser.c" /* yacc.c:1651 */ + case 4: /* EntryList: EntryList Entry */ +#line 100 "parser.y" + { APPEND(DMXConfigEntryPtr,(yyvsp[-1].entry),(yyvsp[0].entry)); (yyval.entry) = (yyvsp[-1].entry); } +#line 1281 "parser.c" break; - case 5: -#line 103 "parser.y" /* yacc.c:1651 */ - { (yyval.entry) = dmxConfigEntryVirtual((yyvsp[0].virtual)); } -#line 1339 "parser.c" /* yacc.c:1651 */ + case 5: /* Entry: Virtual */ +#line 103 "parser.y" + { (yyval.entry) = dmxConfigEntryVirtual((yyvsp[0].virtual)); } +#line 1287 "parser.c" break; - case 6: -#line 104 "parser.y" /* yacc.c:1651 */ - { (yyval.entry) = dmxConfigEntryComment((yyvsp[0].comment)); } -#line 1345 "parser.c" /* yacc.c:1651 */ + case 6: /* Entry: T_LINE_COMMENT */ +#line 104 "parser.y" + { (yyval.entry) = dmxConfigEntryComment((yyvsp[0].comment)); } +#line 1293 "parser.c" break; - case 7: -#line 108 "parser.y" /* yacc.c:1651 */ - { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-3].token), NULL, NULL, (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token)); } -#line 1351 "parser.c" /* yacc.c:1651 */ + case 7: /* Virtual: T_VIRTUAL Open SubList Close */ +#line 108 "parser.y" + { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-3].token), NULL, NULL, (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token)); } +#line 1299 "parser.c" break; - case 8: -#line 110 "parser.y" /* yacc.c:1651 */ - { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-4].token), NULL, (yyvsp[-3].pair), (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token)); } -#line 1357 "parser.c" /* yacc.c:1651 */ + case 8: /* Virtual: T_VIRTUAL Dimension Open SubList Close */ +#line 110 "parser.y" + { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-4].token), NULL, (yyvsp[-3].pair), (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token)); } +#line 1305 "parser.c" break; - case 9: -#line 112 "parser.y" /* yacc.c:1651 */ - { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-4].token), (yyvsp[-3].string), NULL, (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token)); } -#line 1363 "parser.c" /* yacc.c:1651 */ + case 9: /* Virtual: T_VIRTUAL Name Open SubList Close */ +#line 112 "parser.y" + { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-4].token), (yyvsp[-3].string), NULL, (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token)); } +#line 1311 "parser.c" break; - case 10: -#line 114 "parser.y" /* yacc.c:1651 */ - { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-5].token), (yyvsp[-4].string), (yyvsp[-3].pair), (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token) ); } -#line 1369 "parser.c" /* yacc.c:1651 */ + case 10: /* Virtual: T_VIRTUAL Name Dimension Open SubList Close */ +#line 114 "parser.y" + { (yyval.virtual) = dmxConfigCreateVirtual((yyvsp[-5].token), (yyvsp[-4].string), (yyvsp[-3].pair), (yyvsp[-2].token), (yyvsp[-1].subentry), (yyvsp[0].token) ); } +#line 1317 "parser.c" break; - case 12: -#line 118 "parser.y" /* yacc.c:1651 */ - { APPEND(DMXConfigSubPtr,(yyvsp[-1].subentry),(yyvsp[0].subentry)); (yyval.subentry) = (yyvsp[-1].subentry); } -#line 1375 "parser.c" /* yacc.c:1651 */ + case 12: /* SubList: SubList Sub */ +#line 118 "parser.y" + { APPEND(DMXConfigSubPtr,(yyvsp[-1].subentry),(yyvsp[0].subentry)); (yyval.subentry) = (yyvsp[-1].subentry); } +#line 1323 "parser.c" break; - case 13: -#line 121 "parser.y" /* yacc.c:1651 */ - { (yyval.subentry) = dmxConfigSubComment((yyvsp[0].comment)); } -#line 1381 "parser.c" /* yacc.c:1651 */ + case 13: /* Sub: T_LINE_COMMENT */ +#line 121 "parser.y" + { (yyval.subentry) = dmxConfigSubComment((yyvsp[0].comment)); } +#line 1329 "parser.c" break; - case 14: -#line 122 "parser.y" /* yacc.c:1651 */ - { (yyval.subentry) = dmxConfigSubDisplay((yyvsp[0].display)); } -#line 1387 "parser.c" /* yacc.c:1651 */ + case 14: /* Sub: DisplayEntry */ +#line 122 "parser.y" + { (yyval.subentry) = dmxConfigSubDisplay((yyvsp[0].display)); } +#line 1335 "parser.c" break; - case 15: -#line 123 "parser.y" /* yacc.c:1651 */ - { (yyval.subentry) = dmxConfigSubWall((yyvsp[0].wall)); } -#line 1393 "parser.c" /* yacc.c:1651 */ + case 15: /* Sub: WallEntry */ +#line 123 "parser.y" + { (yyval.subentry) = dmxConfigSubWall((yyvsp[0].wall)); } +#line 1341 "parser.c" break; - case 16: -#line 124 "parser.y" /* yacc.c:1651 */ - { (yyval.subentry) = dmxConfigSubOption((yyvsp[0].option)); } -#line 1399 "parser.c" /* yacc.c:1651 */ + case 16: /* Sub: OptionEntry */ +#line 124 "parser.y" + { (yyval.subentry) = dmxConfigSubOption((yyvsp[0].option)); } +#line 1347 "parser.c" break; - case 17: -#line 125 "parser.y" /* yacc.c:1651 */ - { (yyval.subentry) = dmxConfigSubParam((yyvsp[0].param)); } -#line 1405 "parser.c" /* yacc.c:1651 */ + case 17: /* Sub: ParamEntry */ +#line 125 "parser.y" + { (yyval.subentry) = dmxConfigSubParam((yyvsp[0].param)); } +#line 1353 "parser.c" break; - case 18: -#line 129 "parser.y" /* yacc.c:1651 */ - { (yyval.option) = dmxConfigCreateOption((yyvsp[-2].token), (yyvsp[-1].string), (yyvsp[0].token)); } -#line 1411 "parser.c" /* yacc.c:1651 */ + case 18: /* OptionEntry: T_OPTION NameList Terminal */ +#line 129 "parser.y" + { (yyval.option) = dmxConfigCreateOption((yyvsp[-2].token), (yyvsp[-1].string), (yyvsp[0].token)); } +#line 1359 "parser.c" break; - case 19: -#line 133 "parser.y" /* yacc.c:1651 */ - { (yyval.param) = dmxConfigCreateParam((yyvsp[-2].token), NULL, (yyvsp[-1].string), NULL, (yyvsp[0].token)); } -#line 1417 "parser.c" /* yacc.c:1651 */ + case 19: /* ParamEntry: T_PARAM NameList Terminal */ +#line 133 "parser.y" + { (yyval.param) = dmxConfigCreateParam((yyvsp[-2].token), NULL, (yyvsp[-1].string), NULL, (yyvsp[0].token)); } +#line 1365 "parser.c" break; - case 20: -#line 135 "parser.y" /* yacc.c:1651 */ - { (yyval.param) = dmxConfigCreateParam((yyvsp[-3].token), (yyvsp[-2].token), NULL, (yyvsp[0].token), NULL); + case 20: /* ParamEntry: T_PARAM Open ParamList Close */ +#line 135 "parser.y" + { (yyval.param) = dmxConfigCreateParam((yyvsp[-3].token), (yyvsp[-2].token), NULL, (yyvsp[0].token), NULL); (yyval.param)->next = (yyvsp[-1].param); } -#line 1425 "parser.c" /* yacc.c:1651 */ +#line 1373 "parser.c" break; - case 22: -#line 141 "parser.y" /* yacc.c:1651 */ - { APPEND(DMXConfigParamPtr,(yyvsp[-1].param),(yyvsp[0].param)); (yyval.param) = (yyvsp[-1].param); } -#line 1431 "parser.c" /* yacc.c:1651 */ + case 22: /* ParamList: ParamList Param */ +#line 141 "parser.y" + { APPEND(DMXConfigParamPtr,(yyvsp[-1].param),(yyvsp[0].param)); (yyval.param) = (yyvsp[-1].param); } +#line 1379 "parser.c" break; - case 23: -#line 145 "parser.y" /* yacc.c:1651 */ - { (yyval.param) = dmxConfigCreateParam(NULL, NULL, (yyvsp[-1].string), NULL, (yyvsp[0].token)); } -#line 1437 "parser.c" /* yacc.c:1651 */ + case 23: /* Param: NameList Terminal */ +#line 145 "parser.y" + { (yyval.param) = dmxConfigCreateParam(NULL, NULL, (yyvsp[-1].string), NULL, (yyvsp[0].token)); } +#line 1385 "parser.c" break; - case 24: -#line 149 "parser.y" /* yacc.c:1651 */ - { (yyval.pdim) = dmxConfigCreatePartDim((yyvsp[-1].pair), (yyvsp[0].pair)); } -#line 1443 "parser.c" /* yacc.c:1651 */ + case 24: /* PartialDim: Dimension Offset */ +#line 149 "parser.y" + { (yyval.pdim) = dmxConfigCreatePartDim((yyvsp[-1].pair), (yyvsp[0].pair)); } +#line 1391 "parser.c" break; - case 25: -#line 151 "parser.y" /* yacc.c:1651 */ - { (yyval.pdim) = dmxConfigCreatePartDim((yyvsp[0].pair), NULL); } -#line 1449 "parser.c" /* yacc.c:1651 */ + case 25: /* PartialDim: Dimension */ +#line 151 "parser.y" + { (yyval.pdim) = dmxConfigCreatePartDim((yyvsp[0].pair), NULL); } +#line 1397 "parser.c" break; - case 26: -#line 153 "parser.y" /* yacc.c:1651 */ - { (yyval.pdim) = dmxConfigCreatePartDim(NULL, (yyvsp[0].pair)); } -#line 1455 "parser.c" /* yacc.c:1651 */ + case 26: /* PartialDim: Offset */ +#line 153 "parser.y" + { (yyval.pdim) = dmxConfigCreatePartDim(NULL, (yyvsp[0].pair)); } +#line 1403 "parser.c" break; - case 27: -#line 157 "parser.y" /* yacc.c:1651 */ - { (yyval.fdim) = dmxConfigCreateFullDim((yyvsp[-2].pdim), (yyvsp[0].pdim)); } -#line 1461 "parser.c" /* yacc.c:1651 */ + case 27: /* FullDim: PartialDim '/' PartialDim */ +#line 157 "parser.y" + { (yyval.fdim) = dmxConfigCreateFullDim((yyvsp[-2].pdim), (yyvsp[0].pdim)); } +#line 1409 "parser.c" break; - case 28: -#line 159 "parser.y" /* yacc.c:1651 */ - { (yyval.fdim) = dmxConfigCreateFullDim(NULL, (yyvsp[0].pdim)); } -#line 1467 "parser.c" /* yacc.c:1651 */ + case 28: /* FullDim: '/' PartialDim */ +#line 159 "parser.y" + { (yyval.fdim) = dmxConfigCreateFullDim(NULL, (yyvsp[0].pdim)); } +#line 1415 "parser.c" break; - case 29: -#line 161 "parser.y" /* yacc.c:1651 */ - { (yyval.fdim) = dmxConfigCreateFullDim((yyvsp[0].pdim), NULL); } -#line 1473 "parser.c" /* yacc.c:1651 */ + case 29: /* FullDim: PartialDim */ +#line 161 "parser.y" + { (yyval.fdim) = dmxConfigCreateFullDim((yyvsp[0].pdim), NULL); } +#line 1421 "parser.c" break; - case 30: -#line 165 "parser.y" /* yacc.c:1651 */ - { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-4].token), (yyvsp[-3].string), (yyvsp[-2].fdim), (yyvsp[-1].pair), (yyvsp[0].token)); } -#line 1479 "parser.c" /* yacc.c:1651 */ + case 30: /* DisplayEntry: Display Name FullDim Origin Terminal */ +#line 165 "parser.y" + { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-4].token), (yyvsp[-3].string), (yyvsp[-2].fdim), (yyvsp[-1].pair), (yyvsp[0].token)); } +#line 1427 "parser.c" break; - case 31: -#line 167 "parser.y" /* yacc.c:1651 */ - { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-3].token), NULL, (yyvsp[-2].fdim), (yyvsp[-1].pair), (yyvsp[0].token)); } -#line 1485 "parser.c" /* yacc.c:1651 */ + case 31: /* DisplayEntry: Display FullDim Origin Terminal */ +#line 167 "parser.y" + { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-3].token), NULL, (yyvsp[-2].fdim), (yyvsp[-1].pair), (yyvsp[0].token)); } +#line 1433 "parser.c" break; - case 32: -#line 169 "parser.y" /* yacc.c:1651 */ - { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-3].token), (yyvsp[-2].string), NULL, (yyvsp[-1].pair), (yyvsp[0].token)); } -#line 1491 "parser.c" /* yacc.c:1651 */ + case 32: /* DisplayEntry: Display Name Origin Terminal */ +#line 169 "parser.y" + { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-3].token), (yyvsp[-2].string), NULL, (yyvsp[-1].pair), (yyvsp[0].token)); } +#line 1439 "parser.c" break; - case 33: -#line 172 "parser.y" /* yacc.c:1651 */ - { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-3].token), (yyvsp[-2].string), (yyvsp[-1].fdim), NULL, (yyvsp[0].token)); } -#line 1497 "parser.c" /* yacc.c:1651 */ + case 33: /* DisplayEntry: Display Name FullDim Terminal */ +#line 172 "parser.y" + { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-3].token), (yyvsp[-2].string), (yyvsp[-1].fdim), NULL, (yyvsp[0].token)); } +#line 1445 "parser.c" break; - case 34: -#line 174 "parser.y" /* yacc.c:1651 */ - { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-2].token), NULL, (yyvsp[-1].fdim), NULL, (yyvsp[0].token)); } -#line 1503 "parser.c" /* yacc.c:1651 */ + case 34: /* DisplayEntry: Display FullDim Terminal */ +#line 174 "parser.y" + { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-2].token), NULL, (yyvsp[-1].fdim), NULL, (yyvsp[0].token)); } +#line 1451 "parser.c" break; - case 35: -#line 176 "parser.y" /* yacc.c:1651 */ - { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-2].token), (yyvsp[-1].string), NULL, NULL, (yyvsp[0].token)); } -#line 1509 "parser.c" /* yacc.c:1651 */ + case 35: /* DisplayEntry: Display Name Terminal */ +#line 176 "parser.y" + { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-2].token), (yyvsp[-1].string), NULL, NULL, (yyvsp[0].token)); } +#line 1457 "parser.c" break; - case 36: -#line 178 "parser.y" /* yacc.c:1651 */ - { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-1].token), NULL, NULL, NULL, (yyvsp[0].token)); } -#line 1515 "parser.c" /* yacc.c:1651 */ + case 36: /* DisplayEntry: Display Terminal */ +#line 178 "parser.y" + { (yyval.display) = dmxConfigCreateDisplay((yyvsp[-1].token), NULL, NULL, NULL, (yyvsp[0].token)); } +#line 1463 "parser.c" break; - case 37: -#line 182 "parser.y" /* yacc.c:1651 */ - { (yyval.wall) = dmxConfigCreateWall((yyvsp[-4].token), (yyvsp[-3].pair), (yyvsp[-2].pair), (yyvsp[-1].string), (yyvsp[0].token)); } -#line 1521 "parser.c" /* yacc.c:1651 */ + case 37: /* WallEntry: Wall Dimension Dimension NameList Terminal */ +#line 182 "parser.y" + { (yyval.wall) = dmxConfigCreateWall((yyvsp[-4].token), (yyvsp[-3].pair), (yyvsp[-2].pair), (yyvsp[-1].string), (yyvsp[0].token)); } +#line 1469 "parser.c" break; - case 38: -#line 184 "parser.y" /* yacc.c:1651 */ - { (yyval.wall) = dmxConfigCreateWall((yyvsp[-3].token), (yyvsp[-2].pair), NULL, (yyvsp[-1].string), (yyvsp[0].token)); } -#line 1527 "parser.c" /* yacc.c:1651 */ + case 38: /* WallEntry: Wall Dimension NameList Terminal */ +#line 184 "parser.y" + { (yyval.wall) = dmxConfigCreateWall((yyvsp[-3].token), (yyvsp[-2].pair), NULL, (yyvsp[-1].string), (yyvsp[0].token)); } +#line 1475 "parser.c" break; - case 39: -#line 186 "parser.y" /* yacc.c:1651 */ - { (yyval.wall) = dmxConfigCreateWall((yyvsp[-2].token), NULL, NULL, (yyvsp[-1].string), (yyvsp[0].token)); } -#line 1533 "parser.c" /* yacc.c:1651 */ + case 39: /* WallEntry: Wall NameList Terminal */ +#line 186 "parser.y" + { (yyval.wall) = dmxConfigCreateWall((yyvsp[-2].token), NULL, NULL, (yyvsp[-1].string), (yyvsp[0].token)); } +#line 1481 "parser.c" break; - case 41: -#line 190 "parser.y" /* yacc.c:1651 */ - { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } -#line 1539 "parser.c" /* yacc.c:1651 */ + case 41: /* Display: T_DISPLAY T_COMMENT */ +#line 190 "parser.y" + { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } +#line 1487 "parser.c" break; - case 43: -#line 194 "parser.y" /* yacc.c:1651 */ - { (yyval.string) = (yyvsp[-1].string); (yyval.string)->comment = (yyvsp[0].comment)->comment; } -#line 1545 "parser.c" /* yacc.c:1651 */ + case 43: /* Name: T_STRING T_COMMENT */ +#line 194 "parser.y" + { (yyval.string) = (yyvsp[-1].string); (yyval.string)->comment = (yyvsp[0].comment)->comment; } +#line 1493 "parser.c" break; - case 45: -#line 198 "parser.y" /* yacc.c:1651 */ - { (yyval.pair) = (yyvsp[-1].pair); (yyval.pair)->comment = (yyvsp[0].comment)->comment; } -#line 1551 "parser.c" /* yacc.c:1651 */ + case 45: /* Dimension: T_DIMENSION T_COMMENT */ +#line 198 "parser.y" + { (yyval.pair) = (yyvsp[-1].pair); (yyval.pair)->comment = (yyvsp[0].comment)->comment; } +#line 1499 "parser.c" break; - case 47: -#line 202 "parser.y" /* yacc.c:1651 */ - { (yyval.pair) = (yyvsp[-1].pair); (yyval.pair)->comment = (yyvsp[0].comment)->comment; } -#line 1557 "parser.c" /* yacc.c:1651 */ + case 47: /* Offset: T_OFFSET T_COMMENT */ +#line 202 "parser.y" + { (yyval.pair) = (yyvsp[-1].pair); (yyval.pair)->comment = (yyvsp[0].comment)->comment; } +#line 1505 "parser.c" break; - case 49: -#line 206 "parser.y" /* yacc.c:1651 */ - { (yyval.pair) = (yyvsp[-1].pair); (yyval.pair)->comment = (yyvsp[0].comment)->comment; } -#line 1563 "parser.c" /* yacc.c:1651 */ + case 49: /* Origin: T_ORIGIN T_COMMENT */ +#line 206 "parser.y" + { (yyval.pair) = (yyvsp[-1].pair); (yyval.pair)->comment = (yyvsp[0].comment)->comment; } +#line 1511 "parser.c" break; - case 51: -#line 210 "parser.y" /* yacc.c:1651 */ - { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } -#line 1569 "parser.c" /* yacc.c:1651 */ + case 51: /* Terminal: ';' T_COMMENT */ +#line 210 "parser.y" + { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } +#line 1517 "parser.c" break; - case 53: -#line 214 "parser.y" /* yacc.c:1651 */ - { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } -#line 1575 "parser.c" /* yacc.c:1651 */ + case 53: /* Open: '{' T_COMMENT */ +#line 214 "parser.y" + { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } +#line 1523 "parser.c" break; - case 55: -#line 218 "parser.y" /* yacc.c:1651 */ - { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } -#line 1581 "parser.c" /* yacc.c:1651 */ + case 55: /* Close: '}' T_COMMENT */ +#line 218 "parser.y" + { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } +#line 1529 "parser.c" break; - case 57: -#line 222 "parser.y" /* yacc.c:1651 */ - { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } -#line 1587 "parser.c" /* yacc.c:1651 */ + case 57: /* Wall: T_WALL T_COMMENT */ +#line 222 "parser.y" + { (yyval.token) = (yyvsp[-1].token); (yyval.token)->comment = (yyvsp[0].comment)->comment; } +#line 1535 "parser.c" break; - case 59: -#line 226 "parser.y" /* yacc.c:1651 */ - { APPEND(DMXConfigStringPtr, (yyvsp[-1].string), (yyvsp[0].string)); (yyval.string) = (yyvsp[-1].string); } -#line 1593 "parser.c" /* yacc.c:1651 */ + case 59: /* NameList: NameList Name */ +#line 226 "parser.y" + { APPEND(DMXConfigStringPtr, (yyvsp[-1].string), (yyvsp[0].string)); (yyval.string) = (yyvsp[-1].string); } +#line 1541 "parser.c" break; -#line 1597 "parser.c" /* yacc.c:1651 */ +#line 1545 "parser.c" + default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -1607,25 +1556,23 @@ case of YYERROR or YYBACKUP, subsequent parser actions might lead to an incorrect destructor call or verbose syntax error message before the lookahead is translated. */ - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); YYPOPSTACK (yylen); yylen = 0; - YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } goto yynewstate; @@ -1636,50 +1583,14 @@ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ - yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); - + yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar); /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; -#if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); -#else -# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ - yyssp, yytoken) - { - char const *yymsgp = YY_("syntax error"); - int yysyntax_error_status; - yysyntax_error_status = YYSYNTAX_ERROR; - if (yysyntax_error_status == 0) - yymsgp = yymsg; - else if (yysyntax_error_status == 1) - { - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); - if (!yymsg) - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - yysyntax_error_status = 2; - } - else - { - yysyntax_error_status = YYSYNTAX_ERROR; - yymsgp = yymsg; - } - } - yyerror (yymsgp); - if (yysyntax_error_status == 2) - goto yyexhaustedlab; - } -# undef YYSYNTAX_ERROR -#endif } - - if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an @@ -1708,12 +1619,10 @@ | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ @@ -1730,13 +1639,14 @@ yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ + /* Pop stack until we find a state that shifts the error token. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + yyn += YYSYMBOL_YYerror; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror) { yyn = yytable[yyn]; if (0 < yyn) @@ -1750,7 +1660,7 @@ yydestruct ("Error: popping", - yystos[yystate], yyvsp); + YY_ACCESSING_SYMBOL (yystate), yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -1762,7 +1672,7 @@ /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -1775,6 +1685,7 @@ yyresult = 0; goto yyreturn; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ @@ -1782,16 +1693,21 @@ yyresult = 1; goto yyreturn; -#if !defined yyoverflow || YYERROR_VERBOSE + +#if !defined yyoverflow /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ yyexhaustedlab: yyerror (YY_("memory exhausted")); yyresult = 2; - /* Fall through. */ + goto yyreturn; #endif + +/*-------------------------------------------------------. +| yyreturn -- parsing is finished, clean up and return. | +`-------------------------------------------------------*/ yyreturn: if (yychar != YYEMPTY) { @@ -1808,16 +1724,14 @@ while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + YY_ACCESSING_SYMBOL (+*yyssp), yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif + return yyresult; } + diff -Nru xorg-server-1.20.9/hw/dmx/config/parser.h xorg-server-1.20.13/hw/dmx/config/parser.h --- xorg-server-1.20.9/hw/dmx/config/parser.h 2020-08-25 15:40:20.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/config/parser.h 2021-07-29 18:48:49.000000000 +0000 @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.1. */ +/* A Bison parser, made by GNU Bison 3.7.6. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -30,6 +31,10 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + #ifndef YY_YY_PARSER_H_INCLUDED # define YY_YY_PARSER_H_INCLUDED /* Debug traces. */ @@ -40,25 +45,34 @@ extern int yydebug; #endif -/* Token type. */ +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE enum yytokentype { - T_VIRTUAL = 258, - T_DISPLAY = 259, - T_WALL = 260, - T_OPTION = 261, - T_PARAM = 262, - T_STRING = 263, - T_DIMENSION = 264, - T_OFFSET = 265, - T_ORIGIN = 266, - T_COMMENT = 267, - T_LINE_COMMENT = 268 + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + T_VIRTUAL = 258, /* T_VIRTUAL */ + T_DISPLAY = 259, /* T_DISPLAY */ + T_WALL = 260, /* T_WALL */ + T_OPTION = 261, /* T_OPTION */ + T_PARAM = 262, /* T_PARAM */ + T_STRING = 263, /* T_STRING */ + T_DIMENSION = 264, /* T_DIMENSION */ + T_OFFSET = 265, /* T_OFFSET */ + T_ORIGIN = 266, /* T_ORIGIN */ + T_COMMENT = 267, /* T_COMMENT */ + T_LINE_COMMENT = 268 /* T_LINE_COMMENT */ }; + typedef enum yytokentype yytoken_kind_t; #endif -/* Tokens. */ +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 #define T_VIRTUAL 258 #define T_DISPLAY 259 #define T_WALL 260 @@ -73,10 +87,9 @@ /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED - union YYSTYPE { -#line 57 "parser.y" /* yacc.c:1913 */ +#line 57 "parser.y" DMXConfigTokenPtr token; DMXConfigStringPtr string; @@ -93,9 +106,9 @@ DMXConfigVirtualPtr virtual; DMXConfigEntryPtr entry; -#line 97 "parser.h" /* yacc.c:1913 */ -}; +#line 110 "parser.h" +}; typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 diff -Nru xorg-server-1.20.9/hw/dmx/dmxextension.c xorg-server-1.20.13/hw/dmx/dmxextension.c --- xorg-server-1.20.9/hw/dmx/dmxextension.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/dmxextension.c 2021-07-29 18:48:14.000000000 +0000 @@ -68,9 +68,6 @@ * _any_ header files. */ extern FontPtr defaultFont; -/* Hack to get Present to build (present requires RandR) */ -RESTYPE RRCrtcType; - /** This routine provides information to the DMX protocol extension * about a particular screen. */ Bool diff -Nru xorg-server-1.20.9/hw/dmx/dmxinit.c xorg-server-1.20.13/hw/dmx/dmxinit.c --- xorg-server-1.20.9/hw/dmx/dmxinit.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/dmxinit.c 2021-07-29 18:48:14.000000000 +0000 @@ -109,8 +109,6 @@ Bool dmxGLXFinishSwap = FALSE; #endif -RESTYPE RRProviderType = 0; - Bool dmxIgnoreBadFontPaths = FALSE; Bool dmxAddRemoveScreens = FALSE; diff -Nru xorg-server-1.20.9/hw/dmx/doc/Makefile.in xorg-server-1.20.13/hw/dmx/doc/Makefile.in --- xorg-server-1.20.9/hw/dmx/doc/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/doc/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -521,6 +521,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/dmx/doxygen/Makefile.in xorg-server-1.20.13/hw/dmx/doxygen/Makefile.in --- xorg-server-1.20.9/hw/dmx/doxygen/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/doxygen/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -502,6 +502,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/dmx/examples/Makefile.in xorg-server-1.20.13/hw/dmx/examples/Makefile.in --- xorg-server-1.20.9/hw/dmx/examples/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/examples/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -642,6 +642,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/dmx/glxProxy/Makefile.in xorg-server-1.20.13/hw/dmx/glxProxy/Makefile.in --- xorg-server-1.20.9/hw/dmx/glxProxy/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/glxProxy/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -545,6 +545,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/dmx/input/Makefile.in xorg-server-1.20.13/hw/dmx/input/Makefile.in --- xorg-server-1.20.9/hw/dmx/input/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/input/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -557,6 +557,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/dmx/Makefile.in xorg-server-1.20.13/hw/dmx/Makefile.in --- xorg-server-1.20.9/hw/dmx/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -616,6 +616,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/dmx/man/Makefile.in xorg-server-1.20.13/hw/dmx/man/Makefile.in --- xorg-server-1.20.9/hw/dmx/man/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/dmx/man/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -539,6 +539,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/kdrive/ephyr/Makefile.in xorg-server-1.20.13/hw/kdrive/ephyr/Makefile.in --- xorg-server-1.20.9/hw/kdrive/ephyr/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/kdrive/ephyr/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -609,6 +609,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/kdrive/ephyr/man/Makefile.in xorg-server-1.20.13/hw/kdrive/ephyr/man/Makefile.in --- xorg-server-1.20.9/hw/kdrive/ephyr/man/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/kdrive/ephyr/man/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -539,6 +539,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/kdrive/Makefile.in xorg-server-1.20.13/hw/kdrive/Makefile.in --- xorg-server-1.20.9/hw/kdrive/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/kdrive/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -536,6 +536,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/kdrive/src/Makefile.in xorg-server-1.20.13/hw/kdrive/src/Makefile.in --- xorg-server-1.20.9/hw/kdrive/src/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/kdrive/src/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -537,6 +537,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/Makefile.in xorg-server-1.20.13/hw/Makefile.in --- xorg-server-1.20.9/hw/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/Makefile.in 2021-07-29 18:48:29.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -536,6 +536,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/vfb/Makefile.in xorg-server-1.20.13/hw/vfb/Makefile.in --- xorg-server-1.20.9/hw/vfb/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/vfb/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -584,6 +584,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/vfb/man/Makefile.in xorg-server-1.20.13/hw/vfb/man/Makefile.in --- xorg-server-1.20.9/hw/vfb/man/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/vfb/man/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -539,6 +539,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/common/Makefile.in xorg-server-1.20.13/hw/xfree86/common/Makefile.in --- xorg-server-1.20.9/hw/xfree86/common/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/common/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -607,6 +607,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -929,7 +930,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1092,7 +1094,7 @@ uninstall-am: uninstall-sdkHEADERS -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-generic clean-libtool clean-noinstLTLIBRARIES \ diff -Nru xorg-server-1.20.9/hw/xfree86/common/xf86Bus.c xorg-server-1.20.13/hw/xfree86/common/xf86Bus.c --- xorg-server-1.20.9/hw/xfree86/common/xf86Bus.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/common/xf86Bus.c 2021-07-29 18:48:14.000000000 +0000 @@ -525,8 +525,8 @@ for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++) if (xf86Entities[entityIndex]->devices[i]->screen == instance) - break; - return xf86Entities[entityIndex]->devices[i]; + return xf86Entities[entityIndex]->devices[i]; + return NULL; } /* diff -Nru xorg-server-1.20.9/hw/xfree86/common/xf86Config.c xorg-server-1.20.13/hw/xfree86/common/xf86Config.c --- xorg-server-1.20.9/hw/xfree86/common/xf86Config.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/common/xf86Config.c 2021-07-29 18:48:14.000000000 +0000 @@ -1760,31 +1760,30 @@ count++; dispptr = (XF86ConfDisplayPtr) dispptr->list.next; } - screenp->displays = xnfallocarray(count, sizeof(DispRec)); + screenp->displays = xnfallocarray(count, sizeof(DispPtr)); screenp->numdisplays = count; - /* Fill in the default Virtual size, if any */ - if (conf_screen->scrn_virtualX && conf_screen->scrn_virtualY) { - for (count = 0, dispptr = conf_screen->scrn_display_lst; - dispptr; - dispptr = (XF86ConfDisplayPtr) dispptr->list.next, count++) { - screenp->displays[count].virtualX = conf_screen->scrn_virtualX; - screenp->displays[count].virtualY = conf_screen->scrn_virtualY; + for (count = 0, dispptr = conf_screen->scrn_display_lst; + dispptr; + dispptr = (XF86ConfDisplayPtr) dispptr->list.next, count++) { + + /* Allocate individual Display records */ + screenp->displays[count] = xnfcalloc(1, sizeof(DispRec)); + + /* Fill in the default Virtual size, if any */ + if (conf_screen->scrn_virtualX && conf_screen->scrn_virtualY) { + screenp->displays[count]->virtualX = conf_screen->scrn_virtualX; + screenp->displays[count]->virtualY = conf_screen->scrn_virtualY; } - } - /* Now do the per-Display Virtual sizes */ - count = 0; - dispptr = conf_screen->scrn_display_lst; - while (dispptr) { - configDisplay(&(screenp->displays[count]), dispptr); - count++; - dispptr = (XF86ConfDisplayPtr) dispptr->list.next; + /* Now do the per-Display Virtual sizes */ + configDisplay(screenp->displays[count], dispptr); } /* * figure out how many videoadaptor references there are and fill them in */ + count = 0; conf_adaptor = conf_screen->scrn_adaptor_lst; while (conf_adaptor) { count++; diff -Nru xorg-server-1.20.9/hw/xfree86/common/xf86Helper.c xorg-server-1.20.13/hw/xfree86/common/xf86Helper.c --- xorg-server-1.20.9/hw/xfree86/common/xf86Helper.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/common/xf86Helper.c 2021-07-29 18:48:14.000000000 +0000 @@ -525,8 +525,8 @@ * Find the Display subsection matching the depth/fbbpp and initialise * scrp->display with it. */ - for (i = 0, disp = scrp->confScreen->displays; - i < scrp->confScreen->numdisplays; i++, disp++) { + for (i = 0; i < scrp->confScreen->numdisplays; i++) { + disp = scrp->confScreen->displays[i]; if ((disp->depth == scrp->depth && disp->fbbpp == scrp->bitsPerPixel) || (disp->depth == scrp->depth && disp->fbbpp <= 0) || (disp->fbbpp == scrp->bitsPerPixel && disp->depth <= 0)) { @@ -540,8 +540,8 @@ * depth or fbbpp specified. */ if (i == scrp->confScreen->numdisplays) { - for (i = 0, disp = scrp->confScreen->displays; - i < scrp->confScreen->numdisplays; i++, disp++) { + for (i = 0; i < scrp->confScreen->numdisplays; i++) { + disp = scrp->confScreen->displays[i]; if (disp->depth <= 0 && disp->fbbpp <= 0) { scrp->display = disp; break; @@ -556,24 +556,25 @@ scrp->confScreen->numdisplays++; scrp->confScreen->displays = xnfreallocarray(scrp->confScreen->displays, - scrp->confScreen->numdisplays, sizeof(DispRec)); + scrp->confScreen->numdisplays, sizeof(DispPtr)); xf86DrvMsg(scrp->scrnIndex, X_INFO, "Creating default Display subsection in Screen section\n" "\t\"%s\" for depth/fbbpp %d/%d\n", scrp->confScreen->id, scrp->depth, scrp->bitsPerPixel); - memset(&scrp->confScreen->displays[i], 0, sizeof(DispRec)); - scrp->confScreen->displays[i].blackColour.red = -1; - scrp->confScreen->displays[i].blackColour.green = -1; - scrp->confScreen->displays[i].blackColour.blue = -1; - scrp->confScreen->displays[i].whiteColour.red = -1; - scrp->confScreen->displays[i].whiteColour.green = -1; - scrp->confScreen->displays[i].whiteColour.blue = -1; - scrp->confScreen->displays[i].defaultVisual = -1; - scrp->confScreen->displays[i].modes = xnfalloc(sizeof(char *)); - scrp->confScreen->displays[i].modes[0] = NULL; - scrp->confScreen->displays[i].depth = depth; - scrp->confScreen->displays[i].fbbpp = fbbpp; - scrp->display = &scrp->confScreen->displays[i]; + scrp->confScreen->displays[i] = xnfcalloc(1, sizeof(DispRec)); + memset(scrp->confScreen->displays[i], 0, sizeof(DispRec)); + scrp->confScreen->displays[i]->blackColour.red = -1; + scrp->confScreen->displays[i]->blackColour.green = -1; + scrp->confScreen->displays[i]->blackColour.blue = -1; + scrp->confScreen->displays[i]->whiteColour.red = -1; + scrp->confScreen->displays[i]->whiteColour.green = -1; + scrp->confScreen->displays[i]->whiteColour.blue = -1; + scrp->confScreen->displays[i]->defaultVisual = -1; + scrp->confScreen->displays[i]->modes = xnfalloc(sizeof(char *)); + scrp->confScreen->displays[i]->modes[0] = NULL; + scrp->confScreen->displays[i]->depth = depth; + scrp->confScreen->displays[i]->fbbpp = fbbpp; + scrp->display = scrp->confScreen->displays[i]; } /* diff -Nru xorg-server-1.20.9/hw/xfree86/common/xf86str.h xorg-server-1.20.13/hw/xfree86/common/xf86str.h --- xorg-server-1.20.9/hw/xfree86/common/xf86str.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/common/xf86str.h 2021-07-29 18:48:14.000000000 +0000 @@ -349,7 +349,7 @@ MonPtr monitor; GDevPtr device; int numdisplays; - DispPtr displays; + DispPtr *displays; int numxvadaptors; confXvAdaptorPtr xvadaptors; void *options; diff -Nru xorg-server-1.20.9/hw/xfree86/ddc/Makefile.in xorg-server-1.20.13/hw/xfree86/ddc/Makefile.in --- xorg-server-1.20.9/hw/xfree86/ddc/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/ddc/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -559,6 +559,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/dixmods/Makefile.in xorg-server-1.20.13/hw/xfree86/dixmods/Makefile.in --- xorg-server-1.20.9/hw/xfree86/dixmods/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/dixmods/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -601,6 +601,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/doc/Makefile.in xorg-server-1.20.13/hw/xfree86/doc/Makefile.in --- xorg-server-1.20.9/hw/xfree86/doc/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/doc/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -500,6 +500,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/dri/Makefile.in xorg-server-1.20.13/hw/xfree86/dri/Makefile.in --- xorg-server-1.20.9/hw/xfree86/dri/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/dri/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -557,6 +557,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/dri2/Makefile.in xorg-server-1.20.13/hw/xfree86/dri2/Makefile.in --- xorg-server-1.20.9/hw/xfree86/dri2/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/dri2/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -599,6 +599,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/dri2/pci_ids/Makefile.in xorg-server-1.20.13/hw/xfree86/dri2/pci_ids/Makefile.in --- xorg-server-1.20.9/hw/xfree86/dri2/pci_ids/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/dri2/pci_ids/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -477,6 +477,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/drivers/Makefile.in xorg-server-1.20.13/hw/xfree86/drivers/Makefile.in --- xorg-server-1.20.9/hw/xfree86/drivers/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -538,6 +538,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/drivers/modesetting/dri2.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/dri2.c --- xorg-server-1.20.9/hw/xfree86/drivers/modesetting/dri2.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/dri2.c 2021-07-29 18:48:14.000000000 +0000 @@ -549,7 +549,7 @@ return FALSE; #endif - if (ms_crtc_on(config->crtc[i])) + if (xf86_crtc_on(config->crtc[i])) num_crtcs_on++; } diff -Nru xorg-server-1.20.9/hw/xfree86/drivers/modesetting/driver.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/driver.c --- xorg-server-1.20.9/hw/xfree86/drivers/modesetting/driver.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/driver.c 2021-07-29 18:48:14.000000000 +0000 @@ -705,7 +705,7 @@ msBlockHandler(pScreen, pTimeout); - drmmode_set_desired_modes(pScrn, &ms->drmmode, TRUE); + drmmode_set_desired_modes(pScrn, &ms->drmmode, TRUE, FALSE); } static void @@ -1348,7 +1348,7 @@ ret = pScreen->CreateScreenResources(pScreen); pScreen->CreateScreenResources = CreateScreenResources; - if (!drmmode_set_desired_modes(pScrn, &ms->drmmode, pScrn->is_gpu)) + if (!drmmode_set_desired_modes(pScrn, &ms->drmmode, pScrn->is_gpu, FALSE)) return FALSE; if (!drmmode_glamor_handle_new_screen_pixmap(&ms->drmmode)) @@ -1747,28 +1747,41 @@ "Failed to initialize the DRI2 extension.\n"); } - if (!(ms->drmmode.present_enable = ms_present_screen_init(pScreen))) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Failed to initialize the Present extension.\n"); - } /* enable reverse prime if we are a GPU screen, and accelerated, and not - * i915. i915 is happy scanning out from sysmem. */ + * i915, evdi or udl. i915 is happy scanning out from sysmem. + * evdi and udl are virtual drivers scanning out from sysmem + * backed dumb buffers. + */ if (pScreen->isGPU) { drmVersionPtr version; /* enable if we are an accelerated GPU screen */ ms->drmmode.reverse_prime_offload_mode = TRUE; - /* disable if we detect i915 */ if ((version = drmGetVersion(ms->drmmode.fd))) { if (!strncmp("i915", version->name, version->name_len)) { ms->drmmode.reverse_prime_offload_mode = FALSE; } + if (!strncmp("evdi", version->name, version->name_len)) { + ms->drmmode.reverse_prime_offload_mode = FALSE; + } + if (!strncmp("udl", version->name, version->name_len)) { + ms->drmmode.reverse_prime_offload_mode = FALSE; + } + if (!ms->drmmode.reverse_prime_offload_mode) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Disable reverse prime offload mode for %s.\n", version->name); + } drmFreeVersion(version); } } } #endif + if (!(ms->drmmode.present_enable = ms_present_screen_init(pScreen))) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Failed to initialize the Present extension.\n"); + } + pScrn->vtSema = TRUE; @@ -1820,8 +1833,25 @@ SetMaster(pScrn); - if (!drmmode_set_desired_modes(pScrn, &ms->drmmode, TRUE)) - return FALSE; + drmmode_update_kms_state(&ms->drmmode); + + /* allow not all modes to be set successfully since some events might have + * happened while not being master that could prevent the previous + * configuration from being re-applied. + */ + if (!drmmode_set_desired_modes(pScrn, &ms->drmmode, TRUE, TRUE)) { + xf86DisableUnusedFunctions(pScrn); + + /* TODO: check that at least one screen is on, to allow the user to fix + * their setup if all modeset failed... + */ + + /* Tell the desktop environment that something changed, so that they + * can hopefully correct the situation + */ + RRSetChanged(xf86ScrnToScreen(pScrn)); + RRTellChanged(xf86ScrnToScreen(pScrn)); + } return TRUE; } diff -Nru xorg-server-1.20.9/hw/xfree86/drivers/modesetting/driver.h xorg-server-1.20.13/hw/xfree86/drivers/modesetting/driver.h --- xorg-server-1.20.9/hw/xfree86/drivers/modesetting/driver.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/driver.h 2021-07-29 18:48:14.000000000 +0000 @@ -146,7 +146,7 @@ void *match_data); void ms_drm_abort_seq(ScrnInfoPtr scrn, uint32_t seq); -Bool ms_crtc_on(xf86CrtcPtr crtc); +Bool xf86_crtc_on(xf86CrtcPtr crtc); xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr pDraw); RRCrtcPtr ms_randr_crtc_covering_drawable(DrawablePtr pDraw); diff -Nru xorg-server-1.20.9/hw/xfree86/drivers/modesetting/drmmode_display.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/drmmode_display.c --- xorg-server-1.20.9/hw/xfree86/drivers/modesetting/drmmode_display.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/drmmode_display.c 2021-07-29 18:48:14.000000000 +0000 @@ -2997,9 +2997,9 @@ output->driver_private = drmmode_output; output->non_desktop = nonDesktop; - output->possible_crtcs = 0x7f; + output->possible_crtcs = 0; for (i = 0; i < koutput->count_encoders; i++) { - output->possible_crtcs &= kencoders[i]->possible_crtcs >> crtcshift; + output->possible_crtcs |= (kencoders[i]->possible_crtcs >> crtcshift) & 0x7f; } /* work out the possible clones later */ output->possible_clones = 0; @@ -3021,8 +3021,14 @@ "DPMS"); } - if (dynamic) + if (dynamic) { output->randr_output = RROutputCreate(xf86ScrnToScreen(pScrn), output->name, strlen(output->name), output); + if (output->randr_output) { + drmmode_output_create_resources(output); + RRPostPendingProperties(output->randr_output); + } + } + return 1; out_free_encoders: @@ -3457,9 +3463,11 @@ } Bool -drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw) +drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw, + Bool ign_err) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); + Bool success = TRUE; int c; for (c = 0; c < config->num_crtc; c++) { @@ -3507,8 +3515,17 @@ if (set_hw) { if (!crtc->funcs-> set_mode_major(crtc, &crtc->desiredMode, crtc->desiredRotation, - crtc->desiredX, crtc->desiredY)) - return FALSE; + crtc->desiredX, crtc->desiredY)) { + if (!ign_err) + return FALSE; + else { + success = FALSE; + crtc->enabled = FALSE; + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Failed to set the desired mode on connector %s\n", + output->name); + } + } } else { crtc->mode = crtc->desiredMode; crtc->rotation = crtc->desiredRotation; @@ -3522,7 +3539,7 @@ /* Validate leases on VT re-entry */ drmmode_validate_leases(pScrn); - return TRUE; + return success; } static void @@ -3607,30 +3624,19 @@ return TRUE; } -#ifdef CONFIG_UDEV_KMS - #define DRM_MODE_LINK_STATUS_GOOD 0 #define DRM_MODE_LINK_STATUS_BAD 1 -static void -drmmode_handle_uevents(int fd, void *closure) +void +drmmode_update_kms_state(drmmode_ptr drmmode) { - drmmode_ptr drmmode = closure; ScrnInfoPtr scrn = drmmode->scrn; - struct udev_device *dev; drmModeResPtr mode_res; xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); int i, j; Bool found = FALSE; Bool changed = FALSE; - while ((dev = udev_monitor_receive_device(drmmode->uevent_monitor))) { - udev_device_unref(dev); - found = TRUE; - } - if (!found) - return; - /* Try to re-set the mode on all the connectors with a BAD link-state: * This may happen if a link degrades and a new modeset is necessary, using * different link-training parameters. If the kernel found that the current @@ -3745,6 +3751,25 @@ #undef DRM_MODE_LINK_STATUS_BAD #undef DRM_MODE_LINK_STATUS_GOOD +#ifdef CONFIG_UDEV_KMS + +static void +drmmode_handle_uevents(int fd, void *closure) +{ + drmmode_ptr drmmode = closure; + struct udev_device *dev; + Bool found = FALSE; + + while ((dev = udev_monitor_receive_device(drmmode->uevent_monitor))) { + udev_device_unref(dev); + found = TRUE; + } + if (!found) + return; + + drmmode_update_kms_state(drmmode); +} + #endif void diff -Nru xorg-server-1.20.9/hw/xfree86/drivers/modesetting/drmmode_display.h xorg-server-1.20.13/hw/xfree86/drivers/modesetting/drmmode_display.h --- xorg-server-1.20.9/hw/xfree86/drivers/modesetting/drmmode_display.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/drmmode_display.h 2021-07-29 18:48:14.000000000 +0000 @@ -278,9 +278,11 @@ extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp); extern Bool drmmode_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode); void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y); -extern Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw); +extern Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, + Bool set_hw, Bool ign_err); extern Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn); +extern void drmmode_update_kms_state(drmmode_ptr drmmode); extern void drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode); extern void drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode); diff -Nru xorg-server-1.20.9/hw/xfree86/drivers/modesetting/Makefile.in xorg-server-1.20.13/hw/xfree86/drivers/modesetting/Makefile.in --- xorg-server-1.20.9/hw/xfree86/drivers/modesetting/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -626,6 +626,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/drivers/modesetting/pageflip.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/pageflip.c --- xorg-server-1.20.9/hw/xfree86/drivers/modesetting/pageflip.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/pageflip.c 2021-07-29 18:48:14.000000000 +0000 @@ -301,7 +301,7 @@ for (i = 0; i < config->num_crtc; i++) { xf86CrtcPtr crtc = config->crtc[i]; - if (!ms_crtc_on(crtc)) + if (!xf86_crtc_on(crtc)) continue; if (!queue_flip_on_crtc(screen, crtc, flipdata, diff -Nru xorg-server-1.20.9/hw/xfree86/drivers/modesetting/present.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/present.c --- xorg-server-1.20.9/hw/xfree86/drivers/modesetting/present.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/present.c 2021-07-29 18:48:14.000000000 +0000 @@ -244,7 +244,7 @@ if (drmmode_crtc->rotate_bo.gbm) return FALSE; - if (ms_crtc_on(config->crtc[i])) + if (xf86_crtc_on(config->crtc[i])) num_crtcs_on++; } @@ -257,6 +257,9 @@ pixmap->devKind != drmmode_bo_get_pitch(&ms->drmmode.front_bo)) return FALSE; + if (!ms->drmmode.glamor) + return FALSE; + #ifdef GBM_BO_WITH_MODIFIERS /* Check if buffer format/modifier is supported by all active CRTCs */ gbm = glamor_gbm_bo_from_pixmap(screen, pixmap); diff -Nru xorg-server-1.20.9/hw/xfree86/drivers/modesetting/vblank.c xorg-server-1.20.13/hw/xfree86/drivers/modesetting/vblank.c --- xorg-server-1.20.9/hw/xfree86/drivers/modesetting/vblank.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/drivers/modesetting/vblank.c 2021-07-29 18:48:14.000000000 +0000 @@ -49,7 +49,7 @@ static struct xorg_list ms_drm_queue; static uint32_t ms_drm_seq; -static void ms_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) +static void box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) { dest->x1 = a->x1 > b->x1 ? a->x1 : b->x1; dest->x2 = a->x2 < b->x2 ? a->x2 : b->x2; @@ -64,20 +64,7 @@ dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0; } -static void ms_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) -{ - if (crtc->enabled) { - crtc_box->x1 = crtc->x; - crtc_box->x2 = - crtc->x + xf86ModeWidth(&crtc->mode, crtc->rotation); - crtc_box->y1 = crtc->y; - crtc_box->y2 = - crtc->y + xf86ModeHeight(&crtc->mode, crtc->rotation); - } else - crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0; -} - -static void ms_randr_crtc_box(RRCrtcPtr crtc, BoxPtr crtc_box) +static void rr_crtc_box(RRCrtcPtr crtc, BoxPtr crtc_box) { if (crtc->mode) { crtc_box->x1 = crtc->x; @@ -99,133 +86,44 @@ crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0; } -static int ms_box_area(BoxPtr box) +static int box_area(BoxPtr box) { return (int)(box->x2 - box->x1) * (int)(box->y2 - box->y1); } +static Bool rr_crtc_on(RRCrtcPtr crtc, Bool crtc_is_xf86_hint) +{ + if (!crtc) { + return FALSE; + } + if (crtc_is_xf86_hint && crtc->devPrivate) { + return xf86_crtc_on(crtc->devPrivate); + } else { + return !!crtc->mode; + } +} + Bool -ms_crtc_on(xf86CrtcPtr crtc) +xf86_crtc_on(xf86CrtcPtr crtc) { drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; return crtc->enabled && drmmode_crtc->dpms_mode == DPMSModeOn; } -/* - * Return the first output which is connected to an active CRTC on this screen. - * - * RRFirstOutput() will return an output from a slave screen if it is primary, - * which is not the behavior that ms_covering_crtc() wants. - */ - -static RROutputPtr ms_first_output(ScreenPtr pScreen) -{ - rrScrPriv(pScreen); - RROutputPtr output; - int i, j; - - if (!pScrPriv) - return NULL; - - if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc && - (pScrPriv->primaryOutput->pScreen == pScreen)) { - return pScrPriv->primaryOutput; - } - - for (i = 0; i < pScrPriv->numCrtcs; i++) { - RRCrtcPtr crtc = pScrPriv->crtcs[i]; - - for (j = 0; j < pScrPriv->numOutputs; j++) { - output = pScrPriv->outputs[j]; - if (output->crtc == crtc) - return output; - } - } - return NULL; -} /* * Return the crtc covering 'box'. If two crtcs cover a portion of * 'box', then prefer the crtc with greater coverage. */ - -static xf86CrtcPtr -ms_covering_xf86_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms) -{ - ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - xf86CrtcPtr crtc, best_crtc; - int coverage, best_coverage; - int c; - BoxRec crtc_box, cover_box; - Bool crtc_on; - - best_crtc = NULL; - best_coverage = 0; - - if (!xf86_config) - return NULL; - - for (c = 0; c < xf86_config->num_crtc; c++) { - crtc = xf86_config->crtc[c]; - - if (screen_is_ms) - crtc_on = ms_crtc_on(crtc); - else - crtc_on = crtc->enabled; - - /* If the CRTC is off, treat it as not covering */ - if (!crtc_on) - continue; - - ms_crtc_box(crtc, &crtc_box); - ms_box_intersect(&cover_box, &crtc_box, box); - coverage = ms_box_area(&cover_box); - if (coverage > best_coverage) { - best_crtc = crtc; - best_coverage = coverage; - } - } - - /* Fallback to primary crtc for drawable's on slave outputs */ - if (best_crtc == NULL && !pScreen->isGPU) { - RROutputPtr primary_output = NULL; - ScreenPtr slave; - - if (dixPrivateKeyRegistered(rrPrivKey)) - primary_output = ms_first_output(scrn->pScreen); - if (!primary_output || !primary_output->crtc) - return NULL; - - crtc = primary_output->crtc->devPrivate; - if (!ms_crtc_on(crtc)) - return NULL; - - xorg_list_for_each_entry(slave, &pScreen->slave_list, slave_head) { - if (!slave->is_output_slave) - continue; - - if (ms_covering_xf86_crtc(slave, box, FALSE)) { - /* The drawable is on a slave output, return primary crtc */ - return crtc; - } - } - } - - return best_crtc; -} - static RRCrtcPtr -ms_covering_randr_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms) +rr_crtc_covering_box(ScreenPtr pScreen, BoxPtr box, Bool screen_is_xf86_hint) { - ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); rrScrPrivPtr pScrPriv; RRCrtcPtr crtc, best_crtc; int coverage, best_coverage; int c; BoxRec crtc_box, cover_box; - Bool crtc_on; best_crtc = NULL; best_coverage = 0; @@ -241,57 +139,47 @@ for (c = 0; c < pScrPriv->numCrtcs; c++) { crtc = pScrPriv->crtcs[c]; - if (screen_is_ms) { - crtc_on = ms_crtc_on((xf86CrtcPtr) crtc->devPrivate); - } else { - crtc_on = !!crtc->mode; - } - /* If the CRTC is off, treat it as not covering */ - if (!crtc_on) + if (!rr_crtc_on(crtc, screen_is_xf86_hint)) continue; - ms_randr_crtc_box(crtc, &crtc_box); - ms_box_intersect(&cover_box, &crtc_box, box); - coverage = ms_box_area(&cover_box); + rr_crtc_box(crtc, &crtc_box); + box_intersect(&cover_box, &crtc_box, box); + coverage = box_area(&cover_box); if (coverage > best_coverage) { best_crtc = crtc; best_coverage = coverage; } } - /* Fallback to primary crtc for drawable's on slave outputs */ - if (best_crtc == NULL && !pScreen->isGPU) { - RROutputPtr primary_output = NULL; - ScreenPtr slave; + return best_crtc; +} - if (dixPrivateKeyRegistered(rrPrivKey)) - primary_output = ms_first_output(scrn->pScreen); - if (!primary_output || !primary_output->crtc) - return NULL; - - crtc = primary_output->crtc; - if (!ms_crtc_on((xf86CrtcPtr) crtc->devPrivate)) - return NULL; +static RRCrtcPtr +rr_crtc_covering_box_on_slave(ScreenPtr pScreen, BoxPtr box) +{ + if (!pScreen->isGPU) { + ScreenPtr slave; + RRCrtcPtr crtc = NULL; xorg_list_for_each_entry(slave, &pScreen->slave_list, slave_head) { if (!slave->is_output_slave) continue; - if (ms_covering_randr_crtc(slave, box, FALSE)) { - /* The drawable is on a slave output, return primary crtc */ + crtc = rr_crtc_covering_box(slave, box, FALSE); + if (crtc) return crtc; - } } } - return best_crtc; + return NULL; } xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr pDraw) { ScreenPtr pScreen = pDraw->pScreen; + RRCrtcPtr crtc = NULL; BoxRec box; box.x1 = pDraw->x; @@ -299,13 +187,18 @@ box.x2 = box.x1 + pDraw->width; box.y2 = box.y1 + pDraw->height; - return ms_covering_xf86_crtc(pScreen, &box, TRUE); + crtc = rr_crtc_covering_box(pScreen, &box, TRUE); + if (crtc) { + return crtc->devPrivate; + } + return NULL; } RRCrtcPtr ms_randr_crtc_covering_drawable(DrawablePtr pDraw) { ScreenPtr pScreen = pDraw->pScreen; + RRCrtcPtr crtc = NULL; BoxRec box; box.x1 = pDraw->x; @@ -313,7 +206,11 @@ box.x2 = box.x1 + pDraw->width; box.y2 = box.y1 + pDraw->height; - return ms_covering_randr_crtc(pScreen, &box, TRUE); + crtc = rr_crtc_covering_box(pScreen, &box, TRUE); + if (!crtc) { + crtc = rr_crtc_covering_box_on_slave(pScreen, &box); + } + return crtc; } static Bool diff -Nru xorg-server-1.20.9/hw/xfree86/exa/Makefile.in xorg-server-1.20.13/hw/xfree86/exa/Makefile.in --- xorg-server-1.20.9/hw/xfree86/exa/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/exa/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -601,6 +601,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/exa/man/Makefile.in xorg-server-1.20.13/hw/xfree86/exa/man/Makefile.in --- xorg-server-1.20.9/hw/xfree86/exa/man/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/exa/man/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -539,6 +539,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/fbdevhw/Makefile.in xorg-server-1.20.13/hw/xfree86/fbdevhw/Makefile.in --- xorg-server-1.20.9/hw/xfree86/fbdevhw/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/fbdevhw/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -605,6 +605,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/fbdevhw/man/Makefile.in xorg-server-1.20.13/hw/xfree86/fbdevhw/man/Makefile.in --- xorg-server-1.20.9/hw/xfree86/fbdevhw/man/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/fbdevhw/man/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -539,6 +539,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/glamor_egl/Makefile.in xorg-server-1.20.13/hw/xfree86/glamor_egl/Makefile.in --- xorg-server-1.20.9/hw/xfree86/glamor_egl/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/glamor_egl/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -583,6 +583,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/i2c/Makefile.in xorg-server-1.20.13/hw/xfree86/i2c/Makefile.in --- xorg-server-1.20.9/hw/xfree86/i2c/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/i2c/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -557,6 +557,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/int10/Makefile.in xorg-server-1.20.13/hw/xfree86/int10/Makefile.in --- xorg-server-1.20.9/hw/xfree86/int10/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/int10/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -581,6 +581,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/loader/Makefile.in xorg-server-1.20.13/hw/xfree86/loader/Makefile.in --- xorg-server-1.20.9/hw/xfree86/loader/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/loader/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -528,6 +528,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/Makefile.in xorg-server-1.20.13/hw/xfree86/Makefile.in --- xorg-server-1.20.9/hw/xfree86/Makefile.in 2020-08-25 15:40:06.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/Makefile.in 2021-07-29 18:48:30.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -590,6 +590,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -1027,7 +1028,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -1136,7 +1138,7 @@ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: $(am__recursive_targets) all check install install-am \ - install-exec-am install-strip uninstall-am + install-exec install-exec-am install-strip uninstall-am .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles check check-am clean clean-binPROGRAMS \ diff -Nru xorg-server-1.20.9/hw/xfree86/man/Makefile.in xorg-server-1.20.13/hw/xfree86/man/Makefile.in --- xorg-server-1.20.9/hw/xfree86/man/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/man/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -542,6 +542,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/modes/Makefile.in xorg-server-1.20.13/hw/xfree86/modes/Makefile.in --- xorg-server-1.20.9/hw/xfree86/modes/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/modes/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -567,6 +567,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/os-support/bsd/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/bsd/Makefile.in --- xorg-server-1.20.9/hw/xfree86/os-support/bsd/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/bsd/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -560,6 +560,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/os-support/bus/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/bus/Makefile.in --- xorg-server-1.20.9/hw/xfree86/os-support/bus/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/bus/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -568,6 +568,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/os-support/hurd/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/hurd/Makefile.in --- xorg-server-1.20.9/hw/xfree86/os-support/hurd/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/hurd/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -534,6 +534,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/os-support/linux/lnx_platform.c xorg-server-1.20.13/hw/xfree86/os-support/linux/lnx_platform.c --- xorg-server-1.20.9/hw/xfree86/os-support/linux/lnx_platform.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/linux/lnx_platform.c 2021-07-29 18:48:14.000000000 +0000 @@ -23,13 +23,13 @@ static Bool get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index) { + drmSetVersion sv; drmVersionPtr v; + char *buf; int fd; int err = 0; Bool paused, server_fd = FALSE; - LogMessage(X_INFO, "Platform probe for %s\n", attribs->syspath); - fd = systemd_logind_take_fd(attribs->major, attribs->minor, path, &paused); if (fd != -1) { if (paused) { @@ -48,6 +48,18 @@ if (fd == -1) return FALSE; + sv.drm_di_major = 1; + sv.drm_di_minor = 4; + sv.drm_dd_major = -1; /* Don't care */ + sv.drm_dd_minor = -1; /* Don't care */ + + err = drmSetInterfaceVersion(fd, &sv); + if (err) { + xf86Msg(X_ERROR, "%s: failed to set DRM interface version 1.4: %s\n", + path, strerror(-err)); + goto out; + } + /* for a delayed probe we've already added the device */ if (delayed_index == -1) { xf86_add_platform_device(attribs, FALSE); @@ -57,6 +69,10 @@ if (server_fd) xf86_platform_devices[delayed_index].flags |= XF86_PDEV_SERVER_FD; + buf = drmGetBusid(fd); + xf86_platform_odev_attributes(delayed_index)->busid = XNFstrdup(buf); + drmFreeBusid(buf); + v = drmGetVersion(fd); if (!v) { xf86Msg(X_ERROR, "%s: failed to query DRM version\n", path); diff -Nru xorg-server-1.20.9/hw/xfree86/os-support/linux/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/linux/Makefile.in --- xorg-server-1.20.9/hw/xfree86/os-support/linux/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/linux/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -550,6 +550,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/os-support/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/Makefile.in --- xorg-server-1.20.9/hw/xfree86/os-support/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -595,6 +595,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/os-support/misc/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/misc/Makefile.in --- xorg-server-1.20.9/hw/xfree86/os-support/misc/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/misc/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -527,6 +527,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/os-support/solaris/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/solaris/Makefile.in --- xorg-server-1.20.9/hw/xfree86/os-support/solaris/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/solaris/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -589,6 +589,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/os-support/stub/Makefile.in xorg-server-1.20.13/hw/xfree86/os-support/stub/Makefile.in --- xorg-server-1.20.9/hw/xfree86/os-support/stub/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/os-support/stub/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -534,6 +534,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/parser/Makefile.in xorg-server-1.20.13/hw/xfree86/parser/Makefile.in --- xorg-server-1.20.9/hw/xfree86/parser/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/parser/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -569,6 +569,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/ramdac/Makefile.in xorg-server-1.20.13/hw/xfree86/ramdac/Makefile.in --- xorg-server-1.20.9/hw/xfree86/ramdac/Makefile.in 2020-08-25 15:40:07.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/ramdac/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -561,6 +561,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/ramdac/xf86CursorRD.c xorg-server-1.20.13/hw/xfree86/ramdac/xf86CursorRD.c --- xorg-server-1.20.9/hw/xfree86/ramdac/xf86CursorRD.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/ramdac/xf86CursorRD.c 2021-07-29 18:48:14.000000000 +0000 @@ -334,6 +334,9 @@ ScreenPriv->HotY = cursor->bits->yhot; if (!infoPtr->pScrn->vtSema) { + cursor = RefCursor(cursor); + if (ScreenPriv->SavedCursor) + FreeCursor(ScreenPriv->SavedCursor, None); ScreenPriv->SavedCursor = cursor; return; } diff -Nru xorg-server-1.20.9/hw/xfree86/shadowfb/Makefile.in xorg-server-1.20.13/hw/xfree86/shadowfb/Makefile.in --- xorg-server-1.20.9/hw/xfree86/shadowfb/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/shadowfb/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -563,6 +563,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/utils/cvt/Makefile.in xorg-server-1.20.13/hw/xfree86/utils/cvt/Makefile.in --- xorg-server-1.20.9/hw/xfree86/utils/cvt/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/utils/cvt/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -556,6 +556,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/utils/gtf/Makefile.in xorg-server-1.20.13/hw/xfree86/utils/gtf/Makefile.in --- xorg-server-1.20.9/hw/xfree86/utils/gtf/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/utils/gtf/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -554,6 +554,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/utils/Makefile.in xorg-server-1.20.13/hw/xfree86/utils/Makefile.in --- xorg-server-1.20.9/hw/xfree86/utils/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/utils/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -537,6 +537,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/utils/man/Makefile.in xorg-server-1.20.13/hw/xfree86/utils/man/Makefile.in --- xorg-server-1.20.9/hw/xfree86/utils/man/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/utils/man/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -539,6 +539,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/vbe/Makefile.in xorg-server-1.20.13/hw/xfree86/vbe/Makefile.in --- xorg-server-1.20.9/hw/xfree86/vbe/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/vbe/Makefile.in 2021-07-29 18:48:31.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -561,6 +561,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/vgahw/Makefile.in xorg-server-1.20.13/hw/xfree86/vgahw/Makefile.in --- xorg-server-1.20.9/hw/xfree86/vgahw/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/vgahw/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -562,6 +562,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/x86emu/Makefile.in xorg-server-1.20.13/hw/xfree86/x86emu/Makefile.in --- xorg-server-1.20.9/hw/xfree86/x86emu/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/x86emu/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -531,6 +531,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xfree86/xkb/Makefile.in xorg-server-1.20.13/hw/xfree86/xkb/Makefile.in --- xorg-server-1.20.9/hw/xfree86/xkb/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xfree86/xkb/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -528,6 +528,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xnest/Makefile.in xorg-server-1.20.13/hw/xnest/Makefile.in --- xorg-server-1.20.9/hw/xnest/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xnest/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -591,6 +591,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xnest/man/Makefile.in xorg-server-1.20.13/hw/xnest/man/Makefile.in --- xorg-server-1.20.9/hw/xnest/man/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xnest/man/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -539,6 +539,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xquartz/applewm.c xorg-server-1.20.13/hw/xquartz/applewm.c --- xorg-server-1.20.9/hw/xquartz/applewm.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/applewm.c 2021-07-29 18:48:14.000000000 +0000 @@ -34,7 +34,7 @@ #include #endif -#include "quartzCommon.h" +#include "quartz.h" #include "misc.h" #include "dixstruct.h" diff -Nru xorg-server-1.20.9/hw/xquartz/applewmExt.h xorg-server-1.20.13/hw/xquartz/applewmExt.h --- xorg-server-1.20.9/hw/xquartz/applewmExt.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/applewmExt.h 2021-07-29 18:48:14.000000000 +0000 @@ -35,12 +35,6 @@ #include "window.h" #include -#if XPLUGIN_VERSION < 4 -typedef int xp_frame_attr; -typedef int xp_frame_class; -typedef int xp_frame_rect; -#endif - typedef int (*DisableUpdateProc)(void); typedef int (*EnableUpdateProc)(void); typedef int (*SetWindowLevelProc)(WindowPtr pWin, int level); diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Info.plist.cpp xorg-server-1.20.13/hw/xquartz/bundle/Info.plist.cpp --- xorg-server-1.20.9/hw/xquartz/bundle/Info.plist.cpp 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Info.plist.cpp 2021-07-29 18:48:14.000000000 +0000 @@ -39,9 +39,9 @@ LSApplicationCategoryType public.app-category.utilities NSHumanReadableCopyright - © 2003-2016 Apple Inc. + © 2003-2021 Apple Inc. © 2003 XFree86 Project, Inc. -© 2003-2016 X.org Foundation, Inc. +© 2003-2021 X.org Foundation, Inc. NSMainNibFile main diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Makefile.am xorg-server-1.20.13/hw/xquartz/bundle/Makefile.am --- xorg-server-1.20.9/hw/xquartz/bundle/Makefile.am 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Makefile.am 2021-07-29 18:48:14.000000000 +0000 @@ -36,120 +36,150 @@ Resources/ar.lproj/locversion.plist \ Resources/ar.lproj/main.nib/designable.nib \ Resources/ar.lproj/main.nib/keyedobjects.nib \ + Resources/ar.lproj/main.nib/keyedobjects-110000.nib \ Resources/ca.lproj/Localizable.strings \ Resources/ca.lproj/locversion.plist \ Resources/ca.lproj/main.nib/designable.nib \ Resources/ca.lproj/main.nib/keyedobjects.nib \ + Resources/ca.lproj/main.nib/keyedobjects-110000.nib \ Resources/cs.lproj/Localizable.strings \ Resources/cs.lproj/locversion.plist \ Resources/cs.lproj/main.nib/designable.nib \ Resources/cs.lproj/main.nib/keyedobjects.nib \ + Resources/cs.lproj/main.nib/keyedobjects-110000.nib \ Resources/da.lproj/Localizable.strings \ Resources/da.lproj/locversion.plist \ Resources/da.lproj/main.nib/designable.nib \ Resources/da.lproj/main.nib/keyedobjects.nib \ + Resources/da.lproj/main.nib/keyedobjects-110000.nib \ Resources/Dutch.lproj/Localizable.strings \ Resources/Dutch.lproj/locversion.plist \ Resources/Dutch.lproj/main.nib/designable.nib \ Resources/Dutch.lproj/main.nib/keyedobjects.nib \ + Resources/Dutch.lproj/main.nib/keyedobjects-110000.nib \ Resources/el.lproj/Localizable.strings \ Resources/el.lproj/locversion.plist \ Resources/el.lproj/main.nib/designable.nib \ Resources/el.lproj/main.nib/keyedobjects.nib \ + Resources/el.lproj/main.nib/keyedobjects-110000.nib \ Resources/English.lproj/Localizable.strings \ Resources/English.lproj/locversion.plist \ Resources/English.lproj/main.nib/designable.nib \ Resources/English.lproj/main.nib/keyedobjects.nib \ + Resources/English.lproj/main.nib/keyedobjects-110000.nib \ Resources/fi.lproj/Localizable.strings \ Resources/fi.lproj/locversion.plist \ Resources/fi.lproj/main.nib/designable.nib \ Resources/fi.lproj/main.nib/keyedobjects.nib \ + Resources/fi.lproj/main.nib/keyedobjects-110000.nib \ Resources/French.lproj/Localizable.strings \ Resources/French.lproj/locversion.plist \ Resources/French.lproj/main.nib/designable.nib \ Resources/French.lproj/main.nib/keyedobjects.nib \ + Resources/French.lproj/main.nib/keyedobjects-110000.nib \ Resources/German.lproj/Localizable.strings \ Resources/German.lproj/locversion.plist \ Resources/German.lproj/main.nib/designable.nib \ Resources/German.lproj/main.nib/keyedobjects.nib \ + Resources/German.lproj/main.nib/keyedobjects-110000.nib \ Resources/he.lproj/Localizable.strings \ Resources/he.lproj/locversion.plist \ Resources/he.lproj/main.nib/designable.nib \ Resources/he.lproj/main.nib/keyedobjects.nib \ + Resources/he.lproj/main.nib/keyedobjects-110000.nib \ Resources/hr.lproj/Localizable.strings \ Resources/hr.lproj/locversion.plist \ Resources/hr.lproj/main.nib/designable.nib \ Resources/hr.lproj/main.nib/keyedobjects.nib \ + Resources/hr.lproj/main.nib/keyedobjects-110000.nib \ Resources/hu.lproj/Localizable.strings \ Resources/hu.lproj/locversion.plist \ Resources/hu.lproj/main.nib/designable.nib \ Resources/hu.lproj/main.nib/keyedobjects.nib \ + Resources/hu.lproj/main.nib/keyedobjects-110000.nib \ Resources/Italian.lproj/Localizable.strings \ Resources/Italian.lproj/locversion.plist \ Resources/Italian.lproj/main.nib/designable.nib \ Resources/Italian.lproj/main.nib/keyedobjects.nib \ + Resources/Italian.lproj/main.nib/keyedobjects-110000.nib \ Resources/Japanese.lproj/Localizable.strings \ Resources/Japanese.lproj/locversion.plist \ Resources/Japanese.lproj/main.nib/designable.nib \ Resources/Japanese.lproj/main.nib/keyedobjects.nib \ + Resources/Japanese.lproj/main.nib/keyedobjects-110000.nib \ Resources/ko.lproj/Localizable.strings \ Resources/ko.lproj/locversion.plist \ Resources/ko.lproj/main.nib/designable.nib \ Resources/ko.lproj/main.nib/keyedobjects.nib \ + Resources/ko.lproj/main.nib/keyedobjects-110000.nib \ Resources/no.lproj/Localizable.strings \ Resources/no.lproj/locversion.plist \ Resources/no.lproj/main.nib/designable.nib \ Resources/no.lproj/main.nib/keyedobjects.nib \ + Resources/no.lproj/main.nib/keyedobjects-110000.nib \ Resources/pl.lproj/Localizable.strings \ Resources/pl.lproj/locversion.plist \ Resources/pl.lproj/main.nib/designable.nib \ Resources/pl.lproj/main.nib/keyedobjects.nib \ + Resources/pl.lproj/main.nib/keyedobjects-110000.nib \ Resources/pt.lproj/Localizable.strings \ Resources/pt.lproj/locversion.plist \ Resources/pt.lproj/main.nib/designable.nib \ Resources/pt.lproj/main.nib/keyedobjects.nib \ + Resources/pt.lproj/main.nib/keyedobjects-110000.nib \ Resources/pt_PT.lproj/Localizable.strings \ Resources/pt_PT.lproj/locversion.plist \ Resources/pt_PT.lproj/main.nib/designable.nib \ Resources/pt_PT.lproj/main.nib/keyedobjects.nib \ + Resources/pt_PT.lproj/main.nib/keyedobjects-110000.nib \ Resources/ro.lproj/Localizable.strings \ Resources/ro.lproj/locversion.plist \ Resources/ro.lproj/main.nib/designable.nib \ Resources/ro.lproj/main.nib/keyedobjects.nib \ + Resources/ro.lproj/main.nib/keyedobjects-110000.nib \ Resources/ru.lproj/Localizable.strings \ Resources/ru.lproj/locversion.plist \ Resources/ru.lproj/main.nib/designable.nib \ Resources/ru.lproj/main.nib/keyedobjects.nib \ + Resources/ru.lproj/main.nib/keyedobjects-110000.nib \ Resources/sk.lproj/Localizable.strings \ Resources/sk.lproj/locversion.plist \ Resources/sk.lproj/main.nib/designable.nib \ Resources/sk.lproj/main.nib/keyedobjects.nib \ + Resources/sk.lproj/main.nib/keyedobjects-110000.nib \ Resources/Spanish.lproj/Localizable.strings \ Resources/Spanish.lproj/locversion.plist \ Resources/Spanish.lproj/main.nib/designable.nib \ Resources/Spanish.lproj/main.nib/keyedobjects.nib \ + Resources/Spanish.lproj/main.nib/keyedobjects-110000.nib \ Resources/sv.lproj/Localizable.strings \ Resources/sv.lproj/locversion.plist \ Resources/sv.lproj/main.nib/designable.nib \ Resources/sv.lproj/main.nib/keyedobjects.nib \ + Resources/sv.lproj/main.nib/keyedobjects-110000.nib \ Resources/th.lproj/Localizable.strings \ Resources/th.lproj/locversion.plist \ Resources/th.lproj/main.nib/designable.nib \ Resources/th.lproj/main.nib/keyedobjects.nib \ + Resources/th.lproj/main.nib/keyedobjects-110000.nib \ Resources/tr.lproj/Localizable.strings \ Resources/tr.lproj/locversion.plist \ Resources/tr.lproj/main.nib/designable.nib \ Resources/tr.lproj/main.nib/keyedobjects.nib \ + Resources/tr.lproj/main.nib/keyedobjects-110000.nib \ Resources/uk.lproj/Localizable.strings \ Resources/uk.lproj/locversion.plist \ Resources/uk.lproj/main.nib/designable.nib \ Resources/uk.lproj/main.nib/keyedobjects.nib \ + Resources/uk.lproj/main.nib/keyedobjects-110000.nib \ Resources/X11.icns \ Resources/zh_CN.lproj/Localizable.strings \ Resources/zh_CN.lproj/locversion.plist \ Resources/zh_CN.lproj/main.nib/designable.nib \ Resources/zh_CN.lproj/main.nib/keyedobjects.nib \ + Resources/zh_CN.lproj/main.nib/keyedobjects-110000.nib \ Resources/zh_TW.lproj/Localizable.strings \ Resources/zh_TW.lproj/locversion.plist \ Resources/zh_TW.lproj/main.nib/designable.nib \ Resources/zh_TW.lproj/main.nib/keyedobjects.nib + Resources/zh_TW.lproj/main.nib/keyedobjects-110000.nib diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Makefile.in xorg-server-1.20.13/hw/xquartz/bundle/Makefile.in --- xorg-server-1.20.9/hw/xquartz/bundle/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -515,6 +515,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -556,119 +557,148 @@ Resources/ar.lproj/locversion.plist \ Resources/ar.lproj/main.nib/designable.nib \ Resources/ar.lproj/main.nib/keyedobjects.nib \ + Resources/ar.lproj/main.nib/keyedobjects-110000.nib \ Resources/ca.lproj/Localizable.strings \ Resources/ca.lproj/locversion.plist \ Resources/ca.lproj/main.nib/designable.nib \ Resources/ca.lproj/main.nib/keyedobjects.nib \ + Resources/ca.lproj/main.nib/keyedobjects-110000.nib \ Resources/cs.lproj/Localizable.strings \ Resources/cs.lproj/locversion.plist \ Resources/cs.lproj/main.nib/designable.nib \ Resources/cs.lproj/main.nib/keyedobjects.nib \ + Resources/cs.lproj/main.nib/keyedobjects-110000.nib \ Resources/da.lproj/Localizable.strings \ Resources/da.lproj/locversion.plist \ Resources/da.lproj/main.nib/designable.nib \ Resources/da.lproj/main.nib/keyedobjects.nib \ + Resources/da.lproj/main.nib/keyedobjects-110000.nib \ Resources/Dutch.lproj/Localizable.strings \ Resources/Dutch.lproj/locversion.plist \ Resources/Dutch.lproj/main.nib/designable.nib \ Resources/Dutch.lproj/main.nib/keyedobjects.nib \ + Resources/Dutch.lproj/main.nib/keyedobjects-110000.nib \ Resources/el.lproj/Localizable.strings \ Resources/el.lproj/locversion.plist \ Resources/el.lproj/main.nib/designable.nib \ Resources/el.lproj/main.nib/keyedobjects.nib \ + Resources/el.lproj/main.nib/keyedobjects-110000.nib \ Resources/English.lproj/Localizable.strings \ Resources/English.lproj/locversion.plist \ Resources/English.lproj/main.nib/designable.nib \ Resources/English.lproj/main.nib/keyedobjects.nib \ + Resources/English.lproj/main.nib/keyedobjects-110000.nib \ Resources/fi.lproj/Localizable.strings \ Resources/fi.lproj/locversion.plist \ Resources/fi.lproj/main.nib/designable.nib \ Resources/fi.lproj/main.nib/keyedobjects.nib \ + Resources/fi.lproj/main.nib/keyedobjects-110000.nib \ Resources/French.lproj/Localizable.strings \ Resources/French.lproj/locversion.plist \ Resources/French.lproj/main.nib/designable.nib \ Resources/French.lproj/main.nib/keyedobjects.nib \ + Resources/French.lproj/main.nib/keyedobjects-110000.nib \ Resources/German.lproj/Localizable.strings \ Resources/German.lproj/locversion.plist \ Resources/German.lproj/main.nib/designable.nib \ Resources/German.lproj/main.nib/keyedobjects.nib \ + Resources/German.lproj/main.nib/keyedobjects-110000.nib \ Resources/he.lproj/Localizable.strings \ Resources/he.lproj/locversion.plist \ Resources/he.lproj/main.nib/designable.nib \ Resources/he.lproj/main.nib/keyedobjects.nib \ + Resources/he.lproj/main.nib/keyedobjects-110000.nib \ Resources/hr.lproj/Localizable.strings \ Resources/hr.lproj/locversion.plist \ Resources/hr.lproj/main.nib/designable.nib \ Resources/hr.lproj/main.nib/keyedobjects.nib \ + Resources/hr.lproj/main.nib/keyedobjects-110000.nib \ Resources/hu.lproj/Localizable.strings \ Resources/hu.lproj/locversion.plist \ Resources/hu.lproj/main.nib/designable.nib \ Resources/hu.lproj/main.nib/keyedobjects.nib \ + Resources/hu.lproj/main.nib/keyedobjects-110000.nib \ Resources/Italian.lproj/Localizable.strings \ Resources/Italian.lproj/locversion.plist \ Resources/Italian.lproj/main.nib/designable.nib \ Resources/Italian.lproj/main.nib/keyedobjects.nib \ + Resources/Italian.lproj/main.nib/keyedobjects-110000.nib \ Resources/Japanese.lproj/Localizable.strings \ Resources/Japanese.lproj/locversion.plist \ Resources/Japanese.lproj/main.nib/designable.nib \ Resources/Japanese.lproj/main.nib/keyedobjects.nib \ + Resources/Japanese.lproj/main.nib/keyedobjects-110000.nib \ Resources/ko.lproj/Localizable.strings \ Resources/ko.lproj/locversion.plist \ Resources/ko.lproj/main.nib/designable.nib \ Resources/ko.lproj/main.nib/keyedobjects.nib \ + Resources/ko.lproj/main.nib/keyedobjects-110000.nib \ Resources/no.lproj/Localizable.strings \ Resources/no.lproj/locversion.plist \ Resources/no.lproj/main.nib/designable.nib \ Resources/no.lproj/main.nib/keyedobjects.nib \ + Resources/no.lproj/main.nib/keyedobjects-110000.nib \ Resources/pl.lproj/Localizable.strings \ Resources/pl.lproj/locversion.plist \ Resources/pl.lproj/main.nib/designable.nib \ Resources/pl.lproj/main.nib/keyedobjects.nib \ + Resources/pl.lproj/main.nib/keyedobjects-110000.nib \ Resources/pt.lproj/Localizable.strings \ Resources/pt.lproj/locversion.plist \ Resources/pt.lproj/main.nib/designable.nib \ Resources/pt.lproj/main.nib/keyedobjects.nib \ + Resources/pt.lproj/main.nib/keyedobjects-110000.nib \ Resources/pt_PT.lproj/Localizable.strings \ Resources/pt_PT.lproj/locversion.plist \ Resources/pt_PT.lproj/main.nib/designable.nib \ Resources/pt_PT.lproj/main.nib/keyedobjects.nib \ + Resources/pt_PT.lproj/main.nib/keyedobjects-110000.nib \ Resources/ro.lproj/Localizable.strings \ Resources/ro.lproj/locversion.plist \ Resources/ro.lproj/main.nib/designable.nib \ Resources/ro.lproj/main.nib/keyedobjects.nib \ + Resources/ro.lproj/main.nib/keyedobjects-110000.nib \ Resources/ru.lproj/Localizable.strings \ Resources/ru.lproj/locversion.plist \ Resources/ru.lproj/main.nib/designable.nib \ Resources/ru.lproj/main.nib/keyedobjects.nib \ + Resources/ru.lproj/main.nib/keyedobjects-110000.nib \ Resources/sk.lproj/Localizable.strings \ Resources/sk.lproj/locversion.plist \ Resources/sk.lproj/main.nib/designable.nib \ Resources/sk.lproj/main.nib/keyedobjects.nib \ + Resources/sk.lproj/main.nib/keyedobjects-110000.nib \ Resources/Spanish.lproj/Localizable.strings \ Resources/Spanish.lproj/locversion.plist \ Resources/Spanish.lproj/main.nib/designable.nib \ Resources/Spanish.lproj/main.nib/keyedobjects.nib \ + Resources/Spanish.lproj/main.nib/keyedobjects-110000.nib \ Resources/sv.lproj/Localizable.strings \ Resources/sv.lproj/locversion.plist \ Resources/sv.lproj/main.nib/designable.nib \ Resources/sv.lproj/main.nib/keyedobjects.nib \ + Resources/sv.lproj/main.nib/keyedobjects-110000.nib \ Resources/th.lproj/Localizable.strings \ Resources/th.lproj/locversion.plist \ Resources/th.lproj/main.nib/designable.nib \ Resources/th.lproj/main.nib/keyedobjects.nib \ + Resources/th.lproj/main.nib/keyedobjects-110000.nib \ Resources/tr.lproj/Localizable.strings \ Resources/tr.lproj/locversion.plist \ Resources/tr.lproj/main.nib/designable.nib \ Resources/tr.lproj/main.nib/keyedobjects.nib \ + Resources/tr.lproj/main.nib/keyedobjects-110000.nib \ Resources/uk.lproj/Localizable.strings \ Resources/uk.lproj/locversion.plist \ Resources/uk.lproj/main.nib/designable.nib \ Resources/uk.lproj/main.nib/keyedobjects.nib \ + Resources/uk.lproj/main.nib/keyedobjects-110000.nib \ Resources/X11.icns \ Resources/zh_CN.lproj/Localizable.strings \ Resources/zh_CN.lproj/locversion.plist \ Resources/zh_CN.lproj/main.nib/designable.nib \ Resources/zh_CN.lproj/main.nib/keyedobjects.nib \ + Resources/zh_CN.lproj/main.nib/keyedobjects-110000.nib \ Resources/zh_TW.lproj/Localizable.strings \ Resources/zh_TW.lproj/locversion.plist \ Resources/zh_TW.lproj/main.nib/designable.nib \ @@ -909,6 +939,7 @@ $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Resources $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Info.plist $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/PkgInfo + Resources/zh_TW.lproj/main.nib/keyedobjects-110000.nib # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/mk_bundke.sh xorg-server-1.20.13/hw/xquartz/bundle/mk_bundke.sh --- xorg-server-1.20.9/hw/xquartz/bundle/mk_bundke.sh 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/mk_bundke.sh 2021-07-29 18:48:14.000000000 +0000 @@ -12,7 +12,7 @@ mkdir -p ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1 - for f in Localizable.strings main.nib/keyedobjects.nib ; do + for f in Localizable.strings main.nib/keyedobjects.nib main.nib/keyedobjects-110000.nib ; do install -m 644 ${SRCDIR}/Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f} done done @@ -24,7 +24,7 @@ install -m 644 ${SRCDIR}/PkgInfo ${BUNDLE_ROOT}/Contents mkdir -p ${BUNDLE_ROOT}/Contents/MacOS -install -m 755 ${SRCDIR}/X11.sh ${BUNDLE_ROOT}/Contents/MacOS/X11 +install -m 755 ${SRCDIR}/X11.sh ${BUNDLE_ROOT}/Contents/MacOS if [[ $(id -u) == 0 ]] ; then chown -R root:admin ${BUNDLE_ROOT} diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3647 +1,754 @@ - - - 1040 - 11A444d - 905 - 1119.1 - 555.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 905 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - حول X11 - - 2147483647 - - - - - - تفضيلات... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - خدمات - - 1048576 - 2147483647 - - - submenuAction: - - خدمات - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - تبديل ملء الشاشة - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - إخفاء X11 - h - 1048576 - 2147483647 - - - 42 - - - - إخفاء الأخرى - h - 1572864 - 2147483647 - - - - - - إظهار الكل - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - إنهاء X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - التطبيقات - - 1048576 - 2147483647 - - - submenuAction: - - تطبيقات - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - تخصيص... - - 1048576 - 2147483647 - - - - - - - - - تحرير - - 1048576 - 2147483647 - - - submenuAction: - - تحرير - - - - نسخ - c - 1048576 - 2147483647 - - - - - - - - - نافذة - - 1048576 - 2147483647 - - - submenuAction: - - نافذة - - - - إغلاق - w - 1048576 - 2147483647 - - - - - - تصغير - m - 1048576 - 2147483647 - - - - - - تكبير/تصغير - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - تدوير عبر النوافذ - ` - 1048576 - 2147483647 - - - - - - عكس التدوير عبر النوافذ - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - إحضار الكل إلى الأمام - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - مساعدة - - 1048576 - 2147483647 - - - submenuAction: - - مساعدة - - - - مساعدة X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364}, {484, 341.03906}} - 1350041600 - تفضيلات X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {458, 325}} - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 67108992 - مصادقة الاتصالات - - LucidaGrande - 13 - 1040 - - - 1210864127 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 67108992 - السماح بالاتصالات من عملاء الشبكة - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{17, 195}, {385, 42}} - - - YES - - 67239424 - 71303296 - يؤدي بدء تشغيل X11 إلى إنشاء مفاتيح تحكم في وصول Xauthority. في حالة تغيير عنوان IP للنظام، تصبح هذه المفاتيح غير صالحة، مما قد يؤدي إلى الحيلولة دون بدء تشغيل تطبيقات X11. - - LucidaGrande - 11 - 3088 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2ODY1AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{17, 118}, {385, 42}} - - - YES - - 67239424 - 71303296 - في حالة التمكين، يجب أيضًا تمكين مصادقة الاتصالات للتأكد من تأمين النظام. وفي حالة التعطيل، لا يتم السماح بالاتصالات من تطبيقات بعيدة. - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 71303296 - يتم تنفيذ هذه الخيارات في المرة التالية لبدء تشغيل X11. - - - - - - - - {{10, 33}, {438, 279}} - - - الأمان - - - - - - 2 - - - - 256 - - - - 256 - {{17, 245}, {402, 18}} - - - YES - - 67239424 - 67108992 - النقر خلال النوافذ غير النشطة - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{19, 208}, {385, 31}} - - - YES - - 67239424 - 71303296 - عند تمكينه، سيؤدي النقر على نافذة غير نشطة إلى مرور نقرة الماوس هذه عبر هذه النافذة بالإضافة إلى تنشيطها. - - - - - - - - - 256 - {{17, 184}, {402, 18}} - - - YES - - 67239424 - 67108992 - التركيز تبعًا لموضع مؤشر الماوس - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{19, 161}, {385, 17}} - - - YES - - 67239424 - 71303296 - يتبع تركيز نافذة X11 موضع المؤشر، ولهذا بعض الآثار السلبية. - - - - - - - - - 256 - {{17, 140}, {402, 18}} - - - YES - - 67239424 - 67108992 - التركيز على النوافذ الجديدة - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{19, 106}, {385, 28}} - - - YES - - 67239424 - 71303296 - عند تمكينه، سيؤدي إنشاء نافذة X11 جديدة إلى انتقال تطبيق X11.app إلى المقدمة (بدلاً من Finder.app أو Terminal.app وما إلى ذلك) - - - - - - - - {{10, 33}, {438, 279}} - - - النوافذ - - - - - - 2 - - - - 256 - - - - 256 - {{11, 255}, {409, 23}} - - - YES - - 67239424 - 67108992 - تمكين المزامنة - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{17, 221}, {385, 28}} - - - YES - - 67239424 - 71303296 - يقوم بتمكين عنصر القائمة "نسخ" ويسمح بالمزامنة بين لوحة اللصق في OSX وحافظة X11 وذاكرات التخزين المؤقت الأساسية. - - - - - - - - - 256 - {{-5, 129}, {409, 23}} - - - YES - - 67239424 - 67108992 - تحديث الحافظة عند إجراء تغييرات على لوحة اللصق - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{-5, 104}, {409, 23}} - - - YES - - 67239424 - 67108992 - تحديث الذاكرة الأساسية (نقر بالزر الأوسط) عند إجراء تغييرات على لوحة اللصق - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{-5, 79}, {409, 23}} - - - YES - - 67239424 - 67108992 - تحديث لوحة اللصق على الفور عند تحديد نص جديد - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{-5, 192}, {409, 23}} - - - YES - - 67239424 - 67108992 - تحديث لوحة اللصق عند إجراء تغييرات على الحافظة - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{2, 158}, {385, 28}} - - - YES - - 67239424 - 71303296 - قم بتعطيل هذا الخيار إذا كنت ترغب في استخدام xclipboard أوklipper أو أية أداة أخرى لإدارة حافظة X11. - - - - - - - - - 256 - {{17, 47}, {370, 28}} - - - YES - - 67239424 - 71303296 - نظرًا للقيود الموجودة في بروتوكول X11، قد لا يعمل هذا الخيار دومًا في بعض التطبيقات. - - - - - - - - {{10, 33}, {438, 279}} - - - لوحة اللصق - - - - - - 2 - - - - 256 - - - - 256 - {{253, 235}, {128, 26}} - - - YES - - -2076049856 - 67110016 - - - 111821055 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - من شاشة العرض - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - ٢٥٦ لونًا - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - آلاف - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - ملايين - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{383, 238}, {55, 20}} - - - YES - - 67239424 - 4194432 - الألوان: - - - - - - - - - 256 - {{10, 216}, {392, 14}} - - - YES - - 67239424 - 71303296 - يتم تنفيذ هذا الخيار في المرة التالية لبدء تشغيل X11. - - - - - - - - - 256 - {{11, 182}, {409, 23}} - - - YES - - 67239424 - 67108992 - وضع ملء الشاشة - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{-8, 116}, {409, 23}} - - - YES - - 67239424 - 67108992 - السماح بالوصول إلى شريط القوائم في وضع ملء الشاشة - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{17, 145}, {385, 31}} - - - YES - - 67239424 - 71303296 - تمكين نافذة X11 root. استخدم ضغط مفاتيح الأوامر-الاختيار-A لدخول ومغادرة وضع ملء الشاشة. - - - - - - - - - 256 - {{22, 79}, {362, 31}} - - - YES - - 67239424 - 71303296 - سيصبح شريط القوائم مرئياً عند وضع مؤشر الماوس في الجزء العلوي من شاشة العرض الأساسية. - - - - - - - - {{10, 33}, {438, 279}} - - - الإخراج - - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 67108992 - مضاهاة ماوس ثلاثي الأزرار - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{17, 93}, {385, 31}} - - - YES - - 67239424 - 71303296 - في حالة التمكين، قد تتداخل مكافئات مفاتيح شريط القائمة مع تطبيقات X11 التي تستخدم مفتاح تعديل Meta. - - - - - - - - - 256 - {{17, 195}, {385, 42}} - - - YES - - 67239424 - 71303296 - 2KfYtti62Lcg2YXYuSDYp9mE2KfYs9iq2YXYsdin2LEg2LnZhNmJINmF2YHYqtin2K0g2KfZhNin2K7Y -qtmK2KfYsSDYo9mIINmF2YHYqtin2K0g2KfZhNij2YjYp9mF2LEg2KPYq9mG2KfYoSDYp9mE2YbZgtix -INmE2KrZhti02YrYtyDYstixINin2YTZhdin2YjYsyDYp9mE2KPZiNiz2Lcg2KPZiCDYp9mE2KPZitmF -2YYuCg - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 67108992 - تمكين مكافئات المفاتيح في X11 - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{17, 159}, {385, 14}} - - - YES - - 67239424 - 71303296 - السماح لتغييرات قائمة الإدخال بالكتابة فوق مخطط مفاتيح X11 الحالي. - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - YES - - 67239424 - 67108992 - اتباع تصميم لوحة مفاتيح النظام - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{17, 32}, {385, 31}} - - - YES - - 67239424 - 71303296 - عند تمكينها، تقوم مفاتيح الاختيار بإرسال علامات المفتاح Alt_L و Alt_R X11 بدلًا من Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 67108992 - مفاتيح الاختيار تقوم بإرسال Alt_L و Alt_R - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{2, 8}, {418, 18}} - - - YES - - 67239424 - 67108992 - التمرير دائمًا في اتجاه حركة الإصبع - - - 1210864127 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {438, 279}} - - - - الإدخال - - - - - - - 0 - YES - YES - - - - - - {{7, 11}, {484, 341}} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {454, 271}} - 1350041600 - قائمة تطبيقات X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 268 - {{14, 191}, {100, 32}} - - YES - - 67239424 - 137887872 - تكرار - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 268 - {{14, 159}, {100, 32}} - - YES - - 67239424 - 137887872 - إزالة - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {316, 213} - - YES - - - 256 - {316, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - 126.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 67110912 - الاسم - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 67110016 - Text Cell - - - - 3 - MQA - - - - 3 - YES - YES - - - - 104 - 40 - 1000 - - 75628096 - 67110912 - الأوامر - - - - - - 338820672 - 67110016 - Text Cell - - - - - - 3 - YES - YES - - - - 76 - 10 - 1000 - - 75628096 - 67110912 - مفتاح اختصار - - - 6 - System - headerColor - - - - - - 338820672 - 67110016 - Text Cell - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {316, 213}} - - - - 4 - - - - 256 - {{302, 17}, {15, 207}} - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {310, 15}} - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {316, 17}} - - - - 4 - - - {{116, 20}, {318, 231}} - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 268 - {{14, 223}, {100, 32}} - - YES - - -2080244224 - 137887872 - إضافة عنصر - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_apps - YES - - - قائمة - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - التطبيقات - - 1048576 - 2147483647 - - - submenuAction: - - تطبيقات - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - تخصيص… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 565}, {484, 308}} - com.apple.InterfaceBuilder.CocoaPlugin - {{507, 565}, {484, 308}} - - {{184, 290}, {481, 345}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + يؤدي بدء تشغيل X11 إلى إنشاء مفاتيح تحكم في وصول Xauthority. في حالة تغيير عنوان IP للنظام، تصبح هذه المفاتيح غير صالحة، مما قد يؤدي إلى الحيلولة دون بدء تشغيل تطبيقات X11. + + + + + + + + + + في حالة التمكين، يجب أيضًا تمكين مصادقة الاتصالات للتأكد من تأمين النظام. وفي حالة التعطيل، لا يتم السماح بالاتصالات من تطبيقات بعيدة. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + اضغط مع الاستمرار على مفتاح الاختيار أو مفتاح الأوامر أثناء النقر لتنشيط زر الماوس الأوسط أو الأيمن. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/ca.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/ca.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/ca.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/ca.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3640 +1,762 @@ - - - 1040 - 11A511 - 900 - 1138 - 566.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 900 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Sobre X11 - - 2147483647 - - - - - - Preferències… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Serveis - - 1048576 - 2147483647 - - - submenuAction: - - Serveis - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Activar o desactivar la pantalla completa - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Ocultar X11 - h - 1048576 - 2147483647 - - - 42 - - - - Ocultar la resta - h - 1572864 - 2147483647 - - - - - - Mostrar-ho tot - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Sortir d’X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Aplicacions - - 1048576 - 2147483647 - - - submenuAction: - - Aplicacions - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalitzar… - - 1048576 - 2147483647 - - - - - - - - - Editar - - 1048576 - 2147483647 - - - submenuAction: - - Editar - - - - Copiar - c - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Finestra - - - - Tancar - w - 1048576 - 2147483647 - - - - - - Minimitzar - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Recórrer les finestres - ` - 1048576 - 2147483647 - - - - - - Recórrer les finestres al revés - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Portar-ho tot a primer pla - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Ajuda - - 1048576 - 2147483647 - - - submenuAction: - - Ajuda - - - - Ajuda X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364.03906}, {575, 341}} - 1350041600 - Preferències d’X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {549, 325}} - - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - - YES - - 67239424 - 0 - Simular un ratolí de tres botons - - LucidaGrande - 13 - 1040 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 103}, {478.5, 28}} - - - - YES - - 67239424 - 4194304 - Quan aquesta opció està activada, els equivalents de teclat de la barra de menús poden interferir amb les aplicacions d’X11 que fan servir el modificador Meta. - - LucidaGrande - 11 - 3088 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2ODY1AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 210}, {474, 30}} - - - - YES - - 67239424 - 4194304 - TWFudGVuaXUgcHJlbXVkZXMgbGVzIHRlY2xlcyBPcGNpw7MgbyBPcmRyZSBhbCBmZXIgY2xpYyBwZXIg -YWN0aXZhciBlbCBib3TDsyBjZW50cmFsIG8gZHJldCBkZWwgcmF0b2zDrS4KA - - - - - - - - - 256 - {{18, 134}, {402, 18}} - - - - YES - - 67239424 - 0 - Activar els equivalents de teclat en X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36.398438, 162}, {479, 17}} - - - - YES - - 67239424 - 4194304 - Permet que els canvis al menú de teclat substitueixin l’assignació de tecles actual d’X11. - - - - - - - - - 256 - {{18, 182}, {402, 18}} - - - - YES - - 67239424 - 0 - Seguir la disposició de teclat del sistema - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 41}, {436.94922, 31}} - - - - YES - - 67239424 - 4194304 - Si aquesta opció està activada, les tecles Opció envien els símbols de tecla d’X11 Alt_L i Alt_R en lloc de Mode_switch. - - - - - - - - - 256 - {{18, 75}, {402, 18}} - - - - YES - - 67239424 - 0 - Les tecles Opció envien Alt_L i Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 13}, {418, 18}} - - - - YES - - 67239424 - 0 - Desplaçar sempre en el sentit del moviment del dit - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {529, 279}} - - - - - Entrada - - - - - - 2 - - - - 256 - - - - 256 - {{67, 235}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - - - 400 - 75 - - - De la pantalla - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 colors - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Milers - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Milions - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{16, 241}, {49, 17}} - - - YES - - 67239424 - 4194304 - Colors: - - - - - - - - - 256 - {{35, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Aquesta opció serà efectiva la propera vegada que s’iniciï X11. - - - - - - - - - 256 - {{17, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Mode de pantalla completa - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 121}, {465, 18}} - - - YES - - 67239424 - 0 - Permetre l’accés a la barra de menús en el mode de pantalla completa - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{35, 145}, {385, 31}} - - - YES - - 67239424 - 4194304 - Activa la finestra arrel d’X11. Feu servir la combinació de tecles Ordre + Opció + A per entrar o sortir del mode de pantalla completa. - - - - - - - - - 256 - {{53, 84}, {362, 31}} - - - YES - - 67239424 - 4194304 - La barra de menús serà visible quan el cursor del ratolí se situï en la part superior de la pantalla principal. - - - - - - - - {{10, 33}, {529, 279}} - - - Sortida - - - - - - 2 - - - - 256 - - - - 256 - {{18, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Activar la sincronització - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 211}, {385, 28}} - - - YES - - 67239424 - 4194304 - Activa l’ítem de menú “copiar” i permet sincronitzar el porta-retalls d’OSX amb les memòries intermèdies CLIPBOARD i PRIMARY d’X11. - - - - - - - - - 256 - {{34, 119}, {409, 23}} - - - YES - - 67239424 - 0 - Actualitzar CLIPBOARD quan el porta-retalls canviï - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 99}, {486, 18}} - - - YES - - 67239424 - 0 - Actualitzar PRIMARY (clic amb el botó central) quan el porta-retalls canviï - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 74}, {469, 18}} - - - YES - - 67239424 - 0 - Actualitzar el porta-retalls immediatament quan se seleccioni text nou - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Actualitzar el porta-retalls quan CLIPBOARD canviï - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 148}, {385, 28}} - - - YES - - 67239424 - 4194304 - Desactiveu aquesta opció si voleu utilitzar xclipboard, klipper o qualsevol altre gestor de porta-retalls d’X11. - - - - - - - - - 256 - {{48, 42}, {370, 28}} - - - YES - - 67239424 - 4194304 - A causa de les limitacions del protocol d’X11, pot ser que aquesta opció no funcioni sempre en algunes aplicacions. - - - - - - - - {{10, 33}, {529, 279}} - - - Porta-retalls - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Fer clic per recórrer les finestres inactives - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 208}, {482, 31}} - - - YES - - 67239424 - 4194304 - Quan aquesta opció està activada, un clic del ratolí en una finestra inactiva fa que el clic passi a aquesta finestra, a més d’activar-la. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Enfocar la posició del ratolí - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 161}, {486, 17}} - - - YES - - 67239424 - 4194304 - El punt d’enfocament de la finestra d’X11 segueix el cursor. Això té alguns inconvenients. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Enfocar les finestres noves - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 92}, {482, 42}} - - - YES - - 67239424 - 4194304 - Quan aquesta opció està activada, la creació d’una nova finestra d’X11 farà que X11.app es traslladi a primer pla (per damunt de Finder.app, Terminal.app, etc.) - - - - - - - - {{10, 33}, {529, 279}} - - - Windows - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Autenticar les connexions - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Permetre connexions de clients de la xarxa - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {479, 42}} - - - YES - - 67239424 - 4194304 - A l’iniciar X11 es crearan claus de control d’accés Xauthority. Si l’adreça IP del sistema canvia, aquestes claus deixaran de ser vàlides i això pot impedir que s’executin aplicacions d’X11. - - - - - - - - - 256 - {{36, 104}, {479, 56}} - - - YES - - 67239424 - 4194304 - Si aquesta opció està activada, també ho ha d’estar l’opció “Autenticar les connexions” per garantir la seguretat del sistema. Si està desactivada, les connexions d’aplicacions remotes no estaran permeses. - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Aquestes opcions seran efectives la propera vegada que s’iniciï X11. - - - - - - - - {{10, 33}, {529, 279}} - - - Seguretat - - - - - - - 0 - YES - YES - - - - - - {575, 341} - - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {464, 271}} - 1350041600 - Menú d’aplicacions X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {111, 32}} - - - YES - - 67239424 - 137887744 - Duplicar - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {111, 32}} - - - YES - - 67239424 - 137887744 - Eliminar - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - - YES - - - 256 - {301, 17} - - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - - 76.270065307617188 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Nom - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - 3 - MQA - - - - 3 - YES - YES - - - - 114.203125 - 40 - 1000 - - 75628096 - 2048 - Ordre - - - - - - 338820672 - 1024 - Text Cell - - - - - - 3 - YES - YES - - - - 101.96484375 - 10 - 1000 - - 75628096 - 2048 - Drecera de teclat - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {301, 15}} - - - 1 - - _doScroller: - 0.99668872356414795 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - - 133170 - - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {111, 32}} - - - YES - - -2080244224 - 137887744 - Afegir ítem - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {464, 271} - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_apps - YES - - - Menú - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Aplicacions - - 1048576 - 2147483647 - - - submenuAction: - - Aplicacions - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalitzar… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{522, 955}, {64, 6}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{299, 988}, {120, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{357, 868}, {293, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 565}, {575, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{507, 565}, {575, 341}} - - {{184, 290}, {481, 345}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{203, 978}, {169, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {464, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {464, 271}} - - {{433, 406}, {486, 327}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {353, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - 36.0546875 - 0 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{428, 988}, {136, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{157, 808}, {365, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Quan aquesta opció està activada, els equivalents de teclat de la barra de menús poden interferir amb les aplicacions d’X11 que fan servir el modificador Meta. + + + + + + + + + + Manteniu premudes les tecles Opció o Ordre al fer clic per activar el botó central o dret del ratolí. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Activa la finestra arrel d’X11. Feu servir la combinació de tecles Ordre + Opció + A per entrar o sortir del mode de pantalla completa. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Activa l’ítem de menú “copiar” i permet sincronitzar el porta-retalls d’OSX amb les memòries intermèdies CLIPBOARD i PRIMARY d’X11. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Quan aquesta opció està activada, un clic del ratolí en una finestra inactiva fa que el clic passi a aquesta finestra, a més d’activar-la. + + + + + + + + + + + + + + + + + + + + + Quan aquesta opció està activada, la creació d’una nova finestra d’X11 farà que X11.app es traslladi a primer pla (per damunt de Finder.app, Terminal.app, etc.) + + + + + + + + + + + + + + + + + + + + A l’iniciar X11 es crearan claus de control d’accés Xauthority. Si l’adreça IP del sistema canvia, aquestes claus deixaran de ser vàlides i això pot impedir que s’executin aplicacions d’X11. + + + + + + + + + + Si aquesta opció està activada, també ho ha d’estar l’opció “Autenticar les connexions” per garantir la seguretat del sistema. Si està desactivada, les connexions d’aplicacions remotes no estaran permeses. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/cs.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/cs.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/cs.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/cs.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3617 +1,760 @@ - - - 1040 - 11A444d - 905 - 1119.1 - 555.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 905 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - O prostředí X11 - - 2147483647 - - - - - - Předvolby… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Služby - - 1048576 - 2147483647 - - - submenuAction: - - Služby - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Celá obrazovka - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Skrýt prostředí X11 - h - 1048576 - 2147483647 - - - 42 - - - - Skrýt ostatní - h - 1572864 - 2147483647 - - - - - - Zobrazit vše - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Ukončit prostředí X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Aplikace - - 1048576 - 2147483647 - - - submenuAction: - - Aplikace - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Vlastní… - - 1048576 - 2147483647 - - - - - - - - - Upravit - - 1048576 - 2147483647 - - - submenuAction: - - Úpravy - - - - Kopírovat - c - 1048576 - 2147483647 - - - - - - - - - Okno - - 1048576 - 2147483647 - - - submenuAction: - - Okno - - - - Zavřít - w - 1048576 - 2147483647 - - - - - - Minimalizovat - m - 1048576 - 2147483647 - - - - - - Přepnout velikost - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Procházet okny - ` - 1048576 - 2147483647 - - - - - - Procházet okny v opačném pořadí - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Převést vše do popředí - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Nápověda - - 1048576 - 2147483647 - - - submenuAction: - - Nápověda - - - - Nápověda pro X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364}, {484, 356}} - 1350041600 - Předvolby prostředí X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {458, 340}} - - - - - - 1 - - - - 256 - - - - 256 - {{18, 263}, {402, 18}} - - - YES - - 67239424 - 0 - Emulovat třítlačítkovou myš - - LucidaGrande - 13 - 1040 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {385, 42}} - - - YES - - 67239424 - 4194304 - Je-li tato volba povolena, mohou vznikat konflikty mezi klávesovými ekvivalenty řádku nabídek a aplikacemi X11, které používají modifikátor Meta. - - LucidaGrande - 11 - 3088 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2ODY1AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 215}, {385, 42}} - - - YES - - 67239424 - 4194304 - UHJvc3TFmWVkbsOtIGEgcHJhdsOpIHRsYcSNw610a28gbXnFoWkgYWt0aXZ1amV0ZSBwxZlpZHLFvmVu -w61tIGtsw6F2ZXN5IEFsdCBuZWJvIENtZCBwxZlpIGtsaWtudXTDrS4KA - - - - - - - - - 256 - {{18, 141}, {402, 18}} - - - YES - - 67239424 - 0 - Povolit v prostředí X11 klávesové ekvivalenty - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36.039062, 165}, {371, 28}} - - - YES - - 67239424 - 4194304 - Umožňuje měnit vstupní nabídku a přepisovat aktuální mapu kláves prostředí X11. - - - - - - - - - 256 - {{18, 199}, {402, 18}} - - - YES - - 67239424 - 0 - Řídit se systémovým uspořádáním klávesnice - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 33}, {385, 31}} - - - YES - - 67239424 - 4194304 - Je-li tato volba povolena, klávesy Alt odesílají symboly kláves prostředí X11 Alt_L a Alt_R, nikoli signál Mode_switch. - - - - - - - - - 256 - {{18, 70}, {402, 18}} - - - YES - - 67239424 - 0 - Klávesy Alt odesílají signály Alt_L a Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 9}, {418, 18}} - - - YES - - 67239424 - 0 - Vždy posouvat ve směru pohybu prstu - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {438, 294}} - - - - Vstup - - - - - - 2 - - - - 256 - - - - 256 - {{64, 235}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - - - 400 - 75 - - - Z monitoru - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 barev - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Tisíce - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Milióny - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {55, 20}} - - - YES - - 67239424 - 4194304 - Barvy: - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Tato volba se uplatní při dalším spuštění prostředí X11. - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Režim celé obrazovky - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - Povolit přístup k řádku nabídek v režimu celé obrazovky - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {385, 31}} - - - YES - - 67239424 - 4194304 - Povoluje kořenové okno prostředí X11. Do režimu celé obrazovky a zpět můžete přecházet kombinací Cmd-Alt-A. - - - - - - - - - 256 - {{54, 79}, {362, 31}} - - - YES - - 67239424 - 4194304 - Řádek nabídek se objeví při přesunutí ukazatele myši na horní okraj primárního monitoru. - - - - - - - - {{10, 33}, {438, 294}} - - - Výstup - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Povolit synchronizaci - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 207}, {392, 42}} - - - YES - - 67239424 - 4194304 - Povoluje položku nabídky „Kopírovat“ a umožňuje synchronizaci mezi schránkou systému OS X a buffery CLIPBOARD a PRIMARY prostředí X11. - - - - - - - - - 256 - {{34, 114}, {409, 23}} - - - YES - - 67239424 - 0 - Při změně schránky aktualizovat buffer CLIPBOARD - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 78.308594}, {364, 34}} - - - YES - - 67239424 - 0 - UMWZaSB6bcSbbsSbIHNjaHLDoW5reSBha3R1YWxpem92YXQgYnVmZmVyIFBSSU1BUlkgCihrbGlrbnV0 -w60gcHJvc3TFmWVkbsOtbSB0bGHEjcOtdGtlbSk - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 49}, {409, 23}} - - - YES - - 67239424 - 0 - Aktualizovat schránku ihned, jakmile je vybrán nový text - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 177}, {409, 23}} - - - YES - - 67239424 - 0 - Při změně bufferu CLIPBOARD aktualizovat schránku - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 143}, {385, 28}} - - - YES - - 67239424 - 4194304 - Tuto volbu zakažte, pokud chcete používat xclipboard, klipper nebo jakéhokoli jiného správce schránky prostředí X11. - - - - - - - - - 256 - {{48, 17}, {370, 28}} - - - YES - - 67239424 - 4194304 - Vzhledem k omezením protokolu X11 nemusí být tato volba vždy funkční ve všech aplikacích. - - - - - - - - {{10, 33}, {438, 294}} - - - Schránka - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Proklikávací neaktivní okna - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {385, 31}} - - - YES - - 67239424 - 4194304 - Je-li tato volba povolena, při kliknutí na neaktivní okno nebude toto okno pouze aktivováno, ale kliknutí mu navíc bude předáno. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Zaměření sleduje myš - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 150}, {369, 28}} - - - YES - - 67239424 - 4194304 - Zaměření oken v prostředí X11 sleduje ukazatel. Toto nastavení má některé nežádoucí důsledky. - - - - - - - - - 256 - {{15, 126}, {402, 18}} - - - YES - - 67239424 - 0 - Zaměřovat na nová okna - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 78}, {376, 42}} - - - YES - - 67239424 - 4194304 - Je-li tato volba povolena, při vytvoření nového okna prostředí X11 se do popředí dostane proces X11.app (nikoli Finder.app, Terminal.app apod.). - - - - - - - - {{10, 33}, {438, 294}} - - - Windows - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Ověřit připojení - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Povolit připojení síťových klientů - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {385, 42}} - - - YES - - 67239424 - 4194304 - Spuštěním prostředí X11 vytvoříte klíče řízení přístupu Xauthority. Změní-li se IP adresa systému, tyto klíče přestanou platit, což může zabránit spuštění aplikací prostředí X11. - - - - - - - - - 256 - {{36, 118}, {385, 42}} - - - YES - - 67239424 - 4194304 - Je-li tato volba povolena, je třeba v zájmu bezpečnosti systému povolit také ověřování připojení. Je-li zakázána, není vzdáleným aplikacím umožněno připojit se. - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Tyto volby se uplatní při příštím spuštění prostředí X11. - - - - - - - - {{10, 33}, {438, 294}} - - - Zabezpečení - - - - - - - 0 - YES - YES - - - - - - {484, 356} - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {484, 271}} - 1350041600 - Nabídka aplikace X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {132, 32}} - - YES - - 67239424 - 137887744 - Duplikovat - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {132, 32}} - - YES - - 67239424 - 137887744 - Odstranit - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 121.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Název - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - 3 - MQA - - - - 3 - YES - YES - - - - 99 - 40 - 1000 - - 75628096 - 2048 - Příkaz - - - - - - 338820672 - 1024 - Text Cell - - - - - - 3 - YES - YES - - - - 71 - 10 - 1000 - - 75628096 - 2048 - Zkratka - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {132, 32}} - - YES - - -2080244224 - 137887744 - Přidat položku - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {484, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_apps - YES - - - Nabídka - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Aplikace - - 1048576 - 2147483647 - - - submenuAction: - - Aplikace - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Vlastní… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{396, 955}, {64, 6}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{279, 988}, {141, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{346, 868}, {322, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 549}, {484, 356}} - com.apple.InterfaceBuilder.CocoaPlugin - {{507, 549}, {484, 356}} - - {{184, 290}, {481, 345}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{203, 978}, {126, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {484, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {484, 271}} - - {{433, 406}, {486, 327}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {354, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCEAAAw3cAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBUAAAw6uAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBkAAAw0MAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{401, 988}, {192, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{157, 808}, {239, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Je-li tato volba povolena, mohou vznikat konflikty mezi klávesovými ekvivalenty řádku nabídek a aplikacemi X11, které používají modifikátor Meta. + + + + + + + + + + Prostřední a pravé tlačítko myši aktivujete přidržením klávesy Alt nebo Cmd při kliknutí. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Povoluje položku nabídky „Kopírovat“ a umožňuje synchronizaci mezi schránkou systému OS X a buffery CLIPBOARD a PRIMARY prostředí X11. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Je-li tato volba povolena, při kliknutí na neaktivní okno nebude toto okno pouze aktivováno, ale kliknutí mu navíc bude předáno. + + + + + + + + + + + + + + + + + + + + + Je-li tato volba povolena, při vytvoření nového okna prostředí X11 se do popředí dostane proces X11.app (nikoli Finder.app, Terminal.app apod.). + + + + + + + + + + + + + + + + + + + + Spuštěním prostředí X11 vytvoříte klíče řízení přístupu Xauthority. Změní-li se IP adresa systému, tyto klíče přestanou platit, což může zabránit spuštění aplikací prostředí X11. + + + + + + + + + + Je-li tato volba povolena, je třeba v zájmu bezpečnosti systému povolit také ověřování připojení. Je-li zakázána, není vzdáleným aplikacím umožněno připojit se. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3662 +1,758 @@ - - - 1040 - 11A444d - 905 - 1119.1 - 555.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 905 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Om X11 - - 2147483647 - - - - - - Indstillinger... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Tjenester - - 1048576 - 2147483647 - - - submenuAction: - - Tjenester - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Slå Fuld skærm til og fra - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Skjul X11 - h - 1048576 - 2147483647 - - - 42 - - - - Skjul andre - h - 1572864 - 2147483647 - - - - - - Vis alle - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Slut X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Programmer - - 1048576 - 2147483647 - - - submenuAction: - - Programmer - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Tilpas... - - 1048576 - 2147483647 - - - - - - - - - Rediger - - 1048576 - 2147483647 - - - submenuAction: - - Rediger - - - - Kopier - c - 1048576 - 2147483647 - - - - - - - - - Vindue - - 1048576 - 2147483647 - - - submenuAction: - - Vindue - - - - Luk - w - 1048576 - 2147483647 - - - - - - Minimer - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Gennemgå vinduer - < - 1048576 - 2147483647 - - - - - - Gennemgå vinduer modsat - > - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Anbring alle forrest - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Hjælp - - 1048576 - 2147483647 - - - submenuAction: - - Hjælp - - - - X11-hjælp - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{319, 328}, {484, 341.0390625}} - 1350041600 - X11-indstillinger - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {458, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Emuler mus med tre knapper - - LucidaGrande - 13 - 1040 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 96}, {355, 28}} - - - YES - - 67239424 - 4194304 - Når tastaturgenveje på menulinjen er slået til, kan de hindre X11-programmer, der bruger "Meta modifier", i at fungere. - - LucidaGrande - 11 - 3088 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {385, 42}} - - - YES - - 67239424 - 4194304 - SG9sZCBBbHRlcm5hdGl2LSBlbGxlciBLb21tYW5kb3Rhc3RlbiBuZWRlLCBtZW5zIGR1IGtsaWtrZXIs -IGZvciBhdCBha3RpdmVyZSBkZW4gbWlkdGVyc3RlIGVsbGVyIGRlbiBow7hqcmUga25hcCBww6UgbXVz -ZW4uCg - - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 0 - Slå tastaturgenveje til under X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 159}, {385, 14}} - - - YES - - 67239424 - 4194304 - Sikrer, at ændringer kan overskrive den aktuelle X11-tastoversigt. - - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - YES - - 67239424 - 0 - Følg systemets tastaturlayout - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {385, 31}} - - - YES - - 67239424 - 4194304 - Når det er slået til, sender Alternativtasterne Alt_L og Alt_R X11-nøglesymboler i stedet for Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Alternativtaster sender Alt_L og Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - Rul altid i den samme retning som fingerens bevægelse - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {438, 279}} - - - - Indtastning - - - - - - 2 - - - - 256 - - - - 256 - {{69, 234}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Fra skærm - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 farver - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Tusinder - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Millioner - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {55, 20}} - - - YES - - 67239424 - 4194304 - Farver: - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Denne indstilling træder i kraft, når X11 startes igen. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Fuld skærm - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {383, 23}} - - - YES - - 67239424 - 0 - Tillad adgang til menulinjen ved fuld skærm - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 148}, {351, 28}} - - - YES - - 67239424 - 4194304 - Slår X11 root-vinduet til. Brug Kommando-Alternativ-A til at slå funktionen fuld skærm til og fra. - - - - - - - - - - 256 - {{54, 79}, {362, 31}} - - - YES - - 67239424 - 4194304 - Menulinjen bliver synlig, når musens markør anbringes øverst på den primære skærm. - - - - - - - - {{10, 33}, {438, 279}} - - - Resultat - - - - - - 2 - - - - 256 - - - - 256 - {{13, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Slå synkronisering til - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{31, 221}, {392, 28}} - - - YES - - 67239424 - 4194304 - Slår kommandoen "kopier" til og gør det muligt at synkronisere mellem OSX-opslagstavlen og X11-UDKLIPSHOLDEREN og de PRIMÆRE buffere. - - - - - - - - - 256 - {{29, 129}, {398, 23}} - - - YES - - 67239424 - 0 - Opdater CLIPBOARD, når opslagstavlen ændres - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{29, 104}, {400, 23}} - - - YES - - 67239424 - 0 - Opdater PRIMARY (klik i midten), når opslagstavlen ændres - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{29, 84}, {404, 18}} - - - YES - - 67239424 - 0 - Opdater opslagstavlen med det samme, når ny tekst er valgt - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{29, 192}, {398, 23}} - - - YES - - 67239424 - 0 - Opdater opslagstavlen, når CLIPBOARD ændres - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{43, 158}, {385, 28}} - - - YES - - 67239424 - 4194304 - Slå denne indstilling fra, hvis du ikke vil bruge xclipboard, klipper eller andre X11-værktøjer til administration af udklipsholderen. - - - - - - - - - 256 - {{43, 47}, {385, 28}} - - - YES - - 67239424 - 4194304 - Pga. begrænsninger i X11-protokollen virker denne indstilling måske ikke i nogle programmer. - - - - - - - - {{10, 33}, {438, 279}} - - - Opslagstavle - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Klik igennem passive vinduer - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {390, 31}} - - - YES - - 67239424 - 4194304 - Når denne mulighed er slået til, vil musen, når du klikker på et passivt vindue, klikke igennem vinduet ud over at gøre det aktivt. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Fokus følger musen - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {385, 17}} - - - YES - - 67239424 - 4194304 - Fokus i X11-vinduet følger markøren. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Fokus på nye vinduer - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 92}, {390, 42}} - - - YES - - 67239424 - 4194304 - Når denne mulighed er slået til, vil programmet X11, når der oprettes et nyt X11-vindue, anbringes forrest (i stedet for Finder, Terminal osv.). - - - - - - - - {{10, 33}, {438, 279}} - - - Vinduer - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Godkend forbindelser - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Tillad forbindelser fra netværksklienter - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {379, 42}} - - - YES - - 67239424 - 4194304 - Når X11 startes, oprettes Xauthority-taster til adgangskontrol. Hvis systemets IP-adresse ændres, bliver disse taster ugyldige, og det kan forhindre X11-programmer i at starte. - - - - - - - - - - 256 - {{36, 118}, {380, 42}} - - - YES - - 67239424 - 4194304 - Hvis de er slået til, skal Godkend forbindelser også slås til for at sikre systemets sikkerhed. Når de er slået fra, tillades forbindelser fra eksterne programmer ikke. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Disse indstillinger træder i kraft, når X11 startes igen. - - - - - - - - - {{10, 33}, {438, 279}} - - - Sikkerhed - - - - - - - 0 - YES - YES - - - - - - {484, 341} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - YES - - - 11 - 2 - {{360, 400}, {454, 271}} - 1350041600 - X11-programmenu - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {112, 32}} - - YES - - 67239424 - 137887744 - Dubler - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {112, 32}} - - YES - - 67239424 - 137887744 - Fjern - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {316, 213} - - YES - - - 256 - {316, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 127.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Navn - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - - 3 - MQA - - - - 3 - YES - YES - - - - 105 - 40 - 1000 - - 75628096 - 2048 - Kommando - - - - - - 338820672 - 1024 - Text Cell - - - - - - - 3 - YES - YES - - - - 74 - 10 - 1000 - - 75628096 - 2048 - Genvej - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {316, 213}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 213}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {316, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {112, 32}} - - YES - - -2080244224 - 137887744 - Tilføj emne - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - YES - - - Menu - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Programmer - - 1048576 - 2147483647 - - - submenuAction: - - Programmer - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Indstil… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 515}, {484, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - {{507, 515}, {484, 341}} - - {{184, 290}, {481, 345}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Hold Alternativ- eller Kommandotasten nede, mens du klikker, for at aktivere den midterste eller den højre knap på musen. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Slår kommandoen "kopier" til og gør det muligt at synkronisere mellem OSX-opslagstavlen og X11-UDKLIPSHOLDEREN og de PRIMÆRE buffere. + + + + + + + + + + + + + + Slå denne indstilling fra, hvis du ikke vil bruge xclipboard, klipper eller andre X11-værktøjer til administration af udklipsholderen. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Når denne mulighed er slået til, vil musen, når du klikker på et passivt vindue, klikke igennem vinduet ud over at gøre det aktivt. + + + + + + + + + + + + + + + + + + + + + Når denne mulighed er slået til, vil programmet X11, når der oprettes et nyt X11-vindue, anbringes forrest (i stedet for Finder, Terminal osv.). + + + + + + + + + + + + + + + + + + + + Når X11 startes, oprettes Xauthority-taster til adgangskontrol. Hvis systemets IP-adresse ændres, bliver disse taster ugyldige, og det kan forhindre X11-programmer i at starte. + + + + + + + + + + Hvis de er slået til, skal Godkend forbindelser også slås til for at sikre systemets sikkerhed. Når de er slået fra, tillades forbindelser fra eksterne programmer ikke. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3666 +1,758 @@ - - - 1040 - 11A289 - 851 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 851 - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Over X11 - - 2147483647 - - - - - - Voorkeuren... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Voorzieningen - - 1048576 - 2147483647 - - - submenuAction: - - Voorzieningen - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Schermvullende weergave aan/uit - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Verberg X11 - h - 1048576 - 2147483647 - - - 42 - - - - Verberg andere - h - 1572864 - 2147483647 - - - - - - Toon alles - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Stop X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Programma's - - 1048576 - 2147483647 - - - submenuAction: - - Programma's - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Pas aan... - - 1048576 - 2147483647 - - - - - - - - - Wijzig - - 1048576 - 2147483647 - - - submenuAction: - - Wijzig - - - - Kopieer - c - 1048576 - 2147483647 - - - - - - - - - Venster - - 1048576 - 2147483647 - - - submenuAction: - - Venster - - - - Sluit - w - 1048576 - 2147483647 - - - - - - Minimaliseer - m - 1048576 - 2147483647 - - - - - - Vergroot/verklein - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Blader door vensters - ` - 1048576 - 2147483647 - - - - - - Blader omgekeerd door vensters - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Alles op voorgrond - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 1048576 - 2147483647 - - - submenuAction: - - Help - - - - X11 Help - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364.0390625}, {564, 341}} - 1350041600 - X11-voorkeuren - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {538, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Emuleer drieknopsmuis - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {480, 30}} - - - YES - - 67239424 - 4194304 - Als u deze optie inschakelt, kan het gebruik van toetscombinaties voor menucommado's conflicteren met X11-programma's die de Meta-modifier gebruiken. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 209}, {468, 30}} - - - YES - - 67239424 - 4194304 - SG91ZCB0aWpkZW5zIGhldCBrbGlra2VuIGRlIE9wdGlvbi0gb2YgQ29tbWFuZC10b2V0cyBpbmdlZHJ1 -a3Qgb20gZGUgbWlkZGVsc3RlIG11aXNrbm9wIG9mIGRlIHJlY2h0ZXJtdWlza25vcCB0ZSBhY3RpdmVy -ZW4uCg - - - - - - - - - - 256 - {{18, 127}, {402, 18}} - - - YES - - 67239424 - 0 - Activeer toetscombinaties onder X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 151}, {468, 30}} - - - YES - - 67239424 - 4194304 - Maakt het mogelijk dat wijzigingen in het invoermenu de X11-toetsenbordindeling overschrijven. - - - - - - - - - - 256 - {{18, 185}, {402, 18}} - - - YES - - 67239424 - 0 - Volg toetsenbordindeling van systeem - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 35}, {468, 30}} - - - YES - - 67239424 - 4194304 - Indien ingeschakeld, worden met de Option-toetsen de X11-toetssymbolen Alt_L en Alt_R verstuurd in plaats van Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Option-toetsen versturen Alt_L en Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 11}, {418, 18}} - - - YES - - 67239424 - 0 - Scrol altijd in de richting van de vingerbeweging - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {518, 279}} - - - - Invoer - - - - - - 2 - - - - 256 - - - - 256 - {{77, 234}, {168, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Van beeldscherm - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 kleuren - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Duizenden - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Miljoenen - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {58, 20}} - - - YES - - 67239424 - 4194304 - Kleuren: - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Deze instelling wordt actief wanneer X11 opnieuw wordt gestart. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Schermvullende weergave - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - Maak menubalk toegankelijk in schermvullende weergave - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 147}, {468, 31}} - - - YES - - 67239424 - 4194304 - Schakelt het X11-rootvenster in. Gebruik de toetscombinatie Command + Option + A om de schermvullende weergave te starten en te stoppen. - - - - - - - - - - 256 - {{54, 81}, {362, 31}} - - - YES - - 67239424 - 4194304 - De menubalk wordt zichtbaar als de muis aan de bovenkant van het primaire beeldscherm wordt geplaatst. - - - - - - - - {{10, 33}, {518, 279}} - - - Uitvoer - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Schakel synchronisatie in - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 207}, {473, 42}} - - - YES - - 67239424 - 4194304 - Schakelt het menuonderdeel 'kopieer' in en maakt synchronisatie mogelijk tussen het klembord van OS X en de CLIPBOARD- en PRIMARY-buffer van X11. - - - - - - - - - 256 - {{34, 129}, {409, 23}} - - - YES - - 67239424 - 0 - Werk CLIPBOARD bij als plakbord wordt gewijzigd - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {409, 23}} - - - YES - - 67239424 - 0 - Werk PRIMARY (middenklik) bij als plakbord wordt gewijzigd - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {486, 18}} - - - YES - - 67239424 - 0 - Werk plakbord onmiddellijk bij wanneer nieuwe tekst wordt geselecteerd - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {409, 23}} - - - YES - - 67239424 - 0 - Werk plakbord bij als CLIPBOARD wordt gewijzigd - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {461, 28}} - - - YES - - 67239424 - 4194304 - Schakel deze optie uit als u xclipboard, klipper of een ander programma voor X11-klembordbeheer wilt gebruiken. - - - - - - - - - 256 - {{48, 47}, {461, 28}} - - - YES - - 67239424 - 4194304 - Vanwege beperkingen in het X11-protocol werkt deze optie mogelijk niet altijd in alle programma's. - - - - - - - - {{10, 33}, {518, 279}} - - - Plakbord - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Klik in inactieve vensters - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 210}, {481, 31}} - - - YES - - 67239424 - 4194304 - Indien ingeschakeld, wordt een muisklik in een inactief venster toegepast in dat venster en wordt het venster geactiveerd. - - - - - - - - - 256 - {{15, 186}, {402, 18}} - - - YES - - 67239424 - 0 - Focus volgt muis - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 166}, {481, 16}} - - - YES - - 67239424 - 4194304 - Focus van het X11-venster volgt de aanwijzer. Dit heeft ongewenste effecten. - - - - - - - - - 256 - {{15, 142}, {402, 18}} - - - YES - - 67239424 - 0 - Focus op nieuwe vensters - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 96}, {481, 42}} - - - YES - - 67239424 - 4194304 - Indien ingeschakeld, wordt bij aanmaak van een nieuw X11-venster X11.app op de voorgrond geplaatst (in plaats van Finder.app, Terminal.app, enz.). - - - - - - - - {{10, 33}, {518, 279}} - - - Vensters - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Voer identiteitscontrole uit voor verbindingen - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 168}, {402, 18}} - - - YES - - 67239424 - 0 - Sta verbindingen van netwerkclients toe - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 183}, {468, 56}} - - - YES - - 67239424 - 4194304 - 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. - - - - - - - - - - 256 - {{36, 107}, {468, 56}} - - - YES - - 67239424 - 4194304 - 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. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Deze instellingen worden actief wanneer X11 opnieuw wordt gestart. - - - - - - - - - {{10, 33}, {518, 279}} - - - Beveiliging - - - - - - - 0 - YES - YES - - - - - - {564, 341} - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - - - 11 - 2 - {{302, 440}, {454, 271}} - 1350041600 - X11-programmamenu - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {100, 32}} - - YES - - 67239424 - 137887744 - Dupliceer - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {100, 32}} - - YES - - 67239424 - 137887744 - Verwijder - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 121.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Naam - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Tekstcel - - - - - 3 - MQA - - - - 3 - YES - YES - - - - 99 - 40 - 1000 - - 75628096 - 2048 - Commando - - - - - - 338820672 - 1024 - Tekstcel - - - - - - - 3 - YES - YES - - - - 71 - 10 - 1000 - - 75628096 - 2048 - Toetsen - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Tekstcel - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {100, 32}} - - YES - - -2080244224 - 137887744 - Voeg toe - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - - - Menu - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Programma's - - 1048576 - 2147483647 - - - submenuAction: - - Programma's - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Pas aan… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{893, 777}, {564, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - {{893, 777}, {564, 341}} - - {{184, 290}, {481, 345}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - {{982, 977}, {183, 83}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{21, 1012}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Als u deze optie inschakelt, kan het gebruik van toetscombinaties voor menucommado's conflicteren met X11-programma's die de Meta-modifier gebruiken. + + + + + + + + + + Houd tijdens het klikken de Option- of Command-toets ingedrukt om de middelste muisknop of de rechtermuisknop te activeren. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Schakelt het X11-rootvenster in. Gebruik de toetscombinatie Command + Option + A om de schermvullende weergave te starten en te stoppen. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Schakelt het menuonderdeel 'kopieer' in en maakt synchronisatie mogelijk tussen het klembord van OS X en de CLIPBOARD- en PRIMARY-buffer van X11. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Indien ingeschakeld, wordt bij aanmaak van een nieuw X11-venster X11.app op de voorgrond geplaatst (in plaats van Finder.app, Terminal.app, enz.). + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3538 +1,760 @@ - - - 1040 - 11C74 - 1938 - 1138.23 - 567.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - NSTableColumn - NSPopUpButton - NSTableHeaderView - NSMenuItem - NSMenu - NSButtonCell - NSButton - NSTextFieldCell - NSScrollView - NSScroller - NSTableView - NSTabView - NSCustomObject - NSTabViewItem - NSView - NSWindowTemplate - NSTextField - NSPopUpButtonCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Πληροφορίες για το X11 - - 2147483647 - - - - - - Προτιμήσεις... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Υπηρεσίες - - 1048576 - 2147483647 - - - submenuAction: - - Υπηρεσίες - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Εναλλαγή πλήρους οθόνης - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Απόκρυψη X11 - h - 1048576 - 2147483647 - - - 42 - - - - Απόκρυψη άλλων - h - 1572864 - 2147483647 - - - - - - Εμφάνιση όλων - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Τερματισμός X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Εφαρμογές - - 1048576 - 2147483647 - - - submenuAction: - - Εφαρμογές - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Προσαρμογή… - - 1048576 - 2147483647 - - - - - - - - - Επεξεργασία - - 1048576 - 2147483647 - - - submenuAction: - - Επεξεργασία - - - - Αντιγραφή - c - 1048576 - 2147483647 - - - - - - - - - Παράθυρο - - 1048576 - 2147483647 - - - submenuAction: - - Παράθυρο - - - - Κλείσιμο - w - 1048576 - 2147483647 - - - - - - Ελαχιστοποίηση - m - 1048576 - 2147483647 - - - - - - Ζουμ - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Κυκλική μετακίνηση στα παράθυρα - ` - 1048576 - 2147483647 - - - - - - Κυκλική αντίστροφη μετακίνηση στα παράθυρα - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Μεταφορά όλων σε πρώτο πλάνο - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Βοήθεια - - 1048576 - 2147483647 - - - submenuAction: - - Βοήθεια - - - - Βοήθεια για το X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364.0390625}, {640, 341}} - 1350041600 - Προτιμήσεις X11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {614, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Προσομοίωση ποντικιού τριών κουμπιών - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{35, 95}, {545, 28}} - - - YES - - 67239424 - 4194304 - Όταν ενεργοποιηθεί, τα ισοδύναμα πλήκτρα της γραμμής μενού ίσως να παρεμβαίνουν με εφαρμογές X11 που χρησιμοποιούν τον μετατροποποιητή. - - LucidaGrande - 11 - 3100 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 209}, {544, 28}} - - - YES - - 67239424 - 4194304 - zqDOsc+Ezq7Pg8+EzrUgz4DOsc+BzrHPhM61z4TOsc68zq3Ovc6xIM+Ezr8gz4DOu86uzrrPhM+Bzr8g -T3B0aW9uIM6uIENvbW1hbmQgzrXOvc+OIM66zqzOvc61z4TOtSDOus67zrnOuiDOs865zrEgzr3OsSDO -tc69zrXPgc6zzr/PgM6/zrnOrs+DzrXPhM61IM+Ezr8gzrzOtc+DzrHOr86/IM6uIM+Ezr8gzrTOtc6+ -zrnPjCDOus6/z4XOvM+Azq8gz4TOv8+FIM+Azr/Ovc+EzrnOus65zr/PjS4KA - - - - - - - - - 256 - {{18, 129}, {402, 18}} - - - YES - - 67239424 - 0 - Ενεργοποίηση ισοδύναμων πλήκτρων υπό το X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{35.46875, 153}, {544.53125, 28}} - - - YES - - 67239424 - 4194304 - Επιτρέπει την αντικατάσταση του τρέχοντος χάρτη πλήκτρων X11 από τις αλλαγές μενού εισαγωγής. - - - - - - - - - 256 - {{18, 187}, {402, 18}} - - - YES - - 67239424 - 0 - Ακολουθία διάταξης πληκτρολογίου συστήματος - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{35, 34}, {545, 31}} - - - YES - - 67239424 - 4194304 - Όταν ενεργοποιηθεί, τα πλήκτρα Option στέλνουν τα σύμβολα πλήκτρων X11 Alt_L και Alt_R αντί για Mode_switch. - - - - - - - - - 256 - {{18, 71}, {402, 18}} - - - YES - - 67239424 - 0 - Αποστολή Alt_L και Alt_R από πλήκτρα Option - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 10}, {527.0390625, 18}} - - - YES - - 67239424 - 0 - Να γίνεται πάντα κύλιση προς την κατεύθυνση της κίνησης του δαχτύλου - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {594, 279}} - - - - Είσοδος - - - - - - 2 - - - - 256 - - - - 256 - {{89, 233}, {175, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Από την προβολή - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 χρώματα - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Χιλιάδες - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Εκατομμύρια - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {70, 17}} - - - YES - - 67239424 - 4194304 - Χρώματα: - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Αυτή η επιλογή θα ισχύει όταν εκκινηθεί ξανά το X11. - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Λειτουργία πλήρους οθόνης - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 94}, {552, 34}} - - - YES - - 67239424 - 0 - Να επιτρέπεται η πρόσβαση στη γραμμή μενού από λειτουργία πλήρους οθόνης - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 134}, {543, 42}} - - - YES - - 67239424 - 4194304 - Ενεργοποιεί το παράθυρο ρίζας X11. Χρησιμοποιήστε την κίνηση πλήκτρων Command-Option-A για να εισέλθετε και να εξέλθετε από τη λειτουργία πλήρους οθόνης. - - - - - - - - - 256 - {{54, 57}, {543, 31}} - - - YES - - 67239424 - 4194304 - Η γραμμή μενού θα γίνει ορατή όταν ο δείκτης ποντικιού τοποθετηθεί στο άνω μέρος της πρωτεύουσας οθόνης σας. - - - - - - - - {{10, 33}, {594, 279}} - - - Έξοδος - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Ενεργοποίηση συγχρονισμού - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {543, 28}} - - - YES - - 67239424 - 4194304 - Ενεργοποιεί το στοιχείο μενού «αντιγραφή» και επιτρέπει το συγχρονισμό μεταξύ του Πίνακα επικόλλησης OSX και των ενδιάμεσων μνημών CLIPBOARD και PRIMARY του X11. - - - - - - - - - 256 - {{34, 139}, {421, 18}} - - - YES - - 67239424 - 0 - Ενημέρωση CLIPBOARD όταν αλλάζει ο Πίνακας επικόλλησης - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 117}, {493, 18}} - - - YES - - 67239424 - 0 - Ενημέρωση PRIMARY (μεσαίο κλικ) όταν αλλάζει ο Πίνακας επικόλλησης - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 92}, {458, 18}} - - - YES - - 67239424 - 0 - Ενημέρωση Πίνακα επικόλλησης αμέσως όταν επιλεγεί νέο κείμενο - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 197}, {420, 18}} - - - YES - - 67239424 - 0 - Ενημέρωση Πίνακα επικόλλησης όταν αλλάζει το CLIPBOARD - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 163}, {531, 28}} - - - YES - - 67239424 - 4194304 - Απενεργοποιήστε αυτή την επιλογή αν θέλετε να χρησιμοποιήσετε xclipboard, klipper ή οποιονδήποτε άλλο διαχειριστή πρόχειρου X11. - - - - - - - - - 256 - {{48, 60}, {536, 28}} - - - YES - - 67239424 - 4194304 - Εξαιτίας περιορισμών στο πρωτόκολλο X11, αυτή η επιλογή ίσως να μη λειτουργεί πάντα σε ορισμένες εφαρμογές. - - - - - - - - {{10, 33}, {594, 279}} - - - Πίνακας επικόλλησης - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Κλικ μετάβασης σε ανενεργά παράθυρα - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 211}, {557, 28}} - - - YES - - 67239424 - 4194304 - Όταν ενεργοποιηθεί, αν κάνετε κλικ σε μη ενεργό παράθυρο, θα προκαλέσει αυτό το κλικ ποντικιού να διαβιβαστεί στο συγκεκριμένο παράθυρο επιπλέον της ενεργοποίησής του. - - - - - - - - - 256 - {{15, 187}, {402, 18}} - - - YES - - 67239424 - 0 - Εστίαση ακολουθεί ποντίκι - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 167}, {557, 14}} - - - YES - - 67239424 - 4194304 - Η εστίαση παραθύρου X11 ακολουθεί το δρομέα. Αυτό έχει ορισμένες δυσμενείς επιπτώσεις. - - - - - - - - - 256 - {{15, 143}, {402, 18}} - - - YES - - 67239424 - 0 - Εστίαση σε νέα παράθυρα - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 109}, {557, 28}} - - - YES - - 67239424 - 4194304 - Όταν ενεργοποιηθεί, η δημιουργία νέου παραθύρου X11 θα μετακινήσει το X11.app στο προσκήνιο (αντί για το Finder.app, Terminal.app, κτλ.) - - - - - - - - {{10, 33}, {594, 279}} - - - Παράθυρα - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Έλεγχος ταυτότητας συνδέσεων - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Να επιτρέπονται συνδέσεις από πελάτες δικτύου - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 181}, {543, 56}} - - - YES - - 67239424 - 4194304 - Η εκκίνηση X11 θα δημιουργήσει πλήκτρα ελέγχου πρόσβασης Xauthority. Αν αλλάξει η διεύθυνση IP του συστήματος, αυτά τα πλήκτρα καθίστανται μη έγκυρα, γεγονός που ίσως να αποτρέψει την εκκίνηση των εφαρμογών X11. - - - - - - - - - 256 - {{36, 104}, {537, 56}} - - - YES - - 67239424 - 4194304 - Αν ενεργοποιηθεί, πρέπει επίσης να ενεργοποιηθούν οι συνδέσεις ελέγχου ταυτότητας για να διασφαλιστεί η ασφάλεια συστήματος. Όταν απενεργοποιηθούν, δεν επιτρέπονται οι συνδέσεις από απομακρυσμένες εφαρμογές. - - - - - - - - - 256 - {{17, 17}, {436, 14}} - - - YES - - 67239424 - 4194304 - Αυτές οι επιλογές θα ισχύσουν την επόμενη φορά που γίνει εκκίνηση του X11. - - - - - - - - {{10, 33}, {594, 279}} - - - Ασφάλεια - - - - - - - 0 - YES - YES - - - - - - {640, 341} - - {{0, 0}, {1920, 1058}} - {320, 262} - {10000000000000, 10000000000000} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {530, 271}} - 1350041600 - Μενού εφαρμογών X11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 265 - {{344, 191}, {172, 32}} - - YES - - 67239424 - 137887744 - Διπλότυπο - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{344, 159}, {172, 32}} - - YES - - 67239424 - 137887744 - Αφαίρεση - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 121.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Όνομα - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Κελί κειμένου - - - - 3 - MQA - - - - 3 - YES - YES - - - - 99 - 40 - 1000 - - 75628096 - 2048 - Command - - - - - - 338820672 - 1024 - Κελί κειμένου - - - - - - 3 - YES - YES - - - - 71 - 10 - 1000 - - 75628096 - 2048 - Συντόμευση - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Κελί κειμένου - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{344, 223}, {172, 32}} - - YES - - -2080244224 - 137887744 - Προσθήκη στοιχείου - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {530, 271} - - {{0, 0}, {1920, 1058}} - {320, 262} - {10000000000000, 10000000000000} - x11_apps - YES - - - Μενού - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Εφαρμογές - - 1048576 - 2147483647 - - - submenuAction: - - Εφαρμογές - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Προσαρμογή… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - hideOtherApplications: - - - - 263 - - - - dockMenu - - - - 426 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dock_menu - - - - 428 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{507, 515}, {640, 341}} - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{68, 585}, {530, 271}} - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Όταν ενεργοποιηθεί, τα ισοδύναμα πλήκτρα της γραμμής μενού ίσως να παρεμβαίνουν με εφαρμογές X11 που χρησιμοποιούν τον μετατροποποιητή. + + + + + + + + + + Πατήστε παρατεταμένα το πλήκτρο Option ή Command ενώ κάνετε κλικ για να ενεργοποιήσετε το μεσαίο ή το δεξιό κουμπί του ποντικιού. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ενεργοποιεί το παράθυρο ρίζας X11. Χρησιμοποιήστε την κίνηση πλήκτρων Command-Option-A για να εισέλθετε και να εξέλθετε από τη λειτουργία πλήρους οθόνης. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ενεργοποιεί το στοιχείο μενού «αντιγραφή» και επιτρέπει το συγχρονισμό μεταξύ του Πίνακα επικόλλησης OSX και των ενδιάμεσων μνημών CLIPBOARD και PRIMARY του X11. + + + + + + + + + + + + + + Απενεργοποιήστε αυτή την επιλογή αν θέλετε να χρησιμοποιήσετε xclipboard, klipper ή οποιονδήποτε άλλο διαχειριστή πρόχειρου X11. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Όταν ενεργοποιηθεί, αν κάνετε κλικ σε μη ενεργό παράθυρο, θα προκαλέσει αυτό το κλικ ποντικιού να διαβιβαστεί στο συγκεκριμένο παράθυρο επιπλέον της ενεργοποίησής του. + + + + + + + + + + + + + + + + + + + + + Όταν ενεργοποιηθεί, η δημιουργία νέου παραθύρου X11 θα μετακινήσει το X11.app στο προσκήνιο (αντί για το Finder.app, Terminal.app, κτλ.) + + + + + + + + + + + + + + + + + + + + Η εκκίνηση X11 θα δημιουργήσει πλήκτρα ελέγχου πρόσβασης Xauthority. Αν αλλάξει η διεύθυνση IP του συστήματος, αυτά τα πλήκτρα καθίστανται μη έγκυρα, γεγονός που ίσως να αποτρέψει την εκκίνηση των εφαρμογών X11. + + + + + + + + + + Αν ενεργοποιηθεί, πρέπει επίσης να ενεργοποιηθούν οι συνδέσεις ελέγχου ταυτότητας για να διασφαλιστεί η ασφάλεια συστήματος. Όταν απενεργοποιηθούν, δεν επιτρέπονται οι συνδέσεις από απομακρυσμένες εφαρμογές. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3744 +1,735 @@ - - - 1040 - 10J541 - 850 - 1038.35 - 462.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 850 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - About X11 - - 2147483647 - - - - - - Preferences... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - - Services - - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Toggle Full Screen - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide X11 - h - 1048576 - 2147483647 - - - 42 - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Applications - - 1048576 - 2147483647 - - - submenuAction: - - Applications - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Customize... - - 1048576 - 2147483647 - - - - - - - - - Edit - - 1048576 - 2147483647 - - - submenuAction: - - Edit - - - - Copy - c - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - - Window - - - - - Close - w - 1048576 - 2147483647 - - - - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Cycle Through Windows - ` - 1048840 - 2147483647 - - - - - - Reverse Cycle Through Windows - ~ - 1179914 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 1048576 - 2147483647 - - - submenuAction: - - Help - - - - X11 Help - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364}, {484, 308}} - 1350041600 - X11 Preferences - NSPanel - - View - - {1.79769e+308, 1.79769e+308} - {320, 240} - - - 256 - - - - 256 - {{13, 10}, {458, 292}} - - - - - - 1 - - - - 256 - - - - 256 - {{18, 210}, {402, 18}} - - YES - - 67239424 - 0 - Emulate three button mouse - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 60}, {385, 31}} - - YES - - 67239424 - 4194304 - When enabled, menu bar key equivalents may interfere with X11 applications that use the Meta modifier. - - LucidaGrande - 11 - 3100 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 162}, {385, 42}} - - YES - - 67239424 - 4194304 - SG9sZCBPcHRpb24gb3IgQ29tbWFuZCB3aGlsZSBjbGlja2luZyB0byBhY3RpdmF0ZSB0aGUgbWlkZGxl -IG9yIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCg - - - - - - - - - 256 - {{18, 97}, {402, 18}} - - YES - - 67239424 - 0 - Enable key equivalents under X11 - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{36, 126}, {385, 14}} - - YES - - 67239424 - 4194304 - Allows input menu changes to overwrite the current X11 keymap. - - - - - - - - - 256 - {{18, 146}, {402, 18}} - - YES - - 67239424 - 0 - Follow system keyboard layout - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{36, -1}, {385, 31}} - - YES - - 67239424 - 4194304 - When enabled, the option keys send Alt_L and Alt_R X11 key symbols instead of Mode_switch. - - - - - - - - - 256 - {{18, 36}, {402, 18}} - - YES - - 67239424 - 0 - Option keys send Alt_L and Alt_R - - - 1211912703 - 2 - - - - 200 - 25 - - - - {{10, 33}, {438, 246}} - - Input - - - - - - 2 - - - - 256 - - - - 256 - {{74, 202}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - - - 400 - 75 - - - From Display - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 Colors - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Thousands - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Millions - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 205}, {55, 20}} - - - YES - - 67239424 - 4194304 - Colors: - - - - - - - - - 256 - {{36, 183}, {392, 14}} - - - YES - - 67239424 - 4194304 - This option takes effect when X11 is launched again. - - - - - - - - - 256 - {{18, 149}, {409, 23}} - - - YES - - 67239424 - 0 - Full-screen mode - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{37, 83}, {409, 23}} - - - YES - - 67239424 - 0 - Auto-show menu bar in full-screen mode - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{36, 112}, {385, 31}} - - - YES - - 67239424 - 4194304 - Enables the X11 root window. Use the Command-Option-A keystroke to enter and leave full screen mode. - - - - - - - - {{10, 33}, {438, 246}} - - - - Output - - - - - - 2 - - - - 256 - - - - 256 - {{18, 222}, {409, 23}} - - YES - - 67239424 - 0 - Enable syncing - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{36, 188}, {385, 28}} - - YES - - 67239424 - 4194304 - Enables the "copy" menu item and allows for syncing between the OSX Pasteboard and the X11 CLIPBOARD and PRIMARY buffers. - - - - - - - - - 256 - {{34, 96}, {409, 23}} - - YES - - 67239424 - 0 - Update CLIPBOARD when Pasteboard changes - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{34, 71}, {409, 23}} - - YES - - 67239424 - 0 - Update PRIMARY (middle-click) when Pasteboard changes - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{34, 46}, {409, 23}} - - YES - - 67239424 - 0 - Update Pasteboard immediately when new text is selected - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{34, 159}, {409, 23}} - - YES - - 67239424 - 0 - Update Pasteboard when CLIPBOARD changes - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{48, 125}, {385, 28}} - - YES - - 67239424 - 4194304 - Disable this option if you want to use xclipboard, klipper, or any other X11 clipboard manager. - - - - - - - - - 256 - {{48, 14}, {370, 28}} - - YES - - 67239424 - 4194304 - Due to limitations in the X11 protocol, this option may not always work in some applications. - - - - - - - - {{10, 33}, {438, 246}} - - Pasteboard - - - - - - 2 - - - - 256 - - - - 256 - {{15, 212}, {402, 18}} - - YES - - 67239424 - 0 - Click-through Inactive Windows - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{23, 175}, {385, 31}} - - YES - - 67239424 - 4194304 - When enabled, clicking on an inactive window will cause that mouse click to pass through to that window in addition to activating it. - - - - - - - - - 256 - {{15, 151}, {402, 18}} - - YES - - 67239424 - 0 - Focus Follows Mouse - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{23, 128}, {385, 17}} - - YES - - 67239424 - 4194304 - X11 window focus follows the cursor. This has some adverse effects. - - - - - - - - - 256 - {{15, 107}, {402, 18}} - - YES - - 67239424 - 0 - Focus On New Windows - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{23, 73}, {385, 28}} - - YES - - 67239424 - 4194304 - When enabled, creation of a new X11 window will cause X11.app to move to the foreground (instead of Finder.app, Terminal.app, etc.) - - - - - - - - {{10, 33}, {438, 246}} - - Windows - - - - - - - 256 - - - - 256 - {{18, 210}, {402, 18}} - - YES - - 67239424 - 0 - Authenticate connections - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{18, 133}, {402, 18}} - - YES - - 67239424 - 0 - Allow connections from network clients - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{36, 162}, {385, 42}} - - YES - - 67239424 - 4194304 - Launching X11 will create Xauthority access-control keys. If the system's IP address changes, these keys become invalid which may prevent X11 applications from launching. - - - - - - - - - 256 - {{36, 85}, {385, 42}} - - YES - - 67239424 - 4194304 - If enabled, Authenticate connections must also be enabled to ensure system security. When disabled, connections from remote applications are not allowed. - - - - - - - - - 256 - {{20, -16}, {404, 14}} - - YES - - 67239424 - 4194304 - These options take effect when X11 is next launched. - - - - - - - - {{10, 33}, {438, 246}} - - Security - - - - - - - 0 - YES - YES - - - - - - {484, 308} - - - - {{0, 0}, {1280, 938}} - {320, 262} - {1.79769e+308, 1.79769e+308} - x11_prefs - - - 11 - 2 - {{302, 440}, {454, 271}} - 1350041600 - X11 Application Menu - NSPanel - - View - - {1.79769e+308, 1.79769e+308} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {100, 32}} - - YES - - 67239424 - 137887744 - Duplicate - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {100, 32}} - - YES - - 67239424 - 137887744 - Remove - - - -2038284033 - 1 - - - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 121.73099999999999 - 62.731000000000002 - 1000 - - 75628096 - 2048 - Name - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - 3 - MQA - - - - 3 - YES - YES - - - - 99 - 40 - 1000 - - 75628096 - 2048 - Command - - - - - - 338820672 - 1024 - Text Cell - - - - - - 3 - YES - YES - - - - 71 - 10 - 1000 - - 75628096 - 2048 - Shortcut - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 50 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {100, 32}} - - YES - - -2080244224 - 137887744 - Add Item - - - -2038284033 - 1 - - - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1280, 938}} - {320, 262} - {1.79769e+308, 1.79769e+308} - x11_apps - - - Menu - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Applications - - 1048576 - 2147483647 - - - submenuAction: - - Applications - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Customize… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 565}, {484, 308}} - com.apple.InterfaceBuilder.CocoaPlugin - {{507, 565}, {484, 308}} - - {{184, 290}, {481, 345}} - - - {3.40282e+38, 3.40282e+38} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - - - {3.40282e+38, 3.40282e+38} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300481 - - - - - FirstResponder - NSObject - - IBUserSource - - - - - NSFormatter - NSObject - - IBUserSource - - - - - X11Controller - NSObject - - IBUserSource - - - - - - - X11Controller - NSObject - - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - apps_table_delete: - id - - - apps_table_done: - id - - - apps_table_duplicate: - id - - - apps_table_new: - id - - - apps_table_show: - id - - - bring_to_front: - id - - - close_window: - id - - - enable_fullscreen_changed: - id - - - minimize_window: - id - - - next_window: - id - - - prefs_changed: - id - - - prefs_show: - id - - - previous_window: - id - - - quit: - id - - - toggle_fullscreen: - id - - - x11_help: - id - - - zoom_window: - id - - - - NSMenuItem - NSTableView - NSButton - NSMenuItem - NSPopUpButton - NSMenu - NSMenu - NSMenuItem - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSPanel - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSTextField - NSTextField - NSMenuItem - NSButton - NSMenuItem - NSMenuItem - - - - apps_separator - NSMenuItem - - - apps_table - NSTableView - - - click_through - NSButton - - - copy_menu_item - NSMenuItem - - - depth - NSPopUpButton - - - dock_apps_menu - NSMenu - - - dock_menu - NSMenu - - - dock_window_separator - NSMenuItem - - - enable_auth - NSButton - - - enable_fullscreen - NSButton - - - enable_fullscreen_menu - NSButton - - - enable_keyequivs - NSButton - - - enable_tcp - NSButton - - - fake_buttons - NSButton - - - focus_follows_mouse - NSButton - - - focus_on_new_window - NSButton - - - option_sends_alt - NSButton - - - prefs_panel - NSPanel - - - sync_clipboard_to_pasteboard - NSButton - - - sync_keymap - NSButton - - - sync_pasteboard - NSButton - - - sync_pasteboard_to_clipboard - NSButton - - - sync_pasteboard_to_primary - NSButton - - - sync_primary_immediately - NSButton - - - sync_text1 - NSTextField - - - sync_text2 - NSTextField - - - toggle_fullscreen_item - NSMenuItem - - - use_sysbeep - NSButton - - - window_separator - NSMenuItem - - - x11_about_item - NSMenuItem - - - - IBDocumentRelativeSource - ../../../X11Controller.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - ../X11.xcodeproj - 3 - - {9, 8} - {7, 2} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Hold Option or Command while clicking to activate the middle or right mouse buttons. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + When enabled, clicking on an inactive window will cause that mouse click to pass through to that window in addition to activating it. + + + + + + + + + + + + + + + + + + + + + When enabled, creation of a new X11 window will cause X11.app to move to the foreground (instead of Finder.app, Terminal.app, etc.) + + + + + + + + + + + + + + + + + + + + Launching X11 will create Xauthority access-control keys. If the system's IP address changes, these keys become invalid which may prevent X11 applications from launching. + + + + + + + + + + If enabled, Authenticate connections must also be enabled to ensure system security. When disabled, connections from remote applications are not allowed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3673 +1,755 @@ - - - 1040 - 11A444d - 905 - 1119.1 - 555.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 905 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Tietoja: X11 - - 2147483647 - - - - - - Asetukset... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Palvelut - - 1048576 - 2147483647 - - - submenuAction: - - Palvelut - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Vaihda koko näytön tila - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Kätke X11 - h - 1048576 - 2147483647 - - - 42 - - - - Kätke muut - h - 1572864 - 2147483647 - - - - - - Näytä kaikki - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Lopeta X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Ohjelmat - - 1048576 - 2147483647 - - - submenuAction: - - Ohjelmat - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Muokkaa... - - 1048576 - 2147483647 - - - - - - - - - Muokkaa - - 1048576 - 2147483647 - - - submenuAction: - - Muokkaa - - - - Kopioi - c - 1048576 - 2147483647 - - - - - - - - - Ikkuna - - 1048576 - 2147483647 - - - submenuAction: - - Ikkuna - - - - Sulje - w - 1048576 - 2147483647 - - - - - - Pienennä - m - 1048576 - 2147483647 - - - - - - Zoomaa - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Käy ikkunoita läpi - < - 1048576 - 2147483647 - - - - - - Käy ikkunoita läpi käänteisessä järjestyksessä - > - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Tuo kaikki eteen - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Ohje - - 1048576 - 2147483647 - - - submenuAction: - - Ohje - - - - X11-ohje - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 349.03906000000001}, {625, 341}} - 1350041600 - X11-asetukset - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {599, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Emuloi kolmenäppäimistä hiirtä - - LucidaGrande - 13 - 1040 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 96}, {540, 28}} - - - YES - - 67239424 - 4194304 - Kun käytössä, valikkorivin näppäinvastineet saattavat häiritä X11-ohjelmia, jotka käyttävät Meta-muuntonäppäintä. - - LucidaGrande - 11 - 3088 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {540, 42}} - - - YES - - 67239424 - 4194304 - QWt0aXZvaSBoaWlyZW4ga2Vza2ktIHRhaSBvaWtlYSBwYWluaWtlIHBpdMOkbcOkbGzDpCBPcHRpby0g -dGFpIEtvbWVudG8tbsOkcHDDpGltacOkIHBhaW5ldHR1bmEgb3NvaXRldHRhZXNzYS4KA - - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 0 - Ota käyttöön näppäinvastineet X11:ssä - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 159}, {385, 14}} - - - YES - - 67239424 - 4194304 - Salli syöttövalikon muutosten korvata nykyinen X11-näppäinkartta. - - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - YES - - 67239424 - 0 - Noudata järjestelmän näppäinasettelua - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {540, 31}} - - - YES - - 67239424 - 4194304 - Kun käytössä, Optio-näppäimet lähettävät X11:n Alt_L- ja Alt_R-näppäinsymbolit Mode_switchin sijaan. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Optio-näppäimet lähettävät Alt_L:n ja Alt_R:n - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - Vieritä aina sormen kulkemaan suuntaan - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {579, 279}} - - - - Syöte - - - - - - 2 - - - - 256 - - - - 256 - {{58, 234}, {118, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Näytöltä - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 väriä - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Tuhansia - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Miljoonia - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {45, 20}} - - - YES - - 67239424 - 4194304 - Värit: - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Tämä valinta tulee voimaan, kun X11 avataan seuraavan kerran. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Koko näytön tila - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - Salli valikkorivin käyttö koko näytön tilassa - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 148}, {529, 28}} - - - YES - - 67239424 - 4194304 - Ottaa käyttöön X11:n juuri-ikkunan. Voit siirtyä koko näytön tilaan ja siitä pois painamalla Komento-Optio-A. - - - - - - - - - - 256 - {{54, 79}, {511, 31}} - - - YES - - 67239424 - 4194304 - Valikkorivi tulee näkyviin, kun hiiren osoitin on ensisijaisen näytön yläosassa. - - - - - - - - {{10, 33}, {579, 279}} - - - Tuloste - - - - - - 2 - - - - 256 - - - - 256 - {{3, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Ota synkronointi käyttöön - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{21, 213}, {554, 42}} - - - YES - - 67239424 - 4194304 - Ottaa käyttöön Kopioi-valikkokohteen ja mahdollistaa synkronoinnin Mac OS X:n leikepöydän ja X11:n leikepöydän ja ensisijaisen valinnan puskurin välillä. - - - - - - - - - 256 - {{19, 129}, {410, 18}} - - - YES - - 67239424 - 0 - Päivitä X11:n leikepöytä, kun Mac OS X:n leikepöytä muuttuu - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{19, 88}, {555, 34}} - - - YES - - 67239424 - 0 - Päivitä X11:n ensisijainen valinta (keskiosoitus), kun Mac OS X:n leikepöytä muuttuu - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{19, 61}, {409, 23}} - - - YES - - 67239424 - 0 - Päivitä Mac OS X:n leikepöytä heti, kun uutta tekstiä valitaan - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{19, 192}, {438, 18}} - - - YES - - 67239424 - 0 - Päivitä Mac OS X:n leikepöytä, kun X11:n leikepöytä muuttuu - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 158}, {542, 28}} - - - YES - - 67239424 - 4194304 - Poista tämä valinta käytöstä, jos haluat käyttää xclipboardia, klipperiä tai muuta X11-leikepöytäohjelmaa. - - - - - - - - - 256 - {{33, 29}, {542, 28}} - - - YES - - 67239424 - 4194304 - X11-protokollan rajoitusten vuoksi tämä valinta ei välttämättä aina toimi kaikissa ohjelmissa. - - - - - - - - {{10, 33}, {579, 279}} - - - Leikepöytä - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {318, 18}} - - - YES - - 67239424 - 0 - Huomioi osoitukset ei-aktiivisiin ikkunoihin - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {542, 31}} - - - YES - - 67239424 - 4194304 - Kun käytössä, ei-aktiivisen ikkunan osoittaminen saa hiiren osoituksen kulkemaan kyseiselle ikkunalle sen aktivoimisen lisäksi. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Kohdistus seuraa hiirtä - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {407, 17}} - - - YES - - 67239424 - 4194304 - X11:n ikkunakohdistus seuraa osoitinta. Tällä on joitakin haittavaikutuksia. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Kohdista uusiin ikkunoihin - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 106}, {542, 28}} - - - YES - - 67239424 - 4194304 - Kun käytössä, uuden X11-ikkunan luominen saa X11.appin siirtymään etualalle (Finder.appin, Pääte.appin jne. sijasta). - - - - - - - - {{10, 33}, {579, 279}} - - - Ikkunat - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Todenna yhteydet - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Salli yhteydet verkkoasiakkailta - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {529, 42}} - - - YES - - 67239424 - 4194304 - X11:n avaaminen luo Xauthority-pääsynhallinta-avaimia. Jos järjestelmän IP-osoite muuttuu, näistä avaimista tulee virheellisiä, mikä saattaa estää X11-ohjelmia avautumasta. - - - - - - - - - - 256 - {{36, 118}, {529, 42}} - - - YES - - 67239424 - 4194304 - Jos tämä otetaan käyttöön, ”Todenna yhteydet” pitää myös ottaa käyttöön järjestelmän turvallisuuden varmistamiseksi. Kun tämä on pois käytöstä, yhteyksiä etäohjelmista ei sallita. - - - - - - - - - - 256 - {{17, 17}, {363, 17}} - - YES - - 67239424 - 4194304 - Nämä valinnat tulevat voimaan, kun X11 avataan seuraavan kerran. - - - - - - - - - {{10, 33}, {579, 279}} - - - Suojaus - - - - - - - 0 - YES - YES - - - - - - {625, 341} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {469, 271}} - 1350041600 - X11-ohjelmavalikko - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {450, 240} - - - 256 - - - - 265 - {{340, 191}, {115, 32}} - - YES - - 67239424 - 137887744 - Monista - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {115, 32}} - - YES - - 67239424 - 137887744 - Poista - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 121.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Nimi - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - - 3 - MQA - - - - 3 - YES - YES - - - - 99 - 40 - 1000 - - 75628096 - 2048 - Komento - - - - - - 338820672 - 1024 - Text Cell - - - - - - - 3 - YES - YES - - - - 71 - 10 - 1000 - - 75628096 - 2048 - Oikotie - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {115, 32}} - - YES - - -2080244224 - 137887744 - Lisää kohde - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {469, 271} - - {{0, 0}, {1920, 1178}} - {450, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - YES - - - Valikko - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Ohjelmat - - 1048576 - 2147483647 - - - submenuAction: - - Ohjelmat - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Muokkaa… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{232, 184}, {625, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - {{232, 184}, {625, 341}} - - {{184, 290}, {481, 345}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {450, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{772, 836}, {344, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBmAAAwvAAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBUAAAw6aAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCEAAAw2sAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCgAAAw4EAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Aktivoi hiiren keski- tai oikea painike pitämällä Optio- tai Komento-näppäimiä painettuna osoitettaessa. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ottaa käyttöön Kopioi-valikkokohteen ja mahdollistaa synkronoinnin Mac OS X:n leikepöydän ja X11:n leikepöydän ja ensisijaisen valinnan puskurin välillä. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X11:n avaaminen luo Xauthority-pääsynhallinta-avaimia. Jos järjestelmän IP-osoite muuttuu, näistä avaimista tulee virheellisiä, mikä saattaa estää X11-ohjelmia avautumasta. + + + + + + + + + + Jos tämä otetaan käyttöön, ”Todenna yhteydet” pitää myös ottaa käyttöön järjestelmän turvallisuuden varmistamiseksi. Kun tämä on pois käytöstä, yhteyksiä etäohjelmista ei sallita. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3672 +1,758 @@ - - - 1040 - 11A289 - 900 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 900 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - À propos d’X11 - - 2147483647 - - - - - - Préférences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - - Services - - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Basculer en mode plein écran - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Masquer X11 - h - 1048576 - 2147483647 - - - 42 - - - - Masquer les autres - h - 1572864 - 2147483647 - - - - - - Tout afficher - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quitter X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Applications - - 1048576 - 2147483647 - - - submenuAction: - - Applications - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personnaliser… - - 1048576 - 2147483647 - - - - - - - - - Édition - - 1048576 - 2147483647 - - - submenuAction: - - Édition - - - - Copier - c - 1048576 - 2147483647 - - - - - - - - - Fenêtre - - 1048576 - 2147483647 - - - submenuAction: - - Fenêtre - - - - Fermer - w - 1048576 - 2147483647 - - - - - - Placer dans le Dock - m - 1048576 - 2147483647 - - - - - - Réduire/agrandir - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Faire défiler les fenêtres - ` - 1048576 - 2147483647 - - - - - - Faire défiler les fenêtres en sens inverse - ` - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Tout ramener au premier plan - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Aide - - 1048576 - 2147483647 - - - submenuAction: - - Aide - - - - Aide X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{414, 417.03906000000001}, {580, 341}} - 1350041600 - Préférences d’X11 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {554, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Émuler une souris à trois boutons - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 82}, {484, 42}} - - - YES - - 67239424 - 4194304 - Quand cette option est activée, les touches équivalentes de la barre des menus peuvent perturber les applications X11 qui utilisent le modificateur d’instructions virtuelles. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 203}, {484, 34}} - - - YES - - 67239424 - 4194304 - TWFpbnRlbmV6IGxhIHRvdWNoZSBPcHRpb24gb3UgQ29tbWFuZGUgZW5mb25jw6llIHRvdXQgZW4gY2xp -cXVhbnQgcG91ciBhY3RpdmVyIGxlIGJvdXRvbiBkcm9pdCBvdSBjZW50cmFsIGRlIGxhIHNvdXJpcy4K -A - - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 0 - Activer les touches équivalentes sous X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 144}, {484, 29}} - - - YES - - 67239424 - 4194304 - Autorise les modifications du menu d’entrée pour remplacer la disposition des touches du clavier X11. - - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - YES - - 67239424 - 0 - Utiliser la disposition des touches du clavier du système - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 35}, {484, 28}} - - - YES - - 67239424 - 4194304 - Une fois activées, les touches option envoient les symboles Alt_L et Alt_R au lieu de Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Les touches option envoient Alt_L et Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - Faire toujours défiler dans le sens du mouvement des doigts - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {534, 279}} - - - - Entrée - - - - - - 2 - - - - 256 - - - - 256 - {{90, 234}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - du moniteur - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 couleurs - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - milliers - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - millions - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {71, 20}} - - - YES - - 67239424 - 4194304 - Couleurs : - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Cette option prend effet au prochain lancement d’X11. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Mode plein écran - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {468, 18}} - - - YES - - 67239424 - 0 - Autoriser un accès à la barre des menus en mode plein écran - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {484, 31}} - - - YES - - 67239424 - 4194304 - Active la fenêtre root X11. Utilisez le raccourci clavier Commande + Option + A pour ouvrir et fermer le mode plein écran. - - - - - - - - - - 256 - {{54, 79}, {466, 31}} - - - YES - - 67239424 - 4194304 - La barre des menus sera visible lorsque le curseur de souris est placé en haut de votre affichage principal. - - - - - - - - {{10, 33}, {534, 279}} - - - Sortie - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Activer la synchronisation - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 207}, {494, 42}} - - - YES - - 67239424 - 4194304 - Active la commande de menu « Copier » et permet la synchronisation entre le presse-papiers de OSX, celui de X11 (CLIPBOARD) et les mémoires tampons principales (PRIMARY). - - - - - - - - - 256 - {{34, 129}, {458, 18}} - - - YES - - 67239424 - 0 - Mettre à jour CLIPBOARD lorsque le presse-papiers est modifié - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {495, 18}} - - - YES - - 67239424 - 0 - Mettre à jour PRIMARY (clic central) lorsque le presse-papiers est modifié - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {437, 18}} - - - YES - - 67239424 - 0 - Mettre à jour le presse-papiers dès la sélection de nouveau texte - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {474, 18}} - - - YES - - 67239424 - 0 - Mettre à jour le presse-papiers lorsque CLIPBOARD est modifié - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {482, 28}} - - - YES - - 67239424 - 4194304 - Désactivez cette option si vous voulez utiliser xclipboard, klipper, ou tout autre gestionnaire de presse-papiers X11. - - - - - - - - - 256 - {{48, 47}, {482, 28}} - - - YES - - 67239424 - 4194304 - En raison de limitations du protocole X11, cette option ne fonctionnera pas toujours dans certaines applications. - - - - - - - - {{10, 33}, {534, 279}} - - - Presse-papiers - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Activation des fenêtres inactives en un clic - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {505, 31}} - - - YES - - 67239424 - 4194304 - En cas d’activation de cette option, si vous cliquez sur une fenêtre inactive, celle-ci deviendra active et le clic sera effectif. - - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Activation des fenêtres survolées par la souris - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 150}, {505, 28}} - - - YES - - 67239424 - 4194304 - L’activation des fenêtres X11 suit le curseur. Ceci comporte des effets adverses. - - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Activation des nouvelles fenêtres - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 92}, {505, 42}} - - - YES - - 67239424 - 4194304 - Lorsque cette option est activée, la création d’une nouvelle fenêtre X11 fait passer X11.app au premier plan (au lieu de Finder.app, Terminal.app, etc.) - - - - - - - - - {{10, 33}, {534, 279}} - - - Fenêtres - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Authentifier les connexions - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Autoriser les connexions de clients réseau - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {484, 42}} - - - YES - - 67239424 - 4194304 - Le lancement d’X11 créera des touches de contrôle d’accès Xauthority. Si l’adresse IP du système change, ces touches ne seront plus valides, ce qui risquera d’empêcher le lancement des applications X11. - - - - - - - - - - 256 - {{36, 104}, {484, 56}} - - - YES - - 67239424 - 4194304 - En cas d’activation de cette option, « Authentifier les connexions » doit aussi être activée pour garantir la sécurité du système. En cas de désactivation, les connexions à partir d’applications distantes sont interdites. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Ces options prennent effet au prochain lancement d’X11. - - - - - - - - - {{10, 33}, {534, 279}} - - - Sécurité - - - - - - - 0 - YES - YES - - - - - - {580, 341} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - - - 11 - 2 - {{302, 440}, {548, 271}} - 1350041600 - Menu de l’application X11 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 265 - {{372, 191}, {162, 32}} - - YES - - 67239424 - 137887744 - Dupliquer - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{372, 159}, {162, 32}} - - YES - - 67239424 - 137887744 - Supprimer - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {333, 198} - - YES - - - 256 - {333, 17} - - - - - - 256 - {{334, 0}, {16, 17}} - - - - - 155 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Nom - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - - 3 - MQA - - - - 3 - YES - YES - - - - - 100 - 40 - 1000 - - 75628096 - 2048 - Commande - - - - - - 338820672 - 1024 - Text Cell - - - - - - - 3 - YES - YES - - - - - 69 - 10 - 1000 - - 75628096 - 2048 - Raccourci - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {333, 198}} - - - - - 4 - - - - 256 - {{334, 17}, {15, 198}} - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {333, 15}} - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {333, 17}} - - - - - 4 - - - - {{20, 20}, {350, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{372, 223}, {162, 32}} - - YES - - -2080244224 - 137887744 - Ajouter un élément - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {548, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - - - Menu - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Applications - - 1048576 - 2147483647 - - - submenuAction: - - Applications - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personnaliser… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{127, 515}, {580, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{127, 515}, {580, 341}} - - {{184, 290}, {481, 345}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBUAAAw6aAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Quand cette option est activée, les touches équivalentes de la barre des menus peuvent perturber les applications X11 qui utilisent le modificateur d’instructions virtuelles. + + + + + + + + + + Maintenez la touche Option ou Commande enfoncée tout en cliquant pour activer le bouton droit ou central de la souris. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Active la commande de menu « Copier » et permet la synchronisation entre le presse-papiers de OSX, celui de X11 (CLIPBOARD) et les mémoires tampons principales (PRIMARY). + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + En cas d’activation de cette option, si vous cliquez sur une fenêtre inactive, celle-ci deviendra active et le clic sera effectif. + + + + + + + + + + + + + + + + + + + + + Lorsque cette option est activée, la création d’une nouvelle fenêtre X11 fait passer X11.app au premier plan (au lieu de Finder.app, Terminal.app, etc.) + + + + + + + + + + + + + + + + + + + + Le lancement d’X11 créera des touches de contrôle d’accès Xauthority. Si l’adresse IP du système change, ces touches ne seront plus valides, ce qui risquera d’empêcher le lancement des applications X11. + + + + + + + + + + En cas d’activation de cette option, « Authentifier les connexions » doit aussi être activée pour garantir la sécurité du système. En cas de désactivation, les connexions à partir d’applications distantes sont interdites. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3615 +1,758 @@ - - - 1040 - 11A289 - 903 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 903 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Über X11 - - 2147483647 - - - - - - Einstellungen … - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Dienste - - 1048576 - 2147483647 - - - submenuAction: - - Dienste - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Vollbildmodus ein-/ausschalten - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - X11 ausblenden - h - 1048576 - 2147483647 - - - 42 - - - - Andere ausblenden - h - 1572864 - 2147483647 - - - - - - Alle einblenden - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - X11 beenden - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Programme - - 1048576 - 2147483647 - - - submenuAction: - - Programme - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Anpassen … - - 1048576 - 2147483647 - - - - - - - - - Bearbeiten - - 1048576 - 2147483647 - - - submenuAction: - - Bearbeiten - - - - Kopieren - c - 1048576 - 2147483647 - - - - - - - - - Fenster - - 1048576 - 2147483647 - - - submenuAction: - - Fenster - - - - Schließen - w - 1048576 - 2147483647 - - - - - - Im Dock ablegen - m - 1048576 - 2147483647 - - - - - - Zoomen - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Vorwärts blättern - < - 1048576 - 2147483647 - - - - - - Rückwärts blättern - > - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Alle nach vorne bringen - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Hilfe - - 1048576 - 2147483647 - - - submenuAction: - - Hilfe - - - - X11 Hilfe - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{2350, 1291.0391}, {550, 341}} - 1350041600 - X11 Einstellungen - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {524, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Drei Maustasten nachbilden - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {461, 28}} - - - YES - - 67239424 - 4194304 - Bei Aktivierung können die Tastenentsprechungen für die Menüleiste die X11-Programme stören, die Meta-Sondertasten verwenden. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 203}, {461, 34}} - - - YES - - 67239424 - 4194304 - SGFsdGVuIFNpZSBiZWltIEtsaWNrZW4gZGllIFdhaGx0YXN0ZSBvZGVyIGRpZSBCZWZlaGxzdGFzdGUg -Z2VkcsO8Y2t0LCB1bSBkaWUgbWl0dGxlcmUgb2RlciBkaWUgcmVjaHRlIE1hdXN0YXN0ZSB6dSBha3Rp -dmllcmVuLgo - - - - - - - - - - 256 - {{18, 127}, {402, 18}} - - - YES - - 67239424 - 0 - Tastenentsprechungen unter X11 aktivieren - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 151}, {461, 28}} - - - YES - - 67239424 - 4194304 - Bei Aktivierung kann Ihre aktuelle X11-Keymap durch Änderungen des Tastaturmenüs überschrieben werden. - - - - - - - - - - 256 - {{18, 185}, {402, 18}} - - - YES - - 67239424 - 0 - Tastaturbelegung des Systems verwenden - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {461, 31}} - - - YES - - 67239424 - 4194304 - Bei Aktivierung entsprechen die Wahltasten Alt_L und Alt_R X11-Tastensymbolen anstatt „Mode_switch“. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Wahltasten entsprechen Alt_L und Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - Immer in Bewegungsrichtung der Finger scrollen - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {504, 279}} - - - Eingabe - - - - - - 2 - - - - 256 - - - - 256 - {{74, 235}, {197, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Vom Monitor - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 Farben - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - 32768 Farben - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - 16,7 Millionen Farben - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {55, 20}} - - - YES - - 67239424 - 4194304 - Farben: - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Diese Option wird beim nächsten Start von X11 wirksam. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Vollbildmodus - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - Zugriff auf Menüleiste im Vollbildmodus erlauben - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {461, 42}} - - - YES - - 67239424 - 4194304 - Hiermit wird das X11-Hauptfenster aktiviert. Verwenden Sie die Tastenkombination Befehl+Wahl+A, um den Vollbildmodus ein- oder auszuschalten. - - - - - - - - - - 256 - {{54, 79}, {436, 31}} - - - YES - - 67239424 - 4194304 - Die Menüleiste wird sichtbar, sobald Sie den Mauszeiger in den oberen Bereich Ihres primären Display bewegen. - - - - - - - - {{10, 33}, {504, 279}} - - - Ausgabe - - - - - - 2 - - - - 256 - - - - 256 - {{11, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Synchronisierung aktivieren - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{29, 221}, {464, 28}} - - - YES - - 67239424 - 4194304 - Aktiviert das Menüobjekt „Kopieren“ und ermöglicht die Synchronisierung zwischen dem „OSX Pasteboard“ und den Pufferspeichern „CLIPBOARD“ und „PRIMARY“ von X11. - - - - - - - - - 256 - {{27, 129}, {436, 18}} - - - YES - - 67239424 - 0 - CLIPBOARD aktualisieren, wenn Pasteboard geändert wird - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{27, 104}, {463, 18}} - - - YES - - 67239424 - 0 - PRIMARY (Mittel-Klick) aktualisieren, wenn Pasteboard geändert wird - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{27, 81}, {498, 18}} - - - YES - - 67239424 - 0 - Pasteboard sofort aktualisieren, wenn Text ausgewählt wird - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{27, 192}, {438, 18}} - - - YES - - 67239424 - 0 - Pasteboard aktualisieren, wenn CLIPBOARD geändert wird - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{41, 158}, {452, 28}} - - - YES - - 67239424 - 4194304 - Deaktivieren Sie diese Option, wenn Sie „xclipboard“, „klipper“ oder einen beliebigen anderen X11-Zwischenablage-Manager verwenden möchten. - - - - - - - - - 256 - {{41, 47}, {450, 28}} - - - YES - - 67239424 - 4194304 - Aufgrund von Einschränkungen im X11-Protokoll funktioniert diese Option in manchen Programmen u. U. nicht immer. - - - - - - - - {{10, 33}, {504, 279}} - - - - Zwischenablage - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {213, 18}} - - - YES - - 67239424 - 0 - Durch inaktive Fenster klicken - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 211}, {456, 28}} - - - YES - - 67239424 - 4194304 - Bei Aktivierung wird beim Klicken auf ein inaktives Fenster der Mausklick zusätzlich an dieses Fenster weitergegeben. - - - - - - - - - 256 - {{15, 184}, {155, 18}} - - - YES - - 67239424 - 0 - Fokus folgt der Maus - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {442, 17}} - - - YES - - 67239424 - 4194304 - Der Fokus des X11-Fensters folgt dem Cursor. Dies hat einige nachteilige Effekte. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Fokus auf neuem Fenster - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 92}, {456, 42}} - - - YES - - 67239424 - 4194304 - Bei Aktivierung wird beim Erzeugen eines neuen X11-Fensters das „X11.app“ in den Vordergrund gebracht (anstelle von „Finder.app“, „Terminal.app“ usw.). - - - - - - - - {{10, 33}, {504, 279}} - - - Fenster - - - - - - - 256 - - - - 256 - {{18, 243}, {215, 18}} - - - YES - - 67239424 - 0 - Verbindungen authentifizieren - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {312, 18}} - - - YES - - 67239424 - 0 - Verbindungen von Netzwerk-Clients erlauben - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 189}, {463, 48}} - - - YES - - 67239424 - 4194304 - Beim Starten von X11 werden Xauthority-Schlüssel zur Zugriffskontrolle erstellt. Wenn sich die IP-Adresse des Systems ändert, sind diese Schlüssel nicht mehr gültig. Möglicherweise können die X11-Programme dann nicht mehr gestartet werden. - - - - - - - - - - 256 - {{36, 104}, {463, 56}} - - - YES - - 67239424 - 4194304 - Bei Aktivierung muss „Verbindungen authentifizieren“ ebenfalls aktiviert sein, damit die Sicherheit des System gewährleistet ist. Bei Deaktivierung sind Verbindungen von entfernten Programmen nicht erlaubt. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Diese Optionen werden beim nächsten Start von X11 wirksam. - - - - - - - - - {{10, 33}, {504, 279}} - - - Sicherheit - - - - - - - 0 - YES - YES - - - - - - {550, 341} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - - - 11 - 2 - {{360, 400}, {512, 271}} - 1350041600 - X11-Programmmenü - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {512, 240} - - - 256 - - - - 265 - {{340, 191}, {158, 32}} - - YES - - 67239424 - 137887744 - Duplizieren - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {158, 32}} - - YES - - 67239424 - 137887744 - Entfernen - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 122.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Name - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Textzelle - - - - - 3 - MQA - - - - 3 - YES - YES - - - - 100 - 40 - 1000 - - 75628096 - 2048 - Befehl - - - - - - 338820672 - 1024 - Textzelle - - - - - - - 3 - YES - YES - - - - 69 - 10 - 1000 - - 75628096 - 2048 - Kurzbefehl - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Textzelle - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {158, 32}} - - YES - - -2080244224 - 137887744 - Objekt hinzufügen - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {512, 271} - - {{0, 0}, {1920, 1178}} - {512, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - - - Menü - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Programme - - 1048576 - 2147483647 - - - submenuAction: - - Programme - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Anpassen … - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{329, 408}, {550, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - {{329, 408}, {550, 341}} - - {{184, 290}, {481, 345}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {512, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCCAAAwr4AAA - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Halten Sie beim Klicken die Wahltaste oder die Befehlstaste gedrückt, um die mittlere oder die rechte Maustaste zu aktivieren. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Hiermit wird das X11-Hauptfenster aktiviert. Verwenden Sie die Tastenkombination Befehl+Wahl+A, um den Vollbildmodus ein- oder auszuschalten. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Aktiviert das Menüobjekt „Kopieren“ und ermöglicht die Synchronisierung zwischen dem „OSX Pasteboard“ und den Pufferspeichern „CLIPBOARD“ und „PRIMARY“ von X11. + + + + + + + + + + + + + + Deaktivieren Sie diese Option, wenn Sie „xclipboard“, „klipper“ oder einen beliebigen anderen X11-Zwischenablage-Manager verwenden möchten. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bei Aktivierung wird beim Erzeugen eines neuen X11-Fensters das „X11.app“ in den Vordergrund gebracht (anstelle von „Finder.app“, „Terminal.app“ usw.). + + + + + + + + + + + + + + + + + + + + Beim Starten von X11 werden Xauthority-Schlüssel zur Zugriffskontrolle erstellt. Wenn sich die IP-Adresse des Systems ändert, sind diese Schlüssel nicht mehr gültig. Möglicherweise können die X11-Programme dann nicht mehr gestartet werden. + + + + + + + + + + Bei Aktivierung muss „Verbindungen authentifizieren“ ebenfalls aktiviert sein, damit die Sicherheit des System gewährleistet ist. Bei Deaktivierung sind Verbindungen von entfernten Programmen nicht erlaubt. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3799 +1,754 @@ - - - 1040 - 11A511a - 1576 - 1138 - 566.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1576 - - - NSTableColumn - NSPopUpButton - NSTableHeaderView - NSMenuItem - NSMenu - NSButtonCell - NSButton - NSTextFieldCell - NSScrollView - NSScroller - NSTableView - NSTabView - NSCustomObject - NSTabViewItem - NSView - NSWindowTemplate - NSTextField - NSPopUpButtonCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - אודות X11 - - 2147483647 - - - - - - העדפות... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - שירותים - - 1048576 - 2147483647 - - - submenuAction: - - שירותים - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - הפעל/בטל מסך מלא - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - הסתר את X11 - h - 1048576 - 2147483647 - - - 42 - - - - הסתר אחרים - h - 1572864 - 2147483647 - - - - - - הצג הכל - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - סיים את X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - ‏יישומים - - 1048576 - 2147483647 - - - submenuAction: - - ‏יישומים - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - התאמה אישית... - - 1048576 - 2147483647 - - - - - - - - - ערוך - - 1048576 - 2147483647 - - - submenuAction: - - ערוך - - - - העתק - c - 1048576 - 2147483647 - - - - - - - - - חלון - - 1048576 - 2147483647 - - - submenuAction: - - חלון - - - - סגור - w - 1048576 - 2147483647 - - - - - - מזער - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - דפדף בין חלונות - ` - 1048576 - 2147483647 - - - - - - הפוך סדר דפדוף בין חלונות - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - הבא הכול קדימה - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - עזרה - - 1048576 - 2147483647 - - - submenuAction: - - עזרה - - - - עזרה בנושא X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364}, {484, 341.0390625}} - 1350041600 - העדפות X11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {458, 325}} - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 67108992 - אמת חיבורים - - LucidaGrande - 13 - 1044 - - - 1210864127 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 67108992 - אפשר חיבורים מלקוחות הרשת - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{17, 195}, {385, 42}} - - - YES - - 67239424 - 71303296 - הפעלה של X11 תיצור מקשי בקרת גישה של Xauthority. אם כתובת ה-IP של המערכת משתנה, מקשים אלו הופכים לבלתי תקינים. דבר זה עלול למנוע הפעלה של יישומי X11. - - LucidaGrande - 11 - 3100 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{17, 118}, {385, 42}} - - - YES - - 67239424 - 71303296 - כאשר התכונה פעילה, יש להפעיל גם אימות חיבורים כדי להבטיח את אבטחת המערכת. כאשר התכונה מבוטלת, חיבורים מיישומים מרוחקים אינם מורשים. - - - - - - - - - 256 - {{11, 17}, {404, 14}} - - YES - - 67239424 - 71303296 - אפשרויות אלו נכנסות לתוקפן בהפעלה הבאה של X11. - - - - - - - - {{10, 33}, {438, 279}} - - - אבטחה - - - - - - 2 - - - - 256 - - - - 256 - {{21, 245}, {402, 18}} - - - YES - - 67239424 - 67108992 - לחיצת הפעלה של חלונות לא פעילים - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{30, 208}, {385, 31}} - - - YES - - 67239424 - 71303296 - כאשר תכונה זו פעילה, לחיצה בתוך חלון שאינו פעיל תגרום ללחיצת העכבר לעבור לחלון זה ובנוסף גם להפעילו. - - - - - - - - - 256 - {{21, 184}, {402, 18}} - - - YES - - 67239424 - 67108992 - מיקוד עוקב-עכבר - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{30, 161}, {385, 17}} - - - YES - - 67239424 - 71303296 - מיקוד החלון של X11 עוקב אחר הסמן. לתכונה זו ישנן כמה תופעות לוואי. - - - - - - - - - 256 - {{21, 140}, {402, 18}} - - - YES - - 67239424 - 67108992 - מיקוד בחלונות חדשים - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{30, 106}, {385, 28}} - - - YES - - 67239424 - 71303296 - כאשר תכונה זו פעילה, היצירה של חלון X11 חדש תגרום ל-X11.app לעבור לחזית (במקום Finder.app, ‏Terminal.app וכדומה). - - - - - - - - {{10, 33}, {438, 279}} - - - ‏Windows - - - - - - 2 - - - - 256 - - - - 256 - {{25, 255}, {409, 23}} - - - YES - - 67239424 - 67108992 - הפעל סינכרון - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 221}, {385, 28}} - - - YES - - 67239424 - 71303296 - מפעיל את פריט התפריט ״העתק״ ומאפשר סינכרון בין לוח ההדבקה של OSX לבין החוצצים של X11 CLIPBOARD ו-PRIMARY. - - - - - - - - - 256 - {{15, 129}, {409, 23}} - - - YES - - 67239424 - 67108992 - עדכן את CLIPBOARD כאשר לוח ההדבקה משתנה - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{1, 109}, {423, 18}} - - - YES - - 67239424 - 67108992 - עדכן את PRIMARY (לחיצת עכבר אמצעית) כאשר לוח ההדבקה משתנה - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{15, 79}, {409, 23}} - - - YES - - 67239424 - 67108992 - עדכן את לוח ההדבקה מיידית לאחר בחירה בקטע מלל חדש - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{15, 192}, {409, 23}} - - - YES - - 67239424 - 67108992 - עדכן את לוח ההדבקה כאשר CLIPBOARD משתנה - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{25, 158}, {385, 28}} - - - YES - - 67239424 - 71303296 - בטל/י אפשרות זו אם ברצונך להשתמש ב-xclipboard, ב-klipper, או בכל מנהל לוח אחר של X11. - - - - - - - - - 256 - {{40, 47}, {370, 28}} - - - YES - - 67239424 - 71303296 - עקב מגבלות בפרוטוקול X11, יתכן שאפשרות זו לא תמיד תפעל ביישומים מסוימים. - - - - - - - - {{10, 33}, {438, 279}} - - - לוח הדבקה - - - - - - 2 - - - - 256 - - - - 256 - {{246, 235}, {128, 26}} - - - YES - - -2076049856 - 67110016 - - - 111821055 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - מהצג - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - ‭?‬256‮ ‬צבעים - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - ‏אלפים - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - ‏מיליונים - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{376, 238}, {45, 20}} - - - YES - - 67239424 - 71303296 - צבעים: - - - - - - - - - 256 - {{10, 216}, {392, 14}} - - - YES - - 67239424 - 71303296 - אפשרות זו נכנסת לתוקפה בהפעלה הבאה של X11. - - - - - - - - - 256 - {{11, 182}, {409, 23}} - - - YES - - 67239424 - 67108992 - מצב מסך מלא - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{-8, 116}, {409, 23}} - - - YES - - 67239424 - 67108992 - אפשר גישה לשורת התפריטים גם בתצוגת מסך מלא. - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{17, 145}, {385, 31}} - - - YES - - 67239424 - 71303296 - מפעיל את חלון השורש של X11. השתמש/י בשילוב המקשים של Command-Option-A כדי להיכנס ולצאת ממצב מסך מלא. - - - - - - - - - 256 - {{5, 79}, {379, 31}} - - - YES - - 67239424 - 71303296 - שורת התפריטים תופיע ברגע שהסמן של העכבר יועבר מעל הצג הראשי שלך. - - - - - - - - {{10, 33}, {438, 279}} - - - פלט - - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 67108992 - אמולציית עכבר בעל שלושה כפתורים - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{17, 93}, {385, 31}} - - - YES - - 67239424 - 71303296 - כאשר תכונה זו פעילה, שווי הערך של מקשי סרגל התפריט עלולים להפריע ליישומי X11 העושים שימוש במשנה מצב מטה. - - - - - - - - - 256 - {{17, 195}, {385, 42}} - - - YES - - 67239424 - 71303296 - 15TXl9eW16cv15kg15DXqiDXnten16kgT3B0aW9uINeQ15UgQ29tbWFuZCDXqteV15og15vXk9eZINec -15fXmdem15Qg15vXk9eZINec15TXpNei15nXnCDXkNeqINeb16TXqteV16gg15TXoteb15HXqCDXlNeQ -157Xptei15kg15DXlSDXlNeZ157XoNeZLgo - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 67108992 - הפעל שווי ערך של מקשים עבור X11 - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{17, 159}, {385, 14}} - - - YES - - 67239424 - 71303296 - מאפשר לשינויי תפריט קלט להחליף את מפת המקשים הקיימת של X11. - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - YES - - 67239424 - 67108992 - בצע לפי פריסת מקלדת המערכת - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{17, 32}, {385, 31}} - - - YES - - 67239424 - 71303296 - כאשר הם פעילים, מקשי Option שולחים סמלי מקשים של Alt_L ו-Alt_R במקום Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 67108992 - מקשי Option שולחים Alt_L ו-Alt_R - - - 1210864127 - 2 - - - - - 200 - 25 - - - - - 256 - {{2, 8}, {418, 18}} - - - YES - - 67239424 - 67108992 - תמיד גלול בכיוון תנועת האצבע - - - 1210864127 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {438, 279}} - - - - קלט - - - - - - - 0 - YES - YES - - - - - - {484, 341.0390625} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {10000000000000, 10000000000000} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {454, 271}} - 1350041600 - תפריט יישומים של X11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 268 - {{14, 191}, {100, 32}} - - YES - - 67239424 - 137887872 - שכפל - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 268 - {{14, 159}, {100, 32}} - - YES - - 67239424 - 137887872 - הסר - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 71 - 10 - 1000 - - 75628096 - 67110912 - קיצור - - - 6 - System - headerColor - - 3 - MQA - - - - 6 - System - headerTextColor - - - - - 338820672 - 67110016 - תא מלל - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 99 - 40 - 1000 - - 75628096 - 67110912 - ‏Command - - - 3 - MC4zMzMzMzI5OQA - - - - - 338820672 - 67110016 - תא מלל - - - - - - 3 - YES - YES - - - - 121.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 67110912 - ‏שם - - - - - - 338820672 - 67110016 - תא מלל - - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{116, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 268 - {{14, 223}, {100, 32}} - - YES - - -2080244224 - 137887872 - הוסף פריט - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {10000000000000, 10000000000000} - x11_apps - YES - - - ‏תפריט - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - ‏יישומים - - 1048576 - 2147483647 - - - submenuAction: - - ‏יישומים - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - ‏התאמה אישית… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{314, 143}, {484, 341}} - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 300490 - - - - - X11Controller - NSObject - - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - apps_table_delete: - id - - - apps_table_done: - id - - - apps_table_duplicate: - id - - - apps_table_new: - id - - - apps_table_show: - id - - - bring_to_front: - id - - - close_window: - id - - - enable_fullscreen_changed: - id - - - minimize_window: - id - - - next_window: - id - - - prefs_changed: - id - - - prefs_show: - id - - - previous_window: - id - - - quit: - id - - - toggle_fullscreen: - id - - - x11_help: - id - - - zoom_window: - id - - - - NSMenuItem - NSTableView - NSButton - NSMenuItem - NSPopUpButton - NSMenu - NSMenu - NSMenuItem - NSButton - NSButton - NSButton - NSTextField - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSPanel - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSTextField - NSTextField - NSMenuItem - NSButton - NSMenuItem - NSMenuItem - - - - apps_separator - NSMenuItem - - - apps_table - NSTableView - - - click_through - NSButton - - - copy_menu_item - NSMenuItem - - - depth - NSPopUpButton - - - dock_apps_menu - NSMenu - - - dock_menu - NSMenu - - - dock_window_separator - NSMenuItem - - - enable_auth - NSButton - - - enable_fullscreen - NSButton - - - enable_fullscreen_menu - NSButton - - - enable_fullscreen_menu_text - NSTextField - - - enable_keyequivs - NSButton - - - enable_tcp - NSButton - - - fake_buttons - NSButton - - - focus_follows_mouse - NSButton - - - focus_on_new_window - NSButton - - - option_sends_alt - NSButton - - - prefs_panel - NSPanel - - - scroll_in_device_direction - NSButton - - - sync_clipboard_to_pasteboard - NSButton - - - sync_keymap - NSButton - - - sync_pasteboard - NSButton - - - sync_pasteboard_to_clipboard - NSButton - - - sync_pasteboard_to_primary - NSButton - - - sync_primary_immediately - NSButton - - - sync_text1 - NSTextField - - - sync_text2 - NSTextField - - - toggle_fullscreen_item - NSMenuItem - - - use_sysbeep - NSButton - - - window_separator - NSMenuItem - - - x11_about_item - NSMenuItem - - - - IBProjectSource - ./Classes/X11Controller.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + הפעלה של X11 תיצור מקשי בקרת גישה של Xauthority. אם כתובת ה-IP של המערכת משתנה, מקשים אלו הופכים לבלתי תקינים. דבר זה עלול למנוע הפעלה של יישומי X11. + + + + + + + + + + כאשר התכונה פעילה, יש להפעיל גם אימות חיבורים כדי להבטיח את אבטחת המערכת. כאשר התכונה מבוטלת, חיבורים מיישומים מרוחקים אינם מורשים. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + החזק/י את מקש Option או Command תוך כדי לחיצה כדי להפעיל את כפתור העכבר האמצעי או הימני. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/hr.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/hr.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/hr.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/hr.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3533 +1,758 @@ - - - 1040 - 11A511a - 1576 - 1138 - 566.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1576 - - - NSTableColumn - NSPopUpButton - NSTableHeaderView - NSMenuItem - NSMenu - NSButtonCell - NSButton - NSTextFieldCell - NSScrollView - NSScroller - NSTableView - NSTabView - NSCustomObject - NSTabViewItem - NSView - NSWindowTemplate - NSTextField - NSPopUpButtonCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Više o aplikaciji X11 - - 2147483647 - - - - - - Postavke... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Usluge - - 1048576 - 2147483647 - - - submenuAction: - - Usluge - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Uključi/isključi prikaz preko cijelog zaslona - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Sakrij X11 - h - 1048576 - 2147483647 - - - 42 - - - - Sakrij ostalo - h - 1572864 - 2147483647 - - - - - - Prikaži sve - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Zatvori X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Aplikacije - - 1048576 - 2147483647 - - - submenuAction: - - Aplikacije - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Podesi… - - 1048576 - 2147483647 - - - - - - - - - Uredi - - 1048576 - 2147483647 - - - submenuAction: - - Uredi - - - - Kopiraj - c - 1048576 - 2147483647 - - - - - - - - - Prozor - - 1048576 - 2147483647 - - - submenuAction: - - Prozor - - - - Zatvori - w - 1048576 - 2147483647 - - - - - - Smanji - m - 1048576 - 2147483647 - - - - - - Zumiraj - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Ciklička izmjena prozora - ` - 1048576 - 2147483647 - - - - - - Obrnuta ciklička izmjena prozora - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Postavi sve naprijed - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Pomoć - - 1048576 - 2147483647 - - - submenuAction: - - Pomoć - - - - Pomoć za X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364.0390625}, {570, 341}} - 1350041600 - X11 postavke - NSPanel - - View - - - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {544, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Emuliraj miš s tri tipke - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {453, 31}} - - - YES - - 67239424 - 4194304 - Kad je omogućeno, ekvivalentne tipke trake izbornika mogu ometati X11 aplikacije koje koriste meta modifikator. - - LucidaGrande - 11 - 3100 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {453, 42}} - - - YES - - 67239424 - 4194304 - RHLFvml0ZSBwcml0aXNudXR1IHRpcGt1IE9wdGlvbiBpbGkgQ29tbWFuZCB0aWpla29tIGtsaWthbmph -IGtha28gYmlzdGUgYWt0aXZpcmFsaSBzcmVkbmp1IGlsaSBkZXNudSB0aXBrdSBtacWhYS4KA - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 0 - Omogući ekvivalentne tipke unutar X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 159}, {471, 14}} - - - YES - - 67239424 - 4194304 - Dozvoljava promjene izbornika unosa kojima se presnimava trenutna X11 mapa tipaka. - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - YES - - 67239424 - 0 - Slijedi sistemski raspored tipkovnice - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {453, 31}} - - - YES - - 67239424 - 4194304 - Kad je omogućeno, tipke Option šalju Alt_L i Alt_R simbole X11 tipke umjesto mod_preklopke. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Tipke Option šalju Alt_L i Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - Uvijek listaj u smjeru pomicanja prsta - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {524, 279}} - - - - Ulaz - - - - - - 2 - - - - 256 - - - - 256 - {{60, 234}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Od zaslona - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 boja - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Tisuće - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Milijuni - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {41, 20}} - - - YES - - 67239424 - 4194304 - Boje: - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Ova opcija stupit će na snagu kad ponovno pokrenete X11. - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Prikaz preko cijelog zaslona - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {482, 18}} - - - YES - - 67239424 - 0 - Dozvoli pristup traci s izbornicima u modu prikaza preko cijelog zaslona - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 141.671875}, {464, 33.328125}} - - - YES - - 67239424 - 4194304 - Omogućava X11 korijenski prozor. Koristite kombinaciju tipaka Command-Option-A za uključenje i isključenje prikaza preko cijelog zaslona. - - - - - - - - - 256 - {{54, 79}, {362, 31}} - - - YES - - 67239424 - 4194304 - Traka s izbornicima postat se vidljiva kad stavite kursor miša na vrh vašeg primarnog zaslona. - - - - - - - - {{10, 33}, {524, 279}} - - - Izlaz - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Omogući sinkronizaciju - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {469, 28}} - - - YES - - 67239424 - 4194304 - Omogućava stavku izbornika "kopiraj" i dozvoljava sinkronizaciju između OSX memorijskog pretinca i X11 MEMORIJSKOG PRETINCA i PRIMARNIH međumemorija. - - - - - - - - - 256 - {{34, 129}, {457, 18}} - - - YES - - 67239424 - 0 - Ažuriraj MEMORIJSKI PRETINAC kad se memorijski pretinac promijeni - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {470, 18}} - - - YES - - 67239424 - 0 - Ažuriraj PRIMARNO (srednji klik) kad se memorijski pretinac promijeni - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {430, 18}} - - - YES - - 67239424 - 0 - Ažuriraj memorijski pretinac odmah nakon odabira novog teksta - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {457, 18}} - - - YES - - 67239424 - 0 - Ažuriraj memorijski pretinac kad se MEMORIJSKI PRETINAC promijeni - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {462, 28}} - - - YES - - 67239424 - 4194304 - Onemogućite ovu opciju ako želite koristiti xclipboard, klipper ili bilo koji drugi alat za upravljanje X11 memorijskim pretincem. - - - - - - - - - 256 - {{48, 47}, {457, 28}} - - - YES - - 67239424 - 4194304 - Zbog ograničenja X11 protokola, ova opcija možda neće uvijek raditi u nekim aplikacijama. - - - - - - - - {{10, 33}, {524, 279}} - - - Memorijski pretinac - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Klikanje kroz neaktivne prozore - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {482, 31}} - - - YES - - 67239424 - 4194304 - Kad je omogućeno, klikanjem na neaktivni prozor će taj klik mišem proći do tog prozora te ga aktivirati. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Fokus slijedi miša - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 164}, {477, 14}} - - - YES - - 67239424 - 4194304 - Fokus X11 prozora slijedi kursor. To može imate neke negativne učinke. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Fokus na nove prozore - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 106}, {477, 28}} - - - YES - - 67239424 - 4194304 - Kad je omogućeno, izradom novog X11 prozora, aplikacija X11.app premjestit će se u prvi plan (umjesto Finder.app, Terminal.app, itd.) - - - - - - - - {{10, 33}, {524, 279}} - - - Prozori - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Autoriziraj povezivanja - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Dozvoli veze od mrežnih klijenata - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {472, 42}} - - - YES - - 67239424 - 4194304 - Pokrenete li X11, izradit će se Xauthority tipke za kontrolu pristupa. Promijeni li se IP adresa sustava, ove tipke postat će nevažeće i to može spriječiti pokretanje X11 aplikacija. - - - - - - - - - 256 - {{36, 118}, {464, 42}} - - - YES - - 67239424 - 4194304 - Omogućite li ovu opciju, također trebate omogućiti autorizaciju povezivanja kako bi se osigurala zaštita sustava. Kad je onemogućeno, povezivanja iz udaljenih aplikacija nisu dozvoljena. - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Ove promjene stupit će na snagu kad ponovno pokrenete X11. - - - - - - - - {{10, 33}, {524, 279}} - - - Sigurnost - - - - - - - 0 - YES - YES - - - - - - {570, 341} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {10000000000000, 10000000000000} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {480, 271}} - 1350041600 - Izbornik aplikacije X11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 265 - {{343, 191}, {123, 32}} - - YES - - 67239424 - 137887744 - Dupliciraj - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{343, 159}, {123, 32}} - - YES - - 67239424 - 137887744 - Ukloni - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {316, 213} - - YES - - - 256 - {316, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - 126.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Ime - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Polje teksta - - - - 3 - MQA - - - - 3 - YES - YES - - - - 104 - 40 - 1000 - - 75628096 - 2048 - Naredba - - - - - - 338820672 - 1024 - Polje teksta - - - - - - 3 - YES - YES - - - - 76 - 10 - 1000 - - 75628096 - 2048 - Prečac - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Polje teksta - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {316, 213}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 207}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {310, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {316, 17}} - - - - - 4 - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{343, 223}, {123, 32}} - - YES - - -2080244224 - 137887744 - Dodaj stavku - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {480, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {10000000000000, 10000000000000} - x11_apps - YES - - - Izbornik - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Aplikacije - - 1048576 - 2147483647 - - - submenuAction: - - Aplikacije - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Podesi… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{837, 570}, {570, 341}} - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Držite pritisnutu tipku Option ili Command tijekom klikanja kako biste aktivirali srednju ili desnu tipku miša. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Omogućava X11 korijenski prozor. Koristite kombinaciju tipaka Command-Option-A za uključenje i isključenje prikaza preko cijelog zaslona. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Omogućava stavku izbornika "kopiraj" i dozvoljava sinkronizaciju između OSX memorijskog pretinca i X11 MEMORIJSKOG PRETINCA i PRIMARNIH međumemorija. + + + + + + + + + + + + + + Onemogućite ovu opciju ako želite koristiti xclipboard, klipper ili bilo koji drugi alat za upravljanje X11 memorijskim pretincem. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Kad je omogućeno, izradom novog X11 prozora, aplikacija X11.app premjestit će se u prvi plan (umjesto Finder.app, Terminal.app, itd.) + + + + + + + + + + + + + + + + + + + + Pokrenete li X11, izradit će se Xauthority tipke za kontrolu pristupa. Promijeni li se IP adresa sustava, ove tipke postat će nevažeće i to može spriječiti pokretanje X11 aplikacija. + + + + + + + + + + Omogućite li ovu opciju, također trebate omogućiti autorizaciju povezivanja kako bi se osigurala zaštita sustava. Kad je onemogućeno, povezivanja iz udaljenih aplikacija nisu dozvoljena. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/hu.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/hu.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/hu.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/hu.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3642 +1,759 @@ - - - 1040 - 11A444d - 905 - 1119.1 - 555.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 905 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Az X11 névjegye - - 2147483647 - - - - - - Beállítások... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Szolgáltatások - - 1048576 - 2147483647 - - - submenuAction: - - Szolgáltatások - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Váltás teljes képernyőre - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - X11 elrejtése - h - 1048576 - 2147483647 - - - 42 - - - - Többi elrejtése - h - 1572864 - 2147483647 - - - - - - Összes megjelenítése - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Kilépés innen: X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Alkalmazások - - 1048576 - 2147483647 - - - submenuAction: - - Alkalmazások - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Testreszabás... - - 1048576 - 2147483647 - - - - - - - - - Szerkesztés - - 1048576 - 2147483647 - - - submenuAction: - - Szerkesztés - - - - Másolás - c - 1048576 - 2147483647 - - - - - - - - - Ablak - - 1048576 - 2147483647 - - - submenuAction: - - Ablak - - - - Bezárás - w - 1048576 - 2147483647 - - - - - - Minimalizálás - m - 1048576 - 2147483647 - - - - - - Méretezés - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Lépkedés az ablakokon - ` - 1048576 - 2147483647 - - - - - - Visszafelé lépkedés az ablakokon - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Összest az előtérbe - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Súgó - - 1048576 - 2147483647 - - - submenuAction: - - Súgó - - - - X11 súgó - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364.03906}, {524, 341}} - 1350041600 - X11-beállítások - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {498, 325}} - - - - - - 1 - - - - 256 - - - - 256 - {{18, 252}, {402, 18}} - - - - YES - - 67239424 - 0 - Háromgombos egér emulálása - - LucidaGrande - 13 - 1040 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {426, 31}} - - - - YES - - 67239424 - 4194304 - Ha engedélyezve van, a menüsor billentyűzetmegfelelései ütközhetnek a Meta módosítót használó X11 alkalmazásokkal. - - LucidaGrande - 11 - 3088 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2ODY1AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 212}, {428, 34}} - - - - YES - - 67239424 - 4194304 - S2F0dGludMOhcyBrw7Z6YmVuIHRhcnRzYSBsZW55b212YSBheiBBbHQgdmFneSBhIENvbW1hbmQgYmls -bGVudHnFsXQgYSBrw7Z6w6lwc8WRIHZhZ3kgYSBqb2JiIG9sZGFsaSBlZ8OpcmdvbWIgYWt0aXbDoWzD -oXPDoWhvei4KA - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - - YES - - 67239424 - 0 - Billentyűmegfelelések engedélyezése az X11 alatt - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36.691406, 154}, {425.30859, 28}} - - - - YES - - 67239424 - 4194304 - Engedélyezi a beviteli menü módosításait az aktuális X11-billentyűzetkiosztás felülírásához. - - - - - - - - - 256 - {{18, 188}, {402, 18}} - - - - YES - - 67239424 - 0 - Rendszerbillentyűzet-kiosztás követése - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {426, 31}} - - - - YES - - 67239424 - 4194304 - Ha engedélyezve van, az Option billentyűk bal és jobb oldali Alt billentyűként működnek Mód kapcsoló helyett. - - - - - - - - - 256 - {{18, 69}, {443, 18}} - - - - YES - - 67239424 - 0 - Az Option billentyűk bal és jobb oldali Alt billentyűként működnek - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - - YES - - 67239424 - 0 - Mindig az ujjmozgás irányába görgessen - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {478, 279}} - - - - - Bemenet - - - - - - 2 - - - - 256 - - - - 256 - {{74, 235}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - - - 400 - 75 - - - A kijelzőről - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 szín - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Több ezer - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Több millió - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {55, 20}} - - - YES - - 67239424 - 4194304 - Színek: - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Ez a beállítás az X11 újbóli elindításakor lép érvénybe. - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Teljes képernyős mód - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - Menüsor elérésének engedélyezése teljes képernyős módban - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {411, 31}} - - - YES - - 67239424 - 4194304 - Engedélyezi az X11 gyökérablakát. A teljes képernyős módba lépéshez, illetve az abból való kilépéshez nyomja le a Command-Alt-A billentyűket. - - - - - - - - - 256 - {{54, 79}, {362, 31}} - - - YES - - 67239424 - 4194304 - A menüsor az egérmutatónak az elsődleges kijelző tetejére helyezésekor lesz látható. - - - - - - - - {{10, 33}, {478, 279}} - - - Kimenet - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Szinkronizálás engedélyezése - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {428, 28}} - - - YES - - 67239424 - 4194304 - Engedélyezi a "másolás" menüelemet, és lehetővé teszi az OSX illesztőlap, illetve az X11 VÁGÓLAP és az ELSŐDLEGES pufferek közötti szinkronizálást. - - - - - - - - - 256 - {{34, 129}, {409, 23}} - - - YES - - 67239424 - 0 - VÁGÓLAP frissítése az illesztőlap módosulásakor - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 93}, {409, 34}} - - - YES - - 67239424 - 0 - QXogRUxTxZBETEVHRVMgcHVmZmVyIGZyaXNzw610w6lzZSAoa8O2esOpcHPFkSBrYXR0aW50w6FzKSAK -YXogaWxsZXN6dMWRbGFwIG3Ds2Rvc3Vsw6FzYWtvcg - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 68}, {409, 23}} - - - YES - - 67239424 - 0 - Új szöveg kijelölésekor azonnal frissítse az illesztőlapot - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {409, 23}} - - - YES - - 67239424 - 0 - Illesztőlap frissítése a VÁGÓLAP módosulásakor - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {416, 28}} - - - YES - - 67239424 - 4194304 - Tiltsa le ezt a pontot, ha az xclipboardot, a klippert vagy más vágólapkezelőt szeretne használni az X11-ben. - - - - - - - - - 256 - {{48, 36}, {416, 28}} - - - YES - - 67239424 - 4194304 - Az X11 protokoll korlátozásai miatt ez a lehetőség nem minden alkalmazás esetében működik. - - - - - - - - {{10, 33}, {478, 279}} - - - Illesztőlap - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Inaktív ablakok átkattintása - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {433, 31}} - - - YES - - 67239424 - 4194304 - Ha engedélyezve van, egy inaktív ablakra kattintás az aktiválás mellett az adott ablakon való keresztülhaladást is eredményezi. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - A fókusz követi az egeret - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {427, 17}} - - - YES - - 67239424 - 4194304 - Az X11 ablakfókusz a kurzort követi. Ennek negatív következményei is vannak. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Fókusz az új ablakokon - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 92}, {427, 42}} - - - YES - - 67239424 - 4194304 - Ha engedélyezve van, egy új X11 ablak létrehozása az X11.app ablak előtérbe helyezését eredményezi (a Finder.app, Terminal.app stb. helyett) - - - - - - - - {{10, 33}, {478, 279}} - - - Windows - - - - - - - 256 - - - - 256 - {{33, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Kapcsolatok hitelesítése - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Kapcsolódás engedélyezése a hálózati kliensekről - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{51, 195}, {398, 42}} - - - YES - - 67239424 - 4194304 - Az X11 elindítása Xauthority hozzáférés-vezérlő billentyűket hoz létre. Ha a rendszer IP-címe módosul, ezek a billentyűk érvénytelenné válnak, és így az X11 alkalmazások sem indulnak el. - - - - - - - - - 256 - {{51, 118}, {398, 42}} - - - YES - - 67239424 - 4194304 - Ha engedélyezve van, a Kapcsolatok hitelesítése funkciót szintén engedélyezni kell a rendszerbiztonság érdekében. Ha le van tiltva, a távoli alkalmazásokról származó kapcsolatok nincsenek engedélyezve. - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Ezek a beállítások az X11 következő elindításakor lépnek érvénybe. - - - - - - - - {{10, 33}, {478, 279}} - - - Biztonság - - - - - - - 0 - YES - YES - - - - - - {524, 341} - - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {504, 271}} - 1350041600 - X11 alkalmazásmenü - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {149, 32}} - - - YES - - 67239424 - 137887744 - Másolat - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {149, 32}} - - - YES - - 67239424 - 137887744 - Eltávolítás - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - - YES - - - 256 - {301, 17} - - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - - 121.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Név - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Szövegcella - - - - 3 - MQA - - - - 3 - YES - YES - - - - 79 - 40 - 1000 - - 75628096 - 2048 - Parancs - - - - - - 338820672 - 1024 - Szövegmező - - - - - - 3 - YES - YES - - - - 91 - 10 - 1000 - - 75628096 - 2048 - Billentyűparancs - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Szövegmező - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1377861632 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {301, 15}} - - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - - 133170 - - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {149, 32}} - - - YES - - -2080244224 - 137887744 - Elem hozzáadása - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {504, 271} - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_apps - YES - - - Menü - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Alkalmazások - - 1048576 - 2147483647 - - - submenuAction: - - Alkalmazások - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Testreszabás… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 565}, {524, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{507, 565}, {524, 341}} - - {{184, 290}, {481, 345}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{70, 582}, {504, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{70, 582}, {504, 271}} - - {{433, 406}, {486, 327}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBuAAAwzAAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBcAAAwxwAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBUAAAw6aAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Kattintás közben tartsa lenyomva az Alt vagy a Command billentyűt a középső vagy a jobb oldali egérgomb aktiválásához. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Engedélyezi az X11 gyökérablakát. A teljes képernyős módba lépéshez, illetve az abból való kilépéshez nyomja le a Command-Alt-A billentyűket. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Engedélyezi a "másolás" menüelemet, és lehetővé teszi az OSX illesztőlap, illetve az X11 VÁGÓLAP és az ELSŐDLEGES pufferek közötti szinkronizálást. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ha engedélyezve van, egy új X11 ablak létrehozása az X11.app ablak előtérbe helyezését eredményezi (a Finder.app, Terminal.app stb. helyett) + + + + + + + + + + + + + + + + + + + + Az X11 elindítása Xauthority hozzáférés-vezérlő billentyűket hoz létre. Ha a rendszer IP-címe módosul, ezek a billentyűk érvénytelenné válnak, és így az X11 alkalmazások sem indulnak el. + + + + + + + + + + Ha engedélyezve van, a Kapcsolatok hitelesítése funkciót szintén engedélyezni kell a rendszerbiztonság érdekében. Ha le van tiltva, a távoli alkalmazásokról származó kapcsolatok nincsenek engedélyezve. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3666 +1,758 @@ - - - 1040 - 11A289 - 851 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 851 - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Informazioni su X11 - - 2147483647 - - - - - - Preferenze... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Servizi - - 1048576 - 2147483647 - - - submenuAction: - - Servizi - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Alterna A tutto schermo - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Nascondi X11 - h - 1048576 - 2147483647 - - - 42 - - - - Nascondi altre - h - 1572864 - 2147483647 - - - - - - Mostra tutte - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Esci da X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Applicazioni - - 1048576 - 2147483647 - - - submenuAction: - - Applicazioni - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalizza... - - 1048576 - 2147483647 - - - - - - - - - Composizione - - 1048576 - 2147483647 - - - submenuAction: - - Composizione - - - - Copia - c - 1048576 - 2147483647 - - - - - - - - - Finestra - - 1048576 - 2147483647 - - - submenuAction: - - Finestra - - - - Chiudi - w - 1048576 - 2147483647 - - - - - - Contrai - m - 1048576 - 2147483647 - - - - - - Ridimensiona - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Naviga tra le finestre - < - 1048576 - 2147483647 - - - - - - Inverti navigazione tra le finestre - > - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Porta tutto in primo piano - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Aiuto - - 1048576 - 2147483647 - - - submenuAction: - - Aiuto - - - - Aiuto X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{345, 450.03906}, {600, 341}} - 1350041600 - Preferenze X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {574, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Emula mouse a tre pulsanti - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {511, 31}} - - - YES - - 67239424 - 4194304 - Se abilitati, gli equivalenti da tastiera della barra dei menu potrebbero interferire con le applicazioni X11 che utilizzano il modificatore Meta. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2ODY1AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {511, 42}} - - - YES - - 67239424 - 4194304 - UGVyIGF0dGl2YXJlIGlsIHB1bHNhbnRlIGRlc3RybyBvIHF1ZWxsbyBjZW50cmFsZSBkZWwgbW91c2Us -IGZhaSBjbGljIHRlbmVuZG8gcHJlbXV0byBpbCBwdWxzYW50ZSBPcHppb25lIG8gaWwgcHVsc2FudGUg -Q29tYW5kby4KA - - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 0 - Abilita equivalenti da tastiera con X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 155}, {453, 17}} - - - YES - - 67239424 - 4194304 - Consente le modifiche del menu tastiera per riscrivere l'attuale mappa dei tasti X11. - - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - YES - - 67239424 - 0 - Segui layout di tastiera di sistema - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 46}, {497, 17}} - - - YES - - 67239424 - 4194304 - Se abilitati, i tasti Opzione inviano i simboli dei tasti X11 Alt_L e Alt_R anziché Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - I tasti Opzione inviano Alt_L e Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 23}, {435, 18}} - - - YES - - 67239424 - 0 - Scorri sempre contenuto nella direzione del movimento delle dita - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {554, 279}} - - - - Ingresso - - - - - - 2 - - - - 256 - - - - 256 - {{70, 234}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Dal monitor - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 Colori - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Migliaia - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Milioni - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {51, 20}} - - - YES - - 67239424 - 4194304 - Colori: - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Queste opzioni diventeranno effettive al successivo riavvio di X11. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Modalità a tutto schermo - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {474, 18}} - - - YES - - 67239424 - 0 - Consenti accesso alla barra dei menu in modalità a tutto schermo - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {504, 31}} - - - YES - - 67239424 - 4194304 - Abilita la finestra root di X11. Utilizza la combinazione di tasti Comando-Opzione-A per attivare e disattivare la modalità a tutto schermo. - - - - - - - - - - 256 - {{54, 79}, {491, 31}} - - - YES - - 67239424 - 4194304 - La barra dei menu diventa visibile quando il cursore del mouse viene posizionato nella parte superiore dello schermo principale. - - - - - - - - {{10, 33}, {554, 279}} - - - Uscita - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Abilita sincronizzazione - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {512, 28}} - - - YES - - 67239424 - 4194304 - Abilita l'elemento “copia” del menu e consenti la sincronizzazione degli appunti di OSX e i buffer CLIPBOARD e PRIMARY di X11. - - - - - - - - - 256 - {{34, 129}, {409, 23}} - - - YES - - 67239424 - 0 - Aggiorna CLIPBOARD quando gli appunti cambiano - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {513, 23}} - - - YES - - 67239424 - 0 - Aggiorna PRIMARY (clic con il pulsante centrale) quando gli appunti cambiano - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {470, 18}} - - - YES - - 67239424 - 0 - Aggiorna immediatamente gli appunti quando si seleziona nuovo testo - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {409, 23}} - - - YES - - 67239424 - 0 - Aggiorna gli appunti quando CLIPBOARD cambia - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{50, 158}, {500, 28}} - - - YES - - 67239424 - 4194304 - Se desideri utilizzare xclipboard, klipper o qualsiasi altro gestore di appunti di X11, disabilita questa opzione. - - - - - - - - - 256 - {{48, 47}, {500, 28}} - - - YES - - 67239424 - 4194304 - A causa delle limitazioni del protocollo di X11, questa opzione in alcune applicazioni potrebbe non funzionare sempre. - - - - - - - - {{10, 33}, {554, 279}} - - - Appunti - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Clic finestre inattive - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {517, 31}} - - - YES - - 67239424 - 4194304 - Quando il riquadro è attivato, facendo clic su una finestra inattiva, il clic del mouse passerà a tale finestra e la attiverà. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Messa a fuoco mediante il mouse - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 150}, {523, 28}} - - - YES - - 67239424 - 4194304 - La messa a fuoco della finestra di X11 avviene mediante il cursore. Questo può avere effetti controproducenti. - - - - - - - - - 256 - {{15, 125}, {402, 18}} - - - YES - - 67239424 - 0 - Messa a fuoco sulle nuove finestre - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 77}, {517, 42}} - - - YES - - 67239424 - 4194304 - Quando il riquadro è attivato, la creazione di una nuova finestra di X11 farà spostare X11.app in primo piano (invece di Finder.app, Terminal.app, etc.) - - - - - - - - {{10, 33}, {554, 279}} - - - Finestre - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Autentica connessioni - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Consente le connessioni da client network - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 181}, {510, 56}} - - - YES - - 67239424 - 4194304 - All'avvio di X11 verranno create le chiavi Xauthority per il controllo d'accesso. Se l'indirizzo IP del sistema cambia, tali chiavi non sono più valide. Questa situazione potrebbe bloccare l'avvio delle applicazioni X11. - - - - - - - - - - 256 - {{36, 104}, {510, 56}} - - - YES - - 67239424 - 4194304 - Se possibile, per garantire la sicurezza del sistema deve essere inoltre abilitata la funzione Autentica connessioni. Quando questa funzione non è attiva, non sono consentite le connessioni dalle applicazioni remote. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Queste opzioni diventeranno effettive al successivo riavvio di X11. - - - - - - - - - {{10, 33}, {554, 279}} - - - Protezione - - - - - - - 0 - YES - YES - - - - - - {600, 341} - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_prefs - - - 11 - 2 - {{302, 440}, {546, 271}} - 1350041600 - Menu applicazioni X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 265 - {{372, 191}, {160, 32}} - - YES - - 67239424 - 137887744 - Duplica - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{372, 159}, {160, 32}} - - YES - - 67239424 - 137887744 - Rimuovi - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {333, 198} - - YES - - - 256 - {333, 17} - - - - - - 256 - {{334, 0}, {16, 17}} - - - - - 132.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Nome - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Cella di testo - - - - - 3 - MQA - - - - 3 - YES - YES - - - - - 110 - 40 - 1000 - - 75628096 - 2048 - Comando - - - - - - 338820672 - 1024 - Cella di testo - - - - - - - 3 - YES - YES - - - - - 81 - 10 - 1000 - - 75628096 - 2048 - Abbreviazione - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Cella di testo - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {333, 198}} - - - - - 4 - - - - 256 - {{334, 17}, {15, 198}} - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {333, 15}} - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {333, 17}} - - - - - 4 - - - - {{20, 20}, {350, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{372, 223}, {160, 32}} - - YES - - -2080244224 - 137887744 - Aggiungi elemento - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {546, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_apps - - - Menu - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Applicazioni - - 1048576 - 2147483647 - - - submenuAction: - - Applicazioni - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalizza… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{216, 370}, {600, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - {{216, 370}, {600, 341}} - - {{184, 290}, {481, 345}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Se abilitati, gli equivalenti da tastiera della barra dei menu potrebbero interferire con le applicazioni X11 che utilizzano il modificatore Meta. + + + + + + + + + + Per attivare il pulsante destro o quello centrale del mouse, fai clic tenendo premuto il pulsante Opzione o il pulsante Comando. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Abilita la finestra root di X11. Utilizza la combinazione di tasti Comando-Opzione-A per attivare e disattivare la modalità a tutto schermo. + + + + + + + + + + La barra dei menu diventa visibile quando il cursore del mouse viene posizionato nella parte superiore dello schermo principale. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Quando il riquadro è attivato, la creazione di una nuova finestra di X11 farà spostare X11.app in primo piano (invece di Finder.app, Terminal.app, etc.) + + + + + + + + + + + + + + + + + + + + All'avvio di X11 verranno create le chiavi Xauthority per il controllo d'accesso. Se l'indirizzo IP del sistema cambia, tali chiavi non sono più valide. Questa situazione potrebbe bloccare l'avvio delle applicazioni X11. + + + + + + + + + + Se possibile, per garantire la sicurezza del sistema deve essere inoltre abilitata la funzione Autentica connessioni. Quando questa funzione non è attiva, non sono consentite le connessioni dalle applicazioni remote. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3620 +1,752 @@ - - - 1040 - 11A289 - 903 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 903 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - X11 について - - 2147483647 - - - - - - 環境設定... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - サービス - - 1048576 - 2147483647 - - - submenuAction: - - サービス - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - フルスクリーンを切り替える - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - X11 を隠す - h - 1048576 - 2147483647 - - - 42 - - - - ほかを隠す - h - 1572864 - 2147483647 - - - - - - すべてを表示 - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - X11 を終了 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - アプリケーション - - 1048576 - 2147483647 - - - submenuAction: - - アプリケーション - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - カスタマイズ... - - 1048576 - 2147483647 - - - - - - - - - 編集 - - 1048576 - 2147483647 - - - submenuAction: - - 編集 - - - - コピー - c - 1048576 - 2147483647 - - - - - - - - - ウインドウ - - 1048576 - 2147483647 - - - submenuAction: - - ウインドウ - - - - 閉じる - w - 1048576 - 2147483647 - - - - - - しまう - m - 1048576 - 2147483647 - - - - - - 拡大／縮小 - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - ウインドウを巡回 - - 1048576 - 2147483647 - - - - - - ウインドウを逆方向に巡回 - - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - すべてを手前に移動 - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - ヘルプ - - 1048576 - 2147483647 - - - submenuAction: - - ヘルプ - - - - X11 ヘルプ - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{319, 328.03906000000001}, {584, 341}} - 1350041600 - X11 の環境設定 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {558, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {505, 18}} - - - YES - - 67239424 - 0 - 3 ボタンマウスをエミュレート - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 96}, {488, 28}} - - - YES - - 67239424 - 4194304 - 有効にすると、メニューバーの代替キーによって X11 アプリケーションのメタ修飾キーを使用できなくなる場合があります。 - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 209}, {488, 28}} - - - YES - - 67239424 - 4194304 - T3B0aW9uIOOCreODvOOCkuaKvOOBl+OBn+OBvuOBvuOCr+ODquODg+OCr+OBmeOCi+OBqOODnuOCpuOC -ueOBruS4reODnOOCv+ODs+aTjeS9nOOBq+OBquOCiuOAgUNvbW1hbmQg44Kt44O844KS5oq844GX44Gf -44G+44G+44Kv44Oq44OD44Kv44GZ44KL44Go44Oe44Km44K544Gu5Y+z44Oc44K/44Oz5pON5L2c44Gr -44Gq44KK44G+44GZ44CCCg - - - - - - - - - - 256 - {{18, 130}, {505, 18}} - - - YES - - 67239424 - 0 - X11 の代替キーを有効にする - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 156}, {488, 17}} - - - YES - - 67239424 - 4194304 - 入力メニューを変更して現在の X11 キーマップを上書きすることを許可します。 - - - - - - - - - - 256 - {{18, 179}, {505, 18}} - - - YES - - 67239424 - 0 - システムのキーボードレイアウトに従う - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {488, 31}} - - - YES - - 67239424 - 4194304 - 有効にすると、option キー で Mode_switch の代わりに X11 キーシンボルの Alt_L と Alt_R が送信されます。 - - - - - - - - - 256 - {{18, 69}, {505, 18}} - - - YES - - 67239424 - 0 - Option キーで Alt_L と Alt_R を送信 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {505, 18}} - - - YES - - 67239424 - 0 - 常に指を動かした方向にスクロール - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {538, 279}} - - - - 入力 - - - - - - 2 - - - - 256 - - - - 256 - {{75, 234}, {163, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - ディスプレイから - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 色 - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - 約 32000 色 - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - 約 1670 万色 - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {56, 19}} - - - YES - - 67239424 - 4194304 - カラー： - - - - - - - - - - 256 - {{36, 216}, {488, 14}} - - - YES - - 67239424 - 4194304 - このオプションは、次回 X11 を起動したときに有効になります。 - - - - - - - - - - 256 - {{18, 182}, {505, 23}} - - - YES - - 67239424 - 0 - フルスクリーンモード - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 118}, {492, 23}} - - - YES - - 67239424 - 0 - フルスクリーンモード時のメニューバーへのアクセスを許可 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 147}, {494, 28}} - - - YES - - 67239424 - 4194304 - X11 のルートウインドウを有効にします。フルスクリーンモードに切り替えたり、フルスクリーンモードを終了するときは、コマンド + Option + A キーを押します。 - - - - - - - - - - 256 - {{54, 70}, {476, 42}} - - - YES - - 67239424 - 4194304 - マウスカーソルが主ディスプレイの一番上に置かれたときにメニューバーが表示されます。 - - - - - - - - {{10, 33}, {538, 279}} - - - 出力 - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {505, 23}} - - - YES - - 67239424 - 0 - 同期を有効にする - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {488, 28}} - - - YES - - 67239424 - 4194304 - “コピー”メニュー項目を有効にして、OSX のペーストボードと X11 の CLIPBOARD バッファおよび PRIMARY バッファを同期できるようにします。 - - - - - - - - - 256 - {{34, 129}, {489, 18}} - - - YES - - 67239424 - 0 - ペーストボードが変更されたときに CLIPBOARD をアップデート - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {489, 18}} - - - YES - - 67239424 - 0 - ペーストボードが変更されたときに PRIMARY （中クリック）をアップデート - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {489, 18}} - - - YES - - 67239424 - 0 - 新しいテキストが選択されたら、すぐにペーストボードをアップデート - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {489, 18}} - - - YES - - 67239424 - 0 - CLIPBOARD が変更されたときにペーストボードをアップデート - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {476, 28}} - - - YES - - 67239424 - 4194304 - xclipboard、klipper、その他の X11 クリップボードマネージャを使用したい場合は、このオプションを無効にしてください。 - - - - - - - - - 256 - {{48, 47}, {476, 28}} - - - YES - - 67239424 - 4194304 - X11 プロトコルの制限により、このオプションは、一部のアプリケーションで機能しない場合があります。 - - - - - - - - {{10, 33}, {538, 279}} - - - ペーストボード - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {508, 18}} - - - YES - - 67239424 - 0 - 選択されていないウインドウを直接クリック - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 211}, {501, 28}} - - - YES - - 67239424 - 4194304 - 有効にした場合、選択されていないウインドウをクリックしたときに、そのウインドウを一番手前に表示するだけでなく、ウインドウ内の項目を直接クリックします。 - - - - - - - - - - 256 - {{15, 184}, {508, 18}} - - - YES - - 67239424 - 0 - フォーカスをマウスと一緒に移動 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 164}, {501, 14}} - - - YES - - 67239424 - 4194304 - X11 ウインドウのフォーカスがカーソルと一緒に移動します。逆効果になる場合もあります。 - - - - - - - - - - 256 - {{15, 140}, {508, 18}} - - - YES - - 67239424 - 0 - 新規ウインドウにフォーカス - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 106}, {501, 28}} - - - YES - - 67239424 - 4194304 - 有効にした場合、新しい X11 ウインドウを作成すると、Finder.app や ターミナル.app などの代わりに、X11.app が前面に移動します。 - - - - - - - - - {{10, 33}, {538, 279}} - - - ウインドウ - - - - - - - 256 - - - - 256 - {{18, 243}, {482, 18}} - - - YES - - 67239424 - 0 - 接続を認証 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 180}, {402, 18}} - - - YES - - 67239424 - 0 - ネットワーク・クライアントからの接続を許可 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 209}, {488, 28}} - - - YES - - 67239424 - 4194304 - X11 の起動時に、Xauthority アクセス制御キーを作成します。システムの IP アドレスが変更されると、これらのキーが無効になり、X11 アプリケーションが起動しなくなることがあります。 - - - - - - - - - - 256 - {{36, 132}, {488, 42}} - - - YES - - 67239424 - 4194304 - 有効にする場合は、システムのセキュリティを維持するために、“接続を認証”も有効にしてください。無効にすると、リモートアプリケーションからの接続は拒否されます。 - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - これらのオプションは、次回 X11 を起動したときに有効になります。 - - - - - - - - - {{10, 33}, {538, 279}} - - - セキュリティ - - - - - - - 0 - YES - YES - - - - - - {584, 341} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - - - 11 - 2 - {{360, 402}, {454, 271}} - 1350041600 - X11 アプリケーションメニュー - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {454, 271} - - - 256 - - - - 265 - {{340, 191}, {105, 32}} - - YES - - 67239424 - 137887744 - 複製 - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {105, 32}} - - YES - - 67239424 - 137887744 - 削除 - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 103 - 43 - 1000 - - 75628096 - 2048 - 名前 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - テキストセル - - - - - 3 - MQA - - - - 3 - YES - YES - - - - - 100 - 40 - 1000 - - 75628096 - 2048 - コマンド - - - - - - 338820672 - 1024 - テキストセル - - - - - - - 3 - YES - YES - - - - - 89 - 30 - 1000 - - 75628096 - 2048 - ショートカット - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - テキストセル - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {105, 32}} - - YES - - -2080244224 - 137887744 - 項目を追加 - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1920, 1178}} - {454, 293} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - - - メニュー - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - アプリケーション - - 1048576 - 2147483647 - - - submenuAction: - - アプリケーション - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - カスタマイズ... - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 515}, {584, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{507, 515}, {584, 341}} - - {{184, 290}, {481, 345}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {454, 271} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Option キーを押したままクリックするとマウスの中ボタン操作になり、Command キーを押したままクリックするとマウスの右ボタン操作になります。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3623 +1,752 @@ - - - 1040 - 11A289 - 851 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 851 - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - X11에 관하여 - - 2147483647 - - - - - - 환경설정... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 서비스 - - 1048576 - 2147483647 - - - submenuAction: - - 서비스 - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 전체 화면 토글 - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - X11 가리기 - h - 1048576 - 2147483647 - - - 42 - - - - 기타 가리기 - h - 1572864 - 2147483647 - - - - - - 모두 보기 - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - X11 종료 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - 응용 프로그램 - - 1048576 - 2147483647 - - - submenuAction: - - 응용 프로그램 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 사용자화... - - 1048576 - 2147483647 - - - - - - - - - 편집 - - 1048576 - 2147483647 - - - submenuAction: - - 편집 - - - - 복사하기 - c - 1048576 - 2147483647 - - - - - - - - - 윈도우 - - 1048576 - 2147483647 - - - submenuAction: - - 윈도우 - - - - 닫기 - w - 1048576 - 2147483647 - - - - - - 최소화 - m - 1048576 - 2147483647 - - - - - - 확대/축소 - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 윈도우 순환 - ` - 1048576 - 2147483647 - - - - - - 윈도우 역순환 - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 모두 앞으로 가져오기 - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - 도움말 - - 1048576 - 2147483647 - - - submenuAction: - - 도움말 - - - - X11 도움말 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364}, {484, 341.0390625}} - 1350041600 - X11 환경설정 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {458, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - 3중 버튼 마우스 동작 모방하기 - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 96}, {383, 28}} - - - YES - - 67239424 - 4194304 - 활성화되면, 메뉴 막대와 동등한 키가 메타 조합을 사용하는 X11 응용 프로그램에 간섭할 수 있습니다. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {385, 42}} - - - YES - - 67239424 - 4194304 - 66eI7Jqw7IqkIOykkeqwhCDrmJDripQg7Jik66W47Kq9IOuyhO2KvOydhCDtmZzshLHtmZTtlZjroKTr -qbQsIO2BtOumre2VmOuKlCDrj5nslYggT3B0aW9uIOuYkOuKlCBDb21tYW5kIO2CpOulvCDtlajqu5gg -64iE66W06rOgIOyeiOycvOyLreyLnOyYpC4KA - - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 0 - X11에서 동등한 키 활성화하기 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 159}, {385, 14}} - - - YES - - 67239424 - 4194304 - 입력 메뉴 변경사항이 현재 X11 키맵을 덮어쓰도록 허용합니다. - - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - YES - - 67239424 - 0 - 시스템 키보드 레이아웃 따르기 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {385, 31}} - - - YES - - 67239424 - 4194304 - 활성화하면, Option 키는 Mode_switch 대신에 Alt_L 및 Alt_R X11 키 기호를 보냅니다. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Option 키로 Alt_L 및 Alt_R 보내기 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - 항상 손가락이 움직이는 방향으로 스크롤하기 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {438, 279}} - - - - 입력 - - - - - - 2 - - - - 256 - - - - 256 - {{58, 235}, {129, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - 모니터에서 - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 색상 - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - 수만 색상 - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - 수백만 색상 - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {39, 20}} - - - YES - - 67239424 - 4194304 - 색상: - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - 이 옵션은 X11을 다시 실행하면 적용됩니다. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - 전체 화면 모드 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - 전체 화면 모드에서 메뉴 막대 접근 허용하기 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {357, 28}} - - - YES - - 67239424 - 4194304 - X11 루트 윈도우를 활성화합니다. 전체 화면 모드를 시작하거나 종료하려면, Command-Option-A 키를 사용하십시오. - - - - - - - - - - 256 - {{54, 79}, {362, 31}} - - - YES - - 67239424 - 4194304 - 마우스 커서가 주 모니터 상단에 있을 때 메뉴 막대가 표시됩니다. - - - - - - - - {{10, 33}, {438, 279}} - - - 출력 - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - 동기화 활성화 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {385, 28}} - - - YES - - 67239424 - 4194304 - "복사하기" 메뉴 항목을 활성화하고 OSX 붙이기 보드, X11 클립보드 및 PRIMARY 버퍼 간의 동기화를 허용합니다. - - - - - - - - - 256 - {{34, 129}, {409, 23}} - - - YES - - 67239424 - 0 - 붙이기 보드가 변경되면 CLIPBOARD 업데이트 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {409, 23}} - - - YES - - 67239424 - 0 - 붙이기 보드가 변경되면 PRIMARY(중간 클릭) 업데이트 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {409, 23}} - - - YES - - 67239424 - 0 - 새로운 텍스트가 선택되면 바로 붙이기 보드 업데이트 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {409, 23}} - - - YES - - 67239424 - 0 - CLIPBOARD가 변경되면 붙이기 보드 업데이트 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {385, 28}} - - - YES - - 67239424 - 4194304 - xclipboard, klipper 또는 기타 다른 X11 클립보드 관리자를 사용하려면 이 옵션을 비활성화하십시오. - - - - - - - - - 256 - {{48, 47}, {370, 28}} - - - YES - - 67239424 - 4194304 - X11 프로토콜 제한 때문에 이 옵션은 일부 응용 프로그램에서 항상 작동하지 않을 수도 있습니다. - - - - - - - - {{10, 33}, {438, 279}} - - - 붙이기 보드 - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - 비활성 윈도우 클릭 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {385, 31}} - - - YES - - 67239424 - 4194304 - 활성화되었을 때 비활성 윈도우를 클릭하면 마우스 클릭이 비활성 윈도우로 통과될 뿐만 아니라 비활성 윈도우가 활성화됩니다. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - 마우스를 따라 초점 이동 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {412, 17}} - - - YES - - 67239424 - 4194304 - X11 윈도우 초점은 해당 커서를 따릅니다. 이것은 일부 역기능을 가지고 있습니다. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - 새로운 윈도우에 초점 두기 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 106}, {385, 28}} - - - YES - - 67239424 - 4194304 - 활성화되었을 때 새로운 X11 윈도우를 생성하면 (Finder.app 및 터미널.app 등 대신) X11.app이 맨 앞으로 이동됩니다. - - - - - - - - {{10, 33}, {438, 279}} - - - 윈도우 - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - 연결 인증 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - 네트워크 클라이언트에서의 연결을 허용 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {385, 42}} - - - YES - - 67239424 - 4194304 - X11을 실행하면 Xauthority 연결 제어 키를 생성합니다. 시스템의 IP 주소를 변경하면, 이 키들이 유효하지 않게 되어 X11 응용 프로그램이 실행되지 않을 수 있습니다. - - - - - - - - - - 256 - {{36, 132}, {380, 28}} - - - YES - - 67239424 - 4194304 - 활성화되면, 시스템 보안을 확인하기 위해 연결 인증도 활성화되어야 합니다. 비활성화되면, 원격 응용 프로그램 연결이 허용되지 않습니다. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - 이들 옵션은 X11을 다음에 실행하면 적용됩니다. - - - - - - - - - {{10, 33}, {438, 279}} - - - 보안 - - - - - - - 0 - YES - YES - - - - - - {484, 341} - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - - - 11 - 2 - {{302, 440}, {454, 271}} - 1350041600 - X11 응용 프로그램 메뉴 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {100, 32}} - - YES - - 67239424 - 137887744 - 복제 - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {100, 32}} - - YES - - 67239424 - 137887744 - 제거 - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 121.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - 이름 - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - - 3 - MQA - - - - 3 - YES - YES - - - - 99 - 40 - 1000 - - 75628096 - 2048 - 명령 - - - - - - 338820672 - 1024 - Text Cell - - - - - - - 3 - YES - YES - - - - 71 - 10 - 1000 - - 75628096 - 2048 - 단축키 - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {100, 32}} - - YES - - -2080244224 - 137887744 - 항목 추가 - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - - - 메뉴 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 응용 프로그램 - - 1048576 - 2147483647 - - - submenuAction: - - 응용 프로그램 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 사용자화… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 515}, {484, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{507, 515}, {484, 341}} - - {{184, 290}, {481, 345}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 마우스 중간 또는 오른쪽 버튼을 활성화하려면, 클릭하는 동안 Option 또는 Command 키를 함께 누르고 있으십시오. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3615 +1,756 @@ - - - 1040 - 11A444d - 905 - 1119.1 - 555.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 905 - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Om X11 - - 2147483647 - - - - - - Valg... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Tjenester - - 1048576 - 2147483647 - - - submenuAction: - - Tjenester - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Slå fullskjermmodus på/av - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Skjul X11 - h - 1048576 - 2147483647 - - - 42 - - - - Skjul andre - h - 1572864 - 2147483647 - - - - - - Vis alle - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Avslutt X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Programmer - - 1048576 - 2147483647 - - - submenuAction: - - Programmer - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Tilpass... - - 1048576 - 2147483647 - - - - - - - - - Rediger - - 1048576 - 2147483647 - - - submenuAction: - - Rediger - - - - Kopier - c - 1048576 - 2147483647 - - - - - - - - - Vindu - - 1048576 - 2147483647 - - - submenuAction: - - Vindu - - - - Lukk - w - 1048576 - 2147483647 - - - - - - Minimer - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bla gjennom vinduer - < - 1048576 - 2147483647 - - - - - - Bla baklengs gjennom vinduer - < - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Legg alle øverst - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Hjelp - - 1048576 - 2147483647 - - - submenuAction: - - Hjelp - - - - X11-hjelp - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364}, {484, 341.0390625}} - 1350041600 - X11-valg - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {458, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Emuler mus med tre knapper - - LucidaGrande - 13 - 1040 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {385, 28}} - - - YES - - 67239424 - 4194304 - Når aktivert, kan tastaturkommandoer for menylinjen komme i konflikt med X11-programmer som bruker metatasten. - - LucidaGrande - 11 - 3088 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {385, 42}} - - - YES - - 67239424 - 4194304 - SG9sZCBuZWRlIFRpbHZhbGctIGVsbGVyIEtvbW1hbmRvLXRhc3RlbiBtZW5zIGR1IGtsaWtrZXIgZm9y -IMOlIGFrdGl2ZXJlIGRlbiBtaWR0cmUgZWxsZXIgaMO4eXJlIG11c2VrbmFwcGVuLgo - - - - - - - - - - 256 - {{18, 127}, {402, 18}} - - - YES - - 67239424 - 0 - Aktiver tastaturkommandoer i X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 151}, {385, 28}} - - - YES - - 67239424 - 4194304 - Gir deg mulighet til å legge inn menyendringer som overskriver den nåværende X11-tastaturlayouten. - - - - - - - - - - 256 - {{18, 185}, {402, 18}} - - - YES - - 67239424 - 0 - Følg systemets tastaturlayout - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {385, 31}} - - - YES - - 67239424 - 4194304 - Når dette er aktivert, sender Tilvalg-tastene Alt_L og Alt_R X11-nøkkelsymboler i stedet for Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Tilvalg-tastene sender Alt_L og Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - Rull alltid i samme retning som fingerbevegelsene - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {438, 279}} - - - - Inndata - - - - - - 2 - - - - 256 - - - - 256 - {{68, 235}, {134, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Fra skjerm - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 farger - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Tusener - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Millioner - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 241}, {49, 17}} - - - YES - - 67239424 - 4194304 - Farger: - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Denne innstillingen trer i kraft neste gang X11 startes. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Fullskjermmodus - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {373, 23}} - - - YES - - 67239424 - 0 - Gi tilgang til menylinjen i fullskjermmodus - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 148}, {375, 28}} - - - YES - - 67239424 - 4194304 - Aktiverer X11-rotvinduet. Slå fullskjermmodus på og av ved å trykke på Kommando-Tilvalg-A samtidig. - - - - - - - - - - 256 - {{54, 79}, {362, 31}} - - - YES - - 67239424 - 4194304 - Menylinjen blir synlig når musemarkøren plasseres øverst på hovedskjermen. - - - - - - - - {{10, 33}, {438, 279}} - - - Utdata - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Aktiver synkronisering - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {385, 28}} - - - YES - - 67239424 - 4194304 - Aktiverer «kopier»-menyobjektet og gjør det mulig å synkronisere mellom bufrene i OSX Pasteboard, X11 CLIPBOARD og PRIMARY. - - - - - - - - - 256 - {{34, 129}, {383, 23}} - - - YES - - 67239424 - 0 - Oppdater CLIPBOARD når Utklipp endres - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {383, 23}} - - - YES - - 67239424 - 0 - Oppdater PRIMARY (midtklikk) når Utklipp endres - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {383, 23}} - - - YES - - 67239424 - 0 - Oppdater Utklipp umiddelbart når ny tekst markeres - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {383, 23}} - - - YES - - 67239424 - 0 - Oppdater Utklipp når CLIPBOARD endres - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {370, 28}} - - - YES - - 67239424 - 4194304 - Deaktiver dette valget hvis du vil bruke xclipboard, klipper eller andre X11-utklippshåndterere. - - - - - - - - - 256 - {{48, 47}, {370, 28}} - - - YES - - 67239424 - 4194304 - På grunn av begrensninger i X11-protokollen, er det mulig at dette valget ikke fungerer i alle programmer. - - - - - - - - {{10, 33}, {438, 279}} - - - Utklipp - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Registrer klikk i inaktive vinduer - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {385, 31}} - - - YES - - 67239424 - 4194304 - Når denne funksjonen er aktivert, registreres museklikk i inaktive vinduer når du klikker i dem, i tillegg til at vinduene aktiveres. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Fokus følger musen - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {385, 17}} - - - YES - - 67239424 - 4194304 - X11-vindufokus følger markøren. Kan være upraktisk i bruk. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Fokuser på nye vinduer - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 106}, {385, 28}} - - - YES - - 67239424 - 4194304 - Når denne funksjonen er aktivert, legges X11.app øverst (i stedet for Finder.app, Terminal.app osv.) når du oppretter et nytt X11-vindu. - - - - - - - - {{10, 33}, {438, 279}} - - - Vinduer - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Godkjenn tilkoblinger - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Tillat tilkoblinger fra nettverksklienter - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {383, 42}} - - - YES - - 67239424 - 4194304 - Når du starter X11, opprettes det Xauthority-tilgangskontrolltaster. Hvis maskinens IP-adresse endres, kan ikke disse tastene brukes, noe som kan hindre X11-programmer fra å starte. - - - - - - - - - - 256 - {{36, 118}, {364, 42}} - - - YES - - 67239424 - 4194304 - Hvis dette er aktivert, må du for å sikre systemet, også aktivere Godkjenn tilkoblinger. Når dette ikke er aktivert, er tilkoblinger fra eksterne programmer ikke tillatt. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Disse innstillingene trer i kraft neste gang X11 startes. - - - - - - - - - {{10, 33}, {438, 279}} - - - Sikkerhet - - - - - - - 0 - YES - YES - - - - - - {{7, 11}, {484, 341}} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {485, 271}} - 1350041600 - X11-programmeny - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {131, 32}} - - YES - - 67239424 - 137887744 - Dupliser - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {131, 32}} - - YES - - 67239424 - 137887744 - Fjern - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 121.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Navn - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Tekstrute - - - - - 3 - MQA - - - - 3 - YES - YES - - - - 99 - 40 - 1000 - - 75628096 - 2048 - Kommando - - - - - - 338820672 - 1024 - Tekstrute - - - - - - - 3 - YES - YES - - - - 71 - 10 - 1000 - - 75628096 - 2048 - Snarvei - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Tekstrute - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {131, 32}} - - YES - - -2080244224 - 137887744 - Legg til objekt - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {485, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - YES - - - Meny - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Programmer - - 1048576 - 2147483647 - - - submenuAction: - - Programmer - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Tilpass… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{796, 693}, {297, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 565}, {484, 308}} - com.apple.InterfaceBuilder.CocoaPlugin - {{507, 565}, {484, 308}} - - {{184, 290}, {481, 345}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{566, 836}, {354, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Hold nede Tilvalg- eller Kommando-tasten mens du klikker for å aktivere den midtre eller høyre museknappen. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Når denne funksjonen er aktivert, registreres museklikk i inaktive vinduer når du klikker i dem, i tillegg til at vinduene aktiveres. + + + + + + + + + + + + + + + + + + + + + Når denne funksjonen er aktivert, legges X11.app øverst (i stedet for Finder.app, Terminal.app osv.) når du oppretter et nytt X11-vindu. + + + + + + + + + + + + + + + + + + + + Når du starter X11, opprettes det Xauthority-tilgangskontrolltaster. Hvis maskinens IP-adresse endres, kan ikke disse tastene brukes, noe som kan hindre X11-programmer fra å starte. + + + + + + + + + + Hvis dette er aktivert, må du for å sikre systemet, også aktivere Godkjenn tilkoblinger. Når dette ikke er aktivert, er tilkoblinger fra eksterne programmer ikke tillatt. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3691 +1,754 @@ - - - 1040 - 11A289 - 851 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 851 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - X11… - - 2147483647 - - - - - - Preferencje… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Usługi - - 1048576 - 2147483647 - - - submenuAction: - - Usługi - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Przełączaj pełny ekran - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Ukryj X11 - h - 1048576 - 2147483647 - - - 42 - - - - Ukryj pozostałe - h - 1572864 - 2147483647 - - - - - - Pokaż wszystkie - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Zakończ X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Programy - - 1048576 - 2147483647 - - - submenuAction: - - Programy - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Dostosuj… - - 1048576 - 2147483647 - - - - - - - - - Edycja - - 1048576 - 2147483647 - - - submenuAction: - - Edycja - - - - Kopiuj - c - 1048576 - 2147483647 - - - - - - - - - Okno - - 1048576 - 2147483647 - - - submenuAction: - - Okno - - - - Zamknij - w - 1048576 - 2147483647 - - - - - - Minimalizuj okno - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Przełączaj między oknami - ` - 1048576 - 2147483647 - - - - - - Przełączaj wstecz pomiędzy oknami - ` - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Umieść wszystko na wierzchu - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Pomoc - - 1048576 - 2147483647 - - - submenuAction: - - Pomoc - - - - Pomoc X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{288, 302.03906}, {600, 341}} - 1350041600 - Preferencje X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {574, 325}} - - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - - YES - - 67239424 - 0 - Emuluj mysz z trzema przyciskami - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {495, 31}} - - - - YES - - 67239424 - 4194304 - Równoważniki klawiszowe paska menu będą mogły kolidować z programami X11 używającymi modyfikatora Meta. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2ODY1AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 203}, {495, 34}} - - - - YES - - 67239424 - 4194304 - S2xpa25pxJljaWUgeiBwcnp5dHJ6eW1hbnltIGtsYXdpc3plbSBPcGNqYSBsdWIgQ29tbWFuZCBlbXVs -dWplIMWbcm9ka293eSBsdWIgcHJhd3kgcHJ6eWNpc2sgbXlzenkuCg - - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - - YES - - 67239424 - 0 - Włącz równoważniki klawiszowe w środowisku X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 144}, {495, 31}} - - - - YES - - 67239424 - 4194304 - Umożliwia zastąpienie bieżącej mapy klawiszy X11 zmianami w menu wejścia. - - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - - YES - - 67239424 - 0 - Stosuj systemowy układ klawiatury - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {495, 31}} - - - - YES - - 67239424 - 4194304 - Naciśnięcie klawisza Opcja spowoduje wysłanie symboli klawiszy X11 Alt_L i Alt_R X11, a nie Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - - YES - - 67239424 - 0 - Klawisze Opcja działają jak prawy i lewy klawisz Alt - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - - YES - - 67239424 - 0 - Zawsze przewijaj zgodnie z kierunkiem ruchu palca - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {554, 279}} - - - - - Wejście - - - - - - 2 - - - - 256 - - - - 256 - {{74, 235}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Z monitora - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 kolorów - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Tysiące - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Miliony - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {55, 20}} - - - YES - - 67239424 - 4194304 - Kolory: - - - - - - - - - - 256 - {{36, 216}, {369, 14}} - - - YES - - 67239424 - 4194304 - Opcja będzie aktywna po ponownym uruchomieniu X11. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Tryb pełnego ekranu - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {390, 23}} - - - YES - - 67239424 - 0 - Włącz dostęp z paska menu w trybie pełnoekranowym - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {486, 31}} - - - YES - - 67239424 - 4194304 - Włącza okno główne X11. Do włączania i wyłączania trybu pełnego ekranu służą klawisze Command-Opcja-A. - - - - - - - - - - 256 - {{54, 79}, {468, 31}} - - - YES - - 67239424 - 4194304 - Pasek menu będzie pojawiał się, gdy kursor myszy znajdzie się u góry głównego monitora. - - - - - - - - {{10, 33}, {554, 279}} - - - Wyjście - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Włącz synchronizację - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{40, 221}, {483, 28}} - - - YES - - 67239424 - 4194304 - Aktywuje menu kopiowania i umożliwia synchronizowanie schowka OS X z buforami X11 (CLIPBOARD i PRIMARY). - - - - - - - - - 256 - {{38, 129}, {409, 23}} - - - YES - - 67239424 - 0 - Uaktualniaj bufor CLIPBOARD zmianami Schowka - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{38, 104}, {489, 18}} - - - YES - - 67239424 - 0 - Uaktualniaj bufor PRIMARY (środkowy przycisk myszy) zmianami Schowka - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{38, 79}, {432, 18}} - - - YES - - 67239424 - 0 - Uaktualniaj Schowek natychmiast po zaznaczeniu nowego tekstu - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{38, 192}, {409, 23}} - - - YES - - 67239424 - 0 - Uaktualniaj Schowek zmianami bufora CLIPBOARD - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{57, 158}, {385, 28}} - - - YES - - 67239424 - 4194304 - Wyłączenie opcji pozwala korzystać z menedżerów schowka X11 takich jak np. xclipboard lub, klipper. - - - - - - - - - 256 - {{52, 47}, {476, 28}} - - - YES - - 67239424 - 4194304 - Z powodu ograniczeń protokołu X11 funkcja może czasami nie działać w niektórych programach. - - - - - - - - {{10, 33}, {554, 279}} - - - Schowek - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Fokus w nieaktywnym oknie jednym kliknięciem - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {517, 31}} - - - YES - - 67239424 - 4194304 - Kliknięcie nieaktywnego okna będzie powodowało jego uaktywnienie i przeniesienie do niego fokusu. - - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Fokus podąża za myszą - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {401, 17}} - - - YES - - 67239424 - 4194304 - Fokus okien X11 podąża za kursorem (ma to pewne niekorzystne skutki). - - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Fokus w nowych oknach - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 92}, {517, 42}} - - - YES - - 67239424 - 4194304 - Otwarcie nowego okna X11 będzie powodowało umieszczenie programu X11.app na wierzchu (zamiast Finder.app, Terminal.app itd.). - - - - - - - - - {{10, 33}, {554, 279}} - - - Okna - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Uwierzytelniaj połączenia - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Pozwalaj na połączenia od klientów sieciowych - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {452, 42}} - - - YES - - 67239424 - 4194304 - Uruchomienie X11 utworzy klucze kontroli dostępu Xauthority. Jeśli adres IP systemu zmieni się, klucze te stracą ważność, co może uniemożliwić uruchamianie programów X11. - - - - - - - - - - 256 - {{36, 118}, {504, 42}} - - - YES - - 67239424 - 4194304 - Gdy pole jest zaznaczone, dla bezpieczeństwa włączona musi być także opcja Uwierzytelniaj połączenia. Gdy pole nie jest zaznaczone, połączenia ze zdalnych programów nie są dozwolone. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Te opcje będą aktywne po następnym uruchomieniu X11. - - - - - - - - - {{10, 33}, {554, 279}} - - - Zabezpieczenia - - - - - - - 0 - YES - YES - - - - - - {600, 341} - - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_prefs - - - 11 - 2 - {{333, 380}, {454, 271}} - 1350041600 - Menu programów X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {104, 32}} - - - YES - - 67239424 - 137887744 - Powiel - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {104, 32}} - - - YES - - 67239424 - 137887744 - Usuń - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {316, 213} - - - YES - - - 256 - {316, 17} - - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - - 127.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Nazwa - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Komórka tekstowa - - - - - 3 - MQA - - - - 3 - YES - YES - - - - - 105 - 40 - 1000 - - 75628096 - 2048 - Polecenie - - - - - - 338820672 - 1024 - Komórka tekstowa - - - - - - - 3 - YES - YES - - - - - 74 - 10 - 1000 - - 75628096 - 2048 - Skrót - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Komórka tekstowa - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {316, 213}} - - - - - - 4 - - - - 256 - {{302, 17}, {15, 213}} - - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {316, 15}} - - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - - 133170 - - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {104, 32}} - - - YES - - -2080244224 - 137887744 - Dodaj rzecz - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_apps - - - Menu - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Programy - - 1048576 - 2147483647 - - - submenuAction: - - Programy - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Dostosuj… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{536, 476}, {600, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - {{536, 476}, {600, 341}} - - {{184, 290}, {481, 345}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Kliknięcie z przytrzymanym klawiszem Opcja lub Command emuluje środkowy lub prawy przycisk myszy. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Uruchomienie X11 utworzy klucze kontroli dostępu Xauthority. Jeśli adres IP systemu zmieni się, klucze te stracą ważność, co może uniemożliwić uruchamianie programów X11. + + + + + + + + + + Gdy pole jest zaznaczone, dla bezpieczeństwa włączona musi być także opcja Uwierzytelniaj połączenia. Gdy pole nie jest zaznaczone, połączenia ze zdalnych programów nie są dozwolone. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3668 +1,757 @@ - - - 1040 - 11A289 - 851 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 851 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Sobre o X11 - - 2147483647 - - - - - - Preferências... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Serviços - - 1048576 - 2147483647 - - - submenuAction: - - Serviços - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Alternar Tela Cheia - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Ocultar X11 - h - 1048576 - 2147483647 - - - 42 - - - - Ocultar Outros - h - 1572864 - 2147483647 - - - - - - Mostrar Tudo - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Encerrar X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Aplicativos - - 1048576 - 2147483647 - - - submenuAction: - - Aplicativos - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalizar... - - 1048576 - 2147483647 - - - - - - - - - Editar - - 1048576 - 2147483647 - - - submenuAction: - - Editar - - - - Copiar - c - 1048576 - 2147483647 - - - - - - - - - Janela - - 1048576 - 2147483647 - - - submenuAction: - - Janela - - - - Fechar - w - 1048576 - 2147483647 - - - - - - Minimizar - m - 1048576 - 2147483647 - - - - - - Reduzir/Ampliar - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Percorrer Janelas - ` - 1048576 - 2147483647 - - - - - - Percorrer Janelas no Sentido Inverso - ` - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Trazer Todas Para a Frente - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Ajuda - - 1048576 - 2147483647 - - - submenuAction: - - Ajuda - - - - Ajuda X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364.0390625}, {644, 341}} - 1350041600 - Preferências X11 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {618, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 253}, {402, 18}} - - - YES - - 67239424 - 0 - Emular mouse de três botões - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {555, 31}} - - - YES - - 67239424 - 4194304 - Se ativadas, as teclas equivalentes da barra de menus podem interferir com os aplicativos do X11 que usem o modificador Meta. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 205}, {555, 42}} - - - YES - - 67239424 - 4194304 - TWFudGVuaGEgcHJlc3Npb25hZGFzIGFzIHRlY2xhcyBPcMOnw6NvIG91IENvbWFuZG8gYW8gY2xpY2Fy -IHBhcmEgYXRpdmFyIG8gYm90w6NvIGRhIGRpcmVpdGEgb3UgbyBib3TDo28gY2VudHJhbCBkbyBtb3Vz -ZS4KA - - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 0 - Ativar as teclas equivalentes sob X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 153}, {555, 28}} - - - YES - - 67239424 - 4194304 - Permite que as alterações feitas no menu de leiautes de teclado sobrescrevam o mapa de teclado atual do X11. - - - - - - - - - - 256 - {{18, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Seguir o leiaute de teclado do sistema - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {555, 31}} - - - YES - - 67239424 - 4194304 - Quando esta opção está marcada, as teclas opção enviam os símbolos de tecla do X11 Alt_L e Alt_R em vez de Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - As teclas Opção enviam Alt_L e Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - Sempre rolar na direção do movimento do dedo - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {598, 279}} - - - - Entrada - - - - - - 2 - - - - 256 - - - - 256 - {{64, 241}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Da Tela - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 Cores - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Milhares - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Milhões - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 244}, {45, 20}} - - - YES - - 67239424 - 4194304 - Cores: - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Esta opção passa a funcionar quando o X11 é executado novamente. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Modo de tela cheia - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - Permitir acesso à barra de menus no modo tela cheia - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {543, 34}} - - - YES - - 67239424 - 4194304 - Ativa a janela raiz do X11. Usar o toque Comando-Opção-A para digitar e sair do modo tela cheia. - - - - - - - - - - 256 - {{54, 79}, {525, 31}} - - - YES - - 67239424 - 4194304 - A barra de menus ficará visível quando o cursor do mouse for posicionado sobre a sua tela principal. - - - - - - - - {{10, 33}, {598, 279}} - - - Saída - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Ativar sincronização - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 207}, {548, 42}} - - - YES - - 67239424 - 4194304 - Ativa o item de menu "copiar" e permite a sincronização entre a Área de Colagem do OSX e a ÁREA DE TRANSFERÊNCIA e os buffers PRINCIPAIS do X11. - - - - - - - - - 256 - {{34, 115}, {511, 23}} - - - YES - - 67239424 - 0 - Atualizar a ÁREA DE TRANSFERÊNCIA quando a Área de Colagem for alterada - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 90}, {501, 23}} - - - YES - - 67239424 - 0 - Atualizar PRINCIPAL (clique central) quando a Área de Colagem for alterada - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 65}, {553, 23}} - - - YES - - 67239424 - 0 - Atualizar a Área de Colagem imediatamente quando um novo texto for selecionado - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 178}, {511, 23}} - - - YES - - 67239424 - 0 - Atualizar a Área de Colagem quando a ÁREA DE TRANSFERÊNCIA for alterada - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 144}, {529, 28}} - - - YES - - 67239424 - 4194304 - Desative esta opção quando quiser usar o xclipboard, o klipper ou qualquer outro gerenciador de área de transferência do X11. - - - - - - - - - 256 - {{48, 33}, {526, 28}} - - - YES - - 67239424 - 4194304 - Devido a limitações no protocolo do X11, talvez esta opção nem sempre funcione em alguns aplicativos. - - - - - - - - {{10, 33}, {598, 279}} - - - Área de Colagem - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Clicar em Janelas Inativas - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {542, 31}} - - - YES - - 67239424 - 4194304 - Quando esta opção está selecionada, a ação de clicar em uma janela inativa faz com que o clique do mouse seja ativado para essa janela, a qual também é ativada. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - O Foco Segue o Mouse - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {441, 17}} - - - YES - - 67239424 - 4194304 - O foco da janela do X11 segue o cursor. Esta opção tem alguns inconvenientes. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Foco nas Novas Janelas - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 106}, {542, 28}} - - - YES - - 67239424 - 4194304 - Quando esta opção está ativada, a criação de uma nova janela do X11 move o X11.app para o segundo plano (em vez do Finder.app, Terminal.app, etc.) - - - - - - - - {{10, 33}, {598, 279}} - - - Janelas - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Autenticar conexões - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Permitir conexões de clientes da rede - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {539, 35}} - - - YES - - 67239424 - 4194304 - A execução do X11 criará as chaves de controle de acesso Xauthority. Se mudar o endereço de IP do sistema, essas chaves tornam-se inválidas, o que pode impedir a execução dos aplicativos do X11. - - - - - - - - - - 256 - {{36, 118}, {555, 42}} - - - YES - - 67239424 - 4194304 - Se ativadas, as conexões Autenticar também podem ser ativadas para garantir a segurança do sistema. Se desativadas, as conexões dos aplicativos remotos não são permitidas. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Estas opções passam a funcionar quanto o X11 é executado em seguida. - - - - - - - - - {{10, 33}, {598, 279}} - - - Segurança - - - - - - - 0 - YES - YES - - - - - - {644, 341} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - - - 11 - 2 - {{302, 440}, {519, 271}} - 1350041600 - Menu de Aplicativos do X11 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 265 - {{372, 191}, {132, 32}} - - YES - - 67239424 - 137887744 - Duplicar - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{372, 159}, {132, 32}} - - YES - - 67239424 - 137887744 - Remover - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {333, 198} - - YES - - - 256 - {333, 17} - - - - - - 256 - {{334, 0}, {16, 17}} - - - - - 132.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Nome - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - - 3 - MQA - - - - 3 - YES - YES - - - - 110 - 40 - 1000 - - 75628096 - 2048 - Comando - - - - - - 338820672 - 1024 - Text Cell - - - - - - - 3 - YES - YES - - - - 81 - 10 - 1000 - - 75628096 - 2048 - Atalho - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {333, 198}} - - - - - 4 - - - - 256 - {{334, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {333, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {333, 17}} - - - - - 4 - - - - {{20, 20}, {350, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{372, 223}, {132, 32}} - - YES - - -2080244224 - 137887744 - Adicionar Item - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {519, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - - - Menu - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Aplicativos - - 1048576 - 2147483647 - - - submenuAction: - - Aplicativos - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalizar… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{615, 464}, {644, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{615, 464}, {644, 341}} - - {{184, 290}, {481, 345}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{684, 490}, {519, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{684, 490}, {519, 271}} - - {{433, 406}, {486, 327}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCCAAAw1UAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCEAAAw2sAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{0, 801}, {140, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mantenha pressionadas as teclas Opção ou Comando ao clicar para ativar o botão da direita ou o botão central do mouse. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ativa o item de menu "copiar" e permite a sincronização entre a Área de Colagem do OSX e a ÁREA DE TRANSFERÊNCIA e os buffers PRINCIPAIS do X11. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Quando esta opção está selecionada, a ação de clicar em uma janela inativa faz com que o clique do mouse seja ativado para essa janela, a qual também é ativada. + + + + + + + + + + + + + + + + + + + + + Quando esta opção está ativada, a criação de uma nova janela do X11 move o X11.app para o segundo plano (em vez do Finder.app, Terminal.app, etc.) + + + + + + + + + + + + + + + + + + + + A execução do X11 criará as chaves de controle de acesso Xauthority. Se mudar o endereço de IP do sistema, essas chaves tornam-se inválidas, o que pode impedir a execução dos aplicativos do X11. + + + + + + + + + + Se ativadas, as conexões Autenticar também podem ser ativadas para garantir a segurança do sistema. Se desativadas, as conexões dos aplicativos remotos não são permitidas. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3662 +1,757 @@ - - - 1040 - 11A289 - 900 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 900 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Acerca do X11 - - 2147483647 - - - - - - Preferências... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Serviços - - 1048576 - 2147483647 - - - submenuAction: - - Serviços - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Alternar ecrã completo - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Ocultar o X11 - h - 1048576 - 2147483647 - - - 42 - - - - Ocultar outras aplicações - h - 1572864 - 2147483647 - - - - - - Mostrar tudo - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Sair do X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Aplicações - - 1048576 - 2147483647 - - - submenuAction: - - Aplicações - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalizar... - - 1048576 - 2147483647 - - - - - - - - - Edição - - 1048576 - 2147483647 - - - submenuAction: - - Edição - - - - Copiar - c - 1048576 - 2147483647 - - - - - - - - - Janela - - 1048576 - 2147483647 - - - submenuAction: - - Janela - - - - Fechar - w - 1048576 - 2147483647 - - - - - - Minimizar - m - 1048576 - 2147483647 - - - - - - Ampliar - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Percorrer janelas - ) - 1048576 - 2147483647 - - - - - - Percorrer janelas no sentido inverso - ( - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Passar tudo para a frente - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Ajuda - - 1048576 - 2147483647 - - - submenuAction: - - Ajuda - - - - Ajuda do X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{319, 328.0390625}, {660, 341}} - 1350041600 - Preferências do X11 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {634, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Simular rato de três botões - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {564, 28}} - - - YES - - 67239424 - 4194304 - Se estiverem activas, as teclas equivalentes da barra de menus podem interferir nas aplicações X11 que utilizam o modificador Meta. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {564, 42}} - - - YES - - 67239424 - 4194304 - QW8gY2xpY2FyLCBtYW50ZW5oYSBwcmVtaWRhcyBhcyB0ZWNsYXMgT3DDp8OjbyBvdSBDb21hbmRvIHBh -cmEgYWN0aXZhciBvcyBib3TDtWVzIGNlbnRyYWwgb3UgZGlyZWl0byBkbyByYXRvLgo - - - - - - - - - - 256 - {{18, 127}, {402, 18}} - - - YES - - 67239424 - 0 - Activar as equivalências de teclado para X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 151}, {564, 19}} - - - YES - - 67239424 - 4194304 - Permite que alterações do menu de entrada se sobreponham ao actual mapa de teclas do X11. - - - - - - - - - - 256 - {{18, 176}, {402, 18}} - - - YES - - 67239424 - 0 - Seguir a disposição do teclado do sistema - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {564, 31}} - - - YES - - 67239424 - 4194304 - Quando activadas, as teclas de opção enviam símbolos de teclas X11 Alt_L e Alt_R em vez de alternar_modo. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - As teclas de opção enviam Alt_L e Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - Permitir deslocação na direcção do movimento do dedo - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {614, 279}} - - - - Entrada - - - - - - 2 - - - - 256 - - - - 256 - {{69, 235}, {131, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Do monitor - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 cores - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Milhares - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Milhões - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {48, 20}} - - - YES - - 67239424 - 4194304 - Cores: - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Esta opção terá efeito quando voltar a abrir o X11. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Modo ecrã completo - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {476, 18}} - - - YES - - 67239424 - 0 - Permitir acesso à barra de menus em modo de ecrã completo - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 148}, {539, 28}} - - - YES - - 67239424 - 4194304 - Activa a janela raiz do X11. Utilize a combinação de teclas Comando-Opção-A para entrar e sair do modo de ecrã completo. - - - - - - - - - - 256 - {{54, 79}, {521, 31}} - - - YES - - 67239424 - 4194304 - A barra de menus ficará visível quando o cursor do rato for colocado na parte superior do monitor principal. - - - - - - - - {{10, 33}, {614, 279}} - - - Saída - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Activar sincronização - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {540, 28}} - - - YES - - 67239424 - 4194304 - Activa o elemento de menu "copiar" e permite a sincronização entre a área de colagem do OS X e os buffers CLIPBOARD e PRIMARY do X11. - - - - - - - - - 256 - {{34, 129}, {409, 23}} - - - YES - - 67239424 - 0 - Actualizar CLIPBOARD quando a área de colagem for alterada - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {560, 18}} - - - YES - - 67239424 - 0 - Actualizar PRIMARY (clique no botão do meio) quando a área de colagem for alterada - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {544, 22}} - - - YES - - 67239424 - 0 - Actualizar área de colagem assim que for seleccionado novo texto - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {410, 18}} - - - YES - - 67239424 - 0 - Actualizar a área de colagem quando CLIPBOARD for alterado - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {509, 28}} - - - YES - - 67239424 - 4194304 - Desactive esta opção se pretender utilizar o xclipboard, o klipper ou qualquer outro gestor de clipboard X11. - - - - - - - - - 256 - {{48, 47}, {534, 28}} - - - YES - - 67239424 - 4194304 - Devido a limitações do protocolo X11, esta opção nem sempre funcionará em algumas aplicações. - - - - - - - - {{10, 33}, {614, 279}} - - - Área de colagem - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Clique atravessa janelas inactivas - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {557, 31}} - - - YES - - 67239424 - 4194304 - Se assinalar esta opção, ao clicar numa janela inactiva, o clique não só a traz para a frente como activa a janela completamente. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Foco segue o rato - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 158}, {490, 20}} - - - YES - - 67239424 - 4194304 - O foco da janela do X11 segue o cursor. Isto tem alguns efeitos adversos. - - - - - - - - - 256 - {{15, 137}, {402, 18}} - - - YES - - 67239424 - 0 - Foco em janelas novas - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 103}, {577, 28}} - - - YES - - 67239424 - 4194304 - A criação de uma nova janela X11 faz com que X11.app venha para primeiro plano (em vez de Finder.app, Terminal.app, etc.). - - - - - - - - {{10, 33}, {614, 279}} - - - Janelas - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Autenticar ligações - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Permitir ligações de clientes da rede - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {564, 42}} - - - YES - - 67239424 - 4194304 - Lançar o X11 cria chaves Xauthority de controlo de acesso. Se o endereço IP do sistema for alterado, estas chaves perdem a validade, podendo, assim, impossibilitar a execução das aplicações X11. - - - - - - - - - - 256 - {{36, 104}, {564, 56}} - - - YES - - 67239424 - 4194304 - Se activar esta opção, precisa igualmente de activar a opção “Autenticar ligações” para garantir a segurança do sistema. Se não activar esta opção, não são permitidas ligações a partir de aplicações remotas. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Estas opções terão efeito da próxima vez que abrir o X11. - - - - - - - - - {{10, 33}, {614, 279}} - - - Segurança - - - - - - - 0 - YES - YES - - - - - - {660, 341} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - - - 11 - 2 - {{360, 400}, {477, 271}} - 1350041600 - Menu Aplicação do X11 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 265 - {{318, 191}, {155, 32}} - - YES - - 67239424 - 137887744 - Duplicar - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{318, 159}, {155, 32}} - - YES - - 67239424 - 137887744 - Remover - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {279, 198} - - YES - - - 256 - {279, 17} - - - - - - 256 - {{280, 0}, {16, 17}} - - - - - 99.731002807617188 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Nome - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Célula de texto - - - - - 3 - MQA - - - - 3 - YES - YES - - - - 101 - 40 - 1000 - - 75628096 - 2048 - Comando - - - - - - 338820672 - 1024 - Célula de texto - - - - - - - 3 - YES - YES - - - - 69 - 10 - 1000 - - 75628096 - 2048 - Atalho - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Célula de texto - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {279, 198}} - - - - - 4 - - - - 256 - {{280, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {279, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {279, 17}} - - - - - 4 - - - - {{20, 20}, {296, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{318, 223}, {155, 32}} - - YES - - -2080244224 - 137887744 - Adicionar elemento - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {477, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - - - Menu - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Aplicações - - 1048576 - 2147483647 - - - submenuAction: - - Aplicações - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalizar… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{172, 419}, {660, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - {{172, 419}, {660, 341}} - - {{184, 290}, {481, 345}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCEAAAwu4AAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Se estiverem activas, as teclas equivalentes da barra de menus podem interferir nas aplicações X11 que utilizam o modificador Meta. + + + + + + + + + + Ao clicar, mantenha premidas as teclas Opção ou Comando para activar os botões central ou direito do rato. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Activa o elemento de menu "copiar" e permite a sincronização entre a área de colagem do OS X e os buffers CLIPBOARD e PRIMARY do X11. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Se assinalar esta opção, ao clicar numa janela inactiva, o clique não só a traz para a frente como activa a janela completamente. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Lançar o X11 cria chaves Xauthority de controlo de acesso. Se o endereço IP do sistema for alterado, estas chaves perdem a validade, podendo, assim, impossibilitar a execução das aplicações X11. + + + + + + + + + + Se activar esta opção, precisa igualmente de activar a opção “Autenticar ligações” para garantir a segurança do sistema. Se não activar esta opção, não são permitidas ligações a partir de aplicações remotas. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/ro.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/ro.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/ro.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/ro.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3485 +1,759 @@ - - - 1040 - 11A511a - 1576 - 1138 - 566.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1576 - - - NSTableColumn - NSPopUpButton - NSTableHeaderView - NSMenuItem - NSMenu - NSButtonCell - NSButton - NSTextFieldCell - NSScrollView - NSScroller - NSTableView - NSTabView - NSCustomObject - NSTabViewItem - NSView - NSWindowTemplate - NSTextField - NSPopUpButtonCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Despre X11 - - 2147483647 - - - - - - Preferințe... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Servicii - - 1048576 - 2147483647 - - - submenuAction: - - Servicii - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Comută afișarea pe tot ecranul - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Ascunde X11 - h - 1048576 - 2147483647 - - - 42 - - - - Ascunde restul - h - 1572864 - 2147483647 - - - - - - Afișează tot - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Termină X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Aplicații - - 1048576 - 2147483647 - - - submenuAction: - - Aplicații - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalizare... - - 1048576 - 2147483647 - - - - - - - - - Editare - - 1048576 - 2147483647 - - - submenuAction: - - Editare - - - - Copiază - c - 1048576 - 2147483647 - - - - - - - - - Fereastră - - 1048576 - 2147483647 - - - submenuAction: - - Fereastră - - - - Închide - w - 1048576 - 2147483647 - - - - - - Minimizează - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Circulă prin ferestre - ` - 1048576 - 2147483647 - - - - - - Circulă invers prin ferestre - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Adu tot în față - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Ajutor - - 1048576 - 2147483647 - - - submenuAction: - - Ajutor - - - - Ajutor X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364.03906000000001}, {537, 341}} - 1350041600 - Preferințe X11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {511, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 252}, {402, 18}} - - - YES - - 67239424 - 0 - Emulează un maus cu trei butoane - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {438, 31}} - - - YES - - 67239424 - 4194304 - Când opțiunea este activată, echivalentele tastelor barei de meniu pot interfera cu aplicații X11 care utilizează modificatorul Meta. - - LucidaGrande - 11 - 3100 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 212}, {438, 34}} - - - YES - - 67239424 - 4194304 - QXDEg3NhyJtpIE9wyJtpdW5lIHNhdSBDb21hbmTEgyDDrm4gdGltcCBjZSBmYWNlyJtpIGNsaWMgcGVu -dHJ1IGEgYWN0aXZhIGJ1dG9udWwgZGUgbWlqbG9jIHNhdSBkZSBkcmVhcHRhIGFsIG1hdXN1bHVpLgo - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 0 - Activează echivalentele tastelor sub X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 154}, {438, 28}} - - - YES - - 67239424 - 4194304 - Permite modificări ale meniului de introducere pentru suprascrierea mapării curente a tastelor în X11. - - - - - - - - - 256 - {{18, 188}, {402, 18}} - - - YES - - 67239424 - 0 - Respectă aranjamentul de tastatură al sistemului - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {438, 31}} - - - YES - - 67239424 - 4194304 - Când este activată, tastele Opțiune trimit simbolurile tastelor Alt_L și Alt_R X11 în loc de Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Tastele Opțiune trimit Alt_L și Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - Derulează întotdeauna în direcția mișcării degetului - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {491, 279}} - - - - Intrare - - - - - - 2 - - - - 256 - - - - 256 - {{57, 235}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - De la afișaj - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 culori - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Mii - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Milioane - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{9, 238}, {46, 20}} - - - YES - - 67239424 - 4194304 - Culori: - - - - - - - - - 256 - {{28, 216}, {392, 19}} - - - YES - - 67239424 - 4194304 - Aceste opțiuni intră în vigoare când X11 este lansat din nou. - - - - - - - - - 256 - {{10, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Mod de afișare pe tot ecranul - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{29, 123}, {448, 18}} - - - YES - - 67239424 - 0 - Permite accesul la bara de meniu în modul de afișare pe tot ecranul - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{28, 145}, {446, 31}} - - - YES - - 67239424 - 4194304 - Activează fereastra rădăcină X11. Utilizați combinția de taste Comandă-Opțiune-A pentru intarea și ieșirea din modul de afișare pe tot ecranul. - - - - - - - - - 256 - {{46, 86}, {428, 31}} - - - YES - - 67239424 - 4194304 - Bara de meniu va deveni vizibilă atunci când cursorul mausului este plasat în partea de sus a afișajului dvs. principal. - - - - - - - - {{10, 33}, {491, 279}} - - - Ieșire - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Activează sincronizarea - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 216}, {436, 33}} - - - YES - - 67239424 - 4194304 - Activează articolul de meniu "copiază" și permite sincronizarea între pasteboardul OSX și CLIPBOARDUL și tampoanele PRINCIPALE X11. - - - - - - - - - 256 - {{34, 129}, {409, 23}} - - - YES - - 67239424 - 0 - Actualizează CLIPBOARD la modificarea pasteboardului - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 107}, {458, 18}} - - - YES - - 67239424 - 0 - Actualizează PRINCIPAL (clic de mijloc) la modificarea pasteboardului - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 80}, {409, 23}} - - - YES - - 67239424 - 0 - Actualizează pasteboardul imediat la selectarea de text nou - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {409, 23}} - - - YES - - 67239424 - 0 - Actualizează pasteboardul la modificarea CLIPBOARDULUI - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {424, 28}} - - - YES - - 67239424 - 4194304 - Dezactivați această opțiune dacă doriți să utilizați xclipboard, klipper sau orice alt gestionar de clipboard din X11. - - - - - - - - - 256 - {{48, 46}, {424, 28}} - - - YES - - 67239424 - 4194304 - Din cauza unor limitări ale protocolului X11, este posibil ca această opțiune să nu funcționeze întotdeauna în unele aplicații. - - - - - - - - {{10, 33}, {491, 279}} - - - Pasteboard - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Clic prin ferestrele inactive - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 197}, {451, 42}} - - - YES - - 67239424 - 4194304 - Când opțiunea este activată, clicul pe o fereastră inactivă va determina trecerea clicului de maus prin fereastra respectivă, pe lângă activarea acesteia. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Focalizarea urmărește mausul - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 164}, {451, 14}} - - - YES - - 67239424 - 4194304 - Focalizarea ferestrei X11 urmărește cursorul. Aceasta are câteva efecte adverse. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Focalizează pe ferestrele noi - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 106}, {451, 28}} - - - YES - - 67239424 - 4194304 - Când opțiunea este activată, crearea unei ferestre X11 noi va determina aducerea X11.app în primplan (în locul Finder.app, Terminal.app etc.) - - - - - - - - {{10, 33}, {491, 279}} - - - Ferestre - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Efectuează autentificarea conexiunilor - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 23}} - - - YES - - 67239424 - 0 - Permite conexiuni de la clienți din rețea - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 190}, {438, 47}} - - - YES - - 67239424 - 4194304 - Lansarea X11 va crea cheile de control al accesului Xauthority. Dacă adresa de IP a sistemului se schimbă, aceste chei devin nevalide, ceea ce poate împiedica lansarea aplicațiilor X11. - - - - - - - - - 256 - {{36, 104}, {438, 56}} - - - YES - - 67239424 - 4194304 - Dacă opțiunea este activată, trebuie să fie activată și opțiunea “Efectuează autentificarea conexiunilor” pentru a asigura securitatea sistemului. Când opțiunea este dezactivată, nu sunt permise conexiunile din partea aplicațiilor de la distanță. - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Aceste opțiuni intră în vigoare la următoarea lansare X11. - - - - - - - - {{10, 33}, {491, 279}} - - - Securitate - - - - - - - 0 - YES - YES - - - - - - {537, 341} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {10000000000000, 10000000000000} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {490, 271}} - 1350041600 - Meniu aplicații X11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 265 - {{342, 191}, {134, 32}} - - YES - - 67239424 - 137887744 - Duplică - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{342, 159}, {134, 32}} - - YES - - 67239424 - 137887744 - Elimină - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {316, 213} - - YES - - - 256 - {316, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - 121.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Nume - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Celulă de text - - - - 3 - MQA - - - - 3 - YES - YES - - - - 105 - 40 - 1000 - - 75628096 - 2048 - Comandă - - - - - - 338820672 - 1024 - Celulă de text - - - - - - 3 - YES - YES - - - - 80 - 10 - 1000 - - 75628096 - 2048 - Scurtătură - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Celulă de text - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {316, 213}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 207}} - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {310, 15}} - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {316, 17}} - - - - - 4 - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{334, 223}, {152, 32}} - - YES - - -2080244224 - 137887744 - Adaugă un articol - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {490, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {10000000000000, 10000000000000} - x11_apps - YES - - - Meniu - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Aplicații - - 1048576 - 2147483647 - - - submenuAction: - - Aplicații - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalizare… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{507, 565}, {537, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Când opțiunea este activată, echivalentele tastelor barei de meniu pot interfera cu aplicații X11 care utilizează modificatorul Meta. + + + + + + + + + + Apăsați Opțiune sau Comandă în timp ce faceți clic pentru a activa butonul de mijloc sau de dreapta al mausului. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Activează fereastra rădăcină X11. Utilizați combinția de taste Comandă-Opțiune-A pentru intarea și ieșirea din modul de afișare pe tot ecranul. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Activează articolul de meniu "copiază" și permite sincronizarea între pasteboardul OSX și CLIPBOARDUL și tampoanele PRINCIPALE X11. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Când opțiunea este activată, clicul pe o fereastră inactivă va determina trecerea clicului de maus prin fereastra respectivă, pe lângă activarea acesteia. + + + + + + + + + + + + + + + + + + + + + Când opțiunea este activată, crearea unei ferestre X11 noi va determina aducerea X11.app în primplan (în locul Finder.app, Terminal.app etc.) + + + + + + + + + + + + + + + + + + + + Lansarea X11 va crea cheile de control al accesului Xauthority. Dacă adresa de IP a sistemului se schimbă, aceste chei devin nevalide, ceea ce poate împiedica lansarea aplicațiilor X11. + + + + + + + + + + Dacă opțiunea este activată, trebuie să fie activată și opțiunea “Efectuează autentificarea conexiunilor” pentru a asigura securitatea sistemului. Când opțiunea este dezactivată, nu sunt permise conexiunile din partea aplicațiilor de la distanță. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3696 +1,758 @@ - - - 1040 - 11A289 - 851 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 851 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - О программе X11 - - 2147483647 - - - - - - Настройки… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Службы - - 1048576 - 2147483647 - - - submenuAction: - - Службы - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Переключение полноэкранного режима - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Скрыть X11 - h - 1048576 - 2147483647 - - - 42 - - - - Скрыть остальные - h - 1572864 - 2147483647 - - - - - - Показать все - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Завершить X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Программы - - 1048576 - 2147483647 - - - submenuAction: - - Программы - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Настроить… - - 1048576 - 2147483647 - - - - - - - - - Правка - - 1048576 - 2147483647 - - - submenuAction: - - Правка - - - - Копировать - c - 1048576 - 2147483647 - - - - - - - - - Окно - - 1048576 - 2147483647 - - - submenuAction: - - Окно - - - - Закрыть - w - 1048576 - 2147483647 - - - - - - Убрать в Dock - m - 1048576 - 2147483647 - - - - - - Изменить масштаб - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Круговое переключение окон - ` - 1048576 - 2147483647 - - - - - - Обратное круговое переключение окон - ` - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Все окна — на передний план - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Справка - - 1048576 - 2147483647 - - - submenuAction: - - Справка - - - - Справка X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364.0390625}, {600, 341}} - 1350041600 - Настройки X11 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {574, 325}} - - - - - - 1 - - - - 256 - - - - 256 - {{15, 243}, {402, 18}} - - YES - - 67239424 - 0 - Эмулировать трехкнопочную мышь - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{33, 105}, {504, 28}} - - YES - - 67239424 - 4194304 - Если включено, эквиваленты клавиш строки меню могут пересекаться с эквивалентами в программах X11, использующих мета-модификатор. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{33, 200}, {495, 42}} - - YES - - 67239424 - 4194304 - 0KPQtNC10YDQttC40LLQsNC50YLQtSDQvdCw0LbQsNGC0YvQvNC4INC60L3QvtC/0LrQuCBPcHRpb24g -0LjQu9C4IENvbW1hbmQg0L/RgNC4INCw0LrRgtC40LLQsNGG0LjQuCDRgdGA0LXQtNC90LXQuSDQuNC7 -0Lgg0L/RgNCw0LLQvtC5INC60L3QvtC/0L7QuiDQvNGL0YjQuC4KA - - - - - - - - - - 256 - {{15, 137}, {402, 18}} - - YES - - 67239424 - 0 - Включить эквиваленты клавиш в X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 166}, {504, 14}} - - YES - - 67239424 - 4194304 - Разрешать изменения меню ввода для перезаписи текущей X11-карты ключей. - - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - YES - - 67239424 - 0 - Следовать системной раскладке клавиатуры - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 41}, {504, 31}} - - YES - - 67239424 - 4194304 - Если включено, клавиши Option отправляют символы X11 клавиш Alt_L и Alt_R X11, вместо Mode_switch. - - - - - - - - - 256 - {{15, 76}, {402, 18}} - - YES - - 67239424 - 0 - Клавиши Option отправляют Alt_L и Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{15, 12}, {418, 18}} - - YES - - 67239424 - 0 - Всегда прокручивать в сторону движения пальца - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {554, 279}} - - Вход - - - - - - 2 - - - - 256 - - - - 256 - {{57, 234}, {132, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - С экрана - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 цветов - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Тысячи - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Миллионы - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{9, 241}, {46, 17}} - - - YES - - 67239424 - 4194304 - Цвета: - - - - - - - - - - 256 - {{33, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Этот параметр вступит в силу при следующем запуске X11. - - - - - - - - - - 256 - {{15, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Полноэкранный режим - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{15, 103}, {338, 34}} - - - YES - - 67239424 - 0 - 0KDQsNC30YDQtdGI0LjRgtGMINCw0LLRgtC+0LzQsNGC0LjRh9C10YHQutC4INC00L7RgdGC0YPQvyDQ -uiDRgdGC0YDQvtC60LUg0LzQtdC90Y4K0LIg0L/QvtC70L3QvtGN0LrRgNCw0L3QvdC+0Lwg0YDQtdC2 -0LjQvNC1A - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 148}, {487, 28}} - - - YES - - 67239424 - 4194304 - Включает корневое окно X11. Используйте сочетание клавиш «Command-Option-A» для включения и выключения полноэкранного режима. - - - - - - - - - - 256 - {{33, 66}, {487, 31}} - - - YES - - 67239424 - 4194304 - Строка меню будет видимой, когда указатель мыши переведен в верхнюю часть первичного экрана. - - - - - - - - {{10, 33}, {554, 279}} - - - Выход - - - - - - 2 - - - - 256 - - - - 256 - {{2, 255}, {409, 23}} - - - - YES - - 67239424 - 0 - Включить синхронизацию - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{20, 221}, {522, 28}} - - - - YES - - 67239424 - 4194304 - Включает объект меню «Копировать» и разрешает синхронизацию между буфером обмена OS X и буферами X11 CLIPBOARD/PRIMARY. - - - - - - - - - 256 - {{21, 129}, {409, 23}} - - - - YES - - 67239424 - 0 - Обновлять CLIPBOARD при изменениях в буфере обмена - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{21, 102}, {539, 23}} - - - - YES - - 67239424 - 0 - Обновлять PRIMARY (средняя кнопка мыши) при изменениях в буфере обмена - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{21, 80}, {419, 18}} - - - - YES - - 67239424 - 0 - Обновлять буфер обмена сразу после выбора нового текста - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{21, 192}, {409, 23}} - - - - YES - - 67239424 - 0 - Обновлять буфер обмена при изменениях в CLIPBOARD - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 158}, {501, 28}} - - - - YES - - 67239424 - 4194304 - Отключите этот параметр, если хотите использовать xclipboard, klipper или иную другую программу-менеджер буфера обмена X11. - - - - - - - - - 256 - {{36, 31}, {501, 43}} - - - - YES - - 67239424 - 4194304 - В связи с ограничениями в протоколе X11 этот параметр, возможно, в некоторых программах иногда работать не будет. - - - - - - - - {{10, 33}, {554, 279}} - - - - - Буфер обмена - - - - - - 2 - - - - 256 - - - - 256 - {{17, 245}, {402, 18}} - - YES - - 67239424 - 0 - Сквозное нажатие неактивных окон - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{35, 208}, {491, 31}} - - YES - - 67239424 - 4194304 - Если включено, нажатие неактивного окна повлечет за собой не только его активацию, но и сквозное прохождение мыши к этому окну. - - - - - - - - - 256 - {{17, 179}, {402, 18}} - - YES - - 67239424 - 0 - Фокус следует за мышью - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{35, 145}, {491, 28}} - - YES - - 67239424 - 4194304 - Фокус окна X11 следует за движением курсора, что имеет некоторые отрицательные последствия. - - - - - - - - - 256 - {{15, 116}, {402, 18}} - - YES - - 67239424 - 0 - Фокус – на новые окна - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{35, 68}, {491, 42}} - - YES - - 67239424 - 4194304 - Если включено, создание нового окна X11 повлечет за собой перемещение на передний план X11.app (вместо Finder.app, Terminal.app и т. д.) - - - - - - - - {{10, 33}, {554, 279}} - - Окна - - - - - - - 256 - - - - 256 - {{15, 243}, {402, 18}} - - YES - - 67239424 - 0 - Проверять аутентификации подключений - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{15, 166}, {402, 18}} - - YES - - 67239424 - 0 - Разрешать подключения из клиентских сетей - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 195}, {504, 42}} - - YES - - 67239424 - 4194304 - Запуск X11 создаст ключи доступа-контроля Xauthority. Если системный IP-адрес изменяется, эти ключи становятся недействительными, что может препятствовать запуску программ X11. - - - - - - - - - - 256 - {{33, 112}, {504, 48}} - - YES - - 67239424 - 4194304 - Если включено, проверка аутентификации подключений должна быть также включена для гарантии работы системы безопасности. Если выключено, подключения из удаленных программ недоступны. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Эти параметры вступят в силу при следующем запуске X11. - - - - - - - - - {{10, 33}, {554, 279}} - - Безопасность - - - - - - - 0 - YES - YES - - - - - - {600, 341} - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - - - 11 - 2 - {{302, 440}, {504, 271}} - 1350041600 - Программное меню X11 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 265 - {{380, 191}, {118, 32}} - - YES - - 67239424 - 137887744 - Дублировать - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{380, 159}, {118, 32}} - - YES - - 67239424 - 137887744 - Удалить - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {351, 198} - - YES - - - 256 - {351, 17} - - - - - - 256 - {{352, 0}, {16, 17}} - - - - - 138.73101806640625 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Имя - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - - 3 - MQA - - - - 3 - YES - YES - - - - 116 - 40 - 1000 - - 75628096 - 2048 - Команда - - - - - - 338820672 - 1024 - Text Cell - - - - - - - 3 - YES - YES - - - - 86.999969482421875 - 10 - 1000 - - 75628096 - 2048 - Соч. кл. - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {351, 198}} - - - - - 4 - - - - 256 - {{352, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {351, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {351, 17}} - - - - - 4 - - - - {{10, 20}, {368, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{380, 223}, {118, 32}} - - YES - - -2080244224 - 137887744 - Доб. объект - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {504, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - - - Меню - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Программы - - 1048576 - 2147483647 - - - submenuAction: - - Программы - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Настроить… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{480, 511}, {600, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - {{480, 511}, {600, 341}} - - {{184, 290}, {481, 345}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAADClAAAw20AAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAADCeAAAwyAAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABAAAAAws4AAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAADDMgAAw3cAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCCAAAwxYAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBcAAAwvAAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCCAAAw1UAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAADCbAAAwzgAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAADCCAAAwr4AAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAADC4gAAwkwAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBUAAAw6aAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAADB8AAAwvQAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCEAAAwysAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBwAAAw2sAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - {{563, 711}, {145, 83}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAAAAAAAAwyQAAA - - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Если включено, эквиваленты клавиш строки меню могут пересекаться с эквивалентами в программах X11, использующих мета-модификатор. + + + + + + + + + + Удерживайте нажатыми кнопки Option или Command при активации средней или правой кнопок мыши. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Если включено, создание нового окна X11 повлечет за собой перемещение на передний план X11.app (вместо Finder.app, Terminal.app и т. д.) + + + + + + + + + + + + + + + + + + + + Запуск X11 создаст ключи доступа-контроля Xauthority. Если системный IP-адрес изменяется, эти ключи становятся недействительными, что может препятствовать запуску программ X11. + + + + + + + + + + Если включено, проверка аутентификации подключений должна быть также включена для гарантии работы системы безопасности. Если выключено, подключения из удаленных программ недоступны. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3508 +1,755 @@ - - - 1040 - 11A511 - 1576 - 1138 - 566.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1576 - - - NSTableColumn - NSPopUpButton - NSTableHeaderView - NSMenuItem - NSMenu - NSButtonCell - NSButton - NSTextFieldCell - NSScrollView - NSScroller - NSTableView - NSTabView - NSCustomObject - NSTabViewItem - NSView - NSWindowTemplate - NSTextField - NSPopUpButtonCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - O X11 - - 2147483647 - - - - - - Nastavenia… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Služby - - 1048576 - 2147483647 - - - submenuAction: - - Služby - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Prepnúť celú obrazovku - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Skryť X11 - h - 1048576 - 2147483647 - - - 42 - - - - Skryť ostatné - h - 1572864 - 2147483647 - - - - - - Zobraziť všetko - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Zrušiť X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Aplikácie - - 1048576 - 2147483647 - - - submenuAction: - - Aplikácie - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Prispôsobiť... - - 1048576 - 2147483647 - - - - - - - - - Upraviť - - 1048576 - 2147483647 - - - submenuAction: - - Upraviť - - - - Kopírovať - c - 1048576 - 2147483647 - - - - - - - - - Okno - - 1048576 - 2147483647 - - - submenuAction: - - Okno - - - - Zatvoriť - w - 1048576 - 2147483647 - - - - - - Minimalizovať - m - 1048576 - 2147483647 - - - - - - Zväčšiť - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Prechádzať oknami - ` - 1048576 - 2147483647 - - - - - - Prechádzať oknami smerom dozadu - ` - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Presunúť všetky do popredia - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Pomocník - - 1048576 - 2147483647 - - - submenuAction: - - Pomocník - - - - Pomocník pre X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364}, {542, 348}} - 1350041600 - Nastavenie X11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {516, 332}} - - - - - - - 1 - - - - 256 - - - - 256 - {{18, 250}, {402, 18}} - - - - YES - - 67239424 - 0 - Emulovať myš s troma tlačidlami - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 100}, {427, 31}} - - - - YES - - 67239424 - 4194304 - Po povolení môžu klávesové ekvivalenty lišty narušiť X11 aplikácie užívajúce Meta modifikátor. - - LucidaGrande - 11 - 3100 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 202}, {436, 42}} - - - - YES - - 67239424 - 4194304 - UG9kcsW+dGUgcG/EjWFzIGtsaWtudXRpYSBPcHRpb24gYWxlYm8gQ29tbWFuZCBwcmUgYWt0aXbDoWNp -dSBzdHJlZG7DqWhvIGFsZWJvIHByYXbDqWhvIHRsYcSNaWRsYSBtecWhaS4KA - - - - - - - - - 256 - {{18, 137}, {402, 18}} - - - - YES - - 67239424 - 0 - Povoliť ekvivalenty klávesu s X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 166}, {451, 14}} - - - - YES - - 67239424 - 4194304 - Povoľuje zmeny vstupného menu, ktoré prepíšu aktuálnu mapu kláves serveru X11. - - - - - - - - - 256 - {{18, 186}, {402, 18}} - - - - YES - - 67239424 - 0 - Riadiť sa systémovým rozložením klávesnice - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 39}, {419, 31}} - - - - YES - - 67239424 - 4194304 - Keď je povolené, klávesy možnosti posielajú symboly klávesov Alt_L a Alt_R X11 namiesto Mode_switch. - - - - - - - - - 256 - {{18, 76}, {402, 18}} - - - - YES - - 67239424 - 0 - Klávesy možnosti posielajú Alt_L a Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 15}, {418, 18}} - - - - YES - - 67239424 - 0 - Vždy rolovať v smere pohybu prsta - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {496, 286}} - - - - - Vstup - - - - - - 2 - - - - 256 - - - - 256 - {{63, 243}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Z displeja - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 farieb - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Tisíce - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Milióny - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{19, 249}, {43, 17}} - - - YES - - 67239424 - 4194304 - Farby: - - - - - - - - - 256 - {{36, 223}, {392, 14}} - - - YES - - 67239424 - 4194304 - Táto možnosť bude zavedená pri ďalšom spustení X11. - - - - - - - - - 256 - {{18, 189}, {409, 23}} - - - YES - - 67239424 - 0 - Režim celej obrazovky - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 123}, {409, 23}} - - - YES - - 67239424 - 0 - Povoliť prístup na lištu v zobrazení na celej obrazovke - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 152}, {436, 31}} - - - YES - - 67239424 - 4194304 - Povoľuje X11 koreňové okno. Použite klávesovú sekvenciu Command-Option-A pre aktivovanie a deaktivovanie režimu celej obrazovky. - - - - - - - - - 256 - {{54, 86}, {374, 31}} - - - YES - - 67239424 - 4194304 - Lišta sa zobrazí po umiestnení kurzora myši do vrchnej časti primárneho displeja. - - - - - - - - {{10, 33}, {496, 286}} - - - Výstup - - - - - - 2 - - - - 256 - - - - 256 - {{18, 247}, {354, 23}} - - - YES - - 67239424 - 0 - Povoliť synchronizáciu - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 216}, {435, 28}} - - - YES - - 67239424 - 4194304 - Povoľuje položku menu „kopírovať“ a povoľuje synchronizáciu Pasteboardu OSX s X11 SCHRÁNKOU a PRIMÁRNYM bufferom. - - - - - - - - - 256 - {{34, 124}, {346, 23}} - - - YES - - 67239424 - 0 - Aktualizovať SCHRÁNKU pri zmenách Pasteboardu - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 86}, {436, 34}} - - - YES - - 67239424 - 0 - Aktualizovať PRIMÁRNY buffer (stredné kliknutie) pri
zmene Pasteboardu - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 50}, {353, 23}} - - - YES - - 67239424 - 0 - Aktualizovať Pasteboard okamžite po vybratí textu - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 183}, {338, 23}} - - - YES - - 67239424 - 0 - Aktualizovať Pasteboard pri zmenách SCHRÁNKY - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 152}, {420, 28}} - - - YES - - 67239424 - 4194304 - Zakážte túto možnosť ak chcete použiť xschránku, klipper, alebo iného X11 manažéra schránky. - - - - - - - - - 256 - {{48, 16}, {417, 28}} - - - YES - - 67239424 - 4194304 - Kvôli obmedzeniam v X11 protokole, táto možnosť možno nebude fungovať v niektorých aplikáciách. - - - - - - - - {{10, 33}, {496, 286}} - - - Pasteboard - - - - - - 2 - - - - 256 - - - - 256 - {{18, 250}, {402, 18}} - - - YES - - 67239424 - 0 - Preklikať neaktívne okná - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 213}, {437, 31}} - - - YES - - 67239424 - 4194304 - Keď je povolené, kliknutím na neaktívne okno posunie kliknutie myši do daného okna a aktivuje ho. - - - - - - - - - 256 - {{18, 186}, {402, 18}} - - - YES - - 67239424 - 0 - Sledovanie myši - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 166}, {429, 14}} - - - YES - - 67239424 - 4194304 - Aktívne okno sa nachádza pod kurzorom myši. Toto má nežiadúce účinky. - - - - - - - - - 256 - {{18, 137}, {402, 18}} - - - YES - - 67239424 - 0 - Sústrediť sa na nové okná - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 103}, {415, 28}} - - - YES - - 67239424 - 4194304 - Keď je povolené, vytvorenie nového X11 okna spôsobí posunutie X11.app do popredia (namiesto Finder.app, Terminal.app, atď.) - - - - - - - - {{10, 33}, {496, 286}} - - - Okná - - - - - - - 256 - - - - 256 - {{18, 250}, {402, 18}} - - - YES - - 67239424 - 0 - Autentifikovať spojenia - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 173}, {402, 18}} - - - YES - - 67239424 - 0 - Povoliť pripojenia od sieťových klientov - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 202}, {446, 42}} - - - YES - - 67239424 - 4194304 - Spustenie X11 vytvorí klávesy ochrany prístupu Xautority. Tieto klávesy sa stanú neplatnými ak sa zmení systémová IP adresa, čo môže zabrániť spusteniu X11 aplikácií. - - - - - - - - - 256 - {{36, 125}, {446, 42}} - - - YES - - 67239424 - 4194304 - Ak je povolené, musí byť povolená aj funkcia Autentifikácia spojení, aby bola zaistená bezpečnosť systému. Ak nie je povolené, pripojenia zo vzdialených aplikácií nie sú povolené. - - - - - - - - - 256 - {{17, 24}, {404, 14}} - - - YES - - 67239424 - 4194304 - Zmeny týchto možností budú zavedené pri ďalšom spustení X11. - - - - - - - - {{10, 33}, {496, 286}} - - - Zabezpečenie - - - - - - - 0 - YES - YES - - - - - - {542, 348} - - - - - {{0, 0}, {1280, 1002}} - {320, 262} - {10000000000000, 10000000000000} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {454, 271}} - 1350041600 - Aplikačné menu X11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 265 - {{324, 191}, {124, 32}} - - YES - - 67239424 - 137887744 - Duplikovať - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{324, 159}, {124, 32}} - - YES - - 67239424 - 137887744 - Odstrániť - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {285, 198} - - YES - - - 256 - {285, 17} - - - - - - 256 - {{286, 0}, {16, 17}} - - - - - 93.215377807617188 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Meno - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - 3 - MQA - - - - 3 - YES - YES - - - - 80.484375 - 40 - 1000 - - 75628096 - 2048 - Command - - - - - - 338820672 - 1024 - Text Cell - - - - - - 3 - YES - YES - - - - 103 - 10 - 1000 - - 75628096 - 2048 - Klávesová skratka - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {285, 198}} - - - - - 4 - - - - 256 - {{286, 17}, {15, 198}} - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {285, 15}} - - 1 - - _doScroller: - 0.98684209585189819 - - - - 2304 - - - - {{1, 0}, {285, 17}} - - - - - 4 - - - - {{20, 20}, {302, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{324, 223}, {124, 32}} - - YES - - -2080244224 - 137887744 - Pridať položku - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1280, 1002}} - {320, 262} - {10000000000000, 10000000000000} - x11_apps - YES - - - Menu - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Aplikácie - - 1048576 - 2147483647 - - - submenuAction: - - Aplikácie - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Prispôsobiť… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{507, 565}, {484, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Podržte počas kliknutia Option alebo Command pre aktiváciu stredného alebo pravého tlačidla myši. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Povoľuje X11 koreňové okno. Použite klávesovú sekvenciu Command-Option-A pre aktivovanie a deaktivovanie režimu celej obrazovky. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Spustenie X11 vytvorí klávesy ochrany prístupu Xautority. Tieto klávesy sa stanú neplatnými ak sa zmení systémová IP adresa, čo môže zabrániť spusteniu X11 aplikácií. + + + + + + + + + + Ak je povolené, musí byť povolená aj funkcia Autentifikácia spojení, aby bola zaistená bezpečnosť systému. Ak nie je povolené, pripojenia zo vzdialených aplikácií nie sú povolené. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3678 +1,758 @@ - - - 1040 - 11A289 - 851 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 851 - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Acerca de X11 - - 2147483647 - - - - - - Preferencias... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Servicios - - 1048576 - 2147483647 - - - submenuAction: - - Servicios - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Activar/desactivar pantalla completa - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Ocultar X11 - h - 1048576 - 2147483647 - - - 42 - - - - Ocultar otros - h - 1572864 - 2147483647 - - - - - - Mostrar todo - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Salir de X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Aplicaciones - - 1048576 - 2147483647 - - - submenuAction: - - Aplicaciones - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalizar... - - 1048576 - 2147483647 - - - - - - - - - Edición - - 1048576 - 2147483647 - - - submenuAction: - - Edición - - - - Copiar - c - 1048576 - 2147483647 - - - - - - - - - Ventana - - 1048576 - 2147483647 - - - submenuAction: - - Ventana - - - - Cerrar - w - 1048576 - 2147483647 - - - - - - Minimizar - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Recorrer ventanas - < - 1048576 - 2147483647 - - - - - - Recorrer ventanas al revés - > - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Traer todo al frente - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Ayuda - - 1048576 - 2147483647 - - - submenuAction: - - Ayuda - - - - Ayuda X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{345, 450.03906}, {619, 341}} - 1350041600 - Preferencias de X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {593, 325}} - - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - - YES - - 67239424 - 0 - Simular ratón de tres botones - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {501, 28}} - - - - YES - - 67239424 - 4194304 - 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. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2ODY1AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 209}, {501, 28}} - - - - YES - - 67239424 - 4194304 - TWFudGVuZ2EgcHVsc2FkYXMgbGFzIHRlY2xhcyBPcGNpw7NuIG8gQ29tYW5kbyBhbCBoYWNlciBjbGlj -IHBhcmEgYWN0aXZhciBlbCBib3TDs24gY2VudHJhbCBvIGRlcmVjaG8gZGVsIHJhdMOzbi4KA - - - - - - - - - - 256 - {{18, 127}, {402, 18}} - - - - YES - - 67239424 - 0 - Activar equivalentes de teclado en X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 151}, {501, 28}} - - - - YES - - 67239424 - 4194304 - Permite que los cambios en el menú de teclado reemplacen la distribución de teclas actual de X11. - - - - - - - - - - 256 - {{18, 185}, {402, 18}} - - - - YES - - 67239424 - 0 - Seguir la distribución de teclado del sistema - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 35}, {501, 28}} - - - - YES - - 67239424 - 4194304 - Si esta opción está seleccionada, las teclas Opción envían los símbolos de tecla de X11 Alt_L y Alt_R en vez de Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - - YES - - 67239424 - 0 - Las teclas Opción envían Alt_L y Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 11}, {459, 18}} - - - - YES - - 67239424 - 0 - Permitir desplazamiento en la dirección del movimiento de los dedos - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {573, 279}} - - - - - Entrada - - - - - - 2 - - - - 256 - - - - 256 - {{77, 234}, {168, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - De la pantalla - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 colores - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Miles - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Millones - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {58, 20}} - - - YES - - 67239424 - 4194304 - Colores: - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Esta opción será efectiva la próxima vez que se inicie X11. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Modalidad de pantalla completa - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {533, 18}} - - - YES - - 67239424 - 0 - Permitir acceso a la barra de menús en la modalidad de pantalla completa - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {511, 31}} - - - YES - - 67239424 - 4194304 - 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. - - - - - - - - - - 256 - {{54, 79}, {493, 31}} - - - YES - - 67239424 - 4194304 - La barra de menús estará visible cuando el cursor del ratón se sitúe en la parte superior de la pantalla principal. - - - - - - - - {{10, 33}, {573, 279}} - - - Salida - - - - - - 2 - - - - 256 - - - - 256 - {{18, 238}, {409, 23}} - - - YES - - 67239424 - 0 - Activar sincronización - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 204}, {501, 28}} - - - YES - - 67239424 - 4194304 - Activa el ítem de menú “copiar” y permite sincronizar el portapapeles de OSX y los búfers CLIPBOARD y PRIMARY de X11. - - - - - - - - - 256 - {{34, 112}, {409, 23}} - - - YES - - 67239424 - 0 - Actualizar el CLIPBOARD cuando cambie el portapapeles - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 87}, {529, 23}} - - - YES - - 67239424 - 0 - Actualizar el PRIMARY (clic con el botón central) cuando cambie el portapapeles - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 62}, {495, 18}} - - - YES - - 67239424 - 0 - Actualizar el portapapeles de inmediato cuando se seleccione texto nuevo - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 175}, {409, 23}} - - - YES - - 67239424 - 0 - Actualizar el portapapeles cuando cambie el CLIPBOARD - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 141}, {485, 28}} - - - YES - - 67239424 - 4194304 - Desactive esta opción si desea usar xclipboard, klipper o cualquier otro gestor de portapapeles de X11. - - - - - - - - - 256 - {{48, 30}, {485, 28}} - - - YES - - 67239424 - 4194304 - A causa de las limitaciones del protocolo de X11, puede que esta opción no funcione siempre en algunas aplicaciones. - - - - - - - - {{10, 33}, {573, 279}} - - - Portapapeles - - - - - - 2 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Hacer clic para pasar de una ventana inactiva a otra - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{26, 206}, {523, 31}} - - - YES - - 67239424 - 4194304 - 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. - - - - - - - - - 256 - {{18, 182}, {402, 18}} - - - YES - - 67239424 - 0 - Enfocar la posición del ratón - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{26, 162}, {523, 14}} - - - YES - - 67239424 - 4194304 - El punto de enfoque de la ventana de X11 sigue el cursor. Esto conlleva algunos inconvenientes. - - - - - - - - - 256 - {{18, 138}, {402, 18}} - - - YES - - 67239424 - 0 - Enfocar las ventanas nuevas - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{26, 90}, {523, 42}} - - - YES - - 67239424 - 4194304 - 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.) - - - - - - - - {{10, 33}, {573, 279}} - - - Ventanas - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Autenticar conexiones - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Permitir conexiones de clientes de red - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {501, 42}} - - - YES - - 67239424 - 4194304 - 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. - - - - - - - - - - 256 - {{36, 104}, {501, 56}} - - - YES - - 67239424 - 4194304 - 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. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Estas opciones serán efectivas la próxima vez que se inicie X11. - - - - - - - - - {{10, 33}, {573, 279}} - - - Seguridad - - - - - - - 0 - YES - YES - - - - - - {619, 341} - - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_prefs - - - 11 - 2 - {{302, 440}, {454, 271}} - 1350041600 - Menú de aplicaciones X11 - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {110, 32}} - - YES - - 67239424 - 137887744 - Duplicar - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {110, 32}} - - YES - - 67239424 - 137887744 - Eliminar - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {316, 213} - - YES - - - 256 - {316, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 110 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Nombre - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Celda de texto - - - - - 3 - MQA - - - - 3 - YES - YES - - - - - 93 - 40 - 1000 - - 75628096 - 2048 - Comando - - - - - - 338820672 - 1024 - Celda de texto - - - - - - - 3 - YES - YES - - - - - 104 - 10 - 1000 - - 75628096 - 2048 - Función rápida - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Celda de texto - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {316, 213}} - - - - 4 - - - - 256 - {{302, 17}, {15, 213}} - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {316, 15}} - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - 4 - - - - {{20, 20}, {318, 231}} - - 133170 - - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {110, 32}} - - YES - - -2080244224 - 137887744 - Añadir ítem - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_apps - - - Menú - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Aplicaciones - - 1048576 - 2147483647 - - - submenuAction: - - Aplicaciones - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Personalizar… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 565}, {619, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{507, 565}, {619, 341}} - - {{184, 290}, {481, 345}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - IBBuiltInLabel-Red - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{0, 992}, {151, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{151, 982}, {163, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + Mantenga pulsadas las teclas Opción o Comando al hacer clic para activar el botón central o derecho del ratón. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + 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.) + + + + + + + + + + + + + + + + + + + + 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. + + + + + + + + + + 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3881 +1,756 @@ - - - 1040 - 11A289 - 904 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 904 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Om X11 - - 2147483647 - - - - - - Inställningar... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Tjänster - - 1048576 - 2147483647 - - - submenuAction: - - Tjänster - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Växla helskärmsläge - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Göm X11 - h - 1048576 - 2147483647 - - - 42 - - - - Göm övriga - h - 1572864 - 2147483647 - - - - - - Visa alla - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Avsluta X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Program - - 1048576 - 2147483647 - - - submenuAction: - - Program - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Anpassa... - - 1048576 - 2147483647 - - - - - - - - - Redigera - - 1048576 - 2147483647 - - - submenuAction: - - Redigera - - - - Kopiera - c - 1048576 - 2147483647 - - - - - - - - - Fönster - - 1048576 - 2147483647 - - - submenuAction: - - Fönster - - - - Stäng - w - 1048576 - 2147483647 - - - - - - Minimera - m - 1048576 - 2147483647 - - - - - - Zooma - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bläddra genom fönster - < - 1048576 - 2147483647 - - - - - - Bläddra genom fönster baklänges - > - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Lägg alla överst - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Hjälp - - 1048576 - 2147483647 - - - submenuAction: - - Hjälp - - - - X11 Hjälp - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{288, 302}, {484, 341.0390625}} - 1350041600 - X11-inställningar - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {458, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Emulera treknappsmus - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 89}, {385, 31}} - - - YES - - 67239424 - 4194304 - Om de är aktiverade kan tangenter som motsvarar menyraden hamna i konflikt med X11-program som använder metamodifieraren. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {385, 42}} - - - YES - - 67239424 - 4194304 - SMOlbGwgbmVkIGFsdGVybmF0aXYtIGVsbGVyIGtvbW1hbmRvdGFuZ2VudGVuIG7DpHIgZHUga2xpY2th -ciBzw6UgYWt0aXZlcmFzIG11c2VucyBtaXR0LSByZXNwZWt0aXZlIGjDtmdlcmtuYXBwLgo - - - - - - - - - - 256 - {{18, 124}, {402, 18}} - - - YES - - 67239424 - 0 - Aktivera tangentmotsvarigheter i X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 149}, {400, 29}} - - - YES - - 67239424 - 4194304 - Tillåter att ändringar i inmatningsmenyn skriver över de befintliga X11-tangentkopplingarna. - - - - - - - - - - 256 - {{18, 182}, {402, 18}} - - - YES - - 67239424 - 0 - Följ datorns tangentbordslayout - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {385, 31}} - - - YES - - 67239424 - 4194304 - När aktiverad kommer alt-tangenterna att skicka X11-tangentsymboler Alt_L och Alt_R istället för Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Alt-tangenter sänder Alt_L och Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - Rulla alltid i samma riktning som fingerrörelsen - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {438, 279}} - - - - Indata - - - - - - 2 - - - - 256 - - - - 256 - {{74, 235}, {154, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Från bildskärm - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 färger - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Tusentals - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Miljontals - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {55, 20}} - - - YES - - 67239424 - 4194304 - Färger: - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Alternativet börjar gälla nästa gång X11 öppnas. - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Helskärmsläge - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - Tillåt åtkomst till menyraden i helskärmsläge - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {385, 31}} - - - YES - - 67239424 - 4194304 - Aktiverar X11:s rotfönster. Tryck ned kommando-alt-A för att växla till och från helskärmsläge. - - - - - - - - - - 256 - {{54, 79}, {362, 31}} - - - YES - - 67239424 - 4194304 - Menyraden visas när musmarkören placeras högst upp på huvudskärmen. - - - - - - - - {{10, 33}, {438, 279}} - - - Utdata - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Aktivera synkronisering - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {397, 28}} - - - YES - - 67239424 - 4194304 - Aktiverar menyalternativet ”Kopiera” och gör det möjligt att synkronisera mellan urklipp i OSX och CLIPBOARD- och PRIMARY-buffertarna i X11. - - - - - - - - - 256 - {{34, 129}, {409, 23}} - - - YES - - 67239424 - 0 - Uppdatera CLIPBOARD när urklipp ändras - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {409, 23}} - - - YES - - 67239424 - 0 - Uppdatera PRIMARY (mellanklick) när urklipp ändras - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {409, 23}} - - - YES - - 67239424 - 0 - Uppdatera urklipp så snart ny text markeras - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {409, 23}} - - - YES - - 67239424 - 0 - Uppdatera urklipp när CLIPBOARD ändras - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {385, 28}} - - - YES - - 67239424 - 4194304 - Avaktivera det här alternativet om du vill använda xclipboard, klipper, eller någon annan urklippshanterare i X11. - - - - - - - - - 256 - {{48, 47}, {370, 28}} - - - YES - - 67239424 - 4194304 - På grund av begränsningar i X11-protokollet kanske det här alternativet inte fungerar i vissa program. - - - - - - - - {{10, 33}, {438, 279}} - - - Urklipp - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Klicka igenom inaktiva fönster - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {385, 31}} - - - YES - - 67239424 - 4194304 - Med det här alternativet kommer ett klick på ett inaktivt fönster både aktivera fönstret och låta musklicket påverka innehållet. - - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Fokus följer mus - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {385, 17}} - - - YES - - 67239424 - 4194304 - Fönsterfokus i X11 följer pekaren. Det här har några bieffekter. - - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Fokus på nya fönster - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 106}, {385, 28}} - - - YES - - 67239424 - 4194304 - Med det här alternativet kommer skapandet av ett nytt X11-fönster att lägga X11 överst (istället för Finder, Terminal, etc.) - - - - - - - - - {{10, 33}, {438, 279}} - - - Fönster - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Autentisera anslutningar - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Tillåt anslutningar från nätverksklienter - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {385, 42}} - - - YES - - 67239424 - 4194304 - När du öppnar X11 skapas Xauthority-nycklar som kontrollerar åtkomst. Om datorns IP-adress ändras blir nycklarna ogiltiga vilket kan förhindra att X11-program öppnas. - - - - - - - - - - 256 - {{36, 118}, {385, 42}} - - - YES - - 67239424 - 4194304 - Om det är aktiverat måste Autentisera anslutningar också vara aktiverat för att säkerställa säkerheten i systemet. Om det är avaktiverat tillåts inte anslutningar från fjärrprogram. - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Alternativen börjar gälla nästa gång X11 öppnas. - - - - - - - - - {{10, 33}, {438, 279}} - - - Säkerhet - - - - - - - 0 - YES - YES - - - - - - {{7, 11}, {484, 341}} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - - - 11 - 2 - {{302, 440}, {496, 271}} - 1350041600 - X11 Programmeny - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {142, 32}} - - YES - - 67239424 - 137887744 - Duplicera - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {142, 32}} - - YES - - 67239424 - 137887744 - Ta bort - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 122.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Namn - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - - 3 - MQA - - - - 3 - YES - YES - - - - - 100 - 40 - 1000 - - 75628096 - 2048 - Kommando - - - - - - 338820672 - 1024 - Text Cell - - - - - - - 3 - YES - YES - - - - - 69 - 10 - 1000 - - 75628096 - 2048 - Kortkom. - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {142, 32}} - - YES - - -2080244224 - 137887744 - Lägg till objekt - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {496, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - - - Meny - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Program - - 1048576 - 2147483647 - - - submenuAction: - - Program - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Anpassa… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 565}, {484, 308}} - com.apple.InterfaceBuilder.CocoaPlugin - {{507, 565}, {484, 308}} - - {{184, 290}, {481, 345}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - - - X11Controller - NSObject - - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - apps_table_delete: - id - - - apps_table_done: - id - - - apps_table_duplicate: - id - - - apps_table_new: - id - - - apps_table_show: - id - - - bring_to_front: - id - - - close_window: - id - - - enable_fullscreen_changed: - id - - - minimize_window: - id - - - next_window: - id - - - prefs_changed: - id - - - prefs_show: - id - - - previous_window: - id - - - quit: - id - - - toggle_fullscreen: - id - - - x11_help: - id - - - zoom_window: - id - - - - NSMenuItem - NSTableView - NSButton - NSMenuItem - NSPopUpButton - NSMenu - NSMenu - NSMenuItem - NSButton - NSButton - NSButton - NSTextField - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSPanel - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSTextField - NSTextField - NSMenuItem - NSButton - NSMenuItem - NSMenuItem - - - - apps_separator - NSMenuItem - - - apps_table - NSTableView - - - click_through - NSButton - - - copy_menu_item - NSMenuItem - - - depth - NSPopUpButton - - - dock_apps_menu - NSMenu - - - dock_menu - NSMenu - - - dock_window_separator - NSMenuItem - - - enable_auth - NSButton - - - enable_fullscreen - NSButton - - - enable_fullscreen_menu - NSButton - - - enable_fullscreen_menu_text - NSTextField - - - enable_keyequivs - NSButton - - - enable_tcp - NSButton - - - fake_buttons - NSButton - - - focus_follows_mouse - NSButton - - - focus_on_new_window - NSButton - - - option_sends_alt - NSButton - - - prefs_panel - NSPanel - - - scroll_in_device_direction - NSButton - - - sync_clipboard_to_pasteboard - NSButton - - - sync_keymap - NSButton - - - sync_pasteboard - NSButton - - - sync_pasteboard_to_clipboard - NSButton - - - sync_pasteboard_to_primary - NSButton - - - sync_primary_immediately - NSButton - - - sync_text1 - NSTextField - - - sync_text2 - NSTextField - - - toggle_fullscreen_item - NSMenuItem - - - use_sysbeep - NSButton - - - window_separator - NSMenuItem - - - x11_about_item - NSMenuItem - - - - IBDocumentRelativeSource - ../../../X11Controller.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Håll ned alternativ- eller kommandotangenten när du klickar så aktiveras musens mitt- respektive högerknapp. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Aktiverar menyalternativet ”Kopiera” och gör det möjligt att synkronisera mellan urklipp i OSX och CLIPBOARD- och PRIMARY-buffertarna i X11. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Med det här alternativet kommer ett klick på ett inaktivt fönster både aktivera fönstret och låta musklicket påverka innehållet. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + När du öppnar X11 skapas Xauthority-nycklar som kontrollerar åtkomst. Om datorns IP-adress ändras blir nycklarna ogiltiga vilket kan förhindra att X11-program öppnas. + + + + + + + + + + Om det är aktiverat måste Autentisera anslutningar också vara aktiverat för att säkerställa säkerheten i systemet. Om det är avaktiverat tillåts inte anslutningar från fjärrprogram. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3758 +1,755 @@ - - - 1040 - 11A511a - 1576 - 1138 - 566.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1576 - - - NSTableColumn - NSPopUpButton - NSTableHeaderView - NSMenuItem - NSMenu - NSButtonCell - NSButton - NSTextFieldCell - NSScrollView - NSScroller - NSTableView - NSTabView - NSCustomObject - NSTabViewItem - NSView - NSWindowTemplate - NSTextField - NSPopUpButtonCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - เมนูหลัก - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - เกี่ยวกับ X11 - - 2147483647 - - - - - - การตั้งค่า... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - บริการ - - 1048576 - 2147483647 - - - submenuAction: - - บริการ - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - สลับเป็นแบบเต็มหน้าจอ - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - ซ่อน X11 - h - 1048576 - 2147483647 - - - 42 - - - - ซ่อนอื่นๆ - h - 1572864 - 2147483647 - - - - - - แสดงทั้งหมด - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - ออกจาก X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - แอปพลิเคชัน - - 1048576 - 2147483647 - - - submenuAction: - - แอปพลิเคชัน - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - กำหนดเอง... - - 1048576 - 2147483647 - - - - - - - - - แก้ไข - - 1048576 - 2147483647 - - - submenuAction: - - แก้ไข - - - - คัดลอก - c - 1048576 - 2147483647 - - - - - - - - - หน้าต่าง - - 1048576 - 2147483647 - - - submenuAction: - - หน้าต่าง - - - - ปิด - w - 1048576 - 2147483647 - - - - - - ย่อเล็กสุด - m - 1048576 - 2147483647 - - - - - - ซูม - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - วนดูหน้าต่าง - ` - 1048576 - 2147483647 - - - - - - วนกลับผ่านหน้าต่าง - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - นำทั้งหมดมาไว้ด้านหน้า - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - วิธีใช้ - - 1048576 - 2147483647 - - - submenuAction: - - วิธีใช้ - - - - วิธีใช้ X11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364}, {484, 341.0390625}} - 1350041600 - การตั้งค่า X11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {458, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - จำลองเมาส์สามปุ่ม - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {385, 31}} - - - YES - - 67239424 - 4194304 - เมื่อเปิดใช้งานแล้ว การเทียบเท่ากับปุ่มแถบเมนูอาจมีผลต่อแอปพลิเคชัน X11 ที่ใช้ตัวปรับแต่ง Meta - - LucidaGrande - 11 - 3100 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {385, 42}} - - - YES - - 67239424 - 4194304 - 4LiB4LiU4Lib4Li44LmI4LihIE9wdGlvbiDguKvguKPguLfguK0gQ29tbWFuZCDguITguYnguLLguIfg -uYTguKfguYnguYPguJnguILguJPguLDguJfguLXguYjguITguKXguLTguIHguYDguJ7guLfguYjguK3g -uYDguJvguLTguJTguYPguIrguYnguIfguLLguJnguJvguLjguYjguKHguYDguKHguLLguKrguYzguILg -uKfguLLguKvguKPguLfguK3guJvguLjguYjguKHguIHguKXguLLguIcKA - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 0 - เปิดใช้งานการเทียบเท่าปุ่มภายใต้ X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 159}, {385, 14}} - - - YES - - 67239424 - 4194304 - อนุญาตให้เปลี่ยนเมนู input เพื่อเขียนทับคีย์แมป X11 ปัจจุบัน - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - YES - - 67239424 - 0 - ทำตามรูปแบบแป้นพิมพ์ของระบบ - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {385, 31}} - - - YES - - 67239424 - 4194304 - เมื่อเปิดใช้งานแล้ว ปุ่มตัวเลือกจะส่งสัญลักษณ์ปุ่ม Alt_L และ Alt_R X11 แทน Mode_switch - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - ปุ่ม Option ส่ง Alt_L และ Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - เลื่อนไปตามทิศทางการเคลื่อนที่ของนิ้วเสมอ - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {438, 279}} - - - - นำเข้า - - - - - - 2 - - - - 256 - - - - 256 - {{36, 235}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - - - 400 - 75 - - - จากจอแสดงผล - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - มุมมองอื่นๆ - - - - - 256 สี - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - พัน - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - ล้าน - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {20, 20}} - - - YES - - 67239424 - 4194304 - สี: - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - ตัวเลือกนี้จะมีผลเมื่อเริ่ม X11 อีกครั้ง - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - โหมดเต็มหน้าจอ - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - อนุญาตให้แถบเมนูเข้าถึงในโหมดเต็มหน้าจอ - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {385, 31}} - - - YES - - 67239424 - 4194304 - เปิดใช้งานหน้าต่างราก X11 ใช้การกดปุ่ม Command-Option เพื่อเข้าหรืออกจากโหมดเต็มหน้าจอ - - - - - - - - - 256 - {{55, 79}, {362, 31}} - - - YES - - 67239424 - 4194304 - จะมองเห็นแถบเมนูได้ก็ต่อเมื่อวางเคอร์เซอร์เมาส์ไว้ด้านบนของจอแสดงผลหลักของคุณ - - - - - - - - {{10, 33}, {438, 279}} - - - ขาออก - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - เปิดใช้งานการซิงค์ - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {385, 28}} - - - YES - - 67239424 - 4194304 - เปิดใช้งานรายการเมนู "copy" และอนุญาตให้ซิงค์ระหว่างกระดานพักข้อมูล OSX กับ X11 CLIPBOARD และบัฟเฟอร์ PRIMARY - - - - - - - - - 256 - {{34, 129}, {409, 23}} - - - YES - - 67239424 - 0 - อัปเดต CLIPBOARD เมื่อกระดานพักข้อมูลเปลี่ยนแปลง - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {409, 23}} - - - YES - - 67239424 - 0 - อัปเดต PRIMARY (คลิกตรงกลาง) เมื่อกระดานพักข้อมูลเปลี่ยนแปลง - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {409, 23}} - - - YES - - 67239424 - 0 - อัปเดตกระดานพักข้อมูลทันทีเมื่อเลือกข้อความใหม่แล้ว - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {409, 23}} - - - YES - - 67239424 - 0 - อัปเดตกระดานพักข้อมูลเมื่อ CLIPBOARD เปลี่ยนแปลง - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{52, 158}, {385, 28}} - - - YES - - 67239424 - 4194304 - ปิดใช้งานตัวเลือกนี้ถ้าคุณต้องการใช้ xclipboard, klipper หรือตัวจัดการคลิปบอร์ด X11 อื่นๆ - - - - - - - - - 256 - {{52, 47}, {370, 28}} - - - YES - - 67239424 - 4194304 - ตัวเลือกนี้ไม่สามารถทำงานได้ในบางแอปพลิเคชัน เนื่องมาจากข้อจำกัดในโปรโตคอล X11 - - - - - - - - {{10, 33}, {438, 279}} - - - กระดานพักข้อมูล - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - คลิกผ่าน Windows ที่ไม่มีกิจกรรม - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 208}, {385, 31}} - - - YES - - 67239424 - 4194304 - เมื่อเปิดใช้งานแล้ว การคลิกที่หน้าต่างที่ไม่มีกิจกรรมจะทำให้การคลิกเมาส์นั้นผ่านไปยังหน้าต่างดังกล่าวเพื่อเปิดใช้งาน - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - โฟกัสตามเมาส์ - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 161}, {385, 17}} - - - YES - - 67239424 - 4194304 - การโฟกัสหน้าต่าง X11 จะตามเคอร์เซอร์ ส่งผลในทางตรงข้ามบางอย่าง - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - โฟกัสที่ Windows ใหม่ - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{33, 106}, {385, 28}} - - - YES - - 67239424 - 4194304 - เมื่อเปิดใช้งานแล้ว การสร้างหน้าต่าง X11 ใหม่จะส่งผลให้แอปพลิเคชัน X11 ย้ายไปที่พื้นหน้า (แทนที่แอปพลิเคชัน Finder แอปพลิเคชัน Terminal เป็นต้น) - - - - - - - - {{10, 33}, {438, 279}} - - - หน้าต่าง - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - การรับรองความถูกต้องการเชื่อมต่อ - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - อนุญาตให้เชื่อมต่อจากไคลเอนต์เครือข่าย - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {385, 42}} - - - YES - - 67239424 - 4194304 - การเริ่ม X11 จะสร้างปุ่มควบคุมการเข้าถึง Xauthority ถ้าที่อยู่ IP ของระบบเปลี่ยนแปลง ปุ่มเหล่านี้จะใช้ไม่ได้ซึ่งอาจทำให้เริ่มแอปพลิเคชัน X11 ไม่ได้ - - - - - - - - - 256 - {{36, 118}, {385, 42}} - - - YES - - 67239424 - 4194304 - เมื่อเปิดใช้งานแล้ว ต้องเปิดใช้งานการรับรองความถูกต้องการเชื่อมต่อด้วยเพื่อให้แน่ใจเรื่องความปลอดภับของระบบ เมื่อปิดใช้งานแล้ว จะไม่อนุญาตให้มีการเชื่อมต่อจากแอปพลิเคชันระยะไกล - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - - YES - - 67239424 - 4194304 - ตัวเลือกเหล่านี้จะมีผลเมื่อเริ่ม X11 ในครั้งต่อไป - - - - - - - - {{10, 33}, {438, 279}} - - - ความปลอดภัย - - - - - - - 0 - YES - YES - - - - - - {484, 341.0390625} - - - {{0, 0}, {1440, 878}} - {320, 262} - {10000000000000, 10000000000000} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {454, 271}} - 1350041600 - เมนูแอปพลิเคชัน X11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {100, 32}} - - YES - - 67239424 - 137887744 - ทำซ้ำ - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {100, 32}} - - YES - - 67239424 - 137887744 - ลบ - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 121.73099999999999 - 62.731000000000002 - 1000 - - 75628096 - 2048 - ชื่อ - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - ช่องข้อความ - - - - 3 - MQA - - - - 3 - YES - YES - - - - 99 - 40 - 1000 - - 75628096 - 2048 - คำสั่ง - - - - - - 338820672 - 1024 - ช่องข้อความ - - - - - - 3 - YES - YES - - - - 71 - 10 - 1000 - - 75628096 - 2048 - ทางลัด - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - ช่องข้อความ - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {100, 32}} - - YES - - -2080244224 - 137887744 - เพิ่มรายการ - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1440, 878}} - {320, 262} - {10000000000000, 10000000000000} - x11_apps - YES - - - เมนู - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - แอปพลิเคชัน - - 1048576 - 2147483647 - - - submenuAction: - - แอปพลิเคชัน - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - กำหนดเอง… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{507, 565}, {484, 308}} - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 300490 - - - - - X11Controller - NSObject - - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - apps_table_delete: - id - - - apps_table_done: - id - - - apps_table_duplicate: - id - - - apps_table_new: - id - - - apps_table_show: - id - - - bring_to_front: - id - - - close_window: - id - - - enable_fullscreen_changed: - id - - - minimize_window: - id - - - next_window: - id - - - prefs_changed: - id - - - prefs_show: - id - - - previous_window: - id - - - quit: - id - - - toggle_fullscreen: - id - - - x11_help: - id - - - zoom_window: - id - - - - NSMenuItem - NSTableView - NSButton - NSMenuItem - NSPopUpButton - NSMenu - NSMenu - NSMenuItem - NSButton - NSButton - NSButton - NSTextField - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSPanel - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSTextField - NSTextField - NSMenuItem - NSButton - NSMenuItem - NSMenuItem - - - - apps_separator - NSMenuItem - - - apps_table - NSTableView - - - click_through - NSButton - - - copy_menu_item - NSMenuItem - - - depth - NSPopUpButton - - - dock_apps_menu - NSMenu - - - dock_menu - NSMenu - - - dock_window_separator - NSMenuItem - - - enable_auth - NSButton - - - enable_fullscreen - NSButton - - - enable_fullscreen_menu - NSButton - - - enable_fullscreen_menu_text - NSTextField - - - enable_keyequivs - NSButton - - - enable_tcp - NSButton - - - fake_buttons - NSButton - - - focus_follows_mouse - NSButton - - - focus_on_new_window - NSButton - - - option_sends_alt - NSButton - - - prefs_panel - NSPanel - - - scroll_in_device_direction - NSButton - - - sync_clipboard_to_pasteboard - NSButton - - - sync_keymap - NSButton - - - sync_pasteboard - NSButton - - - sync_pasteboard_to_clipboard - NSButton - - - sync_pasteboard_to_primary - NSButton - - - sync_primary_immediately - NSButton - - - sync_text1 - NSTextField - - - sync_text2 - NSTextField - - - toggle_fullscreen_item - NSMenuItem - - - use_sysbeep - NSButton - - - window_separator - NSMenuItem - - - x11_about_item - NSMenuItem - - - - IBProjectSource - ./Classes/X11Controller.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + กดปุ่ม Option หรือ Command ค้างไว้ในขณะที่คลิกเพื่อเปิดใช้งานปุ่มเมาส์ขวาหรือปุ่มกลาง + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + เมื่อเปิดใช้งานแล้ว การสร้างหน้าต่าง X11 ใหม่จะส่งผลให้แอปพลิเคชัน X11 ย้ายไปที่พื้นหน้า (แทนที่แอปพลิเคชัน Finder แอปพลิเคชัน Terminal เป็นต้น) + + + + + + + + + + + + + + + + + + + + การเริ่ม X11 จะสร้างปุ่มควบคุมการเข้าถึง Xauthority ถ้าที่อยู่ IP ของระบบเปลี่ยนแปลง ปุ่มเหล่านี้จะใช้ไม่ได้ซึ่งอาจทำให้เริ่มแอปพลิเคชัน X11 ไม่ได้ + + + + + + + + + + เมื่อเปิดใช้งานแล้ว ต้องเปิดใช้งานการรับรองความถูกต้องการเชื่อมต่อด้วยเพื่อให้แน่ใจเรื่องความปลอดภับของระบบ เมื่อปิดใช้งานแล้ว จะไม่อนุญาตให้มีการเชื่อมต่อจากแอปพลิเคชันระยะไกล + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/tr.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/tr.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/tr.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/tr.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3611 +1,757 @@ - - - 1040 - 11A444d - 905 - 1119.1 - 555.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 905 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - X11 Hakkında - - 2147483647 - - - - - - Tercihler... - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Servisler - - 1048576 - 2147483647 - - - submenuAction: - - Servisler - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Tam Ekranı Aç/Kapat - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - X11’i Gizle - h - 1048576 - 2147483647 - - - 42 - - - - Diğerlerini Gizle - h - 1572864 - 2147483647 - - - - - - Tümünü Göster - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - X11’den Çık - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Uygulamalar - - 1048576 - 2147483647 - - - submenuAction: - - Uygulamalar - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Özelleştir... - - 1048576 - 2147483647 - - - - - - - - - Düzen - - 1048576 - 2147483647 - - - submenuAction: - - Düzen - - - - Kopyala - c - 1048576 - 2147483647 - - - - - - - - - Pencere - - 1048576 - 2147483647 - - - submenuAction: - - Pencere - - - - Kapat - w - 1048576 - 2147483647 - - - - - - Simge Durumuna Küçült - m - 1048576 - 2147483647 - - - - - - Büyüt/Küçült - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Pencereler Arasında Dolaş - ` - 1048576 - 2147483647 - - - - - - Pencereler Arasında Geriye Doğru Dolaş - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Tümünü Öne Getir - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Yardım - - 1048576 - 2147483647 - - - submenuAction: - - Yardım - - - - X11 Yardım - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 365.03906}, {599, 340}} - 1350041600 - X11 Tercihleri - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 274 - {{13, 9}, {573, 325}} - - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - - YES - - 67239424 - 0 - Üç düğmeli fareye öykün - - LucidaGrande - 13 - 1040 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 93}, {385, 31}} - - - - YES - - 67239424 - 4194304 - Etkinleştirildiğinde, menü çubuğu tuş karşılıkları Meta niteleyicisini kullanan X11 uygulamalarıyla çelişebilir. - - LucidaGrande - 11 - 3088 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2ODY1AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {385, 42}} - - - - YES - - 67239424 - 4194304 - T3J0YWRha2kgdmV5YSBzYcSfZGFraSBmYXJlIGTDvMSfbWVsZXJpbmkgZXRraW5sZcWfdGlybWVrIGnD -p2luIHTEsWtsYXJrZW4gT3B0aW9uIHZleWEgS29tdXQgdHXFn3VudSBiYXPEsWzEsSB0dXR1bi4KA - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - - YES - - 67239424 - 0 - X11 altında tuş karşılıklarını etkinleştir - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 159}, {461, 14}} - - - - YES - - 67239424 - 4194304 - Giriş menüsü değişikliklerinin şu anki X11 tuş eşleminin üzerine yazmasına izin verir. - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - - YES - - 67239424 - 0 - Sistemin klavye yerleşimini takip et - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {385, 31}} - - - - YES - - 67239424 - 4194304 - Etkinleştirildiğinde, Option tuşları Mode_switch yerine Alt_L ve Alt_R X11 tuş sembollerini gönderir. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - - YES - - 67239424 - 0 - Option tuşları Alt_L ve Alt_R gönderir - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - - YES - - 67239424 - 0 - Her zaman parmağın hareket yönünde kaydır - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {553, 279}} - - - - - Giriş - - - - - - 2 - - - - 256 - - - - 256 - {{71, 227}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - - - 400 - 75 - - - Ekrandan - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 Renk - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - Binlerce - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - Milyonlarca - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 231}, {64, 20}} - - - YES - - 67239424 - 4194304 - Renkler: - - - - - - - - - 256 - {{36, 212}, {392, 14}} - - - YES - - 67239424 - 4194304 - Bu seçenek X11 yeniden başlatıldığında etkili olacaktır. - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Tam ekran modu - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - Tam ekran modunda menü çubuğu erişimine izin ver - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {385, 31}} - - - YES - - 67239424 - 4194304 - X11 kök penceresini etkinleştirir. Tam ekran moduna geçmek ve tam ekran modundan çıkmak için Komut-Option-A tuşlarını kullanın. - - - - - - - - - 256 - {{54, 79}, {362, 31}} - - - YES - - 67239424 - 4194304 - Fare imleci birincil ekranınızın en üstüne yerleştirildiğinde menü çubuğu görünür olacaktır. - - - - - - - - {{10, 33}, {553.21875, 279}} - - - Çıkış - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Eşzamanlamayı etkinleştir - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {385, 28}} - - - YES - - 67239424 - 4194304 - "Kopyala" menü öğesini etkinleştirir ve OSX yapıştırma alanıyla X11 CLIPBOARD ve PRIMARY arabelleklerinin eşzamanlanmasına izin verir. - - - - - - - - - 256 - {{34, 129}, {409, 23}} - - - YES - - 67239424 - 0 - Yapıştırma alanı değiştiğinde CLIPBOARD’u güncelle - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 109}, {511, 18}} - - - YES - - 67239424 - 0 - Yapıştırma alanı değiştiğinde PRIMARY’yi (ortadaki düğmeyi tıklama) güncelle - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {409, 23}} - - - YES - - 67239424 - 0 - Yeni metin seçildiğinde Yapıştırma Alanı’nı hemen güncelle - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {409, 23}} - - - YES - - 67239424 - 0 - CLIPBOARD değiştiğinde Yapıştırma Alanı’nı güncelle - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {385, 28}} - - - YES - - 67239424 - 4194304 - xclipboard’u, klipper’ı veya başka bir X11 pano yöneticisini kullanmak istiyorsanız bu seçeneği etkisizleştirin. - - - - - - - - - 256 - {{48, 47}, {370, 28}} - - - YES - - 67239424 - 4194304 - X11 protokolündeki sınırlamalardan dolayı, bu seçenek bazı uygulamalarda her zaman çalışmayabilir. - - - - - - - - {{10, 33}, {553.21875, 279}} - - - Yapıştırma Alanı - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Etkin Olmayan Pencerelere Tıklayarak Geç - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 197}, {480, 42}} - - - YES - - 67239424 - 4194304 - Etkinleştirildiğinde; etkin olmayan bir pencereyi tıklamak, pencerenin etkinleştirilmesinin yanı sıra o fare tıklamasının o pencereye geçirilmesine de neden olacaktır. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Odak Fareyi Takip Eder - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {385, 17}} - - - YES - - 67239424 - 4194304 - X11 pencere odağı imleci takip eder. Bunun bazı yan etkileri olabilir. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Yeni Pencerelere Odaklan - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 92}, {367, 42}} - - - YES - - 67239424 - 4194304 - Etkinleştirildiğinde; yeni bir X11 penceresinin yaratılması, X11.app uygulamasının öne gelmesine (Finder.app, Terminal.app vb. yerine) neden olacaktır. - - - - - - - - {{10, 33}, {553.21875, 279}} - - - Pencereler - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Bağlantılarda kimlik doğrula - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Ağ istemcilerinin bağlantılarına izin ver - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {463.73828, 42}} - - - YES - - 67239424 - 4194304 - X11’i başlatma, Xauthority erişim denetimi tuşlarını yaratacaktır. Sistemin IP adresi değiştiğinde bu tuşlar geçersiz olur ve bu durum X11 uygulamalarının başlamasını engelleyebilir. - - - - - - - - - 256 - {{36, 104}, {449, 56}} - - - YES - - 67239424 - 4194304 - Etkinleştirildiğinde, sistem güvenliğini sağlamak için Bağlantılarda kimlik doğrula seçeneğinin de etkinleştirilmesi gerekir. Etkisizleştirildiğinde, uzaktaki uygulamaların bağlantılarına izin verilmez. - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - Bu seçenekler X11’in bir sonraki başlatılışında etkili olacaktır. - - - - - - - - {{10, 33}, {553, 279}} - - - Güvenlik - - - - - - - 0 - YES - YES - - - - - - {599, 340} - - - - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {454, 271}} - 1350041600 - X11 Uygulama Menüsü - NSPanel - - View - - - {3.4028235e+38, 3.4028235e+38} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {100, 32}} - - YES - - 67239424 - 137887744 - Çoğalt - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {100, 32}} - - YES - - 67239424 - 137887744 - Sil - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {316, 213} - - YES - - - 256 - {316, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - 126.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Ad - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Metin Hücresi - - - - 3 - MQA - - - - 3 - YES - YES - - - - 104 - 40 - 1000 - - 75628096 - 2048 - Komut - - - - - - 338820672 - 1024 - Metin Hücresi - - - - - - 3 - YES - YES - - - - 76 - 10 - 1000 - - 75628096 - 2048 - Kestirme - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Metin Hücresi - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {316, 213}} - - - - 4 - - - - 256 - {{302, 17}, {15, 207}} - - - _doScroller: - 0.99492377042770386 - - - - 256 - {{1, 215}, {310, 15}} - - 1 - - _doScroller: - 0.68852460384368896 - - - - 2304 - - - - {{1, 0}, {316, 17}} - - - - 4 - - - {{20, 20}, {318, 231}} - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {100, 32}} - - YES - - -2080244224 - 137887744 - Öğe Ekle - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {3.4028235e+38, 3.4028235e+38} - x11_apps - YES - - - Menü - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Uygulamalar - - 1048576 - 2147483647 - - - submenuAction: - - Uygulamalar - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Özelleştir… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{599, 580}, {599, 340}} - com.apple.InterfaceBuilder.CocoaPlugin - {{599, 580}, {599, 340}} - - {{184, 290}, {481, 345}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ortadaki veya sağdaki fare düğmelerini etkinleştirmek için tıklarken Option veya Komut tuşunu basılı tutun. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "Kopyala" menü öğesini etkinleştirir ve OSX yapıştırma alanıyla X11 CLIPBOARD ve PRIMARY arabelleklerinin eşzamanlanmasına izin verir. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Etkinleştirildiğinde; etkin olmayan bir pencereyi tıklamak, pencerenin etkinleştirilmesinin yanı sıra o fare tıklamasının o pencereye geçirilmesine de neden olacaktır. + + + + + + + + + + + + + + + + + + + + + Etkinleştirildiğinde; yeni bir X11 penceresinin yaratılması, X11.app uygulamasının öne gelmesine (Finder.app, Terminal.app vb. yerine) neden olacaktır. + + + + + + + + + + + + + + + + + + + + X11’i başlatma, Xauthority erişim denetimi tuşlarını yaratacaktır. Sistemin IP adresi değiştiğinde bu tuşlar geçersiz olur ve bu durum X11 uygulamalarının başlamasını engelleyebilir. + + + + + + + + + + Etkinleştirildiğinde, sistem güvenliğini sağlamak için Bağlantılarda kimlik doğrula seçeneğinin de etkinleştirilmesi gerekir. Etkisizleştirildiğinde, uzaktaki uygulamaların bağlantılarına izin verilmez. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/tr.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/uk.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/uk.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/uk.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/uk.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3492 +1,759 @@ - - - 1040 - 11C74 - 1938 - 1138.23 - 567.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - NSTableColumn - NSPopUpButton - NSTableHeaderView - NSMenuItem - NSMenu - NSButtonCell - NSButton - NSTextFieldCell - NSScrollView - NSScroller - NSTableView - NSTabView - NSCustomObject - NSTabViewItem - NSView - NSWindowTemplate - NSTextField - NSPopUpButtonCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - Про Х11 - - 2147483647 - - - - - - Параметри… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Сервіси - - 1048576 - 2147483647 - - - submenuAction: - - Сервіси - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Увімкнути/вимкнути повноекранний режим - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Сховати Х11 - h - 1048576 - 2147483647 - - - 42 - - - - Сховати решту - h - 1572864 - 2147483647 - - - - - - Показати всі - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Завершити Х11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Програми - - 1048576 - 2147483647 - - - submenuAction: - - Програми - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Настроїти… - - 1048576 - 2147483647 - - - - - - - - - Редагування - - 1048576 - 2147483647 - - - submenuAction: - - Редагування - - - - Скопіювати - c - 1048576 - 2147483647 - - - - - - - - - Вікно - - 1048576 - 2147483647 - - - submenuAction: - - Вікно - - - - Закрити - w - 1048576 - 2147483647 - - - - - - Згорнути - m - 1048576 - 2147483647 - - - - - - Оптимізувати - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Наступне вікно - ` - 1048576 - 2147483647 - - - - - - Попереднє вікно - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Всі наперед - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Довідка - - 1048576 - 2147483647 - - - submenuAction: - - Довідка - - - - Довідка Х11 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{266, 364.0390625}, {545, 341}} - 1350041600 - Параметри Х11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {519, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Емуляція мишки з трьома кнопками - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 82}, {422, 42}} - - - YES - - 67239424 - 4194304 - Якщо увімкнено, то клавіатурні скорочення смуги меню можуть заважати скороченням програм Х11, в яких використовується Meta-клавіша. - - LucidaGrande - 11 - 3100 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {444, 42}} - - - YES - - 67239424 - 4194304 - 0KPRgtGA0LjQvNGD0LnRgtC1INC60LvQsNCy0ZbRiNGWIE9wdGlvbiDRliBDb21tYW5kINC/0ZbQtCDR -h9Cw0YEg0LrQu9Cw0YbQsNC90L3Rjywg0YnQvtCxINCw0LrRgtC40LLRg9Cy0LDRgtC4INGB0LXRgNC1 -0LTQvdGOINGH0Lgg0L/RgNCw0LLRgyDQutC90L7Qv9C60Lgg0LzQuNGI0LrQuC4KA - - - - - - - - - 256 - {{18, 130}, {402, 18}} - - - YES - - 67239424 - 0 - Увімкнути клавіатурні скорочення в X11 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 159}, {444, 14}} - - - YES - - 67239424 - 4194304 - Увімкніть, щоб зміни в меню клавіатур змінювали клавіатурну розкладку в Х11. - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - YES - - 67239424 - 0 - Застосовувати системну розкладку клавіатури - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {431, 31}} - - - YES - - 67239424 - 4194304 - Якщо цю функцію ввімкнено, клавіші Option надсилатимуть символи клавіш Alt_L та Alt_R Х11 замість Mode_switch. - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Клавіші Option надсилають команди Alt_L та Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - Завжди прокручувати в напрямку руху пальця - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {499, 279}} - - - - Введення - - - - - - 2 - - - - 256 - - - - 256 - {{85, 234}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - як у дисплея - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 кольорів - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - тисячі - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - мільйони - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {66, 20}} - - - YES - - 67239424 - 4194304 - Кольори: - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - Цей параметр набере чинності після наступного запуску Х11. - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - Повноекранний режим - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 121}, {418, 18}} - - - YES - - 67239424 - 0 - Дозволити доступ до смуги меню в повноекранному режимі - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {411, 42}} - - - YES - - 67239424 - 4194304 - Вмикає кореневе вікно Х11. Для увімкнення/вимкнення повноекранного режиму використовуйте комбінацію клавіш Command-Alt-A. - - - - - - - - - 256 - {{54, 84}, {362, 31}} - - - YES - - 67239424 - 4194304 - Смуга меню стає видимою, коли курсор мишки розміщено у верхній частині основного дисплея. - - - - - - - - {{10, 33}, {499, 279}} - - - Виведення - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - Увімкнути синхронізацію - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {426, 28}} - - - YES - - 67239424 - 4194304 - Активує елемент меню «копіювати» та дозволяє синхронізацію між компонуванням OS X і буфером обміну Х11, а також первинними буферами. - - - - - - - - - 256 - {{34, 135}, {457, 18}} - - - YES - - 67239424 - 0 - Оновлювати буфер обміну під час внесення змін до компонування - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 97}, {380, 34}} - - - YES - - 67239424 - 0 - 0J7QvdC+0LLQu9GO0LLQsNGC0Lgg0L/QtdGA0LLQuNC90L3QuNC5INCx0YPRhNC10YAg0L7QsdC80ZbQ -vdGDINC/0ZbQtCDRh9Cw0YEK0LLQvdC10YHQtdC90L3RjyDQt9C80ZbQvSDQtNC+INC60L7QvNC/0L7Q -vdGD0LLQsNC90L3Rjw - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 75}, {434, 18}} - - - YES - - 67239424 - 0 - Оновлювати компонування, щойно новий текст буде виділено. - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 195}, {447, 18}} - - - YES - - 67239424 - 0 - Оновлювати компонування під час внесення змін у буфер обміну - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 161}, {434, 28}} - - - YES - - 67239424 - 4194304 - Вимкніть цю опцію, якщо ви хочете використовувати хclipboard, klipper або будь-який інший менеджер буферу обміну Х11. - - - - - - - - - 256 - {{48, 41}, {434, 28}} - - - YES - - 67239424 - 4194304 - Через обмеження в протоколі Х11 ця опція може не працювати в деяких програмах. - - - - - - - - {{10, 33}, {499, 279}} - - - Компонування - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - Натискання неактивних вікон - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {437, 31}} - - - YES - - 67239424 - 4194304 - Якщо натиснути неактивне вікно в активному режимі, то мишка пройде через це вікно та активує його. - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - Фокус прямує за курсором мишки - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 150}, {444, 28}} - - - YES - - 67239424 - 4194304 - Фокус вікна Х11 прямує за курсором. Це може мати деякі негативні наслідки. - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - Фокусування на нових вікнах - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 78}, {437, 56}} - - - YES - - 67239424 - 4194304 - Якщо цю функцію ввімкнено, то створення нового вікна Х11 в активному режимі призведе до того, що програма Х11 переміститься на передній план (замість програм Finder, «Термінал »тощо) - - - - - - - - {{10, 33}, {499, 279}} - - - Вікна - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - Аутентифікація з’єднань - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - Дозволити під’єднання мережевих клієнтів - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {424, 42}} - - - YES - - 67239424 - 4194304 - Запуск X11 створить ключі контролю доступу Xauthority. У разі змінення ІР-адреси системи ці ключі втратять дійсність, що завадить запуску програм Х11. - - - - - - - - - 256 - {{36, 104}, {416, 56}} - - - YES - - 67239424 - 4194304 - У разі ввімкнення цього параметру необхідно також увімкнути параметр «Аутентифікація з’єднань», щоб забезпечити захист системи. Якщо цей параметр вимкнено, під’єднання віддалених програм заборонені. - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - - YES - - 67239424 - 4194304 - Ці параметри наберуть чинності після наступного запуску Х11. - - - - - - - - {{10, 33}, {499, 279}} - - - Тип захисту - - - - - - - 0 - YES - YES - - - - - - {545, 341} - - - {{0, 0}, {1920, 1058}} - {320, 262} - {10000000000000, 10000000000000} - x11_prefs - YES - - - 11 - 2 - {{302, 440}, {500, 271}} - 1350041600 - Меню програм Х11 - NSPanel - - View - - - {320, 240} - - - 256 - - - - 265 - {{347, 191}, {139, 32}} - - YES - - 67239424 - 137887744 - Дублювати - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{347, 159}, {139, 32}} - - YES - - 67239424 - 137887744 - Видалити - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {316, 213} - - YES - - - 256 - {316, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - 119.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - Назва - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Текстова клітинка - - - - 3 - MQA - - - - 3 - YES - YES - - - - 106 - 40 - 1000 - - 75628096 - 2048 - Команда - - - - - - 338820672 - 1024 - Текстова клітинка - - - - - - 3 - YES - YES - - - - 81 - 10 - 1000 - - 75628096 - 2048 - Скорочення - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Текстова клітинка - - LucidaGrande - 12 - 16 - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {316, 213}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 207}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {310, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {316, 17}} - - - - - 4 - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{347, 223}, {139, 32}} - - YES - - -2080244224 - 137887744 - Додати елемент - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {500, 271} - - {{0, 0}, {1920, 1058}} - {320, 262} - {10000000000000, 10000000000000} - x11_apps - YES - - - Меню - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Програми - - 1048576 - 2147483647 - - - submenuAction: - - Програми - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Змінити… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - hideOtherApplications: - - - - 263 - - - - dockMenu - - - - 426 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dock_menu - - - - 428 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{495, 329}, {545, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - IBBuiltInLabel-Red - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Якщо увімкнено, то клавіатурні скорочення смуги меню можуть заважати скороченням програм Х11, в яких використовується Meta-клавіша. + + + + + + + + + + Утримуйте клавіші Option і Command під час клацання, щоб активувати середню чи праву кнопки мишки. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Активує елемент меню «копіювати» та дозволяє синхронізацію між компонуванням OS X і буфером обміну Х11, а також первинними буферами. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Якщо цю функцію ввімкнено, то створення нового вікна Х11 в активному режимі призведе до того, що програма Х11 переміститься на передній план (замість програм Finder, «Термінал »тощо) + + + + + + + + + + + + + + + + + + + + Запуск X11 створить ключі контролю доступу Xauthority. У разі змінення ІР-адреси системи ці ключі втратять дійсність, що завадить запуску програм Х11. + + + + + + + + + + У разі ввімкнення цього параметру необхідно також увімкнути параметр «Аутентифікація з’єднань», щоб забезпечити захист системи. Якщо цей параметр вимкнено, під’єднання віддалених програм заборонені. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/uk.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3880 +1,752 @@ - - - 1040 - 11A444d - 905 - 1119.1 - 555.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 905 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - 关于 X11 - - 2147483647 - - - - - - 偏好设置… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 服务 - - 1048576 - 2147483647 - - - submenuAction: - - 服务 - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 开关全屏幕 - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 隐藏 X11 - h - 1048576 - 2147483647 - - - 42 - - - - 隐藏其他 - h - 1572864 - 2147483647 - - - - - - 全部显示 - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 退出 X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - 应用程序 - - 1048576 - 2147483647 - - - submenuAction: - - 应用程序 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 自定… - - 1048576 - 2147483647 - - - - - - - - - 编辑 - - 1048576 - 2147483647 - - - submenuAction: - - 编辑 - - - - 拷贝 - c - 1048576 - 2147483647 - - - - - - - - - 窗口 - - 1048576 - 2147483647 - - - submenuAction: - - 窗口 - - - - 关闭 - w - 1048576 - 2147483647 - - - - - - 最小化 - m - 1048576 - 2147483647 - - - - - - 缩放 - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 循环显示窗口 - ` - 1048576 - 2147483647 - - - - - - 反向循环显示窗口 - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 前置全部窗口 - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - 帮助 - - 1048576 - 2147483647 - - - submenuAction: - - 帮助 - - - - X11 帮助 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{240, 335}, {484, 341.0390625}} - 1350041600 - X11 偏好设置 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {458, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - 模拟三按键鼠标 - - LucidaGrande - 13 - 1040 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 78}, {385, 31}} - - - YES - - 67239424 - 4194304 - 启用时，菜单栏等效键可能会干扰使用元修饰键的 X11 应用程序。 - - LucidaGrande - 11 - 3088 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 195}, {385, 42}} - - - YES - - 67239424 - 4194304 - 6K+35oyJ5L2PIE9wdGlvbiDmiJYgQ29tbWFuZCDngrnmjInku6Xmv4DmtLvkuK3pl7TmiJblj7Povrnn -moTpvKDmoIfmjInplK7jgIIKA - - - - - - - - - - 256 - {{18, 115}, {402, 18}} - - - YES - - 67239424 - 0 - 在 X11 环境下启用等效键 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 159}, {385, 14}} - - - YES - - 67239424 - 4194304 - 允许进行输入菜单更改以覆盖当前的 X11 键盘映射。 - - - - - - - - - - 256 - {{18, 179}, {402, 18}} - - - YES - - 67239424 - 0 - 依照系统键盘布局 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 32}, {385, 31}} - - - YES - - 67239424 - 4194304 - 如果已启用，则 Option 键会发送 Alt_L 和 Alt_R X11 键符号，而不是发送 Mode_switch。 - - - - - - - - - 256 - {{18, 69}, {402, 18}} - - - YES - - 67239424 - 0 - Option 键会发送 Alt_L 和 Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 8}, {418, 18}} - - - YES - - 67239424 - 0 - 始终按手指移动方向滚动 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {438, 279}} - - - - 输入 - - - - - - 2 - - - - 256 - - - - 256 - {{59, 235}, {128, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - 来自显示器 - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 种颜色 - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - 上万种 - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - 上千万种 - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 239}, {43, 20}} - - - YES - - 67239424 - 4194304 - 颜色： - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - 此选项会在再次开启 X11 时生效。 - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - 全屏幕模式 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - 允许在全屏幕模式下访问菜单栏 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 145}, {405, 31}} - - - YES - - 67239424 - 4194304 - 启用 X11 根窗口。使用 Command-Option-A 击键来进入和离开全屏幕模式。 - - - - - - - - - - 256 - {{54, 79}, {362, 31}} - - - YES - - 67239424 - 4194304 - 当鼠标光标置于主要显示器顶部时将显示菜单栏。 - - - - - - - - {{10, 33}, {438, 279}} - - - 输出 - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - 启用同步 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {385, 28}} - - - YES - - 67239424 - 4194304 - 启用“拷贝”菜单项并允许 OSX“粘贴板”与 X11 CLIPBOARD 和 PRIMARY 缓冲区之间同步。 - - - - - - - - - 256 - {{34, 129}, {409, 23}} - - - YES - - 67239424 - 0 - 粘贴板改变时更新 CLIPBOARD - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {409, 23}} - - - YES - - 67239424 - 0 - 粘贴板改变时更新 PRIMARY（点按鼠标中间键） - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {409, 23}} - - - YES - - 67239424 - 0 - 选定新文本时立即更新粘贴板 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {409, 23}} - - - YES - - 67239424 - 0 - CLIPBOARD 改变时更新粘贴板 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {385, 28}} - - - YES - - 67239424 - 4194304 - 如果您想要使用 xclipboard、klipper 或其他任何 X11 剪贴板管理程序，请停用此选项。 - - - - - - - - - 256 - {{48, 47}, {370, 28}} - - - YES - - 67239424 - 4194304 - 由于 X11 协议中的限制，此选项在某些应用程序中可能无法工作。 - - - - - - - - {{10, 33}, {438, 279}} - - - 粘贴板 - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - 点按各个不活跃窗口 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {385, 31}} - - - YES - - 67239424 - 4194304 - 启用时，点按不活跃窗口会激活窗口，除此以外，还将导致鼠标点按传递到该窗口。 - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - 焦点跟随鼠标 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {385, 17}} - - - YES - - 67239424 - 4194304 - X11 窗口焦点跟随光标。这会产生一些不好的效果。 - - - - - - - - - 256 - {{15, 140}, {402, 18}} - - - YES - - 67239424 - 0 - 聚焦新窗口 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 106}, {395, 28}} - - - YES - - 67239424 - 4194304 - 启用时，创建新 X11 窗口将导致 X11.app 移到最前面（而不是 Finder.app、终端.app 等应用程序移到最前面）。 - - - - - - - - {{10, 33}, {438, 279}} - - - 窗口 - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - 鉴定连接 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - 允许从网络客户端连接 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 195}, {385, 42}} - - - YES - - 67239424 - 4194304 - 开启 X11 将创建 Xauthority 访问控制按键。如果系统的 IP 地址已更改，这些按键会变成无效的，这可能会阻止 X11 应用程序开启。 - - - - - - - - - - 256 - {{36, 118}, {385, 42}} - - - YES - - 67239424 - 4194304 - 如果已启用，则必须也启用鉴定连接以确保系统安全。停用时，不允许远程应用程序的连接。 - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - 这些选项会在下一次开启 X11 时生效。 - - - - - - - - - {{10, 33}, {438, 279}} - - - 安全性 - - - - - - - 0 - YES - YES - - - - - - {{7, 11}, {484, 341}} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - YES - - - 11 - 2 - {{279, 416}, {454, 271}} - 1350041600 - X11 应用程序菜单 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {100, 32}} - - YES - - 67239424 - 137887744 - 复制 - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {100, 32}} - - YES - - 67239424 - 137887744 - 移除 - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 121.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - 名称 - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - - 3 - MQA - - - - 3 - YES - YES - - - - - 99 - 40 - 1000 - - 75628096 - 2048 - 命令 - - - - - - 338820672 - 1024 - Text Cell - - - - - - - 3 - YES - YES - - - - - 71 - 10 - 1000 - - 75628096 - 2048 - 快捷 - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {100, 32}} - - YES - - -2080244224 - 137887744 - 添加项目 - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - YES - - - 菜单 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 应用程序 - - 1048576 - 2147483647 - - - submenuAction: - - 应用程序 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 自定… - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 565}, {484, 308}} - com.apple.InterfaceBuilder.CocoaPlugin - {{507, 565}, {484, 308}} - - {{184, 290}, {481, 345}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - - - X11Controller - NSObject - - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - apps_table_delete: - id - - - apps_table_done: - id - - - apps_table_duplicate: - id - - - apps_table_new: - id - - - apps_table_show: - id - - - bring_to_front: - id - - - close_window: - id - - - enable_fullscreen_changed: - id - - - minimize_window: - id - - - next_window: - id - - - prefs_changed: - id - - - prefs_show: - id - - - previous_window: - id - - - quit: - id - - - toggle_fullscreen: - id - - - x11_help: - id - - - zoom_window: - id - - - - NSMenuItem - NSTableView - NSButton - NSMenuItem - NSPopUpButton - NSMenu - NSMenu - NSMenuItem - NSButton - NSButton - NSButton - NSTextField - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSPanel - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSTextField - NSTextField - NSMenuItem - NSButton - NSMenuItem - NSMenuItem - - - - apps_separator - NSMenuItem - - - apps_table - NSTableView - - - click_through - NSButton - - - copy_menu_item - NSMenuItem - - - depth - NSPopUpButton - - - dock_apps_menu - NSMenu - - - dock_menu - NSMenu - - - dock_window_separator - NSMenuItem - - - enable_auth - NSButton - - - enable_fullscreen - NSButton - - - enable_fullscreen_menu - NSButton - - - enable_fullscreen_menu_text - NSTextField - - - enable_keyequivs - NSButton - - - enable_tcp - NSButton - - - fake_buttons - NSButton - - - focus_follows_mouse - NSButton - - - focus_on_new_window - NSButton - - - option_sends_alt - NSButton - - - prefs_panel - NSPanel - - - scroll_in_device_direction - NSButton - - - sync_clipboard_to_pasteboard - NSButton - - - sync_keymap - NSButton - - - sync_pasteboard - NSButton - - - sync_pasteboard_to_clipboard - NSButton - - - sync_pasteboard_to_primary - NSButton - - - sync_primary_immediately - NSButton - - - sync_text1 - NSTextField - - - sync_text2 - NSTextField - - - toggle_fullscreen_item - NSMenuItem - - - use_sysbeep - NSButton - - - window_separator - NSMenuItem - - - x11_about_item - NSMenuItem - - - - IBDocumentRelativeSource - ../../../X11Controller.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 请按住 Option 或 Command 点按以激活中间或右边的鼠标按键。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects-110000.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects-110000.nib differ Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib xorg-server-1.20.13/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib --- xorg-server-1.20.9/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib 2021-07-29 18:48:14.000000000 +0000 @@ -1,3612 +1,752 @@ - - - 1040 - 11A289 - 900 - 1094.2 - 521.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 900 - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - - NSApplication - - - - FirstResponder - - - NSApplication - - - MainMenu - - - - X11 - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - X11 - - - - 關於 X11 - - 2147483647 - - - - - - 偏好設定⋯ - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 服務 - - 1048576 - 2147483647 - - - submenuAction: - - 服務 - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 切換全螢幕 - a - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 隱藏 X11 - h - 1048576 - 2147483647 - - - 42 - - - - 隱藏其他 - h - 1572864 - 2147483647 - - - - - - 顯示全部 - - 1048576 - 2147483647 - - - 42 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 結束 X11 - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - 應用程式 - - 1048576 - 2147483647 - - - submenuAction: - - 應用程式 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 自定⋯ - - 1048576 - 2147483647 - - - - - - - - - 編輯 - - 1048576 - 2147483647 - - - submenuAction: - - 編輯 - - - - 拷貝 - c - 1048576 - 2147483647 - - - - - - - - - 視窗 - - 1048576 - 2147483647 - - - submenuAction: - - 視窗 - - - - 關閉 - w - 1048576 - 2147483647 - - - - - - 縮到最小 - m - 1048576 - 2147483647 - - - - - - 縮放 - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 循環檢視視窗 - ` - 1048576 - 2147483647 - - - - - - 反向循環檢視視窗 - ~ - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 將此程式所有視窗移至最前 - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - 輔助說明 - - 1048576 - 2147483647 - - - submenuAction: - - 輔助說明 - - - - X11 輔助說明 - - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - X11Controller - - - 3 - 2 - {{319, 329}, {484, 341.0390625}} - 1350041600 - X11 偏好設定 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 274 - {{13, 10}, {458, 325}} - - - - - 1 - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - 模擬三鍵滑鼠 - - LucidaGrande - 13 - 1044 - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{36, 125}, {399, 14}} - - - YES - - 67239424 - 4194304 - 當啟用時，選單列按鍵的對應鍵可能會阻礙使用 Meta 變更鍵的 X11 應用程式。 - - LucidaGrande - 11 - 3100 - - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{36, 209}, {385, 28}} - - - YES - - 67239424 - 4194304 - 5oyJ5L2PIE9wdGlvbiDmiJYgQ29tbWFuZCDnmoTlkIzmmYLmjInkuIDkuIvvvIzku6XllZ/nlKjmu5Hp -vKDnmoTkuK3plpPmiJblj7PpgormjInpiJXjgIIKA - - - - - - - - - - 256 - {{18, 145}, {402, 18}} - - - YES - - 67239424 - 0 - 啟用 X11 下的按鍵對應鍵 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 174}, {385, 14}} - - - YES - - 67239424 - 4194304 - 允許輸入法選單的更動覆寫目前的 X11 按鍵對應。 - - - - - - - - - - 256 - {{18, 194}, {402, 18}} - - - YES - - 67239424 - 0 - 依照系統鍵盤佈局 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 59}, {385, 31}} - - - YES - - 67239424 - 4194304 - 當啟用時，option 鍵會傳送 Alt_L 和 Alt_R X11 按鍵符號，而不是 Mode_switch。 - - - - - - - - - 256 - {{18, 96}, {402, 18}} - - - YES - - 67239424 - 0 - 讓 Option 鍵傳送 Alt_L 和 Alt_R - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 35}, {418, 18}} - - - YES - - 67239424 - 0 - 永遠依照手指移動的方向捲視 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{10, 33}, {438, 279}} - - - - 輸入 - - - - - - 2 - - - - 256 - - - - 256 - {{55, 235}, {136, 26}} - - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - 來自螢幕 - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - -1 - - - YES - - - OtherViews - - - - - - 256 種顏色 - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - 數萬種顏色 - - 1048576 - 2147483647 - - - _popUpItemAction: - 15 - - - - - 千萬種顏色 - - 1048576 - 2147483647 - - - _popUpItemAction: - 24 - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 238}, {44, 20}} - - - YES - - 67239424 - 4194304 - 顏色： - - - - - - - - - - 256 - {{36, 216}, {392, 14}} - - - YES - - 67239424 - 4194304 - 此選項將會在 X11 再次啟動後生效。 - - - - - - - - - - 256 - {{18, 182}, {409, 23}} - - - YES - - 67239424 - 0 - 全螢幕模式 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{37, 116}, {409, 23}} - - - YES - - 67239424 - 0 - 允許在全螢幕模式中取用選單列 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 148}, {382, 28}} - - - YES - - 67239424 - 4194304 - 啟用 X11 root 視窗。使用 Command + Option + A 鍵盤組合來進入和離開全螢幕模式。 - - - - - - - - - - 256 - {{54, 79}, {362, 31}} - - - YES - - 67239424 - 4194304 - 將滑鼠游標置於主要顯示器的上方時將顯示選單列。 - - - - - - - - {{10, 33}, {438, 279}} - - - 輸出 - - - - - - 2 - - - - 256 - - - - 256 - {{18, 255}, {409, 23}} - - - YES - - 67239424 - 0 - 啟用同步功能 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 221}, {385, 28}} - - - YES - - 67239424 - 4194304 - 啟用“拷貝”選單項目，並允許 OSX“剪貼板”與 X11 CLIPBOARD 之間的同步，以及 PRIMARY 緩衝。 - - - - - - - - - 256 - {{34, 129}, {409, 23}} - - - YES - - 67239424 - 0 - 當“剪貼板”更改時更新 CLIPBOARD - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 104}, {409, 23}} - - - YES - - 67239424 - 0 - 當“剪貼板”更改時更新 PRIMARY（中間點按） - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 79}, {409, 23}} - - - YES - - 67239424 - 0 - 當選取新文字時，立即更新“剪貼板” - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{34, 192}, {409, 23}} - - - YES - - 67239424 - 0 - 當 CLIPBOARD 更改時更新“剪貼板” - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{48, 158}, {385, 28}} - - - YES - - 67239424 - 4194304 - 若您想使用 xclipboard、klipper 或任何其他 X11 剪貼板管理程式，請停用此選項。 - - - - - - - - - 256 - {{48, 47}, {370, 28}} - - - YES - - 67239424 - 4194304 - 由於 X11 通訊協定的限制，此選項可能無法在某些應用程式裡使用。 - - - - - - - - {{10, 33}, {438, 279}} - - - 剪貼板 - - - - - - 2 - - - - 256 - - - - 256 - {{15, 245}, {402, 18}} - - - YES - - 67239424 - 0 - 穿透至未啟用的視窗 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 208}, {385, 31}} - - - YES - - 67239424 - 4194304 - 當啟用時，按一下未啟用的視窗將會使滑鼠按鍵穿透至該視窗並將其啟用。 - - - - - - - - - 256 - {{15, 184}, {402, 18}} - - - YES - - 67239424 - 0 - 焦點隨著滑鼠移動 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 161}, {385, 17}} - - - YES - - 67239424 - 4194304 - X11 視窗焦點會跟隨游標移動。這樣會有一些相反的效果。 - - - - - - - - - 256 - {{15, 123}, {402, 18}} - - - YES - - 67239424 - 0 - 讓新視窗取得焦點 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{23, 89}, {409, 28}} - - - YES - - 67239424 - 4194304 - 當啟用時，新增的 X11 視窗將會使 X11.app（而不是 Finder.app、終端機.app 等）移至最前。 - - - - - - - - {{10, 33}, {438, 279}} - - - 視窗 - - - - - - - 256 - - - - 256 - {{18, 243}, {402, 18}} - - - YES - - 67239424 - 0 - 認證連線 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 166}, {402, 18}} - - - YES - - 67239424 - 0 - 允許從網路用戶端連線 - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{36, 209}, {385, 28}} - - - YES - - 67239424 - 4194304 - 啟動 X11 將會製作 Xauthority 取用控制按鍵。若系統的 IP 位址更動，這些鍵將會無效，這可能會令 X11 應用程式無法啟動。 - - - - - - - - - - 256 - {{36, 132}, {388, 28}} - - - YES - - 67239424 - 4194304 - 若啟用，“認證連線”必須也被啟用來確保系統安全。當停用時，不會允許來自遠端應用程式的連線。 - - - - - - - - - - 256 - {{17, 17}, {404, 14}} - - YES - - 67239424 - 4194304 - 這些選項將會在 X11 下次啟動後生效。 - - - - - - - - - {{10, 33}, {438, 279}} - - - 安全性 - - - - - - - 0 - YES - YES - - - - - - {484, 341} - - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_prefs - - - 11 - 2 - {{360, 400}, {454, 271}} - 1350041600 - X11 應用程式選單 - NSPanel - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - - - 256 - - - - 265 - {{340, 191}, {100, 32}} - - YES - - 67239424 - 137887744 - 複製 - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - 200 - 25 - - - - - 265 - {{340, 159}, {100, 32}} - - YES - - 67239424 - 137887744 - 移除 - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - - - 2304 - - - - 256 - {301, 198} - - YES - - - 256 - {301, 17} - - - - - - 256 - {{302, 0}, {16, 17}} - - - - - 122.73100280761719 - 62.730998992919922 - 1000 - - 75628096 - 2048 - 名稱 - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - Text Cell - - - - - 3 - MQA - - - - 3 - YES - YES - - - - 100 - 40 - 1000 - - 75628096 - 2048 - 指令 - - - - - - 338820672 - 1024 - Text Cell - - - - - - - 3 - YES - YES - - - - 69 - 10 - 1000 - - 75628096 - 2048 - 快速鍵 - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - Text Cell - - LucidaGrande - 12 - 16 - - - - YES - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - 1379958784 - - - 1 - -1 - 0 - YES - 0 - 1 - - - {{1, 17}, {301, 198}} - - - - - 4 - - - - 256 - {{302, 17}, {15, 198}} - - - _doScroller: - 0.99492380000000002 - - - - 256 - {{1, 215}, {301, 15}} - - 1 - - _doScroller: - 0.68852460000000004 - - - - 2304 - - - - {{1, 0}, {301, 17}} - - - - - 4 - - - - {{20, 20}, {318, 231}} - - - 133170 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - - 265 - {{340, 223}, {100, 32}} - - YES - - -2080244224 - 137887744 - 加入項目 - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - {454, 271} - - {{0, 0}, {1920, 1178}} - {320, 262} - {1.7976931348623157e+308, 1.7976931348623157e+308} - x11_apps - - - 選單 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 應用程式 - - 1048576 - 2147483647 - - - submenuAction: - - 應用程式 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - 自定⋯ - - 1048576 - 2147483647 - - - - - - - - - - - - - - - copy: - - - - 181 - - - - minimize_window: - - - - 202 - - - - close_window: - - - - 205 - - - - zoom_window: - - - - 206 - - - - bring_to_front: - - - - 207 - - - - hideOtherApplications: - - - - 263 - - - - apps_separator - - - - 273 - - - - apps_table - - - - 301 - - - - apps_table_delete: - - - - 303 - - - - apps_table_duplicate: - - - - 304 - - - - apps_table_show: - - - - 308 - - - - apps_table_new: - - - - 311 - - - - prefs_show: - - - - 318 - - - - x11_about_item - - - - 321 - - - - enable_auth - - - - 387 - - - - enable_tcp - - - - 388 - - - - depth - - - - 389 - - - - fake_buttons - - - - 391 - - - - sync_keymap - - - - 392 - - - - enable_keyequivs - - - - 393 - - - - prefs_changed: - - - - 394 - - - - prefs_changed: - - - - 395 - - - - prefs_changed: - - - - 396 - - - - prefs_changed: - - - - 398 - - - - prefs_changed: - - - - 399 - - - - prefs_changed: - - - - 401 - - - - prefs_panel - - - - 402 - - - - x11_help: - - - - 422 - - - - dockMenu - - - - 426 - - - - dock_menu - - - - 428 - - - - delegate - - - - 429 - - - - hide: - - - - 430 - - - - unhideAllApplications: - - - - 431 - - - - orderFrontStandardAboutPanel: - - - - 433 - - - - dock_apps_menu - - - - 530 - - - - dock_window_separator - - - - 531 - - - - apps_table_show: - - - - 534 - - - - next_window: - - - - 539 - - - - previous_window: - - - - 540 - - - - enable_fullscreen - - - - 546 - - - - enable_fullscreen_changed: - - - - 547 - - - - toggle_fullscreen: - - - - 548 - - - - toggle_fullscreen_item - - - - 549 - - - - menu - - - - 300334 - - - - terminate: - - - - 300336 - - - - prefs_changed: - - - - 300389 - - - - prefs_changed: - - - - 300390 - - - - prefs_changed: - - - - 300391 - - - - click_through - - - - 300392 - - - - focus_follows_mouse - - - - 300393 - - - - focus_on_new_window - - - - 300394 - - - - copy_menu_item - - - - 300443 - - - - sync_pasteboard - - - - 300444 - - - - sync_clipboard_to_pasteboard - - - - 300461 - - - - sync_pasteboard_to_clipboard - - - - 300462 - - - - sync_pasteboard_to_primary - - - - 300463 - - - - sync_primary_immediately - - - - 300464 - - - - prefs_changed: - - - - 300465 - - - - prefs_changed: - - - - 300466 - - - - prefs_changed: - - - - 300467 - - - - prefs_changed: - - - - 300468 - - - - prefs_changed: - - - - 300469 - - - - sync_text1 - - - - 300470 - - - - sync_text2 - - - - 300471 - - - - enable_fullscreen_menu - - - - 300474 - - - - prefs_changed: - - - - 300475 - - - - prefs_changed: - - - - 300480 - - - - option_sends_alt - - - - 300481 - - - - prefs_changed: - - - - 300484 - - - - enable_fullscreen_menu_text - - - - 300489 - - - - scroll_in_device_direction - - - - 300490 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - - MainMenu - - - 19 - - - - - - - - 24 - - - - - - - - - - - - - - - 5 - - - - - 23 - - - - - 92 - - - - - 203 - - - - - 204 - - - - - 536 - - - - - 537 - - - - - 538 - - - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - 58 - - - - - 129 - - - - - 131 - - - - - - - - 130 - - - - - 134 - - - - - 136 - - - - - 143 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 544 - - - - - 545 - - - - - 163 - - - - - - - - 169 - - - - - - - - 157 - - - - - 269 - - - - - - - - 270 - - - - - - - - - 272 - - - - - 305 - - - - - 419 - - - - - - - - 420 - - - - - - - - 421 - - - - - 196 - - - X11Controller - - - 244 - - - - - - PrefsPanel - - - 245 - - - - - - - - 348 - - - - - - - - - - - - 349 - - - - - - - - 351 - - - - - - - - - - - - - - - - 363 - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 368 - - - - - - - - 369 - - - - - - - - 370 - - - - - - - - 352 - - - - - - - - 350 - - - - - - - - - - - - - - 382 - - - - - - - - 385 - - - - - - - - 386 - - - - - - - - 541 - - - - - - - - 543 - - - - - - - - 353 - - - - - - - - 354 - - - - - - - - - - - - 374 - - - - - - - - 375 - - - - - - - - 376 - - - - - - - - 377 - - - - - - - - 379 - - - - - - - - 285 - - - - - - EditPrograms - - - 286 - - - - - - - - - - - 423 - - - - - - - DockMenu - - - 524 - - - - - 526 - - - - - - - - 527 - - - - - - - - - 532 - - - - - 533 - - - - - 100363 - - - - - 100364 - - - - - 100365 - - - - - 100368 - - - - - 100369 - - - - - 100370 - - - - - 100382 - - - - - - - - 100385 - - - - - 100386 - - - - - 100541 - - - - - 100543 - - - - - 100374 - - - - - 100375 - - - - - 100376 - - - - - 100377 - - - - - 100379 - - - - - 380 - - - - - - - - - - - 435 - - - - - 384 - - - - - 383 - - - - - 381 - - - - - 295 - - - - - - - - - - - 300295 - - - - - 200295 - - - - - 100295 - - - - - 296 - - - - - - - - - - 535 - - - - - - - - 575 - - - - - 298 - - - - - - - - 573 - - - - - 297 - - - - - - - - 574 - - - - - 310 - - - - - - - - 100310 - - - - - 292 - - - - - - - - 100292 - - - - - 293 - - - - - - - - 100293 - - - - - 300337 - - - - - - - - 300338 - - - - - - - - - - - - - 300358 - - - - - - - - 300359 - - - - - - - - 300360 - - - - - 300361 - - - - - 300362 - - - - - - - - 300363 - - - - - 300364 - - - - - - - - 300365 - - - - - 300368 - - - - - - - - 300369 - - - - - 300370 - - - - - - - - 300371 - - - - - 300421 - - - - - - - - 300422 - - - - - - - - - - - - - - - 300423 - - - - - - - - 300424 - - - - - - - - 300440 - - - - - 300441 - - - - - 300447 - - - - - - - - 300450 - - - - - 300451 - - - - - - - - 300452 - - - - - 300453 - - - - - - - - 300454 - - - - - 300455 - - - - - - - - 300456 - - - - - 300457 - - - - - - - - 300458 - - - - - 300459 - - - - - - - - 300460 - - - - - 300472 - - - - - - - - 300473 - - - - - 300476 - - - - - - - - 300477 - - - - - - - - 300478 - - - - - 300479 - - - - - 300482 - - - - - - - - 300483 - - - - - 300487 - - - - - - - - 300488 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{168, 821}, {113, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{202, 626}, {154, 153}} - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{349, 868}, {315, 143}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{271, 666}, {301, 153}} - {{507, 515}, {484, 341}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{507, 515}, {484, 341}} - - {{184, 290}, {481, 345}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{58, 803}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{100, 746}, {155, 33}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{68, 585}, {454, 271}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{68, 585}, {454, 271}} - - {{433, 406}, {486, 327}} - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {320, 240} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 1011}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{67, 819}, {336, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{20, 641}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{79, 616}, {218, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - 300490 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - - 3 - - {9, 8} - {7, 2} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 按住 Option 或 Command 的同時按一下，以啟用滑鼠的中間或右邊按鈕。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmphoq9f3yv/3COELuInfk/xorg-server-1.20.9/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib and /tmp/tmphoq9f3yv/cSDarFa42z/xorg-server-1.20.13/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib differ diff -Nru xorg-server-1.20.9/hw/xquartz/console_redirect.c xorg-server-1.20.13/hw/xquartz/console_redirect.c --- xorg-server-1.20.9/hw/xquartz/console_redirect.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/console_redirect.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,482 +0,0 @@ -/* - * Copyright (c) 2011-2012 Apple Inc. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation files - * (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT - * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name(s) of the above - * copyright holders shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization. - */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#else -#define DEBUG_CONSOLE_REDIRECT 1 -#define HAVE_LIBDISPATCH 1 -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "console_redirect.h" - -#define BUF_SIZE 512 - -#ifdef HAVE_LIBDISPATCH -#include - -static dispatch_queue_t redirect_serial_q; -static dispatch_group_t read_source_group; -#else -#include - -static pthread_t redirect_pthread; -static pthread_mutex_t redirect_fds_lock = PTHREAD_MUTEX_INITIALIZER; - -static int kq; - -/* Notifications to our reader thread */ -#define ASL_REDIRECT_TERMINATE ((void *)(uintptr_t)1) -#endif - -typedef struct { - int level; - aslclient asl; - aslmsg msg; - - /* Buffered reading */ - char *buf; - char *w; - -#ifdef HAVE_LIBDISPATCH - dispatch_source_t read_source; -#endif -} asl_redirect; - -static asl_redirect *redirect_fds = NULL; -static int n_redirect_fds = 0; - -/* Read from the FD until there is no more to read and redirect to ASL. - * Preconditions: - * 1: pthread_mutex_lock lock is held (pthreads) or called - * from the appropriate serial queue for operating on - * redirect_fds - * 2: fd corresponds to a valid entry in redirect_fds - * - * Return values: - * If the pipe is closed, EOF is returned regardless of how many bytes - * were processed. If the pipe is still open, the number of read bytes - * is returned. - */ -static inline int -_read_redirect(int fd, int flush) -{ - int total_read = 0; - int nbytes; - asl_redirect *aslr = &redirect_fds[fd]; - - while ((nbytes = - read(fd, aslr->w, - BUF_SIZE - (aslr->w - aslr->buf) - 1)) > 0) { - char *s, *p; - - /* Increment our returned number read */ - total_read += nbytes; - - /* Increment our write location */ - aslr->w += nbytes; - aslr->w[0] = '\0'; - - /* One line at a time */ - for (p = aslr->buf; p < aslr->w; p = s + 1) { - // Find null or \n - for (s = p; *s && *s != '\n'; s++) ; - if (*s == '\n') { - *s = '\0'; - } - - if (s < aslr->w || aslr->buf == p) { - /* Either the first of multiple messages or one message which is larger than our buffer */ - asl_log(aslr->asl, aslr->msg, aslr->level, "%s", p); - } - else { - /* We reached the end of the buffer, move this chunk to the start. */ - memmove(aslr->buf, p, BUF_SIZE - (p - aslr->buf)); - aslr->w = aslr->buf + (s - p); - break; - } - } - - if (p == aslr->w) { - /* Start writing at the beginning in the case where we flushed */ - aslr->w = aslr->buf; - } - } - - /* Flush if requested or we're at EOF */ - if (flush || nbytes == 0) { - if (aslr->w > aslr->buf) { - *aslr->w = '\0'; - asl_log(aslr->asl, aslr->msg, aslr->level, "%s", aslr->buf); - } - } - - if (nbytes == 0) - return EOF; - return total_read; -} - -#ifdef HAVE_LIBDISPATCH -static void -read_from_source(void *_source) -{ - dispatch_source_t source = (dispatch_source_t)_source; - int fd = dispatch_source_get_handle(source); - if (_read_redirect(fd, 0) == EOF) { - dispatch_source_cancel(source); - } -} - -static void -cancel_source(void *_source) -{ - dispatch_source_t source = (dispatch_source_t)_source; - int fd = dispatch_source_get_handle(source); - asl_redirect *aslr = &redirect_fds[fd]; - - /* Flush the buffer */ - _read_redirect(fd, 1); - - close(fd); - free(aslr->buf); - memset(aslr, 0, sizeof(*aslr)); - dispatch_release(source); - dispatch_group_leave(read_source_group); -} - -#else /* !HAVE_LIBDISPATCH */ -static void * -redirect_thread(void *ctx __unused) -{ - struct kevent ev; - int n; - - while (1) { - n = kevent(kq, NULL, 0, &ev, 1, NULL); - - /* Bail on errors */ - if (n < 0) { - asl_log(NULL, NULL, ASL_LEVEL_ERR, "kevent failure: %s", - strerror(errno)); - break; - } - - /* This should not happen */ - if (n == 0) - continue; - - switch (ev.filter) { - case EVFILT_READ: - pthread_mutex_lock(&redirect_fds_lock); - { - int fd = ev.ident; - int close_fd = 0; - asl_redirect *aslr = &redirect_fds[fd]; - - if (fd < 0 || fd >= n_redirect_fds || aslr->buf == NULL) { - asl_log(NULL, NULL, ASL_LEVEL_ERR, - "Unexpected file descriptor: %d", - fd); - goto next; - } - - if (ev.flags & EV_EOF) { - close_fd = 1; - if (EOF != _read_redirect(fd, 1)) { - asl_log( - NULL, NULL, ASL_LEVEL_ERR, - "kevent reported EOF on %d, but read doesn't concur.", - fd); - } - } - else { - close_fd = (EOF == _read_redirect(fd, 0)); - } - - if (close_fd) { - EV_SET(&ev, fd, EVFILT_READ, EV_DELETE, 0, 0, 0); - kevent(kq, &ev, 1, NULL, 0, NULL); - close(fd); - free(aslr->buf); - memset(aslr, 0, sizeof(*aslr)); - } - } -next: - pthread_mutex_unlock(&redirect_fds_lock); - - case EVFILT_TIMER: - if (ev.udata == ASL_REDIRECT_TERMINATE) - return NULL; - - default: - ; - ; - } - } - - return NULL; -} -#endif - -static void -redirect_atexit(void) -{ - /* stdout is linebuffered, so flush the buffer */ - if (redirect_fds[STDOUT_FILENO].buf) - fflush(stdout); - -#ifdef HAVE_LIBDISPATCH - { - int i; - - /* Cancel all of our dispatch sources, so they flush to ASL */ - for (i = 0; i < n_redirect_fds; i++) - if (redirect_fds[i].read_source) - dispatch_source_cancel(redirect_fds[i].read_source); - - /* Wait at least three seconds for our sources to flush to ASL */ - dispatch_group_wait(read_source_group, - dispatch_time(DISPATCH_TIME_NOW, 3LL * - NSEC_PER_SEC)); - } -#else - { - struct kevent ev; - - /* Tell our reader thread it is time to pack up and go home */ - EV_SET(&ev, 0, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 0, - ASL_REDIRECT_TERMINATE); - kevent(kq, &ev, 1, NULL, 0, NULL); - - pthread_join(redirect_pthread, NULL); - } -#endif -} - -#ifdef HAVE_LIBDISPATCH -static void -xq_asl_init(void *ctx __unused) -#else -static void -xq_asl_init(void) -#endif -{ - assert((redirect_fds = calloc(16, sizeof(*redirect_fds))) != NULL); - n_redirect_fds = 16; - -#ifdef HAVE_LIBDISPATCH - redirect_serial_q = dispatch_queue_create("com.apple.asl-redirect", NULL); - assert(redirect_serial_q != NULL); - - read_source_group = dispatch_group_create(); - assert(read_source_group != NULL); -#else - assert((kq = kqueue()) != -1); - assert(pthread_create(&redirect_pthread, NULL, redirect_thread, - NULL) == 0); -#endif - - atexit(redirect_atexit); -} - -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 -#define fls(v) xq_fls(v) - -static inline int fls(int value) { - unsigned int b, v; - - v = *((unsigned int *)&value); - - for(b=0 ; v ; v >>= 1 , b++); - - return b; -} -#endif - -int -xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd) -{ -#ifdef HAVE_LIBDISPATCH - int err __block = 0; - static dispatch_once_t once_control; - dispatch_once_f(&once_control, NULL, xq_asl_init); -#else - int err = 0; - static pthread_once_t once_control = PTHREAD_ONCE_INIT; - assert(pthread_once(&once_control, xq_asl_init) == 0); -#endif - - if (fd < 0) - return EBADF; - -#ifdef HAVE_LIBDISPATCH -#define BLOCK_DONE return - dispatch_sync(redirect_serial_q, ^ -#else -#define BLOCK_DONE goto done - assert(pthread_mutex_lock(&redirect_fds_lock) == 0); -#endif - { - /* Reallocate if we need more space */ - if (fd >= n_redirect_fds) { - size_t new_n = 1 << (fls(fd) + 1); - asl_redirect *new_array = - realloc(redirect_fds, new_n * - sizeof(*redirect_fds)); - if (!new_array) { - err = errno; - BLOCK_DONE; - } - redirect_fds = new_array; - memset(redirect_fds + n_redirect_fds, 0, (new_n - - n_redirect_fds) * sizeof(*redirect_fds)); - n_redirect_fds = new_n; - } - - /* If we're already listening on it, return error. */ - if (redirect_fds[fd].buf != NULL) { - err = EBADF; - BLOCK_DONE; - } - - /* Initialize our buffer */ - redirect_fds[fd].buf = (char *)malloc(BUF_SIZE); - if (redirect_fds[fd].buf == NULL) { - err = errno; - BLOCK_DONE; - } - redirect_fds[fd].w = redirect_fds[fd].buf; - - /* Store our ASL settings */ - redirect_fds[fd].level = level; - redirect_fds[fd].asl = asl; - redirect_fds[fd].msg = msg; - - /* Don't block on reads from this fd */ - fcntl(fd, F_SETFL, - O_NONBLOCK); - - /* Start listening */ -#ifdef HAVE_LIBDISPATCH - { - dispatch_source_t read_source = - dispatch_source_create( - DISPATCH_SOURCE_TYPE_READ, fd, 0, - redirect_serial_q); - redirect_fds[fd].read_source = read_source; - dispatch_set_context(read_source, read_source); - dispatch_source_set_event_handler_f(read_source, - read_from_source); - dispatch_source_set_cancel_handler_f(read_source, - cancel_source); - dispatch_group_enter(read_source_group); - dispatch_resume(read_source); - } -#else - { - struct kevent ev; - EV_SET(&ev, fd, EVFILT_READ, EV_ADD, 0, 0, 0); - kevent(kq, &ev, 1, NULL, 0, NULL); - } -#endif - } -#ifdef HAVE_LIBDISPATCH - ); -#else -done: - assert(pthread_mutex_unlock(&redirect_fds_lock) == 0); -#endif -#undef BLOCK_DONE - - return err; -} - -int -xq_asl_capture_fd(aslclient asl, aslmsg msg, int level, int fd) -{ - int pipepair[2]; - - /* Create pipe */ - if (pipe(pipepair) == -1) - return errno; - - /* Close the read fd but not the write fd on exec */ - if (fcntl(pipepair[0], F_SETFD, FD_CLOEXEC) == -1) - return errno; - - /* Replace the existing fd */ - if (dup2(pipepair[1], fd) == -1) { - close(pipepair[0]); - close(pipepair[1]); - return errno; - } - - /* If we capture STDOUT_FILENO, make sure we linebuffer stdout */ - if (fd == STDOUT_FILENO) - setlinebuf(stdout); - - /* Close the duplicate fds since they've been reassigned */ - close(pipepair[1]); - - /* Hand off the read end of our pipe to xq_asl_log_fd */ - return xq_asl_log_fd(asl, msg, level, pipepair[0]); -} - -#ifdef DEBUG_CONSOLE_REDIRECT -int -main(int argc __unused, char * *argv __unused) -{ - xq_asl_capture_fd(NULL, NULL, ASL_LEVEL_NOTICE, STDOUT_FILENO); - xq_asl_capture_fd(NULL, NULL, ASL_LEVEL_ERR, STDERR_FILENO); - - fprintf(stderr, "TEST ERR1\n"); - fprintf(stdout, "TEST OUT1\n"); - fprintf(stderr, "TEST ERR2\n"); - fprintf(stdout, "TEST OUT2\n"); - system("/bin/echo SYST OUT"); - system("/bin/echo SYST ERR >&2"); - fprintf(stdout, "TEST OUT3\n"); - fprintf(stdout, "TEST OUT4\n"); - fprintf(stderr, "TEST ERR3\n"); - fprintf(stderr, "TEST ERR4\n"); - - exit(0); -} -#endif diff -Nru xorg-server-1.20.9/hw/xquartz/console_redirect.h xorg-server-1.20.13/hw/xquartz/console_redirect.h --- xorg-server-1.20.9/hw/xquartz/console_redirect.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/console_redirect.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -/* Copyright (c) 2011-2012 Apple Inc. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation files - * (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT - * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name(s) of the above - * copyright holders shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization. - */ - -#ifndef _XQUARTZ_CONSOLE_REDIRECT_H_ -#define _XQUARTZ_CONSOLE_REDIRECT_H_ - -#include - -/* The given fd is replaced with a pipe. Anything written to it will will be - * logged to ASL. - */ -int -xq_asl_capture_fd(aslclient asl, aslmsg msg, int level, int fd); - -/* The given fd is read from and passed along to ASL until all write ends of the - * pipe are closed. Once the last writer has closed the pipe, we close our end. - */ -int -xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd); - -#endif diff -Nru xorg-server-1.20.9/hw/xquartz/darwin.c xorg-server-1.20.13/hw/xquartz/darwin.c --- xorg-server-1.20.9/hw/xquartz/darwin.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/darwin.c 2021-07-29 18:48:14.000000000 +0000 @@ -750,7 +750,7 @@ if (!strcmp(argv[i], "-fakemouse2")) { if (i == argc - 1) { - FatalError("-fakemouse2 must be followed by a modifer list\n"); + FatalError("-fakemouse2 must be followed by a modifier list\n"); } if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], "")) darwinFakeMouse2Mask = 0; @@ -763,7 +763,7 @@ if (!strcmp(argv[i], "-fakemouse3")) { if (i == argc - 1) { - FatalError("-fakemouse3 must be followed by a modifer list\n"); + FatalError("-fakemouse3 must be followed by a modifier list\n"); } if (!strcasecmp(argv[i + 1], "none") || !strcmp(argv[i + 1], "")) darwinFakeMouse3Mask = 0; @@ -857,3 +857,12 @@ ErrorF(" AbortDDX\n"); OsAbort(); } + +#if INPUTTHREAD +/** This function is called in Xserver/os/inputthread.c when starting + the input thread. */ +void +ddxInputThreadInit(void) +{ +} +#endif diff -Nru xorg-server-1.20.9/hw/xquartz/GL/capabilities.c xorg-server-1.20.13/hw/xquartz/GL/capabilities.c --- xorg-server-1.20.9/hw/xquartz/GL/capabilities.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/GL/capabilities.c 2021-07-29 18:48:14.000000000 +0000 @@ -369,7 +369,7 @@ assert(c->total_depth_buffer_depths < GLCAPS_DEPTH_BUFFERS); } -/* Return non-zero if an error occured. */ +/* Return non-zero if an error occurred. */ static CGLError handleRendererDescriptions(CGLRendererInfoObj info, GLint r, struct glCapabilitiesConfig *c) @@ -521,7 +521,7 @@ cap->configurations = NULL; } -/*Return true if an error occured. */ +/* Return true if an error occurred. */ bool getGlCapabilities(struct glCapabilities *cap) { @@ -566,6 +566,6 @@ CGLDestroyRendererInfo(info); - /* No error occured. We are done. */ + /* No error occurred. We are done. */ return kCGLNoError; } diff -Nru xorg-server-1.20.9/hw/xquartz/GL/glcontextmodes.c xorg-server-1.20.13/hw/xquartz/GL/glcontextmodes.c --- xorg-server-1.20.9/hw/xquartz/GL/glcontextmodes.c 2021-12-14 18:08:28.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/GL/glcontextmodes.c 2021-12-14 18:08:29.000000000 +0000 @@ -114,7 +114,7 @@ /** * Copy a GLX visual config structure to a GL context mode structure. All * of the fields in \c config are copied to \c mode. Additional fields in - * \c mode that can be derrived from the fields of \c config (i.e., + * \c mode that can be derived from the fields of \c config (i.e., * \c haveDepthBuffer) are also filled in. The remaining fields in \c mode * that cannot be derived are set to default values. * @@ -408,10 +408,10 @@ * \param count Number of structures to allocate. * \param minimum_size Minimum size of a structure to allocate. This allows * for differences in the version of the - * \c __GLcontextModes stucture used in libGL and in a + * \c __GLcontextModes structure used in libGL and in a * DRI-based driver. * \returns A pointer to the first element in a linked list of \c count - * stuctures on success, or \c NULL on failure. + * structures on success, or \c NULL on failure. * * \warning Use of \c minimum_size does \b not guarantee binary compatibility. * The fundamental assumption is that if the \c minimum_size @@ -469,7 +469,7 @@ * Destroy a linked list of \c __GLcontextModes structures created by * \c _gl_context_modes_create. * - * \param modes Linked list of structures to be destroyed. All structres + * \param modes Linked list of structures to be destroyed. All structures * in the list will be freed. */ void diff -Nru xorg-server-1.20.9/hw/xquartz/GL/indirect.c xorg-server-1.20.13/hw/xquartz/GL/indirect.c --- xorg-server-1.20.9/hw/xquartz/GL/indirect.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/GL/indirect.c 2021-07-29 18:48:14.000000000 +0000 @@ -35,8 +35,6 @@ #include #endif -#include - #include #include diff -Nru xorg-server-1.20.9/hw/xquartz/GL/Makefile.in xorg-server-1.20.13/hw/xquartz/GL/Makefile.in --- xorg-server-1.20.9/hw/xquartz/GL/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/GL/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -529,6 +529,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xquartz/GL/visualConfigs.c xorg-server-1.20.13/hw/xquartz/GL/visualConfigs.c --- xorg-server-1.20.9/hw/xquartz/GL/visualConfigs.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/GL/visualConfigs.c 2021-07-29 18:48:14.000000000 +0000 @@ -59,7 +59,7 @@ /* Based originally on code from indirect.c which was based on code from i830_dri.c. */ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber) { int numConfigs = 0; - __GLXconfig *visualConfigs, *c; + __GLXconfig *visualConfigs, *c, *l; struct glCapabilities caps; struct glCapabilitiesConfig *conf; int stereo, depth, aux, buffers, stencil, accum, color, msample; @@ -113,14 +113,13 @@ if(numConfigsPtr) *numConfigsPtr = numConfigs; - visualConfigs = calloc(sizeof(*visualConfigs), numConfigs); - - if(NULL == visualConfigs) { - ErrorF("xcalloc failure when allocating visualConfigs\n"); - freeGlCapabilities(&caps); - return NULL; - } + /* Note that as of 1.20.0, we cannot allocate all the configs at once. + * __glXScreenDestroy now walks all the fbconfigs and frees them one at a time. + * See 4b0a3cbab131eb453e2b3fc0337121969258a7be. + */ + visualConfigs = calloc(sizeof(*visualConfigs), 1); + l = NULL; c = visualConfigs; /* current buffer */ for(conf = caps.configurations; conf; conf = conf->next) { for(stereo = 0; stereo < (conf->stereo ? 2 : 1); ++stereo) { @@ -137,7 +136,8 @@ // Global c->visualID = -1; c->visualType = GLX_TRUE_COLOR; - c->next = c + 1; + c->next = calloc(sizeof(*visualConfigs), 1); + assert(c->next); c->level = 0; c->indexBits = 0; @@ -260,6 +260,7 @@ /* EXT_framebuffer_sRGB */ c->sRGBCapable = GL_FALSE; + l = c; c = c->next; } } @@ -271,11 +272,8 @@ } } - (c-1)->next = NULL; - - if (c - visualConfigs != numConfigs) { - FatalError("numConfigs calculation error in setVisualConfigs! numConfigs is %d i is %d\n", numConfigs, (int)(c - visualConfigs)); - } + free(c); + l->next = NULL; freeGlCapabilities(&caps); return visualConfigs; diff -Nru xorg-server-1.20.9/hw/xquartz/mach-startup/bundle-main.c xorg-server-1.20.13/hw/xquartz/mach-startup/bundle-main.c --- xorg-server-1.20.9/hw/xquartz/mach-startup/bundle-main.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/mach-startup/bundle-main.c 2021-07-29 18:48:14.000000000 +0000 @@ -29,7 +29,6 @@ */ #include -#include #ifdef HAVE_DIX_CONFIG_H #include @@ -44,11 +43,7 @@ #include #include -#ifdef HAVE_LIBDISPATCH #include -#else -#include -#endif #include #include @@ -61,7 +56,7 @@ #include "mach_startup.h" #include "mach_startupServer.h" -#include "console_redirect.h" +#include /* From darwinEvents.c ... but don't want to pull in all the server cruft */ void @@ -91,12 +86,8 @@ static char __crashreporter_info_buff__[4096] = { 0 }; static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0]; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 -// This is actually a toolchain requirement, but I'm not sure the correct check, -// but it should be fine to just only include it for Leopard and later. This line -// just tells the linker to never strip this symbol (such as for space optimization) +// This line just tells the linker to never strip this symbol (such as for space optimization) asm (".desc ___crashreporter_info__, 0x10"); -#endif static const char *__crashreporter_info__base = "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE; @@ -119,23 +110,6 @@ static char *pref_login_shell; static char *pref_startx_script; -#ifndef HAVE_LIBDISPATCH -/*** Pthread Magics ***/ -static pthread_t -create_thread(void *(*func)(void *), void *arg) -{ - pthread_attr_t attr; - pthread_t tid; - - pthread_attr_init(&attr); - pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM); - pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - pthread_create(&tid, &attr, func, arg); - pthread_attr_destroy(&attr); - - return tid; -} -#endif /*** Mach-O IPC Stuffs ***/ @@ -243,16 +217,9 @@ /* This thread accepts an incoming connection and hands off the file * descriptor for the new connection to accept_fd_handoff() */ -#ifdef HAVE_LIBDISPATCH static void socket_handoff(socket_handoff_t *handoff_data) { -#else -static void * -socket_handoff_thread(void *arg) -{ - socket_handoff_t *handoff_data = (socket_handoff_t *)arg; -#endif int launchd_fd = -1; int connected_fd; @@ -287,9 +254,6 @@ launchd_fd); DarwinListenOnOpenFD(launchd_fd); -#ifndef HAVE_LIBDISPATCH - return NULL; -#endif } static int @@ -373,14 +337,10 @@ strlcpy(filename, handoff_data->filename, STRING_T_SIZE); -#ifdef HAVE_LIBDISPATCH dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^ { socket_handoff(handoff_data); }); -#else - create_thread(socket_handoff_thread, handoff_data); -#endif #ifdef DEBUG ErrorF( @@ -477,14 +437,9 @@ kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp); if (kr != KERN_SUCCESS) { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 ErrorF("bootstrap_look_up(%s): %s\n", server_bootstrap_name, bootstrap_strerror( kr)); -#else - ErrorF("bootstrap_look_up(%s): %ul\n", server_bootstrap_name, - (unsigned long)kr); -#endif exit(EXIT_FAILURE); } @@ -564,24 +519,8 @@ asl_set_filter(aslc, ASL_FILTER_MASK_UPTO(ASL_LEVEL_WARNING)); -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -# if MAC_OS_X_VERSION_MIN_REQUIRED < 1080 - if (asl_log_descriptor) -# endif - { - asl_log_descriptor(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO, ASL_LOG_DESCRIPTOR_WRITE); - asl_log_descriptor(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO, ASL_LOG_DESCRIPTOR_WRITE); - } -# if MAC_OS_X_VERSION_MIN_REQUIRED < 1080 - else { - xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO); - xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO); - } -# endif -#else - xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO); - xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO); -#endif + asl_log_descriptor(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO, ASL_LOG_DESCRIPTOR_WRITE); + asl_log_descriptor(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO, ASL_LOG_DESCRIPTOR_WRITE); } static void diff -Nru xorg-server-1.20.9/hw/xquartz/mach-startup/bundle_trampoline.c xorg-server-1.20.13/hw/xquartz/mach-startup/bundle_trampoline.c --- xorg-server-1.20.9/hw/xquartz/mach-startup/bundle_trampoline.c 1970-01-01 00:00:00.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/mach-startup/bundle_trampoline.c 2021-07-29 18:48:14.000000000 +0000 @@ -0,0 +1,87 @@ +/* Copyright (c) 2021 Apple Inc. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT + * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name(s) of the above + * copyright holders shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +/* We wnt XQuartz.app to inherit a login shell environment. This is handled by the X11.sh + * script which re-execs the main binary from a login shell environment. However, recent + * versions of macOS require that the main executable of an app be Mach-O for full system + * fidelity. + * + * Failure to do so results in two problems: + * 1) bash is seen as the responsible executable for Security & Privacy, and the user doesn't + * get prompted to allow filesystem access (https://github.com/XQuartz/XQuartz/issues/6). + * 2) The process is launched under Rosetta for compatability, which results in + * the subsequent spawn of the real executable under Rosetta rather than natively. + * + * This trampoline provides the mach-o needed by LaunchServices and TCC to satisfy those + * needs and simply execs the startup script which then execs the main binary. + */ + +static char *executable_path() { + uint32_t bufsize = PATH_MAX; + char *buf = calloc(1, bufsize); + + if (_NSGetExecutablePath(buf, &bufsize) == -1) { + free(buf); + buf = calloc(1, bufsize); + assert(_NSGetExecutablePath(buf, &bufsize) == 0); + } + + return buf; +} + +int main(int argc, char **argv, char **envp) { + char const * const executable_directory = dirname(executable_path()); + char *executable = NULL; + + asprintf(&executable, "%s/X11.sh", executable_directory); + if (access(executable, X_OK) == -1) { + free(executable); + asprintf(&executable, "%s/X11", executable_directory); + } + assert(access(executable, X_OK) == 0); + + argv[0] = executable; + + posix_spawnattr_t attr; + assert(posix_spawnattr_init(&attr) == 0); + assert(posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETEXEC) == 0); + + pid_t child_pid; + assert(posix_spawn(&child_pid, executable, NULL, &attr, argv, envp) == 0); + + return EXIT_FAILURE; +} diff -Nru xorg-server-1.20.9/hw/xquartz/mach-startup/Makefile.am xorg-server-1.20.13/hw/xquartz/mach-startup/Makefile.am --- xorg-server-1.20.9/hw/xquartz/mach-startup/Makefile.am 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/mach-startup/Makefile.am 2021-07-29 18:48:14.000000000 +0000 @@ -7,17 +7,13 @@ AM_CFLAGS = $(DIX_CFLAGS) x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS -x11app_PROGRAMS = X11.bin +x11app_PROGRAMS = X11.bin X11 dist_X11_bin_SOURCES = \ - bundle-main.c + bundle-main.c -# strndup(3) was added in Mac OS X 10.7, but we do this unconditionally to deal -# with the case where we build on Lion but target Snow Leopard as the minimum -# OS version. -#if NEED_STRNDUP -dist_X11_bin_SOURCES += $(top_srcdir)/os/strndup.c -#endif +dist_X11_SOURCES = \ + bundle_trampoline.c nodist_X11_bin_SOURCES = \ mach_startupServer.c \ diff -Nru xorg-server-1.20.9/hw/xquartz/mach-startup/Makefile.in xorg-server-1.20.13/hw/xquartz/mach-startup/Makefile.in --- xorg-server-1.20.9/hw/xquartz/mach-startup/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/mach-startup/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -88,7 +88,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -x11app_PROGRAMS = X11.bin$(EXEEXT) +x11app_PROGRAMS = X11.bin$(EXEEXT) X11$(EXEEXT) @GLX_TRUE@am__append_1 = \ @GLX_TRUE@ $(top_builddir)/hw/xquartz/GL/libCGLCore.la \ @GLX_TRUE@ $(top_builddir)/glx/libglxvnd.la \ @@ -127,7 +127,14 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(x11appdir)" PROGRAMS = $(bin_PROGRAMS) $(x11app_PROGRAMS) -dist_X11_bin_OBJECTS = bundle-main.$(OBJEXT) strndup.$(OBJEXT) +dist_X11_OBJECTS = bundle_trampoline.$(OBJEXT) +X11_OBJECTS = $(dist_X11_OBJECTS) +X11_LDADD = $(LDADD) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +dist_X11_bin_OBJECTS = bundle-main.$(OBJEXT) nodist_X11_bin_OBJECTS = mach_startupServer.$(OBJEXT) \ mach_startupUser.$(OBJEXT) X11_bin_OBJECTS = $(dist_X11_bin_OBJECTS) $(nodist_X11_bin_OBJECTS) @@ -139,10 +146,6 @@ $(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__append_1) \ $(am__append_4) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = X11_bin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(X11_bin_LDFLAGS) $(LDFLAGS) -o $@ @@ -169,9 +172,9 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/bundle-main.Po \ - ./$(DEPDIR)/launchd_fd.Po ./$(DEPDIR)/mach_startupServer.Po \ - ./$(DEPDIR)/mach_startupUser.Po ./$(DEPDIR)/strndup.Po \ - ./$(DEPDIR)/stub.Po + ./$(DEPDIR)/bundle_trampoline.Po ./$(DEPDIR)/launchd_fd.Po \ + ./$(DEPDIR)/mach_startupServer.Po \ + ./$(DEPDIR)/mach_startupUser.Po ./$(DEPDIR)/stub.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -191,9 +194,11 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(dist_X11_bin_SOURCES) $(nodist_X11_bin_SOURCES) \ - $(dist_Xquartz_SOURCES) $(nodist_Xquartz_SOURCES) -DIST_SOURCES = $(dist_X11_bin_SOURCES) $(dist_Xquartz_SOURCES) +SOURCES = $(dist_X11_SOURCES) $(dist_X11_bin_SOURCES) \ + $(nodist_X11_bin_SOURCES) $(dist_Xquartz_SOURCES) \ + $(nodist_Xquartz_SOURCES) +DIST_SOURCES = $(dist_X11_SOURCES) $(dist_X11_bin_SOURCES) \ + $(dist_Xquartz_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -567,6 +572,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -586,13 +592,12 @@ AM_CFLAGS = $(DIX_CFLAGS) x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS +dist_X11_bin_SOURCES = \ + bundle-main.c + +dist_X11_SOURCES = \ + bundle_trampoline.c -# strndup(3) was added in Mac OS X 10.7, but we do this unconditionally to deal -# with the case where we build on Lion but target Snow Leopard as the minimum -# OS version. -#if NEED_STRNDUP -dist_X11_bin_SOURCES = bundle-main.c $(top_srcdir)/os/strndup.c -#endif nodist_X11_bin_SOURCES = \ mach_startupServer.c \ mach_startupUser.c @@ -769,6 +774,10 @@ echo " rm -f" $$list; \ rm -f $$list +X11$(EXEEXT): $(X11_OBJECTS) $(X11_DEPENDENCIES) $(EXTRA_X11_DEPENDENCIES) + @rm -f X11$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(X11_OBJECTS) $(X11_LDADD) $(LIBS) + X11.bin$(EXEEXT): $(X11_bin_OBJECTS) $(X11_bin_DEPENDENCIES) $(EXTRA_X11_bin_DEPENDENCIES) @rm -f X11.bin$(EXEEXT) $(AM_V_CCLD)$(X11_bin_LINK) $(X11_bin_OBJECTS) $(X11_bin_LDADD) $(LIBS) @@ -784,10 +793,10 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bundle-main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bundle_trampoline.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/launchd_fd.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mach_startupServer.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mach_startupUser.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strndup.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stub.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @@ -817,20 +826,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -strndup.o: $(top_srcdir)/os/strndup.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strndup.o -MD -MP -MF $(DEPDIR)/strndup.Tpo -c -o strndup.o `test -f '$(top_srcdir)/os/strndup.c' || echo '$(srcdir)/'`$(top_srcdir)/os/strndup.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/strndup.Tpo $(DEPDIR)/strndup.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/os/strndup.c' object='strndup.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strndup.o `test -f '$(top_srcdir)/os/strndup.c' || echo '$(srcdir)/'`$(top_srcdir)/os/strndup.c - -strndup.obj: $(top_srcdir)/os/strndup.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strndup.obj -MD -MP -MF $(DEPDIR)/strndup.Tpo -c -o strndup.obj `if test -f '$(top_srcdir)/os/strndup.c'; then $(CYGPATH_W) '$(top_srcdir)/os/strndup.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/os/strndup.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/strndup.Tpo $(DEPDIR)/strndup.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/os/strndup.c' object='strndup.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strndup.obj `if test -f '$(top_srcdir)/os/strndup.c'; then $(CYGPATH_W) '$(top_srcdir)/os/strndup.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/os/strndup.c'; fi` - mostlyclean-libtool: -rm -f *.lo @@ -932,7 +927,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -970,10 +966,10 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/bundle-main.Po + -rm -f ./$(DEPDIR)/bundle_trampoline.Po -rm -f ./$(DEPDIR)/launchd_fd.Po -rm -f ./$(DEPDIR)/mach_startupServer.Po -rm -f ./$(DEPDIR)/mach_startupUser.Po - -rm -f ./$(DEPDIR)/strndup.Po -rm -f ./$(DEPDIR)/stub.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -1021,10 +1017,10 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/bundle-main.Po + -rm -f ./$(DEPDIR)/bundle_trampoline.Po -rm -f ./$(DEPDIR)/launchd_fd.Po -rm -f ./$(DEPDIR)/mach_startupServer.Po -rm -f ./$(DEPDIR)/mach_startupUser.Po - -rm -f ./$(DEPDIR)/strndup.Po -rm -f ./$(DEPDIR)/stub.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1044,7 +1040,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-x11appPROGRAMS -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool \ diff -Nru xorg-server-1.20.9/hw/xquartz/mach-startup/stub.c xorg-server-1.20.13/hw/xquartz/mach-startup/stub.c --- xorg-server-1.20.9/hw/xquartz/mach-startup/stub.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/mach-startup/stub.c 2021-07-29 18:48:14.000000000 +0000 @@ -50,8 +50,6 @@ #include -#include - #include "launchd_fd.h" static char x11_path[PATH_MAX + 1]; @@ -61,8 +59,6 @@ static void set_x11_path(void) { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 - CFURLRef appURL = NULL; OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR( @@ -104,11 +100,6 @@ (int)osstatus); exit(11); } -#else - /* TODO: Make Tiger smarter... but TBH, this should never get called on Tiger... */ - strlcpy(x11_path, "/Applications/Utilities/X11.app/Contents/MacOS/X11", - sizeof(x11_path)); -#endif } static int @@ -291,15 +282,9 @@ } if (kr != KERN_SUCCESS) { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: bootstrap_look_up(): %s", bootstrap_strerror( kr)); -#else - asl_log(aslc, NULL, ASL_LEVEL_ERR, - "Xquartz: bootstrap_look_up(): %ul", - (unsigned long)kr); -#endif return EXIT_FAILURE; } } diff -Nru xorg-server-1.20.9/hw/xquartz/Makefile.am xorg-server-1.20.13/hw/xquartz/Makefile.am --- xorg-server-1.20.9/hw/xquartz/Makefile.am 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/Makefile.am 2021-07-29 18:48:14.000000000 +0000 @@ -29,11 +29,9 @@ darwinXinput.c \ keysym2ucs.c \ quartz.c \ - quartzCocoa.m \ quartzKeyboard.c \ quartzStartup.c \ - quartzRandR.c \ - console_redirect.c + quartzRandR.c libXquartz_la_LIBADD = $(top_builddir)/pseudoramiX/libPseudoramiX.la @@ -46,9 +44,7 @@ darwinEvents.h \ keysym2ucs.h \ quartz.h \ - quartzCommon.h \ quartzKeyboard.h \ quartzRandR.h \ sanitizedCarbon.h \ - sanitizedCocoa.h \ - console_redirect.h + sanitizedCocoa.h diff -Nru xorg-server-1.20.9/hw/xquartz/Makefile.in xorg-server-1.20.13/hw/xquartz/Makefile.in --- xorg-server-1.20.9/hw/xquartz/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -114,9 +114,8 @@ $(top_builddir)/pseudoramiX/libPseudoramiX.la am_libXquartz_la_OBJECTS = miinitext.lo X11Application.lo \ X11Controller.lo applewm.lo darwin.lo darwinEvents.lo \ - darwinXinput.lo keysym2ucs.lo quartz.lo quartzCocoa.lo \ - quartzKeyboard.lo quartzStartup.lo quartzRandR.lo \ - console_redirect.lo + darwinXinput.lo keysym2ucs.lo quartz.lo quartzKeyboard.lo \ + quartzStartup.lo quartzRandR.lo libXquartz_la_OBJECTS = $(am_libXquartz_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -139,10 +138,9 @@ am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/X11Application.Plo \ ./$(DEPDIR)/X11Controller.Plo ./$(DEPDIR)/applewm.Plo \ - ./$(DEPDIR)/console_redirect.Plo ./$(DEPDIR)/darwin.Plo \ - ./$(DEPDIR)/darwinEvents.Plo ./$(DEPDIR)/darwinXinput.Plo \ - ./$(DEPDIR)/keysym2ucs.Plo ./$(DEPDIR)/miinitext.Plo \ - ./$(DEPDIR)/quartz.Plo ./$(DEPDIR)/quartzCocoa.Plo \ + ./$(DEPDIR)/darwin.Plo ./$(DEPDIR)/darwinEvents.Plo \ + ./$(DEPDIR)/darwinXinput.Plo ./$(DEPDIR)/keysym2ucs.Plo \ + ./$(DEPDIR)/miinitext.Plo ./$(DEPDIR)/quartz.Plo \ ./$(DEPDIR)/quartzKeyboard.Plo ./$(DEPDIR)/quartzRandR.Plo \ ./$(DEPDIR)/quartzStartup.Plo am__mv = mv -f @@ -595,6 +593,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -632,11 +631,9 @@ darwinXinput.c \ keysym2ucs.c \ quartz.c \ - quartzCocoa.m \ quartzKeyboard.c \ quartzStartup.c \ - quartzRandR.c \ - console_redirect.c + quartzRandR.c libXquartz_la_LIBADD = $(top_builddir)/pseudoramiX/libPseudoramiX.la EXTRA_DIST = \ @@ -648,12 +645,10 @@ darwinEvents.h \ keysym2ucs.h \ quartz.h \ - quartzCommon.h \ quartzKeyboard.h \ quartzRandR.h \ sanitizedCarbon.h \ - sanitizedCocoa.h \ - console_redirect.h + sanitizedCocoa.h all: all-recursive @@ -712,14 +707,12 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/X11Application.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/X11Controller.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/applewm.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/console_redirect.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/darwin.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/darwinEvents.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/darwinXinput.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keysym2ucs.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/miinitext.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quartz.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quartzCocoa.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quartzKeyboard.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quartzRandR.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quartzStartup.Plo@am__quote@ # am--include-marker @@ -986,14 +979,12 @@ -rm -f ./$(DEPDIR)/X11Application.Plo -rm -f ./$(DEPDIR)/X11Controller.Plo -rm -f ./$(DEPDIR)/applewm.Plo - -rm -f ./$(DEPDIR)/console_redirect.Plo -rm -f ./$(DEPDIR)/darwin.Plo -rm -f ./$(DEPDIR)/darwinEvents.Plo -rm -f ./$(DEPDIR)/darwinXinput.Plo -rm -f ./$(DEPDIR)/keysym2ucs.Plo -rm -f ./$(DEPDIR)/miinitext.Plo -rm -f ./$(DEPDIR)/quartz.Plo - -rm -f ./$(DEPDIR)/quartzCocoa.Plo -rm -f ./$(DEPDIR)/quartzKeyboard.Plo -rm -f ./$(DEPDIR)/quartzRandR.Plo -rm -f ./$(DEPDIR)/quartzStartup.Plo @@ -1045,14 +1036,12 @@ -rm -f ./$(DEPDIR)/X11Application.Plo -rm -f ./$(DEPDIR)/X11Controller.Plo -rm -f ./$(DEPDIR)/applewm.Plo - -rm -f ./$(DEPDIR)/console_redirect.Plo -rm -f ./$(DEPDIR)/darwin.Plo -rm -f ./$(DEPDIR)/darwinEvents.Plo -rm -f ./$(DEPDIR)/darwinXinput.Plo -rm -f ./$(DEPDIR)/keysym2ucs.Plo -rm -f ./$(DEPDIR)/miinitext.Plo -rm -f ./$(DEPDIR)/quartz.Plo - -rm -f ./$(DEPDIR)/quartzCocoa.Plo -rm -f ./$(DEPDIR)/quartzKeyboard.Plo -rm -f ./$(DEPDIR)/quartzRandR.Plo -rm -f ./$(DEPDIR)/quartzStartup.Plo diff -Nru xorg-server-1.20.9/hw/xquartz/man/Makefile.in xorg-server-1.20.13/hw/xquartz/man/Makefile.in --- xorg-server-1.20.9/hw/xquartz/man/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/man/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -539,6 +539,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xquartz/man/Xquartz.man xorg-server-1.20.13/hw/xquartz/man/Xquartz.man --- xorg-server-1.20.9/hw/xquartz/man/Xquartz.man 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/man/Xquartz.man 2021-07-29 18:48:14.000000000 +0000 @@ -120,7 +120,7 @@ .TP 8 .B $ syslog -w -F '$(Time) $(Sender) <$(Level)> $(File):$(Line) $(Function) :: $(Message)' -k Facility eq @bundle_id_prefix@ .PP -By default, XQaurtz sets an ASL mask which prevents it from logging messages +By default, XQuartz sets an ASL mask which prevents it from logging messages below the ASL_LEVEL_WARNING level (meaning almost all logging is done strictly to the file referenced above). To force XQuartz to send all log messages to syslogd(8), you can adjust this mask using the following syslog(1) command: diff -Nru xorg-server-1.20.9/hw/xquartz/pbproxy/main.m xorg-server-1.20.13/hw/xquartz/pbproxy/main.m --- xorg-server-1.20.9/hw/xquartz/pbproxy/main.m 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/pbproxy/main.m 2021-07-29 18:48:14.000000000 +0000 @@ -78,54 +78,48 @@ int xpbproxy_run(void) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - size_t i; + @autoreleasepool { + size_t i; - for (i = 0, xpbproxy_dpy = NULL; !xpbproxy_dpy && i < 5; i++) { - xpbproxy_dpy = XOpenDisplay(NULL); + for (i = 0, xpbproxy_dpy = NULL; !xpbproxy_dpy && i < 5; i++) { + xpbproxy_dpy = XOpenDisplay(NULL); - if (!xpbproxy_dpy && display) { - char _display[32]; - snprintf(_display, sizeof(_display), ":%s", display); - setenv("DISPLAY", _display, TRUE); + if (!xpbproxy_dpy && display) { + char _display[32]; + snprintf(_display, sizeof(_display), ":%s", display); + setenv("DISPLAY", _display, TRUE); + + xpbproxy_dpy = XOpenDisplay(_display); + } + if (!xpbproxy_dpy) + sleep(1); + } - xpbproxy_dpy = XOpenDisplay(_display); + if (xpbproxy_dpy == NULL) { + ErrorF("xpbproxy: can't open default display\n"); + return EXIT_FAILURE; } - if (!xpbproxy_dpy) - sleep(1); - } - if (xpbproxy_dpy == NULL) { - ErrorF("xpbproxy: can't open default display\n"); - [pool release]; - return EXIT_FAILURE; - } + XSetIOErrorHandler(x_io_error_handler); + XSetErrorHandler(x_error_handler); - XSetIOErrorHandler(x_io_error_handler); - XSetErrorHandler(x_error_handler); + if (!XAppleWMQueryExtension(xpbproxy_dpy, &xpbproxy_apple_wm_event_base, + &xpbproxy_apple_wm_error_base)) { + ErrorF("xpbproxy: can't open AppleWM server extension\n"); + return EXIT_FAILURE; + } - if (!XAppleWMQueryExtension(xpbproxy_dpy, &xpbproxy_apple_wm_event_base, - &xpbproxy_apple_wm_error_base)) { - ErrorF("xpbproxy: can't open AppleWM server extension\n"); - [pool release]; - return EXIT_FAILURE; - } + xpbproxy_have_xfixes = XFixesQueryExtension(xpbproxy_dpy, &xpbproxy_xfixes_event_base, + &xpbproxy_xfixes_error_base); - xpbproxy_have_xfixes = - XFixesQueryExtension(xpbproxy_dpy, &xpbproxy_xfixes_event_base, - &xpbproxy_xfixes_error_base); - - XAppleWMSelectInput(xpbproxy_dpy, AppleWMActivationNotifyMask | - AppleWMPasteboardNotifyMask); - - _selection_object = [[x_selection alloc] init]; - - if (!xpbproxy_input_register()) { - [pool release]; - return EXIT_FAILURE; - } + XAppleWMSelectInput(xpbproxy_dpy, AppleWMActivationNotifyMask | AppleWMPasteboardNotifyMask); + + _selection_object = [x_selection new]; - [pool release]; + if (!xpbproxy_input_register()) { + return EXIT_FAILURE; + } + } CFRunLoopRun(); diff -Nru xorg-server-1.20.9/hw/xquartz/pbproxy/Makefile.in xorg-server-1.20.13/hw/xquartz/pbproxy/Makefile.in --- xorg-server-1.20.9/hw/xquartz/pbproxy/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/pbproxy/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -560,6 +560,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xquartz/pbproxy/pbproxy.h xorg-server-1.20.13/hw/xquartz/pbproxy/pbproxy.h --- xorg-server-1.20.9/hw/xquartz/pbproxy/pbproxy.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/pbproxy/pbproxy.h 2021-07-29 18:48:14.000000000 +0000 @@ -35,17 +35,6 @@ #include -#include -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 -#if __LP64__ || NS_BUILD_32_LIKE_64 -typedef long NSInteger; -typedef unsigned long NSUInteger; -#else -typedef int NSInteger; -typedef unsigned int NSUInteger; -#endif -#endif - #define Cursor X_Cursor #undef _SHAPE_H_ #include diff -Nru xorg-server-1.20.9/hw/xquartz/pbproxy/x-input.m xorg-server-1.20.13/hw/xquartz/pbproxy/x-input.m --- xorg-server-1.20.9/hw/xquartz/pbproxy/x-input.m 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/pbproxy/x-input.m 2021-07-29 18:48:14.000000000 +0000 @@ -89,14 +89,7 @@ static void xpbproxy_process_xevents(void) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - if (pool == nil) { - ErrorF("unable to allocate/init auto release pool!\n"); - return; - } - - while (XPending(xpbproxy_dpy) != 0) { + while (XPending(xpbproxy_dpy) != 0) { @autoreleasepool { XEvent e; XNextEvent(xpbproxy_dpy, &e); @@ -134,9 +127,7 @@ } XFlush(xpbproxy_dpy); - } - - [pool release]; + }} } static BOOL diff -Nru xorg-server-1.20.9/hw/xquartz/pbproxy/x-selection.m xorg-server-1.20.13/hw/xquartz/pbproxy/x-selection.m --- xorg-server-1.20.9/hw/xquartz/pbproxy/x-selection.m 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/pbproxy/x-selection.m 2021-07-29 18:48:14.000000000 +0000 @@ -673,13 +673,8 @@ return; } -#ifdef __LP64__ DebugF("pbtypes retainCount after containsObject: %lu\n", [pbtypes retainCount]); -#else - DebugF("pbtypes retainCount after containsObject: %u\n", - [pbtypes retainCount]); -#endif data = [pb stringForType:NSStringPboardType]; @@ -698,11 +693,7 @@ if (length < 50) { DebugF("UTF-8: %s\n", bytes); -#ifdef __LP64__ DebugF("UTF-8 length: %lu\n", length); -#else - DebugF("UTF-8 length: %u\n", length); -#endif } } else { @@ -787,7 +778,7 @@ [self send_reply:&reply]; } -/* Return nil if an error occured. */ +/* Return nil if an error occurred. */ /* DO NOT retain the encdata for longer than the length of an event response. * The autorelease pool will reuse/free it. */ @@ -818,8 +809,8 @@ return encdata; } -/* Return YES when an error has occured when trying to send the PICT. */ -/* The caller should send a default reponse with a property of None when an error occurs. */ +/* Return YES when an error has occurred when trying to send the PICT. */ +/* The caller should send a default response with a property of None when an error occurs. */ - (BOOL) send_image_pict_reply:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb type:(NSBitmapImageFileType)imagetype @@ -866,7 +857,7 @@ return NO; /*no error*/ } -/* Return YES if an error occured. */ +/* Return YES if an error occurred. */ /* The caller should send a reply with a property of None when an error occurs. */ - (BOOL) send_image_tiff_reply:(XSelectionRequestEvent *)e pasteboard:(NSPasteboard *)pb @@ -1049,7 +1040,7 @@ if (get_property(e->requestor, e->property, &pdata, /*Delete*/ True, &type)) { /* - * An error occured, so we should invoke the copy_completed:, but + * An error occurred, so we should invoke the copy_completed:, but * not handle_selection:type:propdata: */ [self copy_completed:e->selection]; @@ -1196,13 +1187,8 @@ return; } -#ifdef __LP64__ DebugF("data retainCount before NSBitmapImageRep initWithData: %lu\n", [data retainCount]); -#else - DebugF("data retainCount before NSBitmapImageRep initWithData: %u\n", - [data retainCount]); -#endif bmimage = [[NSBitmapImageRep alloc] initWithData:data]; @@ -1212,13 +1198,8 @@ return; } -#ifdef __LP64__ DebugF("data retainCount after NSBitmapImageRep initWithData: %lu\n", [data retainCount]); -#else - DebugF("data retainCount after NSBitmapImageRep initWithData: %u\n", - [data retainCount]); -#endif @try { @@ -1233,13 +1214,8 @@ return; } -#ifdef __LP64__ DebugF("bmimage retainCount after TIFFRepresentation %lu\n", [bmimage retainCount]); -#else - DebugF("bmimage retainCount after TIFFRepresentation %u\n", - [bmimage retainCount]); -#endif pbtypes = [NSArray arrayWithObjects:NSTIFFPboardType, nil]; @@ -1256,11 +1232,7 @@ [data autorelease]; -#ifdef __LP64__ DebugF("bmimage retainCount before release %lu\n", [bmimage retainCount]); -#else - DebugF("bmimage retainCount before release %u\n", [bmimage retainCount]); -#endif [bmimage autorelease]; } diff -Nru xorg-server-1.20.9/hw/xquartz/quartz.c xorg-server-1.20.13/hw/xquartz/quartz.c --- xorg-server-1.20.9/hw/xquartz/quartz.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/quartz.c 2021-07-29 18:48:14.000000000 +0000 @@ -35,7 +35,6 @@ #include #endif -#include "quartzCommon.h" #include "quartzRandR.h" #include "inputstr.h" #include "quartz.h" @@ -72,11 +71,14 @@ #include #include -/* Work around a bug on Leopard's headers */ -#if defined (__LP64__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 && MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -extern OSErr UpdateSystemActivity(UInt8 activity); -#define OverallAct 0 -#endif +// These are vended by the Objective-C runtime, but they are unfortunately +// not available as API in the macOS SDK. We are following suit with swift +// and clang in declaring them inline here. They canot be removed or changed +// in the OS without major bincompat ramifications. +// +// These were added in macOS 10.7. +void * _Nonnull objc_autoreleasePoolPush(void); +void objc_autoreleasePoolPop(void * _Nonnull context); DevPrivateKeyRec quartzScreenKeyRec; int aquaMenuBarHeight = 0; @@ -150,6 +152,30 @@ } /* + * QuartzBlockHandler + * Clean out any autoreleased objects. + */ +static void +QuartzBlockHandler(void *blockData, void *pTimeout) +{ + static void *poolToken = NULL; + + if (poolToken) { + objc_autoreleasePoolPop(poolToken); + } + poolToken = objc_autoreleasePoolPush(); +} + +/* + * QuartzWakeupHandler + */ +static void +QuartzWakeupHandler(void *blockData, int result) +{ + /* nothing here */ +} + +/* * QuartzInitOutput * Quartz display initialization. */ diff -Nru xorg-server-1.20.9/hw/xquartz/quartzCocoa.m xorg-server-1.20.13/hw/xquartz/quartzCocoa.m --- xorg-server-1.20.9/hw/xquartz/quartzCocoa.m 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/quartzCocoa.m 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/************************************************************** - * - * Quartz-specific support for the Darwin X Server - * that requires Cocoa and Objective-C. - * - * This file is separate from the parts of Quartz support - * that use X include files to avoid symbol collisions. - * - * Copyright (c) 2001-2004 Torrey T. Lyons and Greg Parker. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name(s) of the above copyright - * holders shall not be used in advertising or otherwise to promote the sale, - * use or other dealings in this Software without prior written authorization. - */ - -#include "sanitizedCocoa.h" - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include "quartzCommon.h" -#include "inputstr.h" - -#include "darwin.h" - -/* - * QuartzBlockHandler - * Clean out any autoreleased objects. - */ -void -QuartzBlockHandler(void *blockData, void *pTimeout) -{ - static NSAutoreleasePool *aPool = nil; - - [aPool release]; - aPool = [[NSAutoreleasePool alloc] init]; -} - -/* - * QuartzWakeupHandler - */ -void -QuartzWakeupHandler(void *blockData, int result) -{ - // nothing here -} diff -Nru xorg-server-1.20.9/hw/xquartz/quartzCommon.h xorg-server-1.20.13/hw/xquartz/quartzCommon.h --- xorg-server-1.20.9/hw/xquartz/quartzCommon.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/quartzCommon.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/* - * quartzCommon.h - * - * Common definitions used internally by all Quartz modes - * - * This file should be included before any X11 or IOKit headers - * so that it can avoid symbol conflicts. - * - * Copyright (c) 2001-2004 Torrey T. Lyons and Greg Parker. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name(s) of the above copyright - * holders shall not be used in advertising or otherwise to promote the sale, - * use or other dealings in this Software without prior written authorization. - */ - -#ifndef _QUARTZCOMMON_H -#define _QUARTZCOMMON_H - -#include -#include "privates.h" - -// Other shared data -extern DevPrivateKeyRec quartzScreenKeyRec; -#define quartzScreenKey (&quartzScreenKeyRec) -extern int aquaMenuBarHeight; - -// Name of GLX bundle for native OpenGL -extern const char *quartzOpenGLBundle; - -void -QuartzBlockHandler(void *blockData, void *pTimeout); - -void -QuartzWakeupHandler(void *blockData, int result); - -#endif /* _QUARTZCOMMON_H */ diff -Nru xorg-server-1.20.9/hw/xquartz/quartz.h xorg-server-1.20.13/hw/xquartz/quartz.h --- xorg-server-1.20.9/hw/xquartz/quartz.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/quartz.h 2021-07-29 18:48:14.000000000 +0000 @@ -34,6 +34,9 @@ #ifndef _QUARTZ_H #define _QUARTZ_H +#include +#include "privates.h" + #include "screenint.h" #include "window.h" #include "pixmap.h" @@ -127,6 +130,14 @@ extern int32_t XQuartzShieldingWindowLevel; /* CGShieldingWindowLevel() or 0 */ +// Other shared data +extern DevPrivateKeyRec quartzScreenKeyRec; +#define quartzScreenKey (&quartzScreenKeyRec) +extern int aquaMenuBarHeight; + +// Name of GLX bundle for native OpenGL +extern const char *quartzOpenGLBundle; + Bool QuartzAddScreen(int index, ScreenPtr pScreen); Bool diff -Nru xorg-server-1.20.9/hw/xquartz/quartzKeyboard.c xorg-server-1.20.13/hw/xquartz/quartzKeyboard.c --- xorg-server-1.20.9/hw/xquartz/quartzKeyboard.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/quartzKeyboard.c 2021-07-29 18:48:14.000000000 +0000 @@ -46,7 +46,6 @@ #include #include #include -#include #include "quartz.h" #include "darwin.h" @@ -95,6 +94,8 @@ { 62, XK_Control_R }, { 63, XK_Meta_R }, + { 110, XK_Menu }, + { 122, XK_F1 }, { 120, XK_F2 }, { 99, XK_F3 }, @@ -110,6 +111,11 @@ { 105, XK_F13 }, { 107, XK_F14 }, { 113, XK_F15 }, + { 106, XK_F16 }, + { 64, XK_F17 }, + { 79, XK_F18 }, + { 80, XK_F19 }, + { 90, XK_F20 }, }; #endif @@ -737,54 +743,6 @@ return 1; } -#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050 -static inline UniChar -macroman2ucs(unsigned char c) -{ - /* Precalculated table mapping MacRoman-128 to Unicode. Generated - by creating single element CFStringRefs then extracting the - first character. */ - - static const unsigned short table[128] = { - 0xc4, 0xc5, 0xc7, 0xc9, 0xd1, 0xd6, 0xdc, - 0xe1, - 0xe0, 0xe2, 0xe4, 0xe3, 0xe5, 0xe7, 0xe9, - 0xe8, - 0xea, 0xeb, 0xed, 0xec, 0xee, 0xef, 0xf1, - 0xf3, - 0xf2, 0xf4, 0xf6, 0xf5, 0xfa, 0xf9, 0xfb, - 0xfc, - 0x2020, 0xb0, 0xa2, 0xa3, 0xa7, 0x2022, 0xb6, - 0xdf, - 0xae, 0xa9, 0x2122, 0xb4, 0xa8, 0x2260, 0xc6, - 0xd8, - 0x221e, 0xb1, 0x2264, 0x2265, 0xa5, 0xb5, 0x2202, - 0x2211, - 0x220f, 0x3c0, 0x222b, 0xaa, 0xba, 0x3a9, 0xe6, - 0xf8, - 0xbf, 0xa1, 0xac, 0x221a, 0x192, 0x2248, 0x2206, - 0xab, - 0xbb, 0x2026, 0xa0, 0xc0, 0xc3, 0xd5, 0x152, - 0x153, - 0x2013, 0x2014, 0x201c, 0x201d, 0x2018, 0x2019, 0xf7, - 0x25ca, - 0xff, 0x178, 0x2044, 0x20ac, 0x2039, 0x203a, 0xfb01, - 0xfb02, - 0x2021, 0xb7, 0x201a, 0x201e, 0x2030, 0xc2, 0xca, - 0xc1, - 0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0xd3, - 0xd4, - 0xf8ff, 0xd2, 0xda, 0xdb, 0xd9, 0x131, 0x2c6, - 0x2dc, - 0xaf, 0x2d8, 0x2d9, 0x2da, 0xb8, 0x2dd, 0x2db, - 0x2c7, - }; - - if (c < 128) return c; - else return table[c - 128]; -} -#endif - static KeySym make_dead_key(KeySym in) { @@ -799,83 +757,34 @@ static Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) { -#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050 - KeyboardLayoutRef key_layout; - int is_uchr = 1; -#endif - const void *chr_data = NULL; + __block const void *chr_data = NULL; int num_keycodes = NUM_KEYCODES; - UInt32 keyboard_type = LMGetKbdType(); + __block UInt32 keyboard_type; int i, j; OSStatus err; KeySym *k; - CFDataRef currentKeyLayoutDataRef = NULL; - -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 - TISInputSourceRef currentKeyLayoutRef = - TISCopyCurrentKeyboardLayoutInputSource(); - - if (currentKeyLayoutRef) { - currentKeyLayoutDataRef = (CFDataRef)TISGetInputSourceProperty( - currentKeyLayoutRef, kTISPropertyUnicodeKeyLayoutData); - if (currentKeyLayoutDataRef) - chr_data = CFDataGetBytePtr(currentKeyLayoutDataRef); - } -#endif -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" // KLGetCurrentKeyboardLayout, KLGetKeyboardLayoutProperty -#endif + dispatch_block_t getKeyboardData = ^{ + keyboard_type = LMGetKbdType(); -#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050 - if (chr_data == NULL) { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 - ErrorF( - "X11.app: Error detected in determining keyboard layout. If you are using an Apple-provided keyboard layout, please report this error at http://xquartz.macosforge.org and http://bugreport.apple.com\n"); - ErrorF( - "X11.app: Debug Info: keyboard_type=%u, currentKeyLayoutRef=%p, currentKeyLayoutDataRef=%p, chr_data=%p\n", - (unsigned)keyboard_type, currentKeyLayoutRef, - currentKeyLayoutDataRef, chr_data); -#endif + TISInputSourceRef currentKeyLayoutRef = TISCopyCurrentKeyboardLayoutInputSource(); - KLGetCurrentKeyboardLayout(&key_layout); - KLGetKeyboardLayoutProperty(key_layout, kKLuchrData, &chr_data); + if (currentKeyLayoutRef) { + CFDataRef currentKeyLayoutDataRef = (CFDataRef)TISGetInputSourceProperty(currentKeyLayoutRef, + kTISPropertyUnicodeKeyLayoutData); + if (currentKeyLayoutDataRef) + chr_data = CFDataGetBytePtr(currentKeyLayoutDataRef); -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 - if (chr_data != NULL) { - ErrorF( - "X11.app: Fallback succeeded, but this is still a bug. Please report the above information.\n"); + CFRelease(currentKeyLayoutRef); } -#endif - } - - if (chr_data == NULL) { - ErrorF( - "X11.app: Debug Info: kKLuchrData failed, trying kKLKCHRData.\n"); - ErrorF( - "If you are using a 3rd party keyboard layout, please see http://xquartz.macosforge.org/trac/ticket/154\n"); - KLGetKeyboardLayoutProperty(key_layout, kKLKCHRData, &chr_data); - is_uchr = 0; - num_keycodes = 128; + }; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 - if (chr_data != NULL) { - ErrorF( - "X11.app: Fallback succeeded, but this is still a bug. Please report the above information.\n"); - } -#endif + /* This is an ugly ant-pattern, but it is more expedient to address the problem right now. */ + if (pthread_main_np()) { + getKeyboardData(); + } else { + dispatch_sync(dispatch_get_main_queue(), getKeyboardData); } -#endif - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 - if (currentKeyLayoutRef) - CFRelease(currentKeyLayoutRef); -#endif if (chr_data == NULL) { ErrorF("Couldn't get uchr or kchr resource\n"); @@ -899,9 +808,6 @@ k = info->keyMap + i * GLYPHS_PER_KEY; for (j = 0; j < 4; j++) { -#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050 - if (is_uchr) { -#endif UniChar s[8]; UniCharCount len; UInt32 dead_key_state = 0, extra_dead = 0; @@ -928,42 +834,6 @@ k[j] = ucs2keysym(s[0]); if (dead_key_state != 0) k[j] = make_dead_key(k[j]); } -#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050 - } - else { // kchr - UInt32 c, state = 0, state2 = 0; - UInt16 code; - - code = i | mods[j]; - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" // KeyTranslate -#endif - - c = KeyTranslate(chr_data, code, &state); - - /* Dead keys are only processed on key-down, so ask - to translate those events. When we find a dead key, - translating the matching key up event will give - us the actual dead character. */ - - if (state != 0) - c = KeyTranslate(chr_data, code | 128, &state2); - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - - /* Characters seem to be in MacRoman encoding. */ - - if (c != 0 && c != 0x0010) { - k[j] = ucs2keysym(macroman2ucs(c & 255)); - - if (state != 0) k[j] = make_dead_key(k[j]); - } - } -#endif } if (k[3] == k[2]) k[3] = NoSymbol; diff -Nru xorg-server-1.20.9/hw/xquartz/quartzRandR.c xorg-server-1.20.13/hw/xquartz/quartzRandR.c --- xorg-server-1.20.9/hw/xquartz/quartzRandR.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/quartzRandR.c 2021-07-29 18:48:14.000000000 +0000 @@ -35,15 +35,12 @@ #include #endif -#include "quartzCommon.h" #include "quartzRandR.h" #include "quartz.h" #include "darwin.h" #include "X11Application.h" -#include - #include #include #include @@ -66,154 +63,6 @@ typedef int (*QuartzModeCallback) (ScreenPtr, QuartzModeInfoPtr, void *); -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - -static long -getDictLong(CFDictionaryRef dictRef, CFStringRef key) -{ - long value; - - CFNumberRef numRef = (CFNumberRef)CFDictionaryGetValue(dictRef, key); - if (!numRef) - return 0; - - if (!CFNumberGetValue(numRef, kCFNumberLongType, &value)) - return 0; - return value; -} - -static double -getDictDouble(CFDictionaryRef dictRef, CFStringRef key) -{ - double value; - - CFNumberRef numRef = (CFNumberRef)CFDictionaryGetValue(dictRef, key); - if (!numRef) - return 0.0; - - if (!CFNumberGetValue(numRef, kCFNumberDoubleType, &value)) - return 0.0; - return value; -} - -static void -QuartzRandRGetModeInfo(CFDictionaryRef modeRef, - QuartzModeInfoPtr pMode) -{ - pMode->width = (size_t)getDictLong(modeRef, kCGDisplayWidth); - pMode->height = (size_t)getDictLong(modeRef, kCGDisplayHeight); - pMode->refresh = - (int)(getDictDouble(modeRef, kCGDisplayRefreshRate) + 0.5); - if (pMode->refresh == 0) - pMode->refresh = DEFAULT_REFRESH; - pMode->ref = NULL; - pMode->pSize = NULL; -} - -static Bool -QuartzRandRCopyCurrentModeInfo(CGDirectDisplayID screenId, - QuartzModeInfoPtr pMode) -{ - CFDictionaryRef curModeRef = CGDisplayCurrentMode(screenId); - if (!curModeRef) - return FALSE; - - QuartzRandRGetModeInfo(curModeRef, pMode); - pMode->ref = (void *)curModeRef; - CFRetain(pMode->ref); - return TRUE; -} - -static Bool -QuartzRandRSetCGMode(CGDirectDisplayID screenId, - QuartzModeInfoPtr pMode) -{ - CFDictionaryRef modeRef = (CFDictionaryRef)pMode->ref; - return (CGDisplaySwitchToMode(screenId, modeRef) == kCGErrorSuccess); -} - -static Bool -QuartzRandREnumerateModes(ScreenPtr pScreen, - QuartzModeCallback callback, - void *data) -{ - Bool retval = FALSE; - QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen); - - /* Just an 800x600 fallback if we have no attached heads */ - if (pQuartzScreen->displayIDs) { - CFDictionaryRef curModeRef, modeRef; - long curBpp; - CFArrayRef modes; - QuartzModeInfo modeInfo; - int i; - CGDirectDisplayID screenId = pQuartzScreen->displayIDs[0]; - - curModeRef = CGDisplayCurrentMode(screenId); - if (!curModeRef) - return FALSE; - curBpp = getDictLong(curModeRef, kCGDisplayBitsPerPixel); - - modes = CGDisplayAvailableModes(screenId); - if (!modes) - return FALSE; - for (i = 0; i < CFArrayGetCount(modes); i++) { - int cb; - modeRef = (CFDictionaryRef)CFArrayGetValueAtIndex(modes, i); - - /* Skip modes that are not usable on the current display or have a - different pixel encoding than the current mode. */ - if (((unsigned long)getDictLong(modeRef, kCGDisplayIOFlags) & - kDisplayModeUsableFlags) != kDisplayModeUsableFlags) - continue; - if (getDictLong(modeRef, kCGDisplayBitsPerPixel) != curBpp) - continue; - - QuartzRandRGetModeInfo(modeRef, &modeInfo); - modeInfo.ref = (void *)modeRef; - cb = callback(pScreen, &modeInfo, data); - if (cb == CALLBACK_CONTINUE) - retval = TRUE; - else if (cb == CALLBACK_SUCCESS) - return TRUE; - else if (cb == CALLBACK_ERROR) - return FALSE; - } - } - - switch (callback(pScreen, &pQuartzScreen->rootlessMode, data)) { - case CALLBACK_SUCCESS: - return TRUE; - - case CALLBACK_ERROR: - return FALSE; - - case CALLBACK_CONTINUE: - retval = TRUE; - - default: - break; - } - - switch (callback(pScreen, &pQuartzScreen->fullscreenMode, data)) { - case CALLBACK_SUCCESS: - return TRUE; - - case CALLBACK_ERROR: - return FALSE; - - case CALLBACK_CONTINUE: - retval = TRUE; - - default: - break; - } - - return retval; -} - -#else /* we have the new CG APIs from Snow Leopard */ - static void QuartzRandRGetModeInfo(CGDisplayModeRef modeRef, QuartzModeInfoPtr pMode) @@ -350,8 +199,6 @@ return retval; } -#endif /* Snow Leopard CoreGraphics APIs */ - static Bool QuartzRandRModesEqual(QuartzModeInfoPtr pMode1, QuartzModeInfoPtr pMode2) diff -Nru xorg-server-1.20.9/hw/xquartz/quartzStartup.c xorg-server-1.20.13/hw/xquartz/quartzStartup.c --- xorg-server-1.20.9/hw/xquartz/quartzStartup.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/quartzStartup.c 2021-07-29 18:48:14.000000000 +0000 @@ -36,7 +36,6 @@ #include #include #include -#include "quartzCommon.h" #include "X11Controller.h" #include "darwin.h" #include "darwinEvents.h" diff -Nru xorg-server-1.20.9/hw/xquartz/X11Application.h xorg-server-1.20.13/hw/xquartz/X11Application.h --- xorg-server-1.20.9/hw/xquartz/X11Application.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/X11Application.h 2021-07-29 18:48:14.000000000 +0000 @@ -31,18 +31,16 @@ #ifndef X11APPLICATION_H #define X11APPLICATION_H 1 +#include + #if __OBJC__ #import "X11Controller.h" -@interface X11Application : NSApplication { - X11Controller *_controller; - - unsigned int _x_active : 1; -} +@interface X11Application : NSApplication -- (void)set_controller:controller; -- (void)set_window_menu:(NSArray *)list; +@property (nonatomic, readwrite, strong) X11Controller *controller; +@property (nonatomic, readonly, assign) OSX_BOOL x_active; - (CFPropertyListRef)prefs_get_copy:(NSString *)key CF_RETURNS_RETAINED; - (int)prefs_get_integer:(NSString *)key default:(int)def; @@ -58,9 +56,6 @@ - (void)prefs_set_array:(NSString *)key value:(NSArray *)value; - (void)prefs_set_string:(NSString *)key value:(NSString *)value; - (void)prefs_synchronize; - -- (X11Controller *)controller; -- (OSX_BOOL)x_active; @end extern X11Application * X11App; diff -Nru xorg-server-1.20.9/hw/xquartz/X11Application.m xorg-server-1.20.13/hw/xquartz/X11Application.m --- xorg-server-1.20.9/hw/xquartz/X11Application.m 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/X11Application.m 2021-07-29 18:48:14.000000000 +0000 @@ -34,8 +34,6 @@ #include #endif -#include "quartzCommon.h" - #import "X11Application.h" #include "darwin.h" @@ -48,7 +46,6 @@ #include #include -#include #include @@ -64,11 +61,9 @@ #define XSERVER_VERSION "?" #endif -#ifdef HAVE_LIBDISPATCH #include static dispatch_queue_t eventTranslationQueue; -#endif #ifndef __has_feature #define __has_feature(x) 0 @@ -82,14 +77,14 @@ #endif #endif +#ifndef APPKIT_APPFLAGS_HACK +#define APPKIT_APPFLAGS_HACK 1 +#endif + extern Bool noTestExtensions; extern Bool noRenderExtension; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 static TISInputSourceRef last_key_layout; -#else -static KeyboardLayoutRef last_key_layout; -#endif /* This preference is only tested on Lion or later as it's not relevant to * earlier OS versions. @@ -111,10 +106,63 @@ #define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask | \ NSAlternateKeyMask | NSCommandKeyMask) +#if APPKIT_APPFLAGS_HACK && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500 +// This was removed from the SDK in 10.15 +@interface NSApplication () { +@protected + /* All instance variables are private */ + short _running; + struct __appFlags { + unsigned int _hidden:1; + unsigned int _appleEventActivationInProgress:1; + unsigned int _active:1; + unsigned int _hasBeenRun:1; + unsigned int _doingUnhide:1; + unsigned int _delegateReturnsValidRequestor:1; + unsigned int _deactPending:1; + unsigned int _invalidState:1; + unsigned int _invalidEvent:1; + unsigned int _postedWindowsNeedUpdateNote:1; + unsigned int _wantsToActivate:1; + unsigned int _doingHide:1; + unsigned int _dontSendShouldTerminate:1; + unsigned int _ignoresFullScreen:1; + unsigned int _finishedLaunching:1; + unsigned int _hasEventDelegate:1; + unsigned int _appTerminating:1; + unsigned int _didNSOpenOrPrint:1; + unsigned int _inDealloc:1; + unsigned int _pendingDidFinish:1; + unsigned int _hasKeyFocus:1; + unsigned int _panelsNonactivating:1; + unsigned int _hiddenOnLaunch:1; + unsigned int _openStatus:2; + unsigned int _batchOrdering:1; + unsigned int _waitingForTerminationReply:1; + unsigned int _unused:1; + unsigned int _enumeratingMemoryPressureHandlers:1; + unsigned int _didTryRestoringPersistentState:1; + unsigned int _windowDragging:1; + unsigned int _mightBeSwitching:1; + } _appFlags; + id _mainMenu; +} +@end +#endif + +@interface NSApplication (Internal) +- (void)_setKeyWindow:(id)window; +- (void)_setMainWindow:(id)window; +@end + @interface X11Application (Private) - (void) sendX11NSEvent:(NSEvent *)e; @end +@interface X11Application () +@property (nonatomic, readwrite, assign) OSX_BOOL x_active; +@end + @implementation X11Application typedef struct message_struct message; @@ -124,72 +172,14 @@ NSObject *arg; }; -static mach_port_t _port; - /* Quartz mode initialization routine. This is often dynamically loaded but is statically linked into this X server. */ Bool QuartzModeBundleInit(void); -static void -init_ports(void) -{ - kern_return_t r; - NSPort *p; - - if (_port != MACH_PORT_NULL) return; - - r = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &_port); - if (r != KERN_SUCCESS) return; - - p = [NSMachPort portWithMachPort:_port]; - [p setDelegate:NSApp]; - [p scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode: - NSDefaultRunLoopMode]; -} - -static void -message_kit_thread(SEL selector, NSObject *arg) -{ - message msg; - kern_return_t r; - - msg.hdr.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_MAKE_SEND, 0); - msg.hdr.msgh_size = sizeof(msg); - msg.hdr.msgh_remote_port = _port; - msg.hdr.msgh_local_port = MACH_PORT_NULL; - msg.hdr.msgh_reserved = 0; - msg.hdr.msgh_id = 0; - - msg.selector = selector; - msg.arg = [arg retain]; - - r = mach_msg(&msg.hdr, MACH_SEND_MSG, msg.hdr.msgh_size, - 0, MACH_PORT_NULL, 0, MACH_PORT_NULL); - if (r != KERN_SUCCESS) - ErrorF("%s: mach_msg failed: %x\n", __FUNCTION__, r); -} - -- (void) handleMachMessage:(void *)_msg -{ - message *msg = _msg; - - [self performSelector:msg->selector withObject:msg->arg]; - [msg->arg release]; -} - -- (void) set_controller:obj -{ - if (_controller == nil) _controller = [obj retain]; -} - - (void) dealloc { - if (_controller != nil) [_controller release]; - - if (_port != MACH_PORT_NULL) - mach_port_deallocate(mach_task_self(), _port); - + self.controller = nil; [super dealloc]; } @@ -219,10 +209,12 @@ - (void) activateX:(OSX_BOOL)state { - if (_x_active == state) + OSX_BOOL const x_active = self.x_active; + + if (x_active == state) return; - DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active); + DEBUG_LOG("state=%d, x_active=%d, \n", state, x_active); if (state) { if (bgMouseLocationUpdated) { DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, @@ -246,7 +238,7 @@ DarwinSendDDXEvent(kXquartzDeactivate, 0); } - _x_active = state; + self.x_active = state; } - (void) became_key:(NSWindow *)win @@ -256,7 +248,16 @@ - (void) sendEvent:(NSEvent *)e { + /* Don't try sending to X if we haven't initialized. This can happen if AppKit takes over + * (eg: uncaught exception) early in launch. + */ + if (!eventTranslationQueue) { + [super sendEvent:e]; + return; + } + OSX_BOOL for_appkit, for_x; + OSX_BOOL const x_active = self.x_active; /* By default pass down the responder chain and to X. */ for_appkit = YES; @@ -272,13 +273,13 @@ if ([e window] != nil) { /* Pointer event has an (AppKit) window. Probably something for the kit. */ for_x = NO; - if (_x_active) [self activateX:NO]; + if (x_active) [self activateX:NO]; } else if ([self modalWindow] == nil) { /* Must be an X window. Tell appkit windows to resign main/key */ for_appkit = NO; - if (!_x_active && quartzProcs->IsX11Window([e windowNumber])) { + if (!x_active && quartzProcs->IsX11Window([e windowNumber])) { if ([self respondsToSelector:@selector(_setKeyWindow:)] && [self respondsToSelector:@selector(_setMainWindow:)]) { NSWindow *keyWindow = [self keyWindow]; if (keyWindow) { @@ -352,14 +353,11 @@ swallow_keycode = [e keyCode]; do_swallow = YES; for_x = NO; -#if XPLUGIN_VERSION >= 1 - } - else if (XQuartzEnableKeyEquivalents && + } else if (XQuartzEnableKeyEquivalents && xp_is_symbolic_hotkey_event([e eventRef])) { swallow_keycode = [e keyCode]; do_swallow = YES; for_x = NO; -#endif } else if (XQuartzEnableKeyEquivalents && [[self mainMenu] performKeyEquivalent:e]) { @@ -425,10 +423,12 @@ BOOL order_all_windows = YES, workspaces, ok; for_appkit = NO; +#if APPKIT_APPFLAGS_HACK /* FIXME: This is a hack to avoid passing the event to AppKit which * would result in it raising one of its windows. */ _appFlags._active = YES; +#endif [self set_front_process:nil]; @@ -490,29 +490,15 @@ if (for_appkit) [super sendEvent:e]; if (for_x) { -#ifdef HAVE_LIBDISPATCH dispatch_async(eventTranslationQueue, ^{ [self sendX11NSEvent:e]; }); -#else - [self sendX11NSEvent:e]; -#endif } } -- (void) set_window_menu:(NSArray *)list -{ - [_controller set_window_menu:list]; -} - -- (void) set_window_menu_check:(NSNumber *)n -{ - [_controller set_window_menu_check:n]; -} - - (void) set_apps_menu:(NSArray *)list { - [_controller set_apps_menu:list]; + [self.controller set_apps_menu:list]; } - (void) set_front_process:unused @@ -523,16 +509,6 @@ [self activateX:YES]; } -- (void) set_can_quit:(NSNumber *)state -{ - [_controller set_can_quit:[state boolValue]]; -} - -- (void) server_ready:unused -{ - [_controller server_ready]; -} - - (void) show_hide_menubar:(NSNumber *)state { /* Also shows/hides the dock */ @@ -545,7 +521,7 @@ - (void) launch_client:(NSString *)cmd { - (void)[_controller application:self openFile:cmd]; + (void)[self.controller application:self openFile:cmd]; } /* user preferences */ @@ -955,123 +931,83 @@ AppleWMCopyToPasteboard); } -- (X11Controller *) controller -{ - return _controller; -} - -- (OSX_BOOL) x_active -{ - return _x_active; -} - @end -static NSArray * -array_with_strings_and_numbers(int nitems, const char **items, - const char *numbers) -{ - NSMutableArray *array, *subarray; - NSString *string, *number; - int i; - - /* (Can't autorelease on the X server thread) */ - - array = [[NSMutableArray alloc] initWithCapacity:nitems]; - - for (i = 0; i < nitems; i++) { - subarray = [[NSMutableArray alloc] initWithCapacity:2]; - - string = [[NSString alloc] initWithUTF8String:items[i]]; - [subarray addObject:string]; - [string release]; - - if (numbers[i] != 0) { - number = [[NSString alloc] initWithFormat:@"%d", numbers[i]]; - [subarray addObject:number]; - [number release]; - } - else - [subarray addObject:@""]; - - [array addObject:subarray]; - [subarray release]; - } - - return array; -} - void X11ApplicationSetWindowMenu(int nitems, const char **items, const char *shortcuts) { - NSArray *array; - array = array_with_strings_and_numbers(nitems, items, shortcuts); + @autoreleasepool { + NSMutableArray *> * const allMenuItems = [NSMutableArray array]; - /* Send the array of strings over to the appkit thread */ + for (int i = 0; i < nitems; i++) { + NSMutableArray * const menuItem = [NSMutableArray array]; + [menuItem addObject:@(items[i])]; + + if (shortcuts[i] == 0) { + [menuItem addObject:@""]; + } else { + [menuItem addObject:[NSString stringWithFormat:@"%d", shortcuts[i]]]; + } + + [allMenuItems addObject:menuItem]; + } - message_kit_thread(@selector (set_window_menu:), array); - [array release]; + dispatch_async(dispatch_get_main_queue(), ^{ + [X11App.controller set_window_menu:allMenuItems]; + }); + } } void X11ApplicationSetWindowMenuCheck(int idx) { - NSNumber *n; - - n = [[NSNumber alloc] initWithInt:idx]; - - message_kit_thread(@selector (set_window_menu_check:), n); - - [n release]; + dispatch_async(dispatch_get_main_queue(), ^{ + [X11App.controller set_window_menu_check:@(idx)]; + }); } void X11ApplicationSetFrontProcess(void) { - message_kit_thread(@selector (set_front_process:), nil); + dispatch_async(dispatch_get_main_queue(), ^{ + [X11App set_front_process:nil]; + }); } void X11ApplicationSetCanQuit(int state) { - NSNumber *n; - - n = [[NSNumber alloc] initWithBool:state]; - - message_kit_thread(@selector (set_can_quit:), n); - - [n release]; + dispatch_async(dispatch_get_main_queue(), ^{ + X11App.controller.can_quit = !!state; + }); } void X11ApplicationServerReady(void) { - message_kit_thread(@selector (server_ready:), nil); + dispatch_async(dispatch_get_main_queue(), ^{ + [X11App.controller server_ready]; + }); } void X11ApplicationShowHideMenubar(int state) { - NSNumber *n; - - n = [[NSNumber alloc] initWithBool:state]; - - message_kit_thread(@selector (show_hide_menubar:), n); - - [n release]; + dispatch_async(dispatch_get_main_queue(), ^{ + [X11App show_hide_menubar:@(state)]; + }); } void X11ApplicationLaunchClient(const char *cmd) { - NSString *string; - - string = [[NSString alloc] initWithUTF8String:cmd]; - - message_kit_thread(@selector (launch_client:), string); - - [string release]; + @autoreleasepool { + NSString *string = @(cmd); + dispatch_async(dispatch_get_main_queue(), ^{ + [X11App launch_client:string]; + }); + } } /* This is a special function in that it is run from the *SERVER* thread and @@ -1096,12 +1032,15 @@ if (!XQuartzIsRootless) QuartzShowFullscreen(FALSE); - switch (NSRunAlertPanel(title, @"%@", - NSLocalizedString(@"Allow", - @""), - NSLocalizedString(@"Cancel", - @""), - NSLocalizedString(@"Always Allow", @""), msg)) { + NSInteger __block alert_result; + dispatch_sync(dispatch_get_main_queue(), ^{ + alert_result = NSRunAlertPanel(title, @"%@", + NSLocalizedString(@"Allow", @""), + NSLocalizedString(@"Cancel", @""), + NSLocalizedString(@"Always Allow", @""), msg); + }); + + switch (alert_result) { case NSAlertOtherReturn: [X11App prefs_set_boolean:@PREFS_NO_RANDR_ALERT value:YES]; [X11App prefs_synchronize]; @@ -1185,91 +1124,71 @@ void X11ApplicationMain(int argc, char **argv, char **envp) { - NSAutoreleasePool *pool; - #ifdef DEBUG while (access("/tmp/x11-block", F_OK) == 0) sleep(1); #endif - pool = [[NSAutoreleasePool alloc] init]; - X11App = (X11Application *)[X11Application sharedApplication]; - init_ports(); - - app_prefs_domain_cfstr = - (CFStringRef)[[NSBundle mainBundle] bundleIdentifier]; - - if (app_prefs_domain_cfstr == NULL) { - ErrorF( - "X11ApplicationMain: Unable to determine bundle identifier. Your installation of XQuartz may be broken.\n"); - app_prefs_domain_cfstr = CFSTR(BUNDLE_ID_PREFIX ".X11"); - } - - [NSApp read_defaults]; - [NSBundle loadNibNamed:@"main" owner:NSApp]; - [[NSNotificationCenter defaultCenter] addObserver:NSApp - selector:@selector (became_key:) - name: - NSWindowDidBecomeKeyNotification object:nil]; - - /* - * The xpr Quartz mode is statically linked into this server. - * Initialize all the Quartz functions. - */ - QuartzModeBundleInit(); + @autoreleasepool { + X11App = (X11Application *)[X11Application sharedApplication]; - /* Calculate the height of the menubar so we can avoid it. */ - aquaMenuBarHeight = [[NSApp mainMenu] menuBarHeight]; -#if ! __LP64__ - if (!aquaMenuBarHeight) { - aquaMenuBarHeight = [NSMenuView menuBarHeight]; - } -#endif - if (!aquaMenuBarHeight) { - NSScreen* primaryScreen = [[NSScreen screens] objectAtIndex:0]; - aquaMenuBarHeight = NSHeight([primaryScreen frame]) - NSMaxY([primaryScreen visibleFrame]); - } + app_prefs_domain_cfstr = (CFStringRef)[[NSBundle mainBundle] bundleIdentifier]; -#ifdef HAVE_LIBDISPATCH - eventTranslationQueue = dispatch_queue_create( - BUNDLE_ID_PREFIX ".X11.NSEventsToX11EventsQueue", NULL); - assert(eventTranslationQueue != NULL); -#endif + if (app_prefs_domain_cfstr == NULL) { + ErrorF("X11ApplicationMain: Unable to determine bundle identifier. Your installation of XQuartz may be broken.\n"); + app_prefs_domain_cfstr = CFSTR(BUNDLE_ID_PREFIX ".X11"); + } + + [NSApp read_defaults]; + [NSBundle loadNibNamed:@"main" owner:NSApp]; + [NSNotificationCenter.defaultCenter addObserver:NSApp + selector:@selector (became_key:) + name:NSWindowDidBecomeKeyNotification + object:nil]; + + /* + * The xpr Quartz mode is statically linked into this server. + * Initialize all the Quartz functions. + */ + QuartzModeBundleInit(); - /* Set the key layout seed before we start the server */ -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 - last_key_layout = TISCopyCurrentKeyboardLayoutInputSource(); - - if (!last_key_layout) - ErrorF( - "X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n"); -#else - KLGetCurrentKeyboardLayout(&last_key_layout); - if (!last_key_layout) - ErrorF( - "X11ApplicationMain: Unable to determine KLGetCurrentKeyboardLayout() at startup.\n"); -#endif + /* Calculate the height of the menubar so we can avoid it. */ + aquaMenuBarHeight = NSApp.mainMenu.menuBarHeight; + if (!aquaMenuBarHeight) { + NSScreen* primaryScreen = NSScreen.screens[0]; + aquaMenuBarHeight = NSHeight(primaryScreen.frame) - NSMaxY(primaryScreen.visibleFrame); + } - if (!QuartsResyncKeymap(FALSE)) { - ErrorF("X11ApplicationMain: Could not build a valid keymap.\n"); - } + eventTranslationQueue = dispatch_queue_create(BUNDLE_ID_PREFIX ".X11.NSEventsToX11EventsQueue", NULL); + assert(eventTranslationQueue != NULL); - /* Tell the server thread that it can proceed */ - QuartzInitServer(argc, argv, envp); + /* Set the key layout seed before we start the server */ + last_key_layout = TISCopyCurrentKeyboardLayoutInputSource(); - /* This must be done after QuartzInitServer because it can result in - * an mieqEnqueue() - - */ - check_xinitrc(); + if (!last_key_layout) { + ErrorF("X11ApplicationMain: Unable to determine TISCopyCurrentKeyboardLayoutInputSource() at startup.\n"); + } + + if (!QuartsResyncKeymap(FALSE)) { + ErrorF("X11ApplicationMain: Could not build a valid keymap.\n"); + } - create_thread(xpbproxy_x_thread, NULL); + /* Tell the server thread that it can proceed */ + QuartzInitServer(argc, argv, envp); + + /* This must be done after QuartzInitServer because it can result in + * an mieqEnqueue() - + */ + check_xinitrc(); + + create_thread(xpbproxy_x_thread, NULL); #if XQUARTZ_SPARKLE - [[X11App controller] setup_sparkle]; - [[SUUpdater sharedUpdater] resetUpdateCycle]; - // [[SUUpdater sharedUpdater] checkForUpdates:X11App]; + [[X11App controller] setup_sparkle]; + [[SUUpdater sharedUpdater] resetUpdateCycle]; + // [[SUUpdater sharedUpdater] checkForUpdates:X11App]; #endif + } - [pool release]; [NSApp run]; /* not reached */ } @@ -1570,8 +1489,6 @@ } if (!XQuartzServerVisible && noTestExtensions) { -#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0 - /* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */ xp_window_id wid = 0; xp_error err; @@ -1584,7 +1501,6 @@ err = xp_find_window(location.x, location.y, 0, &wid); if (err != XP_Success || (err == XP_Success && wid == 0)) -#endif { bgMouseLocation = location; bgMouseLocationUpdated = TRUE; @@ -1640,11 +1556,6 @@ case NSScrollWheel: { -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050 - float deltaX = [e deltaX]; - float deltaY = [e deltaY]; - BOOL isContinuous = NO; -#else CGFloat deltaX = [e deltaX]; CGFloat deltaY = [e deltaY]; CGEventRef cge = [e CGEvent]; @@ -1666,28 +1577,12 @@ deltaY *= lineHeight / 5.0; } #endif -#endif -#if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0 - /* If we're in the background, we need to send a MotionNotify event - * first, since we aren't getting them on background mouse motion - */ - if (!XQuartzServerVisible && noTestExtensions) { - bgMouseLocationUpdated = FALSE; - DarwinSendPointerEvents(darwinPointer, MotionNotify, 0, - location.x, location.y, - 0.0, 0.0); - } -#endif -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 - // TODO: Change 1117 to NSAppKitVersionNumber10_7 when it is defined - if (NSAppKitVersionNumber >= 1117 && - XQuartzScrollInDeviceDirection && + if (XQuartzScrollInDeviceDirection && [e isDirectionInvertedFromDevice]) { deltaX *= -1; deltaY *= -1; } -#endif /* This hack is in place to better deal with "clicky" scroll wheels: * http://xquartz.macosforge.org/trac/ticket/562 */ @@ -1793,7 +1688,6 @@ } if (darwinSyncKeymap) { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 TISInputSourceRef key_layout = TISCopyCurrentKeyboardLayoutInputSource(); TISInputSourceRef clear; @@ -1805,12 +1699,7 @@ clear = last_key_layout; last_key_layout = key_layout; CFRelease(clear); -#else - KeyboardLayoutRef key_layout; - KLGetCurrentKeyboardLayout(&key_layout); - if (key_layout != last_key_layout) { - last_key_layout = key_layout; -#endif + /* Update keyInfo */ if (!QuartsResyncKeymap(TRUE)) { ErrorF( diff -Nru xorg-server-1.20.9/hw/xquartz/X11Controller.h xorg-server-1.20.13/hw/xquartz/X11Controller.h --- xorg-server-1.20.9/hw/xquartz/X11Controller.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/X11Controller.h 2021-07-29 18:48:14.000000000 +0000 @@ -46,76 +46,43 @@ #undef BOOL #endif -#ifndef NSINTEGER_DEFINED -#if __LP64__ || NS_BUILD_32_LIKE_64 -typedef long NSInteger; -typedef unsigned long NSUInteger; -#else -typedef int NSInteger; -typedef unsigned int NSUInteger; -#endif -#endif - -@interface X11Controller : NSObject -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 - -#endif -{ - IBOutlet NSPanel *prefs_panel; - - IBOutlet NSButton *fake_buttons; - IBOutlet NSButton *enable_fullscreen; - IBOutlet NSButton *enable_fullscreen_menu; - IBOutlet NSTextField *enable_fullscreen_menu_text; - IBOutlet NSButton *enable_keyequivs; - IBOutlet NSButton *sync_keymap; - IBOutlet NSButton *option_sends_alt; - IBOutlet NSButton *scroll_in_device_direction; - IBOutlet NSButton *click_through; - IBOutlet NSButton *focus_follows_mouse; - IBOutlet NSButton *focus_on_new_window; - IBOutlet NSButton *enable_auth; - IBOutlet NSButton *enable_tcp; - IBOutlet NSButton *sync_pasteboard; - IBOutlet NSButton *sync_pasteboard_to_clipboard; - IBOutlet NSButton *sync_pasteboard_to_primary; - IBOutlet NSButton *sync_clipboard_to_pasteboard; - IBOutlet NSButton *sync_primary_immediately; - IBOutlet NSTextField *sync_text1; - IBOutlet NSTextField *sync_text2; - IBOutlet NSPopUpButton *depth; - - IBOutlet NSMenuItem *window_separator; - // window_separator is DEPRECATED due to this radar: - // NSApplication releases the separator in the Windows menu even though it's an IBOutlet - // It is kept around for localization compatability and is subject to removal "eventually" - // If it is !NULL (meaning it is in the nib), it is removed from the menu and released - - IBOutlet NSMenuItem *x11_about_item; - IBOutlet NSMenuItem *dock_window_separator; - IBOutlet NSMenuItem *apps_separator; - IBOutlet NSMenuItem *toggle_fullscreen_item; -#ifdef XQUARTZ_SPARKLE - NSMenuItem *check_for_updates_item; // Programatically enabled -#endif - IBOutlet NSMenuItem *copy_menu_item; - IBOutlet NSMenu *dock_apps_menu; - IBOutlet NSTableView *apps_table; - - NSArray *apps; - NSMutableArray *table_apps; - - IBOutlet NSMenu *dock_menu; +@interface X11Controller : NSObject +@property (nonatomic, readwrite, strong) IBOutlet NSPanel *prefs_panel; - // This is where in the Windows menu we'll start (this will be the index of the separator) - NSInteger windows_menu_start; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *fake_buttons; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *enable_fullscreen; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *enable_fullscreen_menu; +@property (nonatomic, readwrite, strong) IBOutlet NSTextField *enable_fullscreen_menu_text; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *enable_keyequivs; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *sync_keymap; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *option_sends_alt; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *scroll_in_device_direction; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *click_through; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *focus_follows_mouse; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *focus_on_new_window; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *enable_auth; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *enable_tcp; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *sync_pasteboard; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *sync_pasteboard_to_clipboard; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *sync_pasteboard_to_primary; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *sync_clipboard_to_pasteboard; +@property (nonatomic, readwrite, strong) IBOutlet NSButton *sync_primary_immediately; +@property (nonatomic, readwrite, strong) IBOutlet NSTextField *sync_text1; +@property (nonatomic, readwrite, strong) IBOutlet NSTextField *sync_text2; +@property (nonatomic, readwrite, strong) IBOutlet NSPopUpButton *depth; + +@property (nonatomic, readwrite, strong) IBOutlet NSMenuItem *x11_about_item; +@property (nonatomic, readwrite, strong) IBOutlet NSMenuItem *dock_window_separator; +@property (nonatomic, readwrite, strong) IBOutlet NSMenuItem *apps_separator; +@property (nonatomic, readwrite, strong) IBOutlet NSMenuItem *toggle_fullscreen_item; + +@property (nonatomic, readwrite, strong) IBOutlet NSMenuItem *copy_menu_item; +@property (nonatomic, readwrite, strong) IBOutlet NSMenu *dock_apps_menu; +@property (nonatomic, readwrite, strong) IBOutlet NSTableView *apps_table; - int checked_window_item; - x_list *pending_apps; +@property (nonatomic, readwrite, strong) IBOutlet NSMenu *dock_menu; - OSX_BOOL finished_launching; - OSX_BOOL can_quit; -} +@property (nonatomic, readwrite, assign) OSX_BOOL can_quit; - (void)set_window_menu:(NSArray *)list; - (void)set_window_menu_check:(NSNumber *)n; @@ -125,7 +92,6 @@ - (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *) update; #endif -- (void)set_can_quit:(OSX_BOOL)state; - (void)server_ready; - (OSX_BOOL)application:(NSApplication *)app openFile:(NSString *)filename; diff -Nru xorg-server-1.20.9/hw/xquartz/X11Controller.m xorg-server-1.20.13/hw/xquartz/X11Controller.m --- xorg-server-1.20.9/hw/xquartz/X11Controller.m 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/X11Controller.m 2021-07-29 18:48:14.000000000 +0000 @@ -29,14 +29,11 @@ */ #include "sanitizedCarbon.h" -#include #ifdef HAVE_DIX_CONFIG_H #include #endif -#include "quartzCommon.h" - #import "X11Controller.h" #import "X11Application.h" @@ -59,6 +56,19 @@ extern aslclient aslc; extern char *bundle_id_prefix; +@interface X11Controller () +#ifdef XQUARTZ_SPARKLE +@property (nonatomic, readwrite, strong) NSMenuItem *check_for_updates_item; // Programatically enabled +#endif + +@property (nonatomic, readwrite, strong) NSArray *apps; +@property (nonatomic, readwrite, strong) NSMutableArray *table_apps; +@property (nonatomic, readwrite, assign) NSInteger windows_menu_nitems; +@property (nonatomic, readwrite, assign) int checked_window_item; +@property (nonatomic, readwrite, assign) x_list *pending_apps; +@property (nonatomic, readwrite, assign) OSX_BOOL finished_launching; +@end + @implementation X11Controller - (void) awakeFromNib @@ -67,7 +77,7 @@ NSArray *array; /* Point X11Application at ourself. */ - [xapp set_controller:self]; + xapp.controller = self; array = [xapp prefs_get_array:@PREFS_APPSMENU]; if (array != nil) { @@ -103,15 +113,7 @@ addObserver: self selector: @selector(apps_table_done:) name: NSWindowWillCloseNotification - object: [apps_table window]]; - - // Setup data about our Windows menu - if (window_separator) { - [[window_separator menu] removeItem:window_separator]; - window_separator = nil; - } - - windows_menu_start = [[X11App windowsMenu] numberOfItems]; + object: self.apps_table.window]; } - (void) item_selected:sender @@ -122,80 +124,16 @@ AppleWMWindowMenuItem, [sender tag]); } -- (void) remove_window_menu -{ - NSMenu *menu; - int count, i; - - /* Work backwards so we don't mess up the indices */ - menu = [X11App windowsMenu]; - count = [menu numberOfItems]; - for (i = count - 1; i >= windows_menu_start; i--) - [menu removeItemAtIndex:i]; - - count = [dock_menu indexOfItem:dock_window_separator]; - for (i = 0; i < count; i++) - [dock_menu removeItemAtIndex:0]; -} - -- (void) install_window_menu:(NSArray *)list -{ - NSMenu *menu; - NSMenuItem *item; - int first, count, i; - - menu = [X11App windowsMenu]; - first = windows_menu_start + 1; - count = [list count]; - - // Push a Separator - if (count) { - [menu addItem:[NSMenuItem separatorItem]]; - } - - for (i = 0; i < count; i++) { - NSString *name, *shortcut; - - name = [[list objectAtIndex:i] objectAtIndex:0]; - shortcut = [[list objectAtIndex:i] objectAtIndex:1]; - - if (windowItemModMask == 0 || windowItemModMask == -1) - shortcut = @""; - - item = - (NSMenuItem *)[menu addItemWithTitle:name action: - @selector - (item_selected:) keyEquivalent:shortcut]; - [item setKeyEquivalentModifierMask:(NSUInteger)windowItemModMask]; - [item setTarget:self]; - [item setTag:i]; - [item setEnabled:YES]; - - item = (NSMenuItem *)[dock_menu insertItemWithTitle:name - action:@selector - (item_selected:) keyEquivalent:shortcut - atIndex:i]; - [item setKeyEquivalentModifierMask:(NSUInteger)windowItemModMask]; - [item setTarget:self]; - [item setTag:i]; - [item setEnabled:YES]; - } - - if (checked_window_item >= 0 && checked_window_item < count) { - item = (NSMenuItem *)[menu itemAtIndex:first + checked_window_item]; - [item setState:NSOnState]; - item = (NSMenuItem *)[dock_menu itemAtIndex:checked_window_item]; - [item setState:NSOnState]; - } -} - - (void) remove_apps_menu { NSMenu *menu; NSMenuItem *item; int i; - if (apps == nil || apps_separator == nil) return; + NSMenuItem * const apps_separator = self.apps_separator; + NSMenu * const dock_apps_menu = self.dock_apps_menu; + + if (self.apps == nil || apps_separator == nil) return; menu = [apps_separator menu]; @@ -215,8 +153,7 @@ } } - [apps release]; - apps = nil; + self.apps = nil; } - (void) prepend_apps_item:(NSArray *)list index:(int)i menu:(NSMenu *)menu @@ -253,6 +190,9 @@ count = [list count]; + NSMenuItem * const apps_separator = self.apps_separator; + NSMenu * const dock_apps_menu = self.dock_apps_menu; + if (count == 0 || apps_separator == nil) return; menu = [apps_separator menu]; @@ -264,28 +204,89 @@ [self prepend_apps_item:list index:i menu:dock_apps_menu]; } - apps = [list retain]; + self.apps = list; } - (void) set_window_menu:(NSArray *)list { - [self remove_window_menu]; - [self install_window_menu:list]; + NSMenu * const menu = X11App.windowsMenu; + NSMenu * const dock_menu = self.dock_menu; - DarwinSendDDXEvent(kXquartzControllerNotify, 1, - AppleWMWindowMenuNotify); + /* First, remove the existing items from the Window Menu */ + NSInteger itemsToRemove = self.windows_menu_nitems; + if (itemsToRemove > 0) { + NSInteger indexForRemoval = menu.numberOfItems - itemsToRemove - 1; /* we also want to remove the separator */ + + for (NSInteger i = 0 ; i < itemsToRemove + 1 ; i++) { + [menu removeItemAtIndex:indexForRemoval]; + } + + for (NSInteger i = 0 ; i < itemsToRemove; i++) { + [dock_menu removeItemAtIndex:0]; + } + } + + NSInteger const itemsToAdd = list.count; + self.windows_menu_nitems = itemsToAdd; + + if (itemsToAdd > 0) { + NSMenuItem *item; + + // Push a Separator + [menu addItem:[NSMenuItem separatorItem]]; + + for (NSInteger i = 0; i < itemsToAdd; i++) { + NSString *name, *shortcut; + + name = list[i][0]; + shortcut = list[i][1]; + + if (windowItemModMask == 0 || windowItemModMask == -1) + shortcut = @""; + + item = (NSMenuItem *)[menu addItemWithTitle:name + action:@selector(item_selected:) + keyEquivalent:shortcut]; + [item setKeyEquivalentModifierMask:(NSUInteger)windowItemModMask]; + [item setTarget:self]; + [item setTag:i]; + [item setEnabled:YES]; + + item = (NSMenuItem *)[dock_menu insertItemWithTitle:name + action:@selector(item_selected:) + keyEquivalent:shortcut + atIndex:i]; + [item setKeyEquivalentModifierMask:(NSUInteger)windowItemModMask]; + [item setTarget:self]; + [item setTag:i]; + [item setEnabled:YES]; + } + + int const checked_window_item = self.checked_window_item; + if (checked_window_item >= 0 && checked_window_item < itemsToAdd) { + NSInteger first = menu.numberOfItems - itemsToAdd; + item = (NSMenuItem *)[menu itemAtIndex:first + checked_window_item]; + [item setState:NSOnState]; + + item = (NSMenuItem *)[dock_menu itemAtIndex:checked_window_item]; + [item setState:NSOnState]; + } + } + + DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMWindowMenuNotify); } - (void) set_window_menu_check:(NSNumber *)nn { - NSMenu *menu; + NSMenu * const menu = X11App.windowsMenu; + NSMenu * const dock_menu = self.dock_menu; NSMenuItem *item; - int first, count; - int n = [nn intValue]; + int n = nn.intValue; + + NSInteger const count = self.windows_menu_nitems; + NSInteger const first = menu.numberOfItems - count; - menu = [X11App windowsMenu]; - first = windows_menu_start + 1; - count = [menu numberOfItems] - first; + int const checked_window_item = self.checked_window_item; if (checked_window_item >= 0 && checked_window_item < count) { item = (NSMenuItem *)[menu itemAtIndex:first + checked_window_item]; @@ -299,7 +300,7 @@ item = (NSMenuItem *)[dock_menu itemAtIndex:n]; [item setState:NSOnState]; } - checked_window_item = n; + self.checked_window_item = n; } - (void) set_apps_menu:(NSArray *)list @@ -311,31 +312,29 @@ #ifdef XQUARTZ_SPARKLE - (void) setup_sparkle { - if (check_for_updates_item) + if (self.check_for_updates_item) return; // already did it... - NSMenu *menu = [x11_about_item menu]; + NSMenu *menu = [self.x11_about_item menu]; - check_for_updates_item = - [menu insertItemWithTitle:NSLocalizedString( - @"Check for X11 Updates...", - @"Check for X11 Updates...") - action:@selector ( - checkForUpdates:) - keyEquivalent:@"" - atIndex:1]; + NSMenuItem * const check_for_updates_item = + [menu insertItemWithTitle:NSLocalizedString(@"Check for X11 Updates...", @"Check for X11 Updates...") + action:@selector(checkForUpdates:) + keyEquivalent:@"" + atIndex:1]; [check_for_updates_item setTarget:[SUUpdater sharedUpdater]]; [check_for_updates_item setEnabled:YES]; + self.check_for_updates_item = check_for_updates_item; + // Set X11Controller as the delegate for the updater. [[SUUpdater sharedUpdater] setDelegate:self]; } // Sent immediately before installing the specified update. -- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *) - update +- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update { - //[self set_can_quit:YES]; + //self.can_quit = YES; } #endif @@ -347,10 +346,8 @@ const char *newargv[4]; char buf[128]; char *s; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 int stdout_pipe[2]; int stderr_pipe[2]; -#endif newargv[0] = [X11App prefs_get_string:@PREFS_LOGIN_SHELL default:"/bin/sh"]; newargv[1] = "-c"; @@ -363,7 +360,6 @@ setenv("DISPLAY", buf, TRUE); } -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 if (&asl_log_descriptor) { char *asl_sender; aslmsg amsg = asl_new(ASL_TYPE_MSG); @@ -395,7 +391,6 @@ asl_free(amsg); } -#endif /* Do the fork-twice trick to avoid having to reap zombies */ child1 = fork(); @@ -413,13 +408,11 @@ _exit(1); case 0: /* child2 */ -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 if (&asl_log_descriptor) { /* Replace our stdout/stderr */ dup2(stdout_pipe[1], STDOUT_FILENO); dup2(stderr_pipe[1], STDERR_FILENO); } -#endif /* close all open files except for standard streams */ max_files = sysconf(_SC_OPEN_MAX); @@ -442,19 +435,18 @@ waitpid(child1, &status, 0); } -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 if (&asl_log_descriptor) { /* Close the write ends of the pipe */ close(stdout_pipe[1]); close(stderr_pipe[1]); } -#endif } - (void) app_selected:sender { int tag; NSString *item; + NSArray * const apps = self.apps; tag = [sender tag] - 1; if (apps == nil || tag < 0 || tag >= [apps count]) @@ -468,12 +460,13 @@ - (IBAction) apps_table_show:sender { NSArray *columns; - NSMutableArray *oldapps = nil; + NSMutableArray *oldapps = self.table_apps; + NSTableView * const apps_table = self.apps_table; - if (table_apps != nil) - oldapps = table_apps; + NSMutableArray * const table_apps = [[NSMutableArray alloc] initWithCapacity:1]; + self.table_apps = table_apps; - table_apps = [[NSMutableArray alloc] initWithCapacity:1]; + NSArray * const apps = self.apps; if (apps != nil) [table_apps addObjectsFromArray:apps]; @@ -494,6 +487,8 @@ - (IBAction) apps_table_done:sender { + NSMutableArray * const table_apps = self.table_apps; + NSTableView * const apps_table = self.apps_table; [apps_table deselectAll:sender]; /* flush edits? */ [self remove_apps_menu]; @@ -504,13 +499,14 @@ [[apps_table window] orderOut:sender]; - [table_apps release]; - table_apps = nil; + self.table_apps = nil; } - (IBAction) apps_table_new:sender { NSMutableArray *item; + NSMutableArray * const table_apps = self.table_apps; + NSTableView * const apps_table = self.apps_table; int row = [apps_table selectedRow], i; @@ -538,6 +534,8 @@ - (IBAction) apps_table_duplicate:sender { + NSMutableArray * const table_apps = self.table_apps; + NSTableView * const apps_table = self.apps_table; int row = [apps_table selectedRow], i; NSObject *item; @@ -562,6 +560,8 @@ - (IBAction) apps_table_delete:sender { + NSMutableArray * const table_apps = self.table_apps; + NSTableView * const apps_table = self.apps_table; int row = [apps_table selectedRow]; if (row >= 0) { @@ -584,6 +584,7 @@ - (NSInteger) numberOfRowsInTableView:(NSTableView *)tableView { + NSMutableArray * const table_apps = self.table_apps; if (table_apps == nil) return 0; return [table_apps count]; @@ -592,6 +593,7 @@ - (id) tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { + NSMutableArray * const table_apps = self.table_apps; NSArray *item; int col; @@ -609,6 +611,7 @@ - (void) tableView:(NSTableView *)tableView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { + NSMutableArray * const table_apps = self.table_apps; NSMutableArray *item; int col; @@ -669,11 +672,10 @@ - (IBAction) enable_fullscreen_changed:sender { - XQuartzRootlessDefault = ![enable_fullscreen intValue]; + XQuartzRootlessDefault = !self.enable_fullscreen.intValue; - [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault]; - [enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ?[ - NSColor disabledControlTextColor] : [NSColor controlTextColor]]; + [self.enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault]; + [self.enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ? NSColor.disabledControlTextColor : NSColor.controlTextColor]; DarwinSendDDXEvent(kXquartzSetRootless, 1, XQuartzRootlessDefault); @@ -686,102 +688,85 @@ DarwinSendDDXEvent(kXquartzToggleFullscreen, 0); } -- (void) set_can_quit:(OSX_BOOL)state -{ - can_quit = state; -} - - (IBAction)prefs_changed:sender { if (!sender) return; - if (sender == fake_buttons) { - darwinFakeButtons = [fake_buttons intValue]; + if (sender == self.fake_buttons) { + darwinFakeButtons = self.fake_buttons.intValue; [NSApp prefs_set_boolean:@PREFS_FAKEBUTTONS value:darwinFakeButtons]; } - else if (sender == enable_keyequivs) { - XQuartzEnableKeyEquivalents = [enable_keyequivs intValue]; + else if (sender == self.enable_keyequivs) { + XQuartzEnableKeyEquivalents = self.enable_keyequivs.intValue; [NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value: XQuartzEnableKeyEquivalents]; } - else if (sender == sync_keymap) { - darwinSyncKeymap = [sync_keymap intValue]; + else if (sender == self.sync_keymap) { + darwinSyncKeymap = self.sync_keymap.intValue; [NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap]; } - else if (sender == enable_fullscreen_menu) { - XQuartzFullscreenMenu = [enable_fullscreen_menu intValue]; + else if (sender == self.enable_fullscreen_menu) { + XQuartzFullscreenMenu = self.enable_fullscreen_menu.intValue; [NSApp prefs_set_boolean:@PREFS_FULLSCREEN_MENU value: XQuartzFullscreenMenu]; } - else if (sender == option_sends_alt) { + else if (sender == self.option_sends_alt) { BOOL prev_opt_sends_alt = XQuartzOptionSendsAlt; - XQuartzOptionSendsAlt = [option_sends_alt intValue]; + XQuartzOptionSendsAlt = self.option_sends_alt.intValue; [NSApp prefs_set_boolean:@PREFS_OPTION_SENDS_ALT value: XQuartzOptionSendsAlt]; if (prev_opt_sends_alt != XQuartzOptionSendsAlt) QuartsResyncKeymap(TRUE); } - else if (sender == click_through) { - [NSApp prefs_set_boolean:@PREFS_CLICK_THROUGH value:[click_through - intValue]]; - } - else if (sender == focus_follows_mouse) { - [NSApp prefs_set_boolean:@PREFS_FFM value:[focus_follows_mouse - intValue]]; - } - else if (sender == focus_on_new_window) { - [NSApp prefs_set_boolean:@PREFS_FOCUS_ON_NEW_WINDOW value:[ - focus_on_new_window intValue]]; - } - else if (sender == enable_auth) { - [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue] - ]; + else if (sender == self.click_through) { + [NSApp prefs_set_boolean:@PREFS_CLICK_THROUGH value:self.click_through.intValue]; + } + else if (sender == self.focus_follows_mouse) { + [NSApp prefs_set_boolean:@PREFS_FFM value:self.focus_follows_mouse.intValue]; + } + else if (sender == self.focus_on_new_window) { + [NSApp prefs_set_boolean:@PREFS_FOCUS_ON_NEW_WINDOW value:self.focus_on_new_window.intValue]; + } + else if (sender == self.enable_auth) { + [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:!self.enable_auth.intValue]; } - else if (sender == enable_tcp) { - [NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]]; + else if (sender == self.enable_tcp) { + [NSApp prefs_set_boolean:@PREFS_NO_TCP value:!self.enable_tcp.intValue]; } - else if (sender == depth) { - [NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]]; + else if (sender == self.depth) { + [NSApp prefs_set_integer:@PREFS_DEPTH value:self.depth.selectedTag]; } - else if (sender == sync_pasteboard) { - BOOL pbproxy_active = [sync_pasteboard intValue]; + else if (sender == self.sync_pasteboard) { + BOOL pbproxy_active = self.sync_pasteboard.intValue; [NSApp prefs_set_boolean:@PREFS_SYNC_PB value:pbproxy_active]; - [sync_pasteboard_to_clipboard setEnabled:pbproxy_active]; - [sync_pasteboard_to_primary setEnabled:pbproxy_active]; - [sync_clipboard_to_pasteboard setEnabled:pbproxy_active]; - [sync_primary_immediately setEnabled:pbproxy_active]; + [self.sync_pasteboard_to_clipboard setEnabled:pbproxy_active]; + [self.sync_pasteboard_to_primary setEnabled:pbproxy_active]; + [self.sync_clipboard_to_pasteboard setEnabled:pbproxy_active]; + [self.sync_primary_immediately setEnabled:pbproxy_active]; // setEnabled doesn't do this... - [sync_text1 setTextColor:pbproxy_active ?[NSColor controlTextColor] : - [NSColor disabledControlTextColor]]; - [sync_text2 setTextColor:pbproxy_active ?[NSColor controlTextColor] : - [NSColor disabledControlTextColor]]; - } - else if (sender == sync_pasteboard_to_clipboard) { - [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD value:[ - sync_pasteboard_to_clipboard intValue]]; - } - else if (sender == sync_pasteboard_to_primary) { - [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_PRIMARY value:[ - sync_pasteboard_to_primary intValue]]; - } - else if (sender == sync_clipboard_to_pasteboard) { - [NSApp prefs_set_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB value:[ - sync_clipboard_to_pasteboard intValue]]; - } - else if (sender == sync_primary_immediately) { - [NSApp prefs_set_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT value:[ - sync_primary_immediately intValue]]; - } - else if (sender == scroll_in_device_direction) { - XQuartzScrollInDeviceDirection = - [scroll_in_device_direction intValue]; - [NSApp prefs_set_boolean:@PREFS_SCROLL_IN_DEV_DIRECTION value: - XQuartzScrollInDeviceDirection]; + [self.sync_text1 setTextColor:pbproxy_active ? NSColor.controlTextColor : NSColor.disabledControlTextColor]; + [self.sync_text2 setTextColor:pbproxy_active ? NSColor.controlTextColor : NSColor.disabledControlTextColor]; + } + else if (sender == self.sync_pasteboard_to_clipboard) { + [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD value:self.sync_pasteboard_to_clipboard.intValue]; + } + else if (sender == self.sync_pasteboard_to_primary) { + [NSApp prefs_set_boolean:@PREFS_SYNC_PB_TO_PRIMARY value:self.sync_pasteboard_to_primary.intValue]; + } + else if (sender == self.sync_clipboard_to_pasteboard) { + [NSApp prefs_set_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB value:self.sync_clipboard_to_pasteboard.intValue]; + } + else if (sender == self.sync_primary_immediately) { + [NSApp prefs_set_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT value:self.sync_primary_immediately.intValue]; + } + else if (sender == self.scroll_in_device_direction) { + XQuartzScrollInDeviceDirection = self.scroll_in_device_direction.intValue; + [NSApp prefs_set_boolean:@PREFS_SCROLL_IN_DEV_DIRECTION value:XQuartzScrollInDeviceDirection]; } [NSApp prefs_synchronize]; @@ -794,71 +779,42 @@ BOOL pbproxy_active = [NSApp prefs_get_boolean:@PREFS_SYNC_PB default:YES]; - // Remove preferences from the GUI which are not supported - // TODO: Change 1117 to NSAppKitVersionNumber10_7 when it is defined - if (scroll_in_device_direction && NSAppKitVersionNumber < 1117) { - [scroll_in_device_direction removeFromSuperview]; - scroll_in_device_direction = nil; - } - else { - [scroll_in_device_direction setIntValue: - XQuartzScrollInDeviceDirection]; - } + [self.scroll_in_device_direction setIntValue:XQuartzScrollInDeviceDirection]; - [fake_buttons setIntValue:darwinFakeButtons]; - [enable_keyequivs setIntValue:XQuartzEnableKeyEquivalents]; - [sync_keymap setIntValue:darwinSyncKeymap]; - [option_sends_alt setIntValue:XQuartzOptionSendsAlt]; - [click_through setIntValue:[NSApp prefs_get_boolean:@PREFS_CLICK_THROUGH - default:NO]]; - [focus_follows_mouse setIntValue:[NSApp prefs_get_boolean:@PREFS_FFM - default:NO]]; - [focus_on_new_window setIntValue:[NSApp prefs_get_boolean: - @PREFS_FOCUS_ON_NEW_WINDOW default:YES] - ]; - - [enable_auth setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_AUTH default - :NO]]; - [enable_tcp setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_TCP default: - NO]]; - - [depth selectItemAtIndex:[depth indexOfItemWithTag:[NSApp - prefs_get_integer: - @PREFS_DEPTH default: - -1]]]; - - [sync_pasteboard setIntValue:pbproxy_active]; - [sync_pasteboard_to_clipboard setIntValue:[NSApp prefs_get_boolean: - @PREFS_SYNC_PB_TO_CLIPBOARD - default:YES]]; - [sync_pasteboard_to_primary setIntValue:[NSApp prefs_get_boolean: - @PREFS_SYNC_PB_TO_PRIMARY - default:YES]]; - [sync_clipboard_to_pasteboard setIntValue:[NSApp prefs_get_boolean: - @PREFS_SYNC_CLIPBOARD_TO_PB - default:YES]]; - [sync_primary_immediately setIntValue:[NSApp prefs_get_boolean: - @PREFS_SYNC_PRIMARY_ON_SELECT - default:NO]]; - - [sync_pasteboard_to_clipboard setEnabled:pbproxy_active]; - [sync_pasteboard_to_primary setEnabled:pbproxy_active]; - [sync_clipboard_to_pasteboard setEnabled:pbproxy_active]; - [sync_primary_immediately setEnabled:pbproxy_active]; + [self.fake_buttons setIntValue:darwinFakeButtons]; + [self.enable_keyequivs setIntValue:XQuartzEnableKeyEquivalents]; + [self.sync_keymap setIntValue:darwinSyncKeymap]; + [self.option_sends_alt setIntValue:XQuartzOptionSendsAlt]; + [self.click_through setIntValue:[NSApp prefs_get_boolean:@PREFS_CLICK_THROUGH default:NO]]; + [self.focus_follows_mouse setIntValue:[NSApp prefs_get_boolean:@PREFS_FFM default:NO]]; + [self.focus_on_new_window setIntValue:[NSApp prefs_get_boolean:@PREFS_FOCUS_ON_NEW_WINDOW default:YES]]; + + [self.enable_auth setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_AUTH default:NO]]; + [self.enable_tcp setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_TCP default:NO]]; + + [self.depth selectItemAtIndex:[self.depth indexOfItemWithTag:[NSApp prefs_get_integer:@PREFS_DEPTH default:-1]]]; + + [self.sync_pasteboard setIntValue:pbproxy_active]; + [self.sync_pasteboard_to_clipboard setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD default:YES]]; + [self.sync_pasteboard_to_primary setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PB_TO_PRIMARY default:YES]]; + [self.sync_clipboard_to_pasteboard setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB default:YES]]; + [self.sync_primary_immediately setIntValue:[NSApp prefs_get_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT default:NO]]; + + [self.sync_pasteboard_to_clipboard setEnabled:pbproxy_active]; + [self.sync_pasteboard_to_primary setEnabled:pbproxy_active]; + [self.sync_clipboard_to_pasteboard setEnabled:pbproxy_active]; + [self.sync_primary_immediately setEnabled:pbproxy_active]; // setEnabled doesn't do this... - [sync_text1 setTextColor:pbproxy_active ?[NSColor controlTextColor] : [ - NSColor disabledControlTextColor]]; - [sync_text2 setTextColor:pbproxy_active ?[NSColor controlTextColor] : [ - NSColor disabledControlTextColor]]; - - [enable_fullscreen setIntValue:!XQuartzRootlessDefault]; - [enable_fullscreen_menu setIntValue:XQuartzFullscreenMenu]; - [enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault]; - [enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ?[ - NSColor disabledControlTextColor] : [NSColor controlTextColor]]; + [self.sync_text1 setTextColor:pbproxy_active ? NSColor.controlTextColor : NSColor.disabledControlTextColor]; + [self.sync_text2 setTextColor:pbproxy_active ? NSColor.controlTextColor : NSColor.disabledControlTextColor]; - [prefs_panel makeKeyAndOrderFront:sender]; + [self.enable_fullscreen setIntValue:!XQuartzRootlessDefault]; + [self.enable_fullscreen_menu setIntValue:XQuartzFullscreenMenu]; + [self.enable_fullscreen_menu setEnabled:!XQuartzRootlessDefault]; + [self.enable_fullscreen_menu_text setTextColor:XQuartzRootlessDefault ? NSColor.disabledControlTextColor : NSColor.controlTextColor]; + + [self.prefs_panel makeKeyAndOrderFront:sender]; } - (IBAction) quit:sender @@ -868,23 +824,18 @@ - (IBAction) x11_help:sender { -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - AHLookupAnchor((CFStringRef)NSLocalizedString(@"Mac Help", - no comment), - CFSTR("mchlp2276")); -#else AHLookupAnchor(CFSTR("com.apple.machelp"), CFSTR("mchlp2276")); -#endif } - (OSX_BOOL) validateMenuItem:(NSMenuItem *)item { NSMenu *menu = [item menu]; + NSMenu * const dock_menu = self.dock_menu; - if (item == toggle_fullscreen_item) + if (item == self.toggle_fullscreen_item) return !XQuartzIsRootless; else if (menu == [X11App windowsMenu] || menu == dock_menu - || (menu == [x11_about_item menu] && [item tag] == 42)) + || (menu == [self.x11_about_item menu] && [item tag] == 42)) return (AppleWMSelectedEvents() & AppleWMControllerNotifyMask) != 0; else return TRUE; @@ -912,7 +863,7 @@ NSString *msg; NSString *title; - if (can_quit || + if (self.can_quit || [X11App prefs_get_boolean:@PREFS_NO_QUIT_ALERT default:NO]) return NSTerminateNow; @@ -951,26 +902,26 @@ { x_list *node; - finished_launching = YES; + self.finished_launching = YES; - for (node = pending_apps; node != NULL; node = node->next) { + for (node = self.pending_apps; node != NULL; node = node->next) { NSString *filename = node->data; [self launch_client:filename]; [filename release]; } - x_list_free(pending_apps); - pending_apps = NULL; + x_list_free(self.pending_apps); + self.pending_apps = NULL; } - (OSX_BOOL) application:(NSApplication *)app openFile:(NSString *)filename { const char *name = [filename UTF8String]; - if (finished_launching) + if (self.finished_launching) [self launch_client:filename]; else if (name[0] != ':') /* ignore display names */ - pending_apps = x_list_prepend(pending_apps, [filename retain]); + self.pending_apps = x_list_prepend(self.pending_apps, [filename retain]); /* FIXME: report failures. */ return YES; diff -Nru xorg-server-1.20.9/hw/xquartz/xpr/dri.c xorg-server-1.20.13/hw/xquartz/xpr/dri.c --- xorg-server-1.20.9/hw/xquartz/xpr/dri.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/xpr/dri.c 2021-07-29 18:48:14.000000000 +0000 @@ -69,8 +69,6 @@ #include "x-hook.h" #include "driWrap.h" -#include - static DevPrivateKeyRec DRIScreenPrivKeyRec; #define DRIScreenPrivKey (&DRIScreenPrivKeyRec) static DevPrivateKeyRec DRIWindowPrivKeyRec; @@ -216,12 +214,10 @@ if (pDRIDrawablePriv->sid == 0) return; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030 wc.depth = (pDraw->bitsPerPixel == 32 ? XP_DEPTH_ARGB8888 : pDraw->bitsPerPixel == 16 ? XP_DEPTH_RGB555 : XP_DEPTH_NIL); if (wc.depth != XP_DEPTH_NIL) flags |= XP_DEPTH; -#endif if (pDraw->type == DRAWABLE_WINDOW) { WindowPtr pWin = (WindowPtr)pDraw; @@ -382,17 +378,13 @@ if (NULL == pDRIDrawablePriv) return FALSE; /*error*/ - } -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030 - else if (pDrawable->type == DRAWABLE_PIXMAP) { + } else if (pDrawable->type == DRAWABLE_PIXMAP) { pDRIDrawablePriv = CreateSurfaceForPixmap(pScreen, (PixmapPtr)pDrawable); if (NULL == pDRIDrawablePriv) return FALSE; /*error*/ - } -#endif - else { + } else { /* We handle GLXPbuffers in a different way (via CGL). */ return FALSE; } diff -Nru xorg-server-1.20.9/hw/xquartz/xpr/driWrap.c xorg-server-1.20.13/hw/xquartz/xpr/driWrap.c --- xorg-server-1.20.9/hw/xquartz/xpr/driWrap.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/xpr/driWrap.c 2021-07-29 18:48:14.000000000 +0000 @@ -45,7 +45,7 @@ #include typedef struct { - GCOps *originalOps; + GCOps const *originalOps; } DRIGCRec; typedef struct { diff -Nru xorg-server-1.20.9/hw/xquartz/xpr/Makefile.in xorg-server-1.20.13/hw/xquartz/xpr/Makefile.in --- xorg-server-1.20.9/hw/xquartz/xpr/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/xpr/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -534,6 +534,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xquartz/xpr/xprAppleWM.c xorg-server-1.20.13/hw/xquartz/xpr/xprAppleWM.c --- xorg-server-1.20.9/hw/xquartz/xpr/xprAppleWM.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/xpr/xprAppleWM.c 2021-07-29 18:48:14.000000000 +0000 @@ -82,7 +82,6 @@ return Success; } -#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3 static int xprAttachTransient(WindowPtr pWinChild, WindowPtr pWinParent) { @@ -114,7 +113,6 @@ return Success; } -#endif static int xprFrameDraw(WindowPtr pWin, @@ -146,16 +144,8 @@ xp_frame_get_rect, xp_frame_hit_test, xprFrameDraw, -#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3 xp_set_dock_proxy, xprAttachTransient -#elif defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 2 - xp_set_dock_proxy, - NULL -#else - NULL, - NULL -#endif }; void diff -Nru xorg-server-1.20.9/hw/xquartz/xpr/xprCursor.c xorg-server-1.20.13/hw/xquartz/xpr/xprCursor.c --- xorg-server-1.20.9/hw/xquartz/xpr/xprCursor.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/xpr/xprCursor.c 2021-07-29 18:48:14.000000000 +0000 @@ -380,7 +380,9 @@ */ void QuartzSuspendXCursor(ScreenPtr pScreen) -{} +{ + xp_show_cursor(); +} /* * QuartzResumeXCursor diff -Nru xorg-server-1.20.9/hw/xquartz/xpr/xprEvent.c xorg-server-1.20.13/hw/xquartz/xpr/xprEvent.c --- xorg-server-1.20.9/hw/xquartz/xpr/xprEvent.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/xpr/xprEvent.c 2021-07-29 18:48:14.000000000 +0000 @@ -52,9 +52,7 @@ #include #include -#ifdef HAVE_LIBDISPATCH #include -#endif #include "rootlessWindow.h" #include "xprEvent.h" @@ -76,24 +74,9 @@ case kXquartzBringAllToFront: DEBUG_LOG("kXquartzBringAllToFront\n"); - /* There's no need to do xp_window_bring_all_to_front on Leopard, - * and we don't care about the result, so just do it async. - */ -#if defined(HAVE_LIBDISPATCH) && defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 6 -# if defined(XPLUGIN_VERSION_MIN_REQUIRED) && XPLUGIN_VERSION_MIN_REQUIRED < 6 - if (&xp_window_bring_all_to_front) { -# endif - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ - xp_window_bring_all_to_front(); - }); -# if defined(XPLUGIN_VERSION_MIN_REQUIRED) && XPLUGIN_VERSION_MIN_REQUIRED < 6 - } else { - RootlessOrderAllWindows(e->data[0]); - } -# endif -#else - RootlessOrderAllWindows(e->data[0]); -#endif + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + xp_window_bring_all_to_front(); + }); return TRUE; diff -Nru xorg-server-1.20.9/hw/xquartz/xpr/xprFrame.c xorg-server-1.20.13/hw/xquartz/xpr/xprFrame.c --- xorg-server-1.20.9/hw/xquartz/xpr/xprFrame.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/xpr/xprFrame.c 2021-07-29 18:48:14.000000000 +0000 @@ -43,11 +43,7 @@ #include "windowstr.h" #include "quartz.h" -#ifdef HAVE_LIBDISPATCH #include -#else -#include -#endif #ifdef DEBUG_XP_LOCK_WINDOW #include @@ -70,11 +66,7 @@ static x_hash_table * window_hash; /* Need to guard window_hash since xprIsX11Window can be called from any thread. */ -#ifdef HAVE_LIBDISPATCH static dispatch_queue_t window_hash_serial_q; -#else -static pthread_rwlock_t window_hash_rwlock; -#endif /* Prototypes for static functions */ static Bool @@ -209,15 +201,9 @@ return FALSE; } -#ifdef HAVE_LIBDISPATCH dispatch_async(window_hash_serial_q, ^ { x_hash_table_insert(window_hash, pFrame->wid, pFrame); }); -#else - pthread_rwlock_wrlock(&window_hash_rwlock); - x_hash_table_insert(window_hash, pFrame->wid, pFrame); - pthread_rwlock_unlock(&window_hash_rwlock); -#endif xprSetNativeProperty(pFrame); @@ -232,15 +218,9 @@ { xp_error err; -#ifdef HAVE_LIBDISPATCH dispatch_async(window_hash_serial_q, ^ { x_hash_table_remove(window_hash, wid); }); -#else - pthread_rwlock_wrlock(&window_hash_rwlock); - x_hash_table_remove(window_hash, wid); - pthread_rwlock_unlock(&window_hash_rwlock); -#endif err = xp_destroy_window(x_cvt_vptr_to_uint(wid)); if (err != Success) @@ -293,9 +273,7 @@ { xp_window_changes wc; unsigned int mask = XP_STACKING; -#ifdef HAVE_LIBDISPATCH __block -#endif RootlessWindowRec * winRec; /* Stack frame below nextWid it if it exists, or raise @@ -310,15 +288,9 @@ wc.sibling = x_cvt_vptr_to_uint(nextWid); } -#ifdef HAVE_LIBDISPATCH dispatch_sync(window_hash_serial_q, ^ { winRec = x_hash_table_lookup(window_hash, wid, NULL); }); -#else - pthread_rwlock_rdlock(&window_hash_rwlock); - winRec = x_hash_table_lookup(window_hash, wid, NULL); - pthread_rwlock_unlock(&window_hash_rwlock); -#endif if (winRec) { if (XQuartzIsRootless) @@ -519,13 +491,9 @@ rootless_CopyWindow_threshold = xp_scroll_area_threshold; assert((window_hash = x_hash_table_new(NULL, NULL, NULL, NULL))); -#ifdef HAVE_LIBDISPATCH assert((window_hash_serial_q = dispatch_queue_create(BUNDLE_ID_PREFIX ".X11.xpr_window_hash", NULL))); -#else - assert(0 == pthread_rwlock_init(&window_hash_rwlock, NULL)); -#endif return TRUE; } @@ -537,19 +505,12 @@ WindowPtr xprGetXWindow(xp_window_id wid) { -#ifdef HAVE_LIBDISPATCH RootlessWindowRec *winRec __block; dispatch_sync(window_hash_serial_q, ^ { winRec = x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid), NULL); }); -#else - RootlessWindowRec *winRec; - pthread_rwlock_rdlock(&window_hash_rwlock); - winRec = x_hash_table_lookup(window_hash, x_cvt_uint_to_vptr(wid), NULL); - pthread_rwlock_unlock(&window_hash_rwlock); -#endif return winRec != NULL ? winRec->win : NULL; } diff -Nru xorg-server-1.20.9/hw/xquartz/xpr/xprScreen.c xorg-server-1.20.13/hw/xquartz/xpr/xprScreen.c --- xorg-server-1.20.9/hw/xquartz/xpr/xprScreen.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xquartz/xpr/xprScreen.c 2021-07-29 18:48:14.000000000 +0000 @@ -33,7 +33,6 @@ #include #endif -#include "quartzCommon.h" #include "inputstr.h" #include "quartz.h" #include "quartzRandR.h" @@ -56,11 +55,6 @@ #include "nonsdk_extinit.h" -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090 -// From NSApplication.h -extern const double NSAppKitVersionNumber; -#endif - /* 10.4's deferred update makes X slower.. have to live with the tearing * for now.. */ #define XP_NO_DEFERRED_UPDATES 8 @@ -172,18 +166,13 @@ (int)frame.origin.x, (int)frame.origin.y); Boolean spacePerDisplay = false; -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090 - if (NSAppKitVersionNumber >= 1265) -#endif - { - Boolean ok; - (void)CFPreferencesAppSynchronize(CFSTR("com.apple.spaces")); - spacePerDisplay = ! CFPreferencesGetAppBooleanValue(CFSTR("spans-displays"), - CFSTR("com.apple.spaces"), - &ok); - if (!ok) - spacePerDisplay = true; - } + Boolean ok; + (void)CFPreferencesAppSynchronize(CFSTR("com.apple.spaces")); + spacePerDisplay = ! CFPreferencesGetAppBooleanValue(CFSTR("spans-displays"), + CFSTR("com.apple.spaces"), + &ok); + if (!ok) + spacePerDisplay = true; /* Remove menubar to help standard X11 window managers. * On Mavericks and later, the menu bar is on all displays when spans-displays is false or unset. @@ -331,10 +320,6 @@ DEBUG_LOG("index=%d depth=%d\n", index, depth); if (depth == -1) { -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - depth = CGDisplaySamplesPerPixel(kCGDirectMainDisplay) * - CGDisplayBitsPerSample(kCGDirectMainDisplay); -#else CGDisplayModeRef modeRef; CFStringRef encStrRef; @@ -364,12 +349,9 @@ } CFRelease(encStrRef); -#endif } -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 have_depth: -#endif switch (depth) { case 8: // pseudo-working dfb->visuals = PseudoColorMask; @@ -470,7 +452,7 @@ /* * xprUpdateScreen - * Update screen after configuation change. + * Update screen after configuration change. */ static void xprUpdateScreen(ScreenPtr pScreen) diff -Nru xorg-server-1.20.9/hw/xwayland/Makefile.in xorg-server-1.20.13/hw/xwayland/Makefile.in --- xorg-server-1.20.9/hw/xwayland/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xwayland/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -613,6 +613,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xwayland/xwayland.c xorg-server-1.20.13/hw/xwayland/xwayland.c --- xorg-server-1.20.9/hw/xwayland/xwayland.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xwayland/xwayland.c 2021-07-29 18:48:14.000000000 +0000 @@ -178,8 +178,8 @@ xwl_window_set_allow_commits(xwl_window, TRUE, "WM fault"); if (!warned) { - LogMessage(X_WARNING, "Window manager is misusing property %s.\n", - NameForAtom(prop->propertyName)); + LogMessageVerb(X_WARNING, 0, "Window manager is misusing property %s.\n", + NameForAtom(prop->propertyName)); warned = TRUE; } return; @@ -193,8 +193,6 @@ xwl_window_property_allow_commits(struct xwl_window *xwl_window, PropertyStateRec *propstate) { - Bool old_allow_commits = xwl_window->allow_commits; - switch (propstate->state) { case PropertyNewValue: xwl_window_set_allow_commits_from_property(xwl_window, propstate->prop); @@ -207,17 +205,6 @@ default: break; } - - /* If allow_commits turned from off to on, discard any frame - * callback we might be waiting for so that a new buffer is posted - * immediately through block_handler() if there is damage to post. - */ - if (!old_allow_commits && xwl_window->allow_commits) { - if (xwl_window->frame_callback) { - wl_callback_destroy(xwl_window->frame_callback); - xwl_window->frame_callback = NULL; - } - } } static void @@ -540,7 +527,7 @@ struct xwl_window *xwl_window; struct wl_region *region; - if (xwl_window_get(window)) + if (xwl_window_from_window(window)) return TRUE; xwl_screen = xwl_screen_get(screen); @@ -1215,6 +1202,11 @@ ®istry_listener, xwl_screen); xwl_screen_roundtrip(xwl_screen); + if (!xwl_screen->rootless && !xwl_screen->shell) { + ErrorF("missing wl_shell protocol\n"); + return FALSE; + } + bpc = xwl_screen->depth / 3; green_bpc = xwl_screen->depth - 2 * bpc; blue_mask = (1 << bpc) - 1; diff -Nru xorg-server-1.20.9/hw/xwayland/xwayland-glamor-eglstream.c xorg-server-1.20.13/hw/xwayland/xwayland-glamor-eglstream.c --- xorg-server-1.20.9/hw/xwayland/xwayland-glamor-eglstream.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xwayland/xwayland-glamor-eglstream.c 2021-07-29 18:48:14.000000000 +0000 @@ -431,8 +431,8 @@ DebugF("eglstream: win %d completes eglstream for pixmap %p, congrats!\n", pending->window->drawable.id, pending->pixmap); - xwl_eglstream_window_set_pending(pending->window, NULL); out: + xwl_eglstream_window_set_pending(pending->window, NULL); xorg_list_del(&pending->link); free(pending); } diff -Nru xorg-server-1.20.9/hw/xwayland/xwayland-glamor-gbm.c xorg-server-1.20.13/hw/xwayland/xwayland-glamor-gbm.c --- xorg-server-1.20.9/hw/xwayland/xwayland-glamor-gbm.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xwayland/xwayland-glamor-gbm.c 2021-07-29 18:48:14.000000000 +0000 @@ -111,21 +111,6 @@ } static char -is_fd_render_node(int fd) -{ - struct stat render; - - if (fstat(fd, &render)) - return 0; - if (!S_ISCHR(render.st_mode)) - return 0; - if (render.st_rdev & 0x80) - return 1; - - return 0; -} - -static char is_device_path_render_node (const char *device_path) { char is_render_node; @@ -135,7 +120,7 @@ if (fd < 0) return 0; - is_render_node = is_fd_render_node(fd); + is_render_node = (drmGetNodeTypeFromFd(fd) == DRM_NODE_RENDER); close(fd); return is_render_node; @@ -767,7 +752,7 @@ return; } - if (is_fd_render_node(xwl_gbm->drm_fd)) { + if (drmGetNodeTypeFromFd(xwl_gbm->drm_fd) == DRM_NODE_RENDER) { xwl_gbm->fd_render_node = 1; xwl_screen->expecting_event--; } else { diff -Nru xorg-server-1.20.9/hw/xwayland/xwayland-input.c xorg-server-1.20.13/hw/xwayland/xwayland-input.c --- xorg-server-1.20.9/hw/xwayland/xwayland-input.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xwayland/xwayland-input.c 2021-07-29 18:48:14.000000000 +0000 @@ -279,6 +279,10 @@ 0, 0xFFFF, 10000, 0, 10000, Absolute); InitValuatorAxisStruct(device, 1, axes_labels[1], 0, 0xFFFF, 10000, 0, 10000, Absolute); + + if (!InitPtrFeedbackClassDeviceStruct(device, xwl_pointer_control)) + return BadValue; + return Success; case DEVICE_ON: diff -Nru xorg-server-1.20.9/hw/xwayland/xwayland-present.c xorg-server-1.20.13/hw/xwayland/xwayland-present.c --- xorg-server-1.20.9/hw/xwayland/xwayland-present.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/hw/xwayland/xwayland-present.c 2021-07-29 18:48:14.000000000 +0000 @@ -421,10 +421,18 @@ PresentFlipReason *reason) { struct xwl_window *xwl_window = xwl_window_from_window(present_window); + ScreenPtr screen = pixmap->drawable.pScreen; if (!xwl_window) return FALSE; + /* Can't flip if the window pixmap doesn't match the xwl_window parent + * window's, e.g. because a client redirected this window or one of its + * parents. + */ + if (screen->GetWindowPixmap(xwl_window->window) != screen->GetWindowPixmap(present_window)) + return FALSE; + /* * We currently only allow flips of windows, that have the same * dimensions as their xwl_window parent window. For the case of diff -Nru xorg-server-1.20.9/hw/xwin/dri/Makefile.in xorg-server-1.20.13/hw/xwin/dri/Makefile.in --- xorg-server-1.20.9/hw/xwin/dri/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/dri/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -527,6 +527,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xwin/glx/Makefile.in xorg-server-1.20.13/hw/xwin/glx/Makefile.in --- xorg-server-1.20.9/hw/xwin/glx/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/glx/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -578,6 +578,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -848,7 +849,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -960,7 +962,7 @@ uninstall-am: uninstall-libLTLIBRARIES -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ clean-generic clean-libLTLIBRARIES clean-libtool \ diff -Nru xorg-server-1.20.9/hw/xwin/Makefile.in xorg-server-1.20.13/hw/xwin/Makefile.in --- xorg-server-1.20.9/hw/xwin/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -705,6 +705,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -1236,7 +1237,8 @@ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -1440,7 +1442,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-xwinconfigDATA .MAKE: $(am__recursive_targets) all check install install-am \ - install-exec-am install-strip + install-exec install-exec-am install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles check check-am clean clean-binPROGRAMS \ diff -Nru xorg-server-1.20.9/hw/xwin/man/Makefile.in xorg-server-1.20.13/hw/xwin/man/Makefile.in --- xorg-server-1.20.9/hw/xwin/man/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/man/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -539,6 +539,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xwin/winclipboard/Makefile.in xorg-server-1.20.13/hw/xwin/winclipboard/Makefile.in --- xorg-server-1.20.9/hw/xwin/winclipboard/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/winclipboard/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -611,6 +611,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/hw/xwin/winprefsyacc.c xorg-server-1.20.13/hw/xwin/winprefsyacc.c --- xorg-server-1.20.9/hw/xwin/winprefsyacc.c 2020-08-25 15:40:21.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/winprefsyacc.c 2021-07-29 18:48:50.000000000 +0000 @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.1. */ +/* A Bison parser, made by GNU Bison 3.7.6. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -33,6 +34,10 @@ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local variables, as they might otherwise be expanded by user macros. @@ -40,11 +45,11 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* Identify Bison output. */ -#define YYBISON 1 +/* Identify Bison output, and Bison version. */ +#define YYBISON 30706 -/* Bison version. */ -#define YYBISON_VERSION "3.1" +/* Bison version string. */ +#define YYBISON_VERSION "3.7.6" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -61,8 +66,8 @@ -/* Copy the first part of user declarations. */ -#line 1 "winprefsyacc.y" /* yacc.c:339 */ +/* First part of user prologue. */ +#line 1 "winprefsyacc.y" /* * Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. @@ -151,26 +156,31 @@ extern int yylex(void); -#line 155 "winprefsyacc.c" /* yacc.c:339 */ +#line 160 "winprefsyacc.c" +# ifndef YY_CAST +# ifdef __cplusplus +# define YY_CAST(Type, Val) static_cast (Val) +# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast (Val) +# else +# define YY_CAST(Type, Val) ((Type) (Val)) +# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val)) +# endif +# endif # ifndef YY_NULLPTR -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif # else -# define YY_NULLPTR 0 +# define YY_NULLPTR ((void*)0) # endif # endif -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 -#endif - -/* In a future release of Bison, this section will be replaced - by #include "y.tab.h". */ +/* Use api.header.include to #include this header + instead of duplicating it here. */ #ifndef YY_YY_WINPREFSYACC_H_INCLUDED # define YY_YY_WINPREFSYACC_H_INCLUDED /* Debug traces. */ @@ -181,43 +191,52 @@ extern int yydebug; #endif -/* Token type. */ +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE enum yytokentype { - NEWLINE = 258, - MENU = 259, - LB = 260, - RB = 261, - ICONDIRECTORY = 262, - DEFAULTICON = 263, - ICONS = 264, - STYLES = 265, - TOPMOST = 266, - MAXIMIZE = 267, - MINIMIZE = 268, - BOTTOM = 269, - NOTITLE = 270, - OUTLINE = 271, - NOFRAME = 272, - DEFAULTSYSMENU = 273, - SYSMENU = 274, - ROOTMENU = 275, - SEPARATOR = 276, - ATSTART = 277, - ATEND = 278, - EXEC = 279, - ALWAYSONTOP = 280, - DEBUGOUTPUT = 281, - RELOAD = 282, - TRAYICON = 283, - FORCEEXIT = 284, - SILENTEXIT = 285, - STRING = 286 + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + NEWLINE = 258, /* NEWLINE */ + MENU = 259, /* MENU */ + LB = 260, /* LB */ + RB = 261, /* RB */ + ICONDIRECTORY = 262, /* ICONDIRECTORY */ + DEFAULTICON = 263, /* DEFAULTICON */ + ICONS = 264, /* ICONS */ + STYLES = 265, /* STYLES */ + TOPMOST = 266, /* TOPMOST */ + MAXIMIZE = 267, /* MAXIMIZE */ + MINIMIZE = 268, /* MINIMIZE */ + BOTTOM = 269, /* BOTTOM */ + NOTITLE = 270, /* NOTITLE */ + OUTLINE = 271, /* OUTLINE */ + NOFRAME = 272, /* NOFRAME */ + DEFAULTSYSMENU = 273, /* DEFAULTSYSMENU */ + SYSMENU = 274, /* SYSMENU */ + ROOTMENU = 275, /* ROOTMENU */ + SEPARATOR = 276, /* SEPARATOR */ + ATSTART = 277, /* ATSTART */ + ATEND = 278, /* ATEND */ + EXEC = 279, /* EXEC */ + ALWAYSONTOP = 280, /* ALWAYSONTOP */ + DEBUGOUTPUT = 281, /* "DEBUG" */ + RELOAD = 282, /* RELOAD */ + TRAYICON = 283, /* TRAYICON */ + FORCEEXIT = 284, /* FORCEEXIT */ + SILENTEXIT = 285, /* SILENTEXIT */ + STRING = 286 /* STRING */ }; + typedef enum yytokentype yytoken_kind_t; #endif -/* Tokens. */ +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 #define NEWLINE 258 #define MENU 259 #define LB 260 @@ -250,18 +269,17 @@ /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED - union YYSTYPE { -#line 90 "winprefsyacc.y" /* yacc.c:355 */ +#line 90 "winprefsyacc.y" char *sVal; unsigned long uVal; int iVal; -#line 263 "winprefsyacc.c" /* yacc.c:355 */ -}; +#line 281 "winprefsyacc.c" +}; typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -273,37 +291,166 @@ int yyparse (void); #endif /* !YY_YY_WINPREFSYACC_H_INCLUDED */ +/* Symbol kind. */ +enum yysymbol_kind_t +{ + YYSYMBOL_YYEMPTY = -2, + YYSYMBOL_YYEOF = 0, /* "end of file" */ + YYSYMBOL_YYerror = 1, /* error */ + YYSYMBOL_YYUNDEF = 2, /* "invalid token" */ + YYSYMBOL_NEWLINE = 3, /* NEWLINE */ + YYSYMBOL_MENU = 4, /* MENU */ + YYSYMBOL_LB = 5, /* LB */ + YYSYMBOL_RB = 6, /* RB */ + YYSYMBOL_ICONDIRECTORY = 7, /* ICONDIRECTORY */ + YYSYMBOL_DEFAULTICON = 8, /* DEFAULTICON */ + YYSYMBOL_ICONS = 9, /* ICONS */ + YYSYMBOL_STYLES = 10, /* STYLES */ + YYSYMBOL_TOPMOST = 11, /* TOPMOST */ + YYSYMBOL_MAXIMIZE = 12, /* MAXIMIZE */ + YYSYMBOL_MINIMIZE = 13, /* MINIMIZE */ + YYSYMBOL_BOTTOM = 14, /* BOTTOM */ + YYSYMBOL_NOTITLE = 15, /* NOTITLE */ + YYSYMBOL_OUTLINE = 16, /* OUTLINE */ + YYSYMBOL_NOFRAME = 17, /* NOFRAME */ + YYSYMBOL_DEFAULTSYSMENU = 18, /* DEFAULTSYSMENU */ + YYSYMBOL_SYSMENU = 19, /* SYSMENU */ + YYSYMBOL_ROOTMENU = 20, /* ROOTMENU */ + YYSYMBOL_SEPARATOR = 21, /* SEPARATOR */ + YYSYMBOL_ATSTART = 22, /* ATSTART */ + YYSYMBOL_ATEND = 23, /* ATEND */ + YYSYMBOL_EXEC = 24, /* EXEC */ + YYSYMBOL_ALWAYSONTOP = 25, /* ALWAYSONTOP */ + YYSYMBOL_DEBUGOUTPUT = 26, /* "DEBUG" */ + YYSYMBOL_RELOAD = 27, /* RELOAD */ + YYSYMBOL_TRAYICON = 28, /* TRAYICON */ + YYSYMBOL_FORCEEXIT = 29, /* FORCEEXIT */ + YYSYMBOL_SILENTEXIT = 30, /* SILENTEXIT */ + YYSYMBOL_STRING = 31, /* STRING */ + YYSYMBOL_YYACCEPT = 32, /* $accept */ + YYSYMBOL_input = 33, /* input */ + YYSYMBOL_line = 34, /* line */ + YYSYMBOL_newline_or_nada = 35, /* newline_or_nada */ + YYSYMBOL_command = 36, /* command */ + YYSYMBOL_trayicon = 37, /* trayicon */ + YYSYMBOL_rootmenu = 38, /* rootmenu */ + YYSYMBOL_defaultsysmenu = 39, /* defaultsysmenu */ + YYSYMBOL_defaulticon = 40, /* defaulticon */ + YYSYMBOL_icondirectory = 41, /* icondirectory */ + YYSYMBOL_menuline = 42, /* menuline */ + YYSYMBOL_menulist = 43, /* menulist */ + YYSYMBOL_menu = 44, /* menu */ + YYSYMBOL_45_1 = 45, /* $@1 */ + YYSYMBOL_iconline = 46, /* iconline */ + YYSYMBOL_iconlist = 47, /* iconlist */ + YYSYMBOL_icons = 48, /* icons */ + YYSYMBOL_49_2 = 49, /* $@2 */ + YYSYMBOL_group1 = 50, /* group1 */ + YYSYMBOL_group2 = 51, /* group2 */ + YYSYMBOL_stylecombo = 52, /* stylecombo */ + YYSYMBOL_styleline = 53, /* styleline */ + YYSYMBOL_stylelist = 54, /* stylelist */ + YYSYMBOL_styles = 55, /* styles */ + YYSYMBOL_56_3 = 56, /* $@3 */ + YYSYMBOL_atspot = 57, /* atspot */ + YYSYMBOL_sysmenuline = 58, /* sysmenuline */ + YYSYMBOL_sysmenulist = 59, /* sysmenulist */ + YYSYMBOL_sysmenu = 60, /* sysmenu */ + YYSYMBOL_61_4 = 61, /* $@4 */ + YYSYMBOL_forceexit = 62, /* forceexit */ + YYSYMBOL_silentexit = 63, /* silentexit */ + YYSYMBOL_debug = 64 /* debug */ +}; +typedef enum yysymbol_kind_t yysymbol_kind_t; + -/* Copy the second part of user declarations. */ -#line 280 "winprefsyacc.c" /* yacc.c:358 */ #ifdef short # undef short #endif -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; +/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure + and (if available) are included + so that the code can choose integer types of a good width. */ + +#ifndef __PTRDIFF_MAX__ +# include /* INFRINGES ON USER NAME SPACE */ +# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_STDINT_H +# endif #endif -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; +/* Narrow types that promote to a signed type and that can represent a + signed or unsigned integer of at least N bits. In tables they can + save space and decrease cache pressure. Promoting to a signed type + helps avoid bugs in integer arithmetic. */ + +#ifdef __INT_LEAST8_MAX__ +typedef __INT_LEAST8_TYPE__ yytype_int8; +#elif defined YY_STDINT_H +typedef int_least8_t yytype_int8; #else typedef signed char yytype_int8; #endif -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; +#ifdef __INT_LEAST16_MAX__ +typedef __INT_LEAST16_TYPE__ yytype_int16; +#elif defined YY_STDINT_H +typedef int_least16_t yytype_int16; #else -typedef unsigned short yytype_uint16; +typedef short yytype_int16; #endif -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; +/* Work around bug in HP-UX 11.23, which defines these macros + incorrectly for preprocessor constants. This workaround can likely + be removed in 2023, as HPE has promised support for HP-UX 11.23 + (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of + . */ +#ifdef __hpux +# undef UINT_LEAST8_MAX +# undef UINT_LEAST16_MAX +# define UINT_LEAST8_MAX 255 +# define UINT_LEAST16_MAX 65535 +#endif + +#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST8_TYPE__ yytype_uint8; +#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST8_MAX <= INT_MAX) +typedef uint_least8_t yytype_uint8; +#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX +typedef unsigned char yytype_uint8; #else -typedef short yytype_int16; +typedef short yytype_uint8; +#endif + +#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST16_TYPE__ yytype_uint16; +#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST16_MAX <= INT_MAX) +typedef uint_least16_t yytype_uint16; +#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX +typedef unsigned short yytype_uint16; +#else +typedef int yytype_uint16; +#endif + +#ifndef YYPTRDIFF_T +# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__ +# define YYPTRDIFF_T __PTRDIFF_TYPE__ +# define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__ +# elif defined PTRDIFF_MAX +# ifndef ptrdiff_t +# include /* INFRINGES ON USER NAME SPACE */ +# endif +# define YYPTRDIFF_T ptrdiff_t +# define YYPTRDIFF_MAXIMUM PTRDIFF_MAX +# else +# define YYPTRDIFF_T long +# define YYPTRDIFF_MAXIMUM LONG_MAX +# endif #endif #ifndef YYSIZE_T @@ -311,7 +458,7 @@ # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T +# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -319,7 +466,20 @@ # endif #endif -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +#define YYSIZE_MAXIMUM \ + YY_CAST (YYPTRDIFF_T, \ + (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \ + ? YYPTRDIFF_MAXIMUM \ + : YY_CAST (YYSIZE_T, -1))) + +#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) + + +/* Stored state numbers (used for stacks). */ +typedef yytype_int8 yy_state_t; + +/* State numbers in computations. */ +typedef int yy_state_fast_t; #ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS @@ -333,47 +493,37 @@ # endif #endif -#ifndef YY_ATTRIBUTE -# if (defined __GNUC__ \ - && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ - || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C -# define YY_ATTRIBUTE(Spec) __attribute__(Spec) -# else -# define YY_ATTRIBUTE(Spec) /* empty */ -# endif -#endif #ifndef YY_ATTRIBUTE_PURE -# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define YY_ATTRIBUTE_PURE +# endif #endif #ifndef YY_ATTRIBUTE_UNUSED -# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) -#endif - -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# if defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) +# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) # else -# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) +# define YY_ATTRIBUTE_UNUSED # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(E) ((void) (E)) +# define YY_USE(E) ((void) (E)) #else -# define YYUSE(E) /* empty */ +# define YY_USE(E) /* empty */ #endif #if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ _Pragma ("GCC diagnostic pop") #else # define YY_INITIAL_VALUE(Value) Value @@ -386,8 +536,22 @@ # define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif +#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__ +# define YY_IGNORE_USELESS_CAST_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"") +# define YY_IGNORE_USELESS_CAST_END \ + _Pragma ("GCC diagnostic pop") +#endif +#ifndef YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_END +#endif + + +#define YY_ASSERT(E) ((void) (0 && (E))) -#if ! defined yyoverflow || YYERROR_VERBOSE +#if !defined yyoverflow /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -452,8 +616,7 @@ # endif # endif # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - +#endif /* !defined yyoverflow */ #if (! defined yyoverflow \ && (! defined __cplusplus \ @@ -462,17 +625,17 @@ /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss_alloc; + yy_state_t yyss_alloc; YYSTYPE yyvs_alloc; }; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) # define YYCOPY_NEEDED 1 @@ -485,11 +648,11 @@ # define YYSTACK_RELOCATE(Stack_alloc, Stack) \ do \ { \ - YYSIZE_T yynewbytes; \ + YYPTRDIFF_T yynewbytes; \ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ + yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / YYSIZEOF (*yyptr); \ } \ while (0) @@ -501,12 +664,12 @@ # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ # define YYCOPY(Dst, Src, Count) \ - __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) + __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src))) # else # define YYCOPY(Dst, Src, Count) \ do \ { \ - YYSIZE_T yyi; \ + YYPTRDIFF_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ @@ -529,17 +692,20 @@ /* YYNSTATES -- Number of states. */ #define YYNSTATES 121 -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ -#define YYUNDEFTOK 2 +/* YYMAXUTOK -- Last valid token kind. */ #define YYMAXUTOK 286 -#define YYTRANSLATE(YYX) \ - ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ +#define YYTRANSLATE(YYX) \ + (0 <= (YYX) && (YYX) <= YYMAXUTOK \ + ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ + : YYSYMBOL_YYUNDEF) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ -static const yytype_uint8 yytranslate[] = + as returned by yylex. */ +static const yytype_int8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -586,16 +752,23 @@ }; #endif -#if YYDEBUG || YYERROR_VERBOSE || 0 +/** Accessing symbol of state STATE. */ +#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) + +#if YYDEBUG || 0 +/* The user-facing name of the symbol whose (internal) number is + YYSYMBOL. No bounds checking. */ +static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; + /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "NEWLINE", "MENU", "LB", "RB", - "ICONDIRECTORY", "DEFAULTICON", "ICONS", "STYLES", "TOPMOST", "MAXIMIZE", - "MINIMIZE", "BOTTOM", "NOTITLE", "OUTLINE", "NOFRAME", "DEFAULTSYSMENU", - "SYSMENU", "ROOTMENU", "SEPARATOR", "ATSTART", "ATEND", "EXEC", - "ALWAYSONTOP", "\"DEBUG\"", "RELOAD", "TRAYICON", "FORCEEXIT", + "\"end of file\"", "error", "\"invalid token\"", "NEWLINE", "MENU", + "LB", "RB", "ICONDIRECTORY", "DEFAULTICON", "ICONS", "STYLES", "TOPMOST", + "MAXIMIZE", "MINIMIZE", "BOTTOM", "NOTITLE", "OUTLINE", "NOFRAME", + "DEFAULTSYSMENU", "SYSMENU", "ROOTMENU", "SEPARATOR", "ATSTART", "ATEND", + "EXEC", "ALWAYSONTOP", "\"DEBUG\"", "RELOAD", "TRAYICON", "FORCEEXIT", "SILENTEXIT", "STRING", "$accept", "input", "line", "newline_or_nada", "command", "trayicon", "rootmenu", "defaultsysmenu", "defaulticon", "icondirectory", "menuline", "menulist", "menu", "$@1", "iconline", @@ -603,28 +776,34 @@ "styleline", "stylelist", "styles", "$@3", "atspot", "sysmenuline", "sysmenulist", "sysmenu", "$@4", "forceexit", "silentexit", "debug", YY_NULLPTR }; + +static const char * +yysymbol_name (yysymbol_kind_t yysymbol) +{ + return yytname[yysymbol]; +} #endif -# ifdef YYPRINT +#ifdef YYPRINT /* YYTOKNUM[NUM] -- (External) token number corresponding to the (internal) symbol number NUM (which must be that of a token). */ -static const yytype_uint16 yytoknum[] = +static const yytype_int16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286 }; -# endif +#endif -#define YYPACT_NINF -47 +#define YYPACT_NINF (-47) -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-47))) +#define yypact_value_is_default(Yyn) \ + ((Yyn) == YYPACT_NINF) -#define YYTABLE_NINF -1 +#define YYTABLE_NINF (-1) -#define yytable_value_is_error(Yytable_value) \ +#define yytable_value_is_error(Yyn) \ 0 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -649,7 +828,7 @@ /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. Performed when YYTABLE does not specify something else to do. Zero means the default is an error. */ -static const yytype_uint8 yydefact[] = +static const yytype_int8 yydefact[] = { 2, 0, 1, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 17, 14, @@ -678,7 +857,7 @@ /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 1, 16, 56, 17, 18, 19, 20, 21, 22, + 0, 1, 16, 56, 17, 18, 19, 20, 21, 22, 71, 72, 23, 54, 63, 64, 24, 45, 83, 84, 85, 66, 67, 25, 46, 49, 89, 90, 26, 59, 27, 28, 29 @@ -687,7 +866,7 @@ /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule whose number is the opposite. If YYTABLE_NINF, syntax error. */ -static const yytype_uint8 yytable[] = +static const yytype_int8 yytable[] = { 57, 92, 69, 76, 77, 78, 79, 2, 60, 61, 3, 4, 70, 68, 5, 6, 7, 8, 80, 81, @@ -717,7 +896,7 @@ /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = +static const yytype_int8 yystos[] = { 0, 33, 0, 3, 4, 7, 8, 9, 10, 18, 19, 20, 26, 28, 29, 30, 34, 36, 37, 38, @@ -735,7 +914,7 @@ }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = +static const yytype_int8 yyr1[] = { 0, 32, 33, 33, 34, 34, 35, 35, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, @@ -747,7 +926,7 @@ }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = +static const yytype_int8 yyr2[] = { 0, 2, 0, 2, 1, 1, 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -759,10 +938,10 @@ }; +enum { YYENOMEM = -2 }; + #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab @@ -771,27 +950,26 @@ #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (0) - -/* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 - +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) + +/* Backward compatibility with an undocumented macro. + Use YYerror or YYUNDEF. */ +#define YYERRCODE YYUNDEF /* Enable debugging if requested. */ @@ -809,54 +987,58 @@ } while (0) /* This macro is provided for backward compatibility. */ -#ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif +# ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ yy_symbol_print (stderr, \ - Type, Value); \ + Kind, Value); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) -/*----------------------------------------. -| Print this symbol's value on YYOUTPUT. | -`----------------------------------------*/ +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_value_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { - FILE *yyo = yyoutput; - YYUSE (yyo); + FILE *yyoutput = yyo; + YY_USE (yyoutput); if (!yyvaluep) return; # ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); + if (yykind < YYNTOKENS) + YYPRINT (yyo, yytoknum[yykind], *yyvaluep); # endif - YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YY_USE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { - YYFPRINTF (yyoutput, "%s %s (", - yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); + YYFPRINTF (yyo, "%s %s (", + yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); + yy_symbol_value_print (yyo, yykind, yyvaluep); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -865,7 +1047,7 @@ `------------------------------------------------------------------*/ static void -yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop) { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -888,21 +1070,21 @@ `------------------------------------------------*/ static void -yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) +yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, + int yyrule) { - unsigned long yylno = yyrline[yyrule]; + int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n", yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, - yystos[yyssp[yyi + 1 - yynrhs]], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); + YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), + &yyvsp[(yyi + 1) - (yynrhs)]); YYFPRINTF (stderr, "\n"); } } @@ -917,8 +1099,8 @@ multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDPRINTF(Args) ((void) 0) +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -941,250 +1123,30 @@ #endif -#if YYERROR_VERBOSE - -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -static YYSIZE_T -yystrlen (const char *yystr) -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -static char * -yystpcpy (char *yydest, const char *yysrc) -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message - about the unexpected token YYTOKEN for the state stack whose top is - YYSSP. - - Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is - not large enough to hold the message. In that case, also set - *YYMSG_ALLOC to the required number of bytes. Return 2 if the - required number of bytes is too large to store. */ -static int -yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - yytype_int16 *yyssp, int yytoken) -{ - YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); - YYSIZE_T yysize = yysize0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - /* Internationalized format string. */ - const char *yyformat = YY_NULLPTR; - /* Arguments of yyformat. */ - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - /* Number of reported tokens (one for the "unexpected", one per - "expected"). */ - int yycount = 0; - - /* There are many possibilities here to consider: - - If this state is a consistent state with a default action, then - the only way this function was invoked is if the default action - is an error action. In that case, don't check for expected - tokens because there are none. - - The only way there can be no lookahead present (in yychar) is if - this state is a consistent state with a default action. Thus, - detecting the absence of a lookahead is sufficient to determine - that there is no unexpected or expected token to report. In that - case, just report a simple "syntax error". - - Don't assume there isn't a lookahead just because this state is a - consistent state with a default action. There might have been a - previous inconsistent state, consistent state with a non-default - action, or user semantic action that manipulated yychar. - - Of course, the expected token list depends on states to have - correct lookahead information, and it depends on the parser not - to perform extra reductions after fetching a lookahead from the - scanner and before detecting a syntax error. Thus, state merging - (from LALR or IELR) and default reductions corrupt the expected - token list. However, the list is correct for canonical LR with - one exception: it will still contain any token that will not be - accepted due to an error action in a later state. - */ - if (yytoken != YYEMPTY) - { - int yyn = yypact[*yyssp]; - yyarg[yycount++] = yytname[yytoken]; - if (!yypact_value_is_default (yyn)) - { - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for - this state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yyx; - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR - && !yytable_value_is_error (yytable[yyx + yyn])) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - break; - } - yyarg[yycount++] = yytname[yyx]; - { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - } - } - } - } - - switch (yycount) - { -# define YYCASE_(N, S) \ - case N: \ - yyformat = S; \ - break - default: /* Avoid compiler warnings. */ - YYCASE_(0, YY_("syntax error")); - YYCASE_(1, YY_("syntax error, unexpected %s")); - YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); - YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); - YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); - YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -# undef YYCASE_ - } - { - YYSIZE_T yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - } - if (*yymsg_alloc < yysize) - { - *yymsg_alloc = 2 * yysize; - if (! (yysize <= *yymsg_alloc - && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) - *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return 1; - } - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - { - char *yyp = *yymsg; - int yyi = 0; - while ((*yyp = *yyformat) != '\0') - if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyformat += 2; - } - else - { - yyp++; - yyformat++; - } - } - return 0; -} -#endif /* YYERROR_VERBOSE */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +yydestruct (const char *yymsg, + yysymbol_kind_t yykind, YYSTYPE *yyvaluep) { - YYUSE (yyvaluep); + YY_USE (yyvaluep); if (!yymsg) yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YYUSE (yytype); + YY_USE (yykind); YY_IGNORE_MAYBE_UNINITIALIZED_END } - - -/* The lookahead symbol. */ +/* Lookahead token kind. */ int yychar; /* The semantic value of the lookahead symbol. */ @@ -1193,6 +1155,8 @@ int yynerrs; + + /*----------. | yyparse. | `----------*/ @@ -1200,43 +1164,36 @@ int yyparse (void) { - int yystate; + yy_state_fast_t yystate = 0; /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - - /* The stacks and their tools: - 'yyss': related to states. - 'yyvs': related to semantic values. + int yyerrstatus = 0; - Refer to the stacks through separate pointers, to allow yyoverflow + /* Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss; - yytype_int16 *yyssp; + /* Their size. */ + YYPTRDIFF_T yystacksize = YYINITDEPTH; - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs; - YYSTYPE *yyvsp; + /* The state stack: array, bottom, top. */ + yy_state_t yyssa[YYINITDEPTH]; + yy_state_t *yyss = yyssa; + yy_state_t *yyssp = yyss; - YYSIZE_T yystacksize; + /* The semantic value stack: array, bottom, top. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp = yyvs; int yyn; + /* The return value of yyparse. */ int yyresult; - /* Lookahead token as an internal (translated) token number. */ - int yytoken = 0; + /* Lookahead symbol kind. */ + yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif + #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) @@ -1244,58 +1201,60 @@ Keep to zero when no symbol should be popped. */ int yylen = 0; - yyssp = yyss = yyssa; - yyvsp = yyvs = yyvsa; - yystacksize = YYINITDEPTH; - YYDPRINTF ((stderr, "Starting parse\n")); - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; + +/*--------------------------------------------------------------------. +| yysetstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + YY_ASSERT (0 <= yystate && yystate < YYNSTATES); + YY_IGNORE_USELESS_CAST_BEGIN + *yyssp = YY_CAST (yy_state_t, yystate); + YY_IGNORE_USELESS_CAST_END + YY_STACK_PRINT (yyss, yyssp); if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + goto yyexhaustedlab; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYPTRDIFF_T yysize = yyssp - yyss + 1; -#ifdef yyoverflow +# if defined yyoverflow { /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into memory. */ + yy_state_t *yyss1 = yyss; YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), + &yyss1, yysize * YYSIZEOF (*yyssp), + &yyvs1, yysize * YYSIZEOF (*yyvsp), &yystacksize); - yyss = yyss1; yyvs = yyvs1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) goto yyexhaustedlab; @@ -1304,9 +1263,10 @@ yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; + yy_state_t *yyss1 = yyss; union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + YY_CAST (union yyalloc *, + YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); if (! yyptr) goto yyexhaustedlab; YYSTACK_RELOCATE (yyss_alloc, yyss); @@ -1316,30 +1276,30 @@ YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long) yystacksize)); + YY_IGNORE_USELESS_CAST_BEGIN + YYDPRINTF ((stderr, "Stack size increased to %ld\n", + YY_CAST (long, yystacksize))); + YY_IGNORE_USELESS_CAST_END if (yyss + yystacksize - 1 <= yyssp) YYABORT; } - - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ if (yystate == YYFINAL) YYACCEPT; goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a lookahead token if we need one and don't already have one. */ @@ -1350,18 +1310,29 @@ /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, "Reading a token: ")); + YYDPRINTF ((stderr, "Reading a token\n")); yychar = yylex (); } if (yychar <= YYEOF) { - yychar = yytoken = YYEOF; + yychar = YYEOF; + yytoken = YYSYMBOL_YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } + else if (yychar == YYerror) + { + /* The scanner already issued an error message, process directly + to error recovery. But do not keep the error token as + lookahead, it is too special and may lead us to an endless + loop in error recovery. */ + yychar = YYUNDEF; + yytoken = YYSYMBOL_YYerror; + goto yyerrlab1; + } else { yytoken = YYTRANSLATE (yychar); @@ -1389,15 +1360,13 @@ /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token. */ - yychar = YYEMPTY; - yystate = yyn; YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; YY_IGNORE_MAYBE_UNINITIALIZED_END + /* Discard the shifted token. */ + yychar = YYEMPTY; goto yynewstate; @@ -1412,7 +1381,7 @@ /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ @@ -1432,236 +1401,237 @@ YY_REDUCE_PRINT (yyn); switch (yyn) { - case 20: -#line 160 "winprefsyacc.y" /* yacc.c:1651 */ - { SetTrayIcon((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1439 "winprefsyacc.c" /* yacc.c:1651 */ + case 20: /* trayicon: TRAYICON STRING NEWLINE */ +#line 160 "winprefsyacc.y" + { SetTrayIcon((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } +#line 1408 "winprefsyacc.c" break; - case 21: -#line 163 "winprefsyacc.y" /* yacc.c:1651 */ - { SetRootMenu((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1445 "winprefsyacc.c" /* yacc.c:1651 */ + case 21: /* rootmenu: ROOTMENU STRING NEWLINE */ +#line 163 "winprefsyacc.y" + { SetRootMenu((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } +#line 1414 "winprefsyacc.c" break; - case 22: -#line 166 "winprefsyacc.y" /* yacc.c:1651 */ - { SetDefaultSysMenu((yyvsp[-2].sVal), (yyvsp[-1].iVal)); free((yyvsp[-2].sVal)); } -#line 1451 "winprefsyacc.c" /* yacc.c:1651 */ + case 22: /* defaultsysmenu: DEFAULTSYSMENU STRING atspot NEWLINE */ +#line 166 "winprefsyacc.y" + { SetDefaultSysMenu((yyvsp[-2].sVal), (yyvsp[-1].iVal)); free((yyvsp[-2].sVal)); } +#line 1420 "winprefsyacc.c" break; - case 23: -#line 169 "winprefsyacc.y" /* yacc.c:1651 */ - { SetDefaultIcon((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1457 "winprefsyacc.c" /* yacc.c:1651 */ + case 23: /* defaulticon: DEFAULTICON STRING NEWLINE */ +#line 169 "winprefsyacc.y" + { SetDefaultIcon((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } +#line 1426 "winprefsyacc.c" break; - case 24: -#line 172 "winprefsyacc.y" /* yacc.c:1651 */ - { SetIconDirectory((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1463 "winprefsyacc.c" /* yacc.c:1651 */ + case 24: /* icondirectory: ICONDIRECTORY STRING NEWLINE */ +#line 172 "winprefsyacc.y" + { SetIconDirectory((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } +#line 1432 "winprefsyacc.c" break; - case 25: -#line 175 "winprefsyacc.y" /* yacc.c:1651 */ - { AddMenuLine("-", CMD_SEPARATOR, ""); } -#line 1469 "winprefsyacc.c" /* yacc.c:1651 */ + case 25: /* menuline: SEPARATOR NEWLINE newline_or_nada */ +#line 175 "winprefsyacc.y" + { AddMenuLine("-", CMD_SEPARATOR, ""); } +#line 1438 "winprefsyacc.c" break; - case 26: -#line 176 "winprefsyacc.y" /* yacc.c:1651 */ - { AddMenuLine((yyvsp[-3].sVal), CMD_ALWAYSONTOP, ""); free((yyvsp[-3].sVal)); } -#line 1475 "winprefsyacc.c" /* yacc.c:1651 */ + case 26: /* menuline: STRING ALWAYSONTOP NEWLINE newline_or_nada */ +#line 176 "winprefsyacc.y" + { AddMenuLine((yyvsp[-3].sVal), CMD_ALWAYSONTOP, ""); free((yyvsp[-3].sVal)); } +#line 1444 "winprefsyacc.c" break; - case 27: -#line 177 "winprefsyacc.y" /* yacc.c:1651 */ - { AddMenuLine((yyvsp[-4].sVal), CMD_EXEC, (yyvsp[-2].sVal)); free((yyvsp[-4].sVal)); free((yyvsp[-2].sVal)); } -#line 1481 "winprefsyacc.c" /* yacc.c:1651 */ + case 27: /* menuline: STRING EXEC STRING NEWLINE newline_or_nada */ +#line 177 "winprefsyacc.y" + { AddMenuLine((yyvsp[-4].sVal), CMD_EXEC, (yyvsp[-2].sVal)); free((yyvsp[-4].sVal)); free((yyvsp[-2].sVal)); } +#line 1450 "winprefsyacc.c" break; - case 28: -#line 178 "winprefsyacc.y" /* yacc.c:1651 */ - { AddMenuLine((yyvsp[-4].sVal), CMD_MENU, (yyvsp[-2].sVal)); free((yyvsp[-4].sVal)); free((yyvsp[-2].sVal)); } -#line 1487 "winprefsyacc.c" /* yacc.c:1651 */ + case 28: /* menuline: STRING MENU STRING NEWLINE newline_or_nada */ +#line 178 "winprefsyacc.y" + { AddMenuLine((yyvsp[-4].sVal), CMD_MENU, (yyvsp[-2].sVal)); free((yyvsp[-4].sVal)); free((yyvsp[-2].sVal)); } +#line 1456 "winprefsyacc.c" break; - case 29: -#line 179 "winprefsyacc.y" /* yacc.c:1651 */ - { AddMenuLine((yyvsp[-3].sVal), CMD_RELOAD, ""); free((yyvsp[-3].sVal)); } -#line 1493 "winprefsyacc.c" /* yacc.c:1651 */ + case 29: /* menuline: STRING RELOAD NEWLINE newline_or_nada */ +#line 179 "winprefsyacc.y" + { AddMenuLine((yyvsp[-3].sVal), CMD_RELOAD, ""); free((yyvsp[-3].sVal)); } +#line 1462 "winprefsyacc.c" break; - case 32: -#line 186 "winprefsyacc.y" /* yacc.c:1651 */ - { OpenMenu((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1499 "winprefsyacc.c" /* yacc.c:1651 */ + case 32: /* $@1: %empty */ +#line 186 "winprefsyacc.y" + { OpenMenu((yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } +#line 1468 "winprefsyacc.c" break; - case 33: -#line 186 "winprefsyacc.y" /* yacc.c:1651 */ - {CloseMenu();} -#line 1505 "winprefsyacc.c" /* yacc.c:1651 */ + case 33: /* menu: MENU STRING LB $@1 newline_or_nada menulist RB */ +#line 186 "winprefsyacc.y" + {CloseMenu();} +#line 1474 "winprefsyacc.c" break; - case 34: -#line 189 "winprefsyacc.y" /* yacc.c:1651 */ - { AddIconLine((yyvsp[-3].sVal), (yyvsp[-2].sVal)); free((yyvsp[-3].sVal)); free((yyvsp[-2].sVal)); } -#line 1511 "winprefsyacc.c" /* yacc.c:1651 */ + case 34: /* iconline: STRING STRING NEWLINE newline_or_nada */ +#line 189 "winprefsyacc.y" + { AddIconLine((yyvsp[-3].sVal), (yyvsp[-2].sVal)); free((yyvsp[-3].sVal)); free((yyvsp[-2].sVal)); } +#line 1480 "winprefsyacc.c" break; - case 37: -#line 196 "winprefsyacc.y" /* yacc.c:1651 */ - {OpenIcons();} -#line 1517 "winprefsyacc.c" /* yacc.c:1651 */ + case 37: /* $@2: %empty */ +#line 196 "winprefsyacc.y" + {OpenIcons();} +#line 1486 "winprefsyacc.c" break; - case 38: -#line 196 "winprefsyacc.y" /* yacc.c:1651 */ - {CloseIcons();} -#line 1523 "winprefsyacc.c" /* yacc.c:1651 */ + case 38: /* icons: ICONS LB $@2 newline_or_nada iconlist RB */ +#line 196 "winprefsyacc.y" + {CloseIcons();} +#line 1492 "winprefsyacc.c" break; - case 39: -#line 199 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.uVal)=STYLE_TOPMOST; } -#line 1529 "winprefsyacc.c" /* yacc.c:1651 */ + case 39: /* group1: TOPMOST */ +#line 199 "winprefsyacc.y" + { (yyval.uVal)=STYLE_TOPMOST; } +#line 1498 "winprefsyacc.c" break; - case 40: -#line 200 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.uVal)=STYLE_MAXIMIZE; } -#line 1535 "winprefsyacc.c" /* yacc.c:1651 */ + case 40: /* group1: MAXIMIZE */ +#line 200 "winprefsyacc.y" + { (yyval.uVal)=STYLE_MAXIMIZE; } +#line 1504 "winprefsyacc.c" break; - case 41: -#line 201 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.uVal)=STYLE_MINIMIZE; } -#line 1541 "winprefsyacc.c" /* yacc.c:1651 */ + case 41: /* group1: MINIMIZE */ +#line 201 "winprefsyacc.y" + { (yyval.uVal)=STYLE_MINIMIZE; } +#line 1510 "winprefsyacc.c" break; - case 42: -#line 202 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.uVal)=STYLE_BOTTOM; } -#line 1547 "winprefsyacc.c" /* yacc.c:1651 */ + case 42: /* group1: BOTTOM */ +#line 202 "winprefsyacc.y" + { (yyval.uVal)=STYLE_BOTTOM; } +#line 1516 "winprefsyacc.c" break; - case 43: -#line 205 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.uVal)=STYLE_NOTITLE; } -#line 1553 "winprefsyacc.c" /* yacc.c:1651 */ + case 43: /* group2: NOTITLE */ +#line 205 "winprefsyacc.y" + { (yyval.uVal)=STYLE_NOTITLE; } +#line 1522 "winprefsyacc.c" break; - case 44: -#line 206 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.uVal)=STYLE_OUTLINE; } -#line 1559 "winprefsyacc.c" /* yacc.c:1651 */ + case 44: /* group2: OUTLINE */ +#line 206 "winprefsyacc.y" + { (yyval.uVal)=STYLE_OUTLINE; } +#line 1528 "winprefsyacc.c" break; - case 45: -#line 207 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.uVal)=STYLE_NOFRAME; } -#line 1565 "winprefsyacc.c" /* yacc.c:1651 */ + case 45: /* group2: NOFRAME */ +#line 207 "winprefsyacc.y" + { (yyval.uVal)=STYLE_NOFRAME; } +#line 1534 "winprefsyacc.c" break; - case 46: -#line 210 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.uVal)=(yyvsp[0].uVal); } -#line 1571 "winprefsyacc.c" /* yacc.c:1651 */ + case 46: /* stylecombo: group1 */ +#line 210 "winprefsyacc.y" + { (yyval.uVal)=(yyvsp[0].uVal); } +#line 1540 "winprefsyacc.c" break; - case 47: -#line 211 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.uVal)=(yyvsp[0].uVal); } -#line 1577 "winprefsyacc.c" /* yacc.c:1651 */ + case 47: /* stylecombo: group2 */ +#line 211 "winprefsyacc.y" + { (yyval.uVal)=(yyvsp[0].uVal); } +#line 1546 "winprefsyacc.c" break; - case 48: -#line 212 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.uVal)=(yyvsp[-1].uVal)|(yyvsp[0].uVal); } -#line 1583 "winprefsyacc.c" /* yacc.c:1651 */ + case 48: /* stylecombo: group1 group2 */ +#line 212 "winprefsyacc.y" + { (yyval.uVal)=(yyvsp[-1].uVal)|(yyvsp[0].uVal); } +#line 1552 "winprefsyacc.c" break; - case 49: -#line 213 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.uVal)=(yyvsp[-1].uVal)|(yyvsp[0].uVal); } -#line 1589 "winprefsyacc.c" /* yacc.c:1651 */ + case 49: /* stylecombo: group2 group1 */ +#line 213 "winprefsyacc.y" + { (yyval.uVal)=(yyvsp[-1].uVal)|(yyvsp[0].uVal); } +#line 1558 "winprefsyacc.c" break; - case 50: -#line 216 "winprefsyacc.y" /* yacc.c:1651 */ - { AddStyleLine((yyvsp[-3].sVal), (yyvsp[-2].uVal)); free((yyvsp[-3].sVal)); } -#line 1595 "winprefsyacc.c" /* yacc.c:1651 */ + case 50: /* styleline: STRING stylecombo NEWLINE newline_or_nada */ +#line 216 "winprefsyacc.y" + { AddStyleLine((yyvsp[-3].sVal), (yyvsp[-2].uVal)); free((yyvsp[-3].sVal)); } +#line 1564 "winprefsyacc.c" break; - case 53: -#line 223 "winprefsyacc.y" /* yacc.c:1651 */ - {OpenStyles();} -#line 1601 "winprefsyacc.c" /* yacc.c:1651 */ + case 53: /* $@3: %empty */ +#line 223 "winprefsyacc.y" + {OpenStyles();} +#line 1570 "winprefsyacc.c" break; - case 54: -#line 223 "winprefsyacc.y" /* yacc.c:1651 */ - {CloseStyles();} -#line 1607 "winprefsyacc.c" /* yacc.c:1651 */ + case 54: /* styles: STYLES LB $@3 newline_or_nada stylelist RB */ +#line 223 "winprefsyacc.y" + {CloseStyles();} +#line 1576 "winprefsyacc.c" break; - case 55: -#line 226 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.iVal)=AT_END; } -#line 1613 "winprefsyacc.c" /* yacc.c:1651 */ + case 55: /* atspot: %empty */ +#line 226 "winprefsyacc.y" + { (yyval.iVal)=AT_END; } +#line 1582 "winprefsyacc.c" break; - case 56: -#line 227 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.iVal)=AT_START; } -#line 1619 "winprefsyacc.c" /* yacc.c:1651 */ + case 56: /* atspot: ATSTART */ +#line 227 "winprefsyacc.y" + { (yyval.iVal)=AT_START; } +#line 1588 "winprefsyacc.c" break; - case 57: -#line 228 "winprefsyacc.y" /* yacc.c:1651 */ - { (yyval.iVal)=AT_END; } -#line 1625 "winprefsyacc.c" /* yacc.c:1651 */ + case 57: /* atspot: ATEND */ +#line 228 "winprefsyacc.y" + { (yyval.iVal)=AT_END; } +#line 1594 "winprefsyacc.c" break; - case 58: -#line 231 "winprefsyacc.y" /* yacc.c:1651 */ - { AddSysMenuLine((yyvsp[-4].sVal), (yyvsp[-3].sVal), (yyvsp[-2].iVal)); free((yyvsp[-4].sVal)); free((yyvsp[-3].sVal)); } -#line 1631 "winprefsyacc.c" /* yacc.c:1651 */ + case 58: /* sysmenuline: STRING STRING atspot NEWLINE newline_or_nada */ +#line 231 "winprefsyacc.y" + { AddSysMenuLine((yyvsp[-4].sVal), (yyvsp[-3].sVal), (yyvsp[-2].iVal)); free((yyvsp[-4].sVal)); free((yyvsp[-3].sVal)); } +#line 1600 "winprefsyacc.c" break; - case 61: -#line 238 "winprefsyacc.y" /* yacc.c:1651 */ - {OpenSysMenu();} -#line 1637 "winprefsyacc.c" /* yacc.c:1651 */ + case 61: /* $@4: %empty */ +#line 238 "winprefsyacc.y" + {OpenSysMenu();} +#line 1606 "winprefsyacc.c" break; - case 62: -#line 238 "winprefsyacc.y" /* yacc.c:1651 */ - {CloseSysMenu();} -#line 1643 "winprefsyacc.c" /* yacc.c:1651 */ + case 62: /* sysmenu: SYSMENU LB NEWLINE $@4 newline_or_nada sysmenulist RB */ +#line 238 "winprefsyacc.y" + {CloseSysMenu();} +#line 1612 "winprefsyacc.c" break; - case 63: -#line 241 "winprefsyacc.y" /* yacc.c:1651 */ - { pref.fForceExit = TRUE; } -#line 1649 "winprefsyacc.c" /* yacc.c:1651 */ + case 63: /* forceexit: FORCEEXIT NEWLINE */ +#line 241 "winprefsyacc.y" + { pref.fForceExit = TRUE; } +#line 1618 "winprefsyacc.c" break; - case 64: -#line 244 "winprefsyacc.y" /* yacc.c:1651 */ - { pref.fSilentExit = TRUE; } -#line 1655 "winprefsyacc.c" /* yacc.c:1651 */ + case 64: /* silentexit: SILENTEXIT NEWLINE */ +#line 244 "winprefsyacc.y" + { pref.fSilentExit = TRUE; } +#line 1624 "winprefsyacc.c" break; - case 65: -#line 247 "winprefsyacc.y" /* yacc.c:1651 */ - { ErrorF("LoadPreferences: %s\n", (yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } -#line 1661 "winprefsyacc.c" /* yacc.c:1651 */ + case 65: /* debug: "DEBUG" STRING NEWLINE */ +#line 247 "winprefsyacc.y" + { ErrorF("LoadPreferences: %s\n", (yyvsp[-1].sVal)); free((yyvsp[-1].sVal)); } +#line 1630 "winprefsyacc.c" break; -#line 1665 "winprefsyacc.c" /* yacc.c:1651 */ +#line 1634 "winprefsyacc.c" + default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -1675,25 +1645,23 @@ case of YYERROR or YYBACKUP, subsequent parser actions might lead to an incorrect destructor call or verbose syntax error message before the lookahead is translated. */ - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); YYPOPSTACK (yylen); yylen = 0; - YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } goto yynewstate; @@ -1704,50 +1672,14 @@ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ - yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); - + yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar); /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; -#if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); -#else -# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ - yyssp, yytoken) - { - char const *yymsgp = YY_("syntax error"); - int yysyntax_error_status; - yysyntax_error_status = YYSYNTAX_ERROR; - if (yysyntax_error_status == 0) - yymsgp = yymsg; - else if (yysyntax_error_status == 1) - { - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); - if (!yymsg) - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - yysyntax_error_status = 2; - } - else - { - yysyntax_error_status = YYSYNTAX_ERROR; - yymsgp = yymsg; - } - } - yyerror (yymsgp); - if (yysyntax_error_status == 2) - goto yyexhaustedlab; - } -# undef YYSYNTAX_ERROR -#endif } - - if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an @@ -1776,12 +1708,10 @@ | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ @@ -1798,13 +1728,14 @@ yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ + /* Pop stack until we find a state that shifts the error token. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + yyn += YYSYMBOL_YYerror; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror) { yyn = yytable[yyn]; if (0 < yyn) @@ -1818,7 +1749,7 @@ yydestruct ("Error: popping", - yystos[yystate], yyvsp); + YY_ACCESSING_SYMBOL (yystate), yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -1830,7 +1761,7 @@ /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -1843,6 +1774,7 @@ yyresult = 0; goto yyreturn; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ @@ -1850,16 +1782,21 @@ yyresult = 1; goto yyreturn; -#if !defined yyoverflow || YYERROR_VERBOSE + +#if !defined yyoverflow /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ yyexhaustedlab: yyerror (YY_("memory exhausted")); yyresult = 2; - /* Fall through. */ + goto yyreturn; #endif + +/*-------------------------------------------------------. +| yyreturn -- parsing is finished, clean up and return. | +`-------------------------------------------------------*/ yyreturn: if (yychar != YYEMPTY) { @@ -1876,20 +1813,18 @@ while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + YY_ACCESSING_SYMBOL (+*yyssp), yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif + return yyresult; } -#line 251 "winprefsyacc.y" /* yacc.c:1910 */ + +#line 251 "winprefsyacc.y" /* * Errors in parsing abort and print log messages diff -Nru xorg-server-1.20.9/hw/xwin/winprefsyacc.h xorg-server-1.20.13/hw/xwin/winprefsyacc.h --- xorg-server-1.20.9/hw/xwin/winprefsyacc.h 2020-08-25 15:40:21.000000000 +0000 +++ xorg-server-1.20.13/hw/xwin/winprefsyacc.h 2021-07-29 18:48:50.000000000 +0000 @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.1. */ +/* A Bison parser, made by GNU Bison 3.7.6. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -30,6 +31,10 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + #ifndef YY_YY_WINPREFSYACC_H_INCLUDED # define YY_YY_WINPREFSYACC_H_INCLUDED /* Debug traces. */ @@ -40,43 +45,52 @@ extern int yydebug; #endif -/* Token type. */ +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE enum yytokentype { - NEWLINE = 258, - MENU = 259, - LB = 260, - RB = 261, - ICONDIRECTORY = 262, - DEFAULTICON = 263, - ICONS = 264, - STYLES = 265, - TOPMOST = 266, - MAXIMIZE = 267, - MINIMIZE = 268, - BOTTOM = 269, - NOTITLE = 270, - OUTLINE = 271, - NOFRAME = 272, - DEFAULTSYSMENU = 273, - SYSMENU = 274, - ROOTMENU = 275, - SEPARATOR = 276, - ATSTART = 277, - ATEND = 278, - EXEC = 279, - ALWAYSONTOP = 280, - DEBUGOUTPUT = 281, - RELOAD = 282, - TRAYICON = 283, - FORCEEXIT = 284, - SILENTEXIT = 285, - STRING = 286 + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + NEWLINE = 258, /* NEWLINE */ + MENU = 259, /* MENU */ + LB = 260, /* LB */ + RB = 261, /* RB */ + ICONDIRECTORY = 262, /* ICONDIRECTORY */ + DEFAULTICON = 263, /* DEFAULTICON */ + ICONS = 264, /* ICONS */ + STYLES = 265, /* STYLES */ + TOPMOST = 266, /* TOPMOST */ + MAXIMIZE = 267, /* MAXIMIZE */ + MINIMIZE = 268, /* MINIMIZE */ + BOTTOM = 269, /* BOTTOM */ + NOTITLE = 270, /* NOTITLE */ + OUTLINE = 271, /* OUTLINE */ + NOFRAME = 272, /* NOFRAME */ + DEFAULTSYSMENU = 273, /* DEFAULTSYSMENU */ + SYSMENU = 274, /* SYSMENU */ + ROOTMENU = 275, /* ROOTMENU */ + SEPARATOR = 276, /* SEPARATOR */ + ATSTART = 277, /* ATSTART */ + ATEND = 278, /* ATEND */ + EXEC = 279, /* EXEC */ + ALWAYSONTOP = 280, /* ALWAYSONTOP */ + DEBUGOUTPUT = 281, /* "DEBUG" */ + RELOAD = 282, /* RELOAD */ + TRAYICON = 283, /* TRAYICON */ + FORCEEXIT = 284, /* FORCEEXIT */ + SILENTEXIT = 285, /* SILENTEXIT */ + STRING = 286 /* STRING */ }; + typedef enum yytokentype yytoken_kind_t; #endif -/* Tokens. */ +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 #define NEWLINE 258 #define MENU 259 #define LB 260 @@ -109,18 +123,17 @@ /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED - union YYSTYPE { -#line 90 "winprefsyacc.y" /* yacc.c:1913 */ +#line 90 "winprefsyacc.y" char *sVal; unsigned long uVal; int iVal; -#line 122 "winprefsyacc.h" /* yacc.c:1913 */ -}; +#line 135 "winprefsyacc.h" +}; typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 diff -Nru xorg-server-1.20.9/include/dix-config.h.in xorg-server-1.20.13/include/dix-config.h.in --- xorg-server-1.20.9/include/dix-config.h.in 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/include/dix-config.h.in 2021-07-29 18:48:14.000000000 +0000 @@ -122,9 +122,6 @@ /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM -/* Define to 1 if you have the libdispatch (GCD) available */ -#undef HAVE_LIBDISPATCH - /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_AGPGART_H diff -Nru xorg-server-1.20.9/include/do-not-use-config.h.in xorg-server-1.20.13/include/do-not-use-config.h.in --- xorg-server-1.20.9/include/do-not-use-config.h.in 2020-08-25 15:40:05.000000000 +0000 +++ xorg-server-1.20.13/include/do-not-use-config.h.in 2021-07-29 18:48:27.000000000 +0000 @@ -233,9 +233,6 @@ /* Define to 1 if you have the `bsd' library (-lbsd). */ #undef HAVE_LIBBSD -/* Define to 1 if you have the libdispatch (GCD) available */ -#undef HAVE_LIBDISPATCH - /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM diff -Nru xorg-server-1.20.9/include/Makefile.in xorg-server-1.20.13/include/Makefile.in --- xorg-server-1.20.9/include/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/include/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -166,8 +166,8 @@ xkbsrv.h xkbstr.h xkbrules.h xserver_poll.h \ xserver-properties.h HEADERS = $(nodist_sdk_HEADERS) $(sdk_HEADERS) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)do-not-use-config.h.in xorg-server.h.in dix-config.h.in \ +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + do-not-use-config.h.in xorg-server.h.in dix-config.h.in \ xorg-config.h.in xkb-config.h.in xwin-config.h.in \ xwayland-config.h.in version-config.h.in # Read a list of newline-separated strings from the standard input, @@ -541,6 +541,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/include/misc.h xorg-server-1.20.13/include/misc.h --- xorg-server-1.20.9/include/misc.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/include/misc.h 2021-07-29 18:48:14.000000000 +0000 @@ -91,7 +91,7 @@ #define LIMITCLIENTS 256 /* Must be a power of 2 and <= MAXCLIENTS */ #define MAXEXTENSIONS 128 #define MAXFORMATS 8 -#define MAXDEVICES 40 /* input devices */ +#define MAXDEVICES 256 /* input devices */ #define GPU_SCREEN_OFFSET 256 /* 128 event opcodes for core + extension events, excluding GE */ diff -Nru xorg-server-1.20.9/install-sh xorg-server-1.20.13/install-sh --- xorg-server-1.20.9/install-sh 2020-08-25 15:40:05.000000000 +0000 +++ xorg-server-1.20.13/install-sh 2021-07-29 18:48:28.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -451,7 +456,18 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -477,6 +493,13 @@ then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -491,9 +514,9 @@ # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff -Nru xorg-server-1.20.9/m4/libtool.m4 xorg-server-1.20.13/m4/libtool.m4 --- xorg-server-1.20.9/m4/libtool.m4 2020-08-25 15:40:00.000000000 +0000 +++ xorg-server-1.20.13/m4/libtool.m4 2021-07-29 18:48:21.000000000 +0000 @@ -1076,7 +1076,7 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[[012]][[,.]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; diff -Nru xorg-server-1.20.9/Makefile.in xorg-server-1.20.13/Makefile.in --- xorg-server-1.20.9/Makefile.in 2020-08-25 15:40:05.000000000 +0000 +++ xorg-server-1.20.13/Makefile.in 2021-07-29 18:48:28.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -235,9 +235,11 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz GZIP_ENV = --best -DIST_TARGETS = dist-bzip2 dist-gzip +DIST_TARGETS = dist-xz dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -589,6 +591,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -985,6 +988,7 @@ dist-gzip: distdir tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__post_remove_distdir) @@ -992,11 +996,14 @@ dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__post_remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -1039,6 +1046,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -1055,7 +1064,7 @@ $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -1220,7 +1229,7 @@ am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ + dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \ distclean-generic distclean-libtool distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-aclocalDATA install-am \ diff -Nru xorg-server-1.20.9/man/Makefile.in xorg-server-1.20.13/man/Makefile.in --- xorg-server-1.20.9/man/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/man/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -543,6 +543,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/meson.build xorg-server-1.20.13/meson.build --- xorg-server-1.20.9/meson.build 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/meson.build 2021-07-29 18:48:14.000000000 +0000 @@ -3,7 +3,7 @@ 'buildtype=debugoptimized', 'c_std=gnu99', ], - version: '1.20.9', + version: '1.20.13', meson_version: '>= 0.42.0', ) add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c') @@ -348,7 +348,7 @@ error('DRI requested, but LIBDRM not found') endif -build_modesetting = libdrm_dep.found() +build_modesetting = libdrm_dep.found() and dri2proto_dep.found() build_vbe = false if get_option('vbe') == 'auto' diff -Nru xorg-server-1.20.9/mi/Makefile.in xorg-server-1.20.13/mi/Makefile.in --- xorg-server-1.20.9/mi/Makefile.in 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/mi/Makefile.in 2021-07-29 18:48:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -579,6 +579,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/miext/damage/Makefile.in xorg-server-1.20.13/miext/damage/Makefile.in --- xorg-server-1.20.9/miext/damage/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/miext/damage/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -559,6 +559,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/miext/Makefile.in xorg-server-1.20.13/miext/Makefile.in --- xorg-server-1.20.9/miext/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/miext/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -537,6 +537,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/miext/rootless/Makefile.in xorg-server-1.20.13/miext/rootless/Makefile.in --- xorg-server-1.20.9/miext/rootless/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/miext/rootless/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -530,6 +530,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/miext/shadow/Makefile.in xorg-server-1.20.13/miext/shadow/Makefile.in --- xorg-server-1.20.9/miext/shadow/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/miext/shadow/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -579,6 +579,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/miext/sync/Makefile.in xorg-server-1.20.13/miext/sync/Makefile.in --- xorg-server-1.20.9/miext/sync/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/miext/sync/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -565,6 +565,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/missing xorg-server-1.20.13/missing --- xorg-server-1.20.9/missing 2020-08-25 15:40:05.000000000 +0000 +++ xorg-server-1.20.13/missing 2021-07-29 18:48:28.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru xorg-server-1.20.9/os/backtrace.c xorg-server-1.20.13/os/backtrace.c --- xorg-server-1.20.9/os/backtrace.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/os/backtrace.c 2021-07-29 18:48:14.000000000 +0000 @@ -45,6 +45,7 @@ { unw_cursor_t cursor; unw_context_t context; + unw_word_t ip; unw_word_t off; unw_proc_info_t pip; int ret, i = 0; @@ -88,7 +89,9 @@ procname[1] = 0; } - if (dladdr((void *)(uintptr_t)(pip.start_ip + off), &dlinfo) && dlinfo.dli_fname && + if (unw_get_reg (&cursor, UNW_REG_IP, &ip) < 0) + ip = pip.start_ip + off; + if (dladdr((void *)(uintptr_t)(ip), &dlinfo) && dlinfo.dli_fname && *dlinfo.dli_fname) filename = dlinfo.dli_fname; else @@ -96,7 +99,7 @@ ErrorFSigSafe("%u: %s (%s%s+0x%x) [%p]\n", i++, filename, procname, ret == -UNW_ENOMEM ? "..." : "", (int)off, - (void *)(uintptr_t)(pip.start_ip + off)); + (void *)(uintptr_t)(ip)); ret = unw_step(&cursor); if (ret < 0) diff -Nru xorg-server-1.20.9/os/log.c xorg-server-1.20.13/os/log.c --- xorg-server-1.20.9/os/log.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/os/log.c 2021-07-29 18:48:14.000000000 +0000 @@ -121,19 +121,12 @@ static Bool needBuffer = TRUE; #ifdef __APPLE__ -#include - static char __crashreporter_info_buff__[4096] = { 0 }; static const char *__crashreporter_info__ __attribute__ ((__used__)) = &__crashreporter_info_buff__[0]; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 -// This is actually a toolchain requirement, but I'm not sure the correct check, -// but it should be fine to just only include it for Leopard and later. This line -// just tells the linker to never strip this symbol (such as for space optimization) asm(".desc ___crashreporter_info__, 0x10"); #endif -#endif /* Prefix strings for log messages. */ #ifndef X_UNKNOWN_STRING diff -Nru xorg-server-1.20.9/os/Makefile.in xorg-server-1.20.13/os/Makefile.in --- xorg-server-1.20.9/os/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/os/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -576,6 +576,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/present/Makefile.in xorg-server-1.20.13/present/Makefile.in --- xorg-server-1.20.9/present/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/present/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -565,6 +565,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/present/present.c xorg-server-1.20.13/present/present.c --- xorg-server-1.20.9/present/present.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/present/present.c 2021-07-29 18:48:14.000000000 +0000 @@ -59,11 +59,19 @@ { ScreenPtr screen = window->drawable.pScreen; present_screen_priv_ptr screen_priv = present_screen_priv(screen); + RRCrtcPtr crtc = NULL; if (!screen_priv) return NULL; - return screen_priv->get_crtc(screen_priv, window); + crtc = screen_priv->get_crtc(screen_priv, window); + if (crtc && !present_screen_priv(crtc->pScreen)) { + crtc = RRFirstEnabledCrtc(screen); + } + if (crtc && !present_screen_priv(crtc->pScreen)) { + crtc = NULL; + } + return crtc; } /* diff -Nru xorg-server-1.20.9/present/present_execute.c xorg-server-1.20.13/present/present_execute.c --- xorg-server-1.20.9/present/present_execute.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/present/present_execute.c 2021-07-29 18:48:14.000000000 +0000 @@ -48,16 +48,13 @@ ScreenPtr screen = window->drawable.pScreen; present_screen_priv_ptr screen_priv = present_screen_priv(screen); - if (vblank->requeue) { - vblank->requeue = FALSE; - if (msc_is_after(vblank->target_msc, crtc_msc) && - Success == screen_priv->queue_vblank(screen, - window, - vblank->crtc, - vblank->event_id, - vblank->target_msc)) - return TRUE; - } + /* We may have to requeue for the next MSC if check_flip_window prevented + * using a flip. + */ + if (vblank->exec_msc == crtc_msc + 1 && + screen_priv->queue_vblank(screen, window, vblank->crtc, vblank->event_id, + vblank->exec_msc) == Success) + return TRUE; if (vblank->wait_fence) { if (!present_fence_check_triggered(vblank->wait_fence)) { @@ -75,13 +72,13 @@ ScreenPtr screen = window->drawable.pScreen; present_screen_priv_ptr screen_priv = present_screen_priv(screen); - /* If present_flip failed, we may have to requeue for the target MSC */ - if (vblank->target_msc == crtc_msc + 1 && + /* If present_flip failed, we may have to requeue for the next MSC */ + if (vblank->exec_msc == crtc_msc + 1 && Success == screen_priv->queue_vblank(screen, window, vblank->crtc, vblank->event_id, - vblank->target_msc)) { + vblank->exec_msc)) { vblank->queued = TRUE; return; } diff -Nru xorg-server-1.20.9/present/present_priv.h xorg-server-1.20.13/present/present_priv.h --- xorg-server-1.20.9/present/present_priv.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/present/present_priv.h 2021-07-29 18:48:14.000000000 +0000 @@ -70,14 +70,14 @@ int16_t y_off; CARD16 kind; uint64_t event_id; - uint64_t target_msc; + uint64_t target_msc; /* target MSC when present should complete */ + uint64_t exec_msc; /* MSC at which present can be executed */ uint64_t msc_offset; present_fence_ptr idle_fence; present_fence_ptr wait_fence; present_notify_ptr notifies; int num_notifies; Bool queued; /* on present_exec_queue */ - Bool requeue; /* on queue, but target_msc has changed */ Bool flip; /* planning on using flip */ Bool flip_ready; /* wants to flip, but waiting for previous flip or unflip */ Bool flip_idler; /* driver explicitly permitted idling */ @@ -469,7 +469,7 @@ const uint32_t *capabilities, present_notify_ptr notifies, int num_notifies, - uint64_t *target_msc, + uint64_t target_msc, uint64_t crtc_msc); void diff -Nru xorg-server-1.20.9/present/present_scmd.c xorg-server-1.20.13/present/present_scmd.c --- xorg-server-1.20.9/present/present_scmd.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/present/present_scmd.c 2021-07-29 18:48:14.000000000 +0000 @@ -82,6 +82,9 @@ WindowPtr root = screen->root; present_screen_priv_ptr screen_priv = present_screen_priv(screen); + if (crtc) { + screen_priv = present_screen_priv(crtc->pScreen); + } if (reason) *reason = PRESENT_FLIP_REASON_UNKNOWN; @@ -181,11 +184,14 @@ present_get_ust_msc(ScreenPtr screen, RRCrtcPtr crtc, uint64_t *ust, uint64_t *msc) { present_screen_priv_ptr screen_priv = present_screen_priv(screen); + present_screen_priv_ptr crtc_screen_priv = screen_priv; + if (crtc) + crtc_screen_priv = present_screen_priv(crtc->pScreen); if (crtc == NULL) return present_fake_get_ust_msc(screen, ust, msc); else - return (*screen_priv->info->get_ust_msc)(crtc, ust, msc); + return (*crtc_screen_priv->info->get_ust_msc)(crtc, ust, msc); } static void @@ -216,7 +222,7 @@ ret = present_fake_queue_vblank(screen, event_id, msc); else { - present_screen_priv_ptr screen_priv = present_screen_priv(screen); + present_screen_priv_ptr screen_priv = present_screen_priv(crtc->pScreen); ret = (*screen_priv->info->queue_vblank) (crtc, event_id, msc); } return ret; @@ -233,11 +239,12 @@ if (window_priv->crtc == PresentCrtcNeverSet) { window_priv->msc_offset = 0; } else { - /* The old CRTC may have been turned off, in which case + /* The old CRTC may have been turned off or be destroyed, in which case * we'll just use whatever previous MSC we'd seen from this CRTC */ - if (present_get_ust_msc(window->drawable.pScreen, window_priv->crtc, &old_ust, &old_msc) != Success) + if (!RRCrtcExists(window->drawable.pScreen, window_priv->crtc) || + present_get_ust_msc(window->drawable.pScreen, window_priv->crtc, &old_ust, &old_msc) != Success) old_msc = window_priv->msc; window_priv->msc_offset += new_msc - old_msc; @@ -361,8 +368,8 @@ ScreenPtr screen = vblank->screen; present_screen_priv_ptr screen_priv = present_screen_priv(screen); - DebugPresent(("\tn %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n", - vblank->event_id, vblank, vblank->target_msc, + DebugPresent(("\tn %" PRIu64 " %p %" PRIu64 " %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n", + vblank->event_id, vblank, vblank->exec_msc, vblank->target_msc, vblank->pixmap ? vblank->pixmap->drawable.id : 0, vblank->window ? vblank->window->drawable.id : 0)); @@ -482,7 +489,7 @@ vblank->flip = FALSE; vblank->reason = reason; if (vblank->sync_flip) - vblank->requeue = TRUE; + vblank->exec_msc = vblank->target_msc; } } } @@ -541,6 +548,9 @@ WindowPtr window = vblank->window; ScreenPtr screen = window->drawable.pScreen; present_screen_priv_ptr screen_priv = present_screen_priv(screen); + if (vblank && vblank->crtc) { + screen_priv=present_screen_priv(vblank->crtc->pScreen); + } if (present_execute_wait(vblank, crtc_msc)) return; @@ -608,6 +618,7 @@ */ screen_priv->flip_pending = NULL; vblank->flip = FALSE; + vblank->exec_msc = vblank->target_msc; } DebugPresent(("\tc %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n", vblank, crtc_msc, vblank->pixmap->drawable.id, vblank->window->drawable.id)); @@ -745,16 +756,19 @@ screen_priv->info ? &screen_priv->info->capabilities : NULL, notifies, num_notifies, - &target_msc, + target_msc, crtc_msc); if (!vblank) return BadAlloc; + if (vblank->flip && vblank->sync_flip) + vblank->exec_msc--; + xorg_list_append(&vblank->event_queue, &present_exec_queue); vblank->queued = TRUE; - if (msc_is_after(target_msc, crtc_msc)) { - ret = present_queue_vblank(screen, window, target_crtc, vblank->event_id, target_msc); + if (msc_is_after(vblank->exec_msc, crtc_msc)) { + ret = present_queue_vblank(screen, window, target_crtc, vblank->event_id, vblank->exec_msc); if (ret == Success) return Success; diff -Nru xorg-server-1.20.9/present/present_vblank.c xorg-server-1.20.13/present/present_vblank.c --- xorg-server-1.20.9/present/present_vblank.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/present/present_vblank.c 2021-07-29 18:48:14.000000000 +0000 @@ -57,7 +57,7 @@ const uint32_t *capabilities, present_notify_ptr notifies, int num_notifies, - uint64_t *target_msc, + uint64_t target_msc, uint64_t crtc_msc) { ScreenPtr screen = window->drawable.pScreen; @@ -66,6 +66,10 @@ present_vblank_ptr vblank; PresentFlipReason reason = PRESENT_FLIP_REASON_UNKNOWN; + if (target_crtc) { + screen_priv = present_screen_priv(target_crtc->pScreen); + } + vblank = calloc (1, sizeof (present_vblank_rec)); if (!vblank) return NULL; @@ -100,7 +104,8 @@ vblank->x_off = x_off; vblank->y_off = y_off; - vblank->target_msc = *target_msc; + vblank->target_msc = target_msc; + vblank->exec_msc = target_msc; vblank->crtc = target_crtc; vblank->msc_offset = window_priv->msc_offset; vblank->notifies = notifies; @@ -111,12 +116,11 @@ if (pixmap != NULL && !(options & PresentOptionCopy) && capabilities) { - if (msc_is_after(*target_msc, crtc_msc) && + if (msc_is_after(target_msc, crtc_msc) && screen_priv->check_flip (target_crtc, window, pixmap, TRUE, valid, x_off, y_off, &reason)) { vblank->flip = TRUE; vblank->sync_flip = TRUE; - *target_msc = *target_msc - 1; } else if ((*capabilities & PresentCapabilityAsync) && screen_priv->check_flip (target_crtc, window, pixmap, FALSE, valid, x_off, y_off, &reason)) { @@ -139,7 +143,7 @@ if (pixmap) DebugPresent(("q %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 " (crtc %p) flip %d vsync %d serial %d\n", - vblank->event_id, vblank, *target_msc, + vblank->event_id, vblank, target_msc, vblank->pixmap->drawable.id, vblank->window->drawable.id, target_crtc, vblank->flip, vblank->sync_flip, vblank->serial)); return vblank; @@ -153,8 +157,8 @@ void present_vblank_scrap(present_vblank_ptr vblank) { - DebugPresent(("\tx %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 " (crtc %p)\n", - vblank->event_id, vblank, vblank->target_msc, + DebugPresent(("\tx %" PRIu64 " %p %" PRIu64 " %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 " (crtc %p)\n", + vblank->event_id, vblank, vblank->exec_msc, vblank->target_msc, vblank->pixmap->drawable.id, vblank->window->drawable.id, vblank->crtc)); @@ -175,8 +179,8 @@ /* Also make sure vblank is removed from event queue (wnmd) */ xorg_list_del(&vblank->event_queue); - DebugPresent(("\td %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n", - vblank->event_id, vblank, vblank->target_msc, + DebugPresent(("\td %" PRIu64 " %p %" PRIu64 " %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n", + vblank->event_id, vblank, vblank->exec_msc, vblank->target_msc, vblank->pixmap ? vblank->pixmap->drawable.id : 0, vblank->window ? vblank->window->drawable.id : 0)); diff -Nru xorg-server-1.20.9/present/present_wnmd.c xorg-server-1.20.13/present/present_wnmd.c --- xorg-server-1.20.9/present/present_wnmd.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/present/present_wnmd.c 2021-07-29 18:48:14.000000000 +0000 @@ -42,6 +42,17 @@ static void present_wnmd_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc); +static int +present_wnmd_queue_vblank(ScreenPtr screen, + WindowPtr window, + RRCrtcPtr crtc, + uint64_t event_id, + uint64_t msc) +{ + present_screen_priv_ptr screen_priv = present_screen_priv(screen); + return (*screen_priv->wnmd_info->queue_vblank) (window, crtc, event_id, msc); +} + static void present_wnmd_create_event_id(present_window_priv_ptr window_priv, present_vblank_ptr vblank) { @@ -111,7 +122,8 @@ present_vblank_ptr vblank, tmp; xorg_list_for_each_entry_safe(vblank, tmp, &window_priv->idle_queue, event_queue) { - present_wnmd_free_idle_vblank(vblank); + if (vblank->flip) + present_wnmd_free_idle_vblank(vblank); } if (window_priv->flip_active) { @@ -168,8 +180,8 @@ WindowPtr window = vblank->window; present_window_priv_ptr window_priv = present_window_priv(window); - DebugPresent(("\tn %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n", - vblank->event_id, vblank, vblank->target_msc, + DebugPresent(("\tn %" PRIu64 " %p %" PRIu64 " %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n", + vblank->event_id, vblank, vblank->exec_msc, vblank->target_msc, vblank->pixmap ? vblank->pixmap->drawable.id : 0, vblank->window ? vblank->window->drawable.id : 0)); @@ -234,7 +246,12 @@ xorg_list_for_each_entry(vblank, &window_priv->idle_queue, event_queue) { if (vblank->event_id == event_id) { - present_wnmd_free_idle_vblank(vblank); + if (vblank->flip) + present_wnmd_free_idle_vblank(vblank); + else + /* Copies which were executed but need their completion event sent */ + present_execute_post(vblank, ust, msc); + return; } } @@ -270,10 +287,6 @@ if (!screen_priv->wnmd_info->flip) return FALSE; - /* Can't flip redirected child windows */ - if (screen->GetWindowPixmap(window) != screen->GetWindowPixmap(toplvl_window)) - return FALSE; - /* Source pixmap must align with window exactly */ if (x_off || y_off) return FALSE; @@ -291,6 +304,10 @@ if ( !RegionEqual(&window->winSize, &toplvl_window->winSize) ) return FALSE; + /* Can't flip if window clipped by children */ + if (!RegionEqual(&window->clipList, &window->winSize)) + return FALSE; + /* Ask the driver for permission */ if (screen_priv->wnmd_info->check_flip2) { if (!(*screen_priv->wnmd_info->check_flip2) (crtc, window, pixmap, sync_flip, reason)) { @@ -342,8 +359,6 @@ vblank->sync_flip, vblank->valid, 0, 0, &reason)) { vblank->flip = FALSE; vblank->reason = reason; - if (vblank->sync_flip) - vblank->requeue = TRUE; } } } @@ -443,6 +458,7 @@ vblank->queued = FALSE; if (vblank->pixmap && vblank->window) { + ScreenPtr screen = window->drawable.pScreen; if (vblank->flip) { RegionPtr damage; @@ -457,10 +473,13 @@ /* Set update region as damaged */ if (vblank->update) { - damage = vblank->update; + damage = RegionDuplicate(vblank->update); + /* Translate update region to screen space */ + assert(vblank->x_off == 0 && vblank->y_off == 0); + RegionTranslate(damage, window->drawable.x, window->drawable.y); RegionIntersect(damage, damage, &window->clipList); } else - damage = &window->clipList; + damage = RegionDuplicate(&window->clipList); /* Try to flip - the vblank is now pending */ @@ -468,7 +487,6 @@ // ask the driver if (present_wnmd_flip(vblank->window, vblank->crtc, vblank->event_id, vblank->target_msc, vblank->pixmap, vblank->sync_flip, damage)) { - ScreenPtr screen = window->drawable.pScreen; WindowPtr toplvl_window = present_wnmd_toplvl_pixmap_window(vblank->window); PixmapPtr old_pixmap = screen->GetWindowPixmap(window); @@ -483,6 +501,7 @@ /* Report damage */ DamageDamageRegion(&vblank->window->drawable, damage); + RegionDestroy(damage); return; } @@ -498,9 +517,12 @@ present_wnmd_cancel_flip(window); present_execute_copy(vblank, crtc_msc); + assert(!vblank->queued); - if (vblank->queued) { - xorg_list_add(&vblank->event_queue, &window_priv->exec_queue); + if (present_wnmd_queue_vblank(screen, window, vblank->crtc, + vblank->event_id, crtc_msc + 1) + == Success) { + xorg_list_add(&vblank->event_queue, &window_priv->idle_queue); xorg_list_append(&vblank->window_list, &window_priv->vblank); return; @@ -510,17 +532,6 @@ present_execute_post(vblank, ust, crtc_msc); } -static int -present_wnmd_queue_vblank(ScreenPtr screen, - WindowPtr window, - RRCrtcPtr crtc, - uint64_t event_id, - uint64_t msc) -{ - present_screen_priv_ptr screen_priv = present_screen_priv(screen); - return (*screen_priv->wnmd_info->queue_vblank) (window, crtc, event_id, msc); -} - static uint64_t present_wnmd_window_to_crtc_msc(WindowPtr window, RRCrtcPtr crtc, uint64_t window_msc, uint64_t new_msc) { @@ -626,15 +637,20 @@ &screen_priv->wnmd_info->capabilities, notifies, num_notifies, - &target_msc, + target_msc, crtc_msc); if (!vblank) return BadAlloc; + /* WNMD presentations always complete (at least) one frame after they + * are executed + */ + vblank->exec_msc = vblank->target_msc - 1; + xorg_list_append(&vblank->event_queue, &window_priv->exec_queue); vblank->queued = TRUE; - if (crtc_msc < target_msc) { - if (present_wnmd_queue_vblank(screen, window, target_crtc, vblank->event_id, target_msc) == Success) { + if (crtc_msc < vblank->exec_msc) { + if (present_wnmd_queue_vblank(screen, window, target_crtc, vblank->event_id, vblank->exec_msc) == Success) { return Success; } DebugPresent(("present_queue_vblank failed\n")); diff -Nru xorg-server-1.20.9/pseudoramiX/Makefile.in xorg-server-1.20.13/pseudoramiX/Makefile.in --- xorg-server-1.20.9/pseudoramiX/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/pseudoramiX/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -529,6 +529,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/randr/Makefile.in xorg-server-1.20.13/randr/Makefile.in --- xorg-server-1.20.9/randr/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/randr/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -577,6 +577,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/randr/randr.c xorg-server-1.20.13/randr/randr.c --- xorg-server-1.20.9/randr/randr.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/randr/randr.c 2021-07-29 18:48:14.000000000 +0000 @@ -693,6 +693,33 @@ return NULL; } +RRCrtcPtr +RRFirstEnabledCrtc(ScreenPtr pScreen) +{ + rrScrPriv(pScreen); + RROutputPtr output; + int i, j; + + if (!pScrPriv) + return NULL; + + if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc && + pScrPriv->primaryOutput->pScreen == pScreen) + return pScrPriv->primaryOutput->crtc; + + for (i = 0; i < pScrPriv->numCrtcs; i++) { + RRCrtcPtr crtc = pScrPriv->crtcs[i]; + + for (j = 0; j < pScrPriv->numOutputs; j++) { + output = pScrPriv->outputs[j]; + if (output->crtc == crtc && crtc->mode) + return crtc; + } + } + return NULL; +} + + CARD16 RRVerticalRefresh(xRRModeInfo * mode) { diff -Nru xorg-server-1.20.9/randr/randrstr.h xorg-server-1.20.13/randr/randrstr.h --- xorg-server-1.20.9/randr/randrstr.h 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/randr/randrstr.h 2021-07-29 18:48:14.000000000 +0000 @@ -593,6 +593,8 @@ extern _X_EXPORT RROutputPtr RRFirstOutput(ScreenPtr pScreen); +extern _X_EXPORT RRCrtcPtr RRFirstEnabledCrtc(ScreenPtr pScreen); + extern _X_EXPORT Bool RROutputSetNonDesktop(RROutputPtr output, Bool non_desktop); extern _X_EXPORT CARD16 @@ -643,6 +645,11 @@ extern _X_EXPORT RRCrtcPtr RRCrtcCreate(ScreenPtr pScreen, void *devPrivate); /* + * Tests if findCrtc belongs to pScreen or slave screens + */ +extern _X_EXPORT Bool RRCrtcExists(ScreenPtr pScreen, RRCrtcPtr findCrtc); + +/* * Set the allowed rotations on a CRTC */ extern _X_EXPORT void diff -Nru xorg-server-1.20.9/randr/rrcrtc.c xorg-server-1.20.13/randr/rrcrtc.c --- xorg-server-1.20.9/randr/rrcrtc.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/randr/rrcrtc.c 2021-07-29 18:48:14.000000000 +0000 @@ -27,7 +27,7 @@ #include -RESTYPE RRCrtcType; +RESTYPE RRCrtcType = 0; /* * Notify the CRTC of some change @@ -960,6 +960,47 @@ return ret; } +static Bool RRCrtcInScreen(ScreenPtr pScreen, RRCrtcPtr findCrtc) +{ + rrScrPrivPtr pScrPriv; + int c; + + if (pScreen == NULL) + return FALSE; + + if (findCrtc == NULL) + return FALSE; + + if (!dixPrivateKeyRegistered(rrPrivKey)) + return FALSE; + + pScrPriv = rrGetScrPriv(pScreen); + for (c = 0; c < pScrPriv->numCrtcs; c++) { + if (pScrPriv->crtcs[c] == findCrtc) + return TRUE; + } + + return FALSE; +} + +Bool RRCrtcExists(ScreenPtr pScreen, RRCrtcPtr findCrtc) +{ + ScreenPtr slave= NULL; + + if (RRCrtcInScreen(pScreen, findCrtc)) + return TRUE; + + xorg_list_for_each_entry(slave, &pScreen->slave_list, slave_head) { + if (!slave->is_output_slave) + continue; + if (RRCrtcInScreen(slave, findCrtc)) + return TRUE; + } + + return FALSE; +} + + /* * Notify the extension that the Crtc gamma has been changed * The driver calls this whenever it has changed the gamma values diff -Nru xorg-server-1.20.9/randr/rrprovider.c xorg-server-1.20.13/randr/rrprovider.c --- xorg-server-1.20.9/randr/rrprovider.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/randr/rrprovider.c 2021-07-29 18:48:14.000000000 +0000 @@ -27,7 +27,7 @@ #include -RESTYPE RRProviderType; +RESTYPE RRProviderType = 0; /* * Initialize provider type error value diff -Nru xorg-server-1.20.9/record/Makefile.in xorg-server-1.20.13/record/Makefile.in --- xorg-server-1.20.9/record/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/record/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -527,6 +527,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/render/Makefile.in xorg-server-1.20.13/render/Makefile.in --- xorg-server-1.20.9/render/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/render/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -566,6 +566,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/test/Makefile.in xorg-server-1.20.13/test/Makefile.in --- xorg-server-1.20.9/test/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/test/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -541,6 +541,7 @@ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) @ENABLE_UNIT_TESTS_TRUE@am__EXEEXT_1 = $(XVFB_TESTS) \ @ENABLE_UNIT_TESTS_TRUE@ $(XEPHYR_GLAMOR_TESTS) @@ -940,6 +941,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -1705,7 +1707,7 @@ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1856,7 +1858,8 @@ installdirs-am: install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -2016,7 +2019,7 @@ uninstall-am: .MAKE: $(am__recursive_targets) all check check-am install install-am \ - install-strip + install-exec install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles check check-TESTS check-am clean clean-generic \ diff -Nru xorg-server-1.20.9/test-driver xorg-server-1.20.13/test-driver --- xorg-server-1.20.9/test-driver 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/test-driver 2021-07-29 18:48:33.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,11 +42,13 @@ { cat <swapped) { if (len < bytes_to_int32(sizeof(xStringFeedbackCtl))) return BadLength; diff -Nru xorg-server-1.20.9/Xi/Makefile.in xorg-server-1.20.13/Xi/Makefile.in --- xorg-server-1.20.9/Xi/Makefile.in 2020-08-25 15:40:05.000000000 +0000 +++ xorg-server-1.20.13/Xi/Makefile.in 2021-07-29 18:48:28.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -568,6 +568,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/xkb/Makefile.in xorg-server-1.20.13/xkb/Makefile.in --- xorg-server-1.20.9/xkb/Makefile.in 2020-08-25 15:40:09.000000000 +0000 +++ xorg-server-1.20.13/xkb/Makefile.in 2021-07-29 18:48:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -580,6 +580,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ diff -Nru xorg-server-1.20.9/xkb/xkb.c xorg-server-1.20.13/xkb/xkb.c --- xorg-server-1.20.9/xkb/xkb.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/xkb/xkb.c 2021-07-29 18:48:14.000000000 +0000 @@ -2382,6 +2382,93 @@ return (char *) wire; } +#define _add_check_len(new) \ + if (len > UINT32_MAX - (new) || len > req_len - (new)) goto bad; \ + else len += new + +/** + * Check the length of the SetMap request + */ +static int +_XkbSetMapCheckLength(xkbSetMapReq *req) +{ + size_t len = sz_xkbSetMapReq, req_len = req->length << 2; + xkbKeyTypeWireDesc *keytype; + xkbSymMapWireDesc *symmap; + BOOL preserve; + int i, map_count, nSyms; + + if (req_len < len) + goto bad; + /* types */ + if (req->present & XkbKeyTypesMask) { + keytype = (xkbKeyTypeWireDesc *)(req + 1); + for (i = 0; i < req->nTypes; i++) { + _add_check_len(XkbPaddedSize(sz_xkbKeyTypeWireDesc)); + if (req->flags & XkbSetMapResizeTypes) { + _add_check_len(keytype->nMapEntries + * sz_xkbKTSetMapEntryWireDesc); + preserve = keytype->preserve; + map_count = keytype->nMapEntries; + if (preserve) { + _add_check_len(map_count * sz_xkbModsWireDesc); + } + keytype += 1; + keytype = (xkbKeyTypeWireDesc *) + ((xkbKTSetMapEntryWireDesc *)keytype + map_count); + if (preserve) + keytype = (xkbKeyTypeWireDesc *) + ((xkbModsWireDesc *)keytype + map_count); + } + } + } + /* syms */ + if (req->present & XkbKeySymsMask) { + symmap = (xkbSymMapWireDesc *)((char *)req + len); + for (i = 0; i < req->nKeySyms; i++) { + _add_check_len(sz_xkbSymMapWireDesc); + nSyms = symmap->nSyms; + _add_check_len(nSyms*sizeof(CARD32)); + symmap += 1; + symmap = (xkbSymMapWireDesc *)((CARD32 *)symmap + nSyms); + } + } + /* actions */ + if (req->present & XkbKeyActionsMask) { + _add_check_len(req->totalActs * sz_xkbActionWireDesc + + XkbPaddedSize(req->nKeyActs)); + } + /* behaviours */ + if (req->present & XkbKeyBehaviorsMask) { + _add_check_len(req->totalKeyBehaviors * sz_xkbBehaviorWireDesc); + } + /* vmods */ + if (req->present & XkbVirtualModsMask) { + _add_check_len(XkbPaddedSize(Ones(req->virtualMods))); + } + /* explicit */ + if (req->present & XkbExplicitComponentsMask) { + /* two bytes per non-zero explicit componen */ + _add_check_len(XkbPaddedSize(req->totalKeyExplicit * sizeof(CARD16))); + } + /* modmap */ + if (req->present & XkbModifierMapMask) { + /* two bytes per non-zero modmap component */ + _add_check_len(XkbPaddedSize(req->totalModMapKeys * sizeof(CARD16))); + } + /* vmodmap */ + if (req->present & XkbVirtualModMapMask) { + _add_check_len(req->totalVModMapKeys * sz_xkbVModMapWireDesc); + } + if (len == req_len) + return Success; +bad: + ErrorF("[xkb] BOGUS LENGTH in SetMap: expected %ld got %ld\n", + len, req_len); + return BadLength; +} + + /** * Check if the given request can be applied to the given device but don't * actually do anything.. @@ -2639,6 +2726,11 @@ CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixManageAccess); CHK_MASK_LEGAL(0x01, stuff->present, XkbAllMapComponentsMask); + /* first verify the request length carefully */ + rc = _XkbSetMapCheckLength(stuff); + if (rc != Success) + return rc; + tmp = (char *) &stuff[1]; /* Check if we can to the SetMap on the requested device. If this @@ -6533,7 +6625,9 @@ unsigned changed, int num, int *status_rtrn, - ClientPtr client, xkbExtensionDeviceNotify * ev) + ClientPtr client, + xkbExtensionDeviceNotify * ev, + xkbSetDeviceInfoReq * stuff) { xkbDeviceLedsWireDesc *ledWire; int i; @@ -6554,6 +6648,11 @@ xkbIndicatorMapWireDesc *mapWire; XkbSrvLedInfoPtr sli; + if (!_XkbCheckRequestBounds(client, stuff, ledWire, ledWire + 1)) { + *status_rtrn = BadLength; + return (char *) ledWire; + } + namec = mapc = statec = 0; sli = XkbFindSrvLedInfo(dev, ledWire->ledClass, ledWire->ledID, XkbXI_IndicatorMapsMask); @@ -6572,6 +6671,10 @@ memset((char *) sli->names, 0, XkbNumIndicators * sizeof(Atom)); for (n = 0, bit = 1; n < XkbNumIndicators; n++, bit <<= 1) { if (ledWire->namesPresent & bit) { + if (!_XkbCheckRequestBounds(client, stuff, atomWire, atomWire + 1)) { + *status_rtrn = BadLength; + return (char *) atomWire; + } sli->names[n] = (Atom) *atomWire; if (sli->names[n] == None) ledWire->namesPresent &= ~bit; @@ -6589,6 +6692,10 @@ if (ledWire->mapsPresent) { for (n = 0, bit = 1; n < XkbNumIndicators; n++, bit <<= 1) { if (ledWire->mapsPresent & bit) { + if (!_XkbCheckRequestBounds(client, stuff, mapWire, mapWire + 1)) { + *status_rtrn = BadLength; + return (char *) mapWire; + } sli->maps[n].flags = mapWire->flags; sli->maps[n].which_groups = mapWire->whichGroups; sli->maps[n].groups = mapWire->groups; @@ -6668,7 +6775,7 @@ ed.deviceID = dev->id; wire = (char *) &stuff[1]; if (stuff->change & XkbXI_ButtonActionsMask) { - int nBtns, sz, i; + int nBtns, sz, i; XkbAction *acts; DeviceIntPtr kbd; @@ -6680,7 +6787,11 @@ return BadAlloc; dev->button->xkb_acts = acts; } + if (stuff->firstBtn + stuff->nBtns > nBtns) + return BadValue; sz = stuff->nBtns * SIZEOF(xkbActionWireDesc); + if (!_XkbCheckRequestBounds(client, stuff, wire, (char *) wire + sz)) + return BadLength; memcpy((char *) &acts[stuff->firstBtn], (char *) wire, sz); wire += sz; ed.reason |= XkbXI_ButtonActionsMask; @@ -6701,7 +6812,8 @@ int status = Success; wire = SetDeviceIndicators(wire, dev, stuff->change, - stuff->nDeviceLedFBs, &status, client, &ed); + stuff->nDeviceLedFBs, &status, client, &ed, + stuff); if (status != Success) return status; } diff -Nru xorg-server-1.20.9/xkb/XKBGAlloc.c xorg-server-1.20.13/xkb/XKBGAlloc.c --- xorg-server-1.20.9/xkb/XKBGAlloc.c 2020-08-25 15:39:55.000000000 +0000 +++ xorg-server-1.20.13/xkb/XKBGAlloc.c 2021-07-29 18:48:14.000000000 +0000 @@ -588,8 +588,7 @@ i++, alias++) { if (strncmp(alias->alias, aliasStr, XkbKeyNameLength) == 0) { memset(alias->real, 0, XkbKeyNameLength); - memcpy(alias->real, realStr, - min(XkbKeyNameLength, strlen(realStr))); + memcpy(alias->real, realStr, strnlen(realStr, XkbKeyNameLength)); return alias; } } @@ -599,8 +598,8 @@ } alias = &geom->key_aliases[geom->num_key_aliases]; memset(alias, 0, sizeof(XkbKeyAliasRec)); - memcpy(alias->alias, aliasStr, min(XkbKeyNameLength, strlen(aliasStr))); - memcpy(alias->real, realStr, min(XkbKeyNameLength, strlen(realStr))); + memcpy(alias->alias, aliasStr, strnlen(aliasStr, XkbKeyNameLength)); + memcpy(alias->real, realStr, strnlen(realStr, XkbKeyNameLength)); geom->num_key_aliases++; return alias; } @@ -815,8 +814,8 @@ (_XkbAllocOverlayKeys(row, 1) != Success)) return NULL; key = &row->keys[row->num_keys]; - memcpy(key->under.name, under, min(XkbKeyNameLength, strlen(under))); - memcpy(key->over.name, over, min(XkbKeyNameLength, strlen(over))); + memcpy(key->under.name, under, strnlen(under, XkbKeyNameLength)); + memcpy(key->over.name, over, strnlen(over, XkbKeyNameLength)); row->num_keys++; return key; } diff -Nru xorg-server-1.20.9/ylwrap xorg-server-1.20.13/ylwrap --- xorg-server-1.20.9/ylwrap 2020-08-25 15:40:08.000000000 +0000 +++ xorg-server-1.20.13/ylwrap 2021-07-29 18:48:32.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # Written by Tom Tromey . #