[Xquartz-changes] xserver: Branch 'master' - 8 commits
Jeremy Huddleston
jeremyhu at freedesktop.org
Wed Jun 22 12:51:16 PDT 2011
Rebased ref, commits from common ancestor:
commit 41be31b2dcb13d9f94258bb30ceda2f851f26282
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Tue Jun 21 21:14:46 2011 -0700
XQuartz: Make a call to activateIgnoringOtherApps in our NSApplicationActivatedEventType handler
In addition, this change will not call into the X11 activation unless an X11
window was active when we deactivated. We can't rely on the event and current
key windows because the key window will be nil until activated, and the event
will only reference the window if the window was clicked (whereas it will be
nil if we activated via dock or cmd-tab).
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 31aa9b9..3973110 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -338,18 +338,21 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
case NSAppKitDefined:
switch ([e subtype]) {
+ static BOOL x_was_active = NO;
+
case NSApplicationActivatedEventType:
for_x = NO;
- if ([self modalWindow] == nil) {
+ if ([e window] == nil && x_was_active) {
BOOL order_all_windows = YES, workspaces, ok;
for_appkit = NO;
-
- /* FIXME: hack to avoid having to pass the event to appkit,
- which would cause it to raise one of its windows. */
+
+ /* 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;
-
- [self activateX:YES];
-
+
+ X11ApplicationSetFrontProcess();
+
/* Get the Spaces preference for SwitchOnActivate */
(void)CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));
workspaces = CFPreferencesGetAppBooleanValue(CFSTR("workspaces"), CFSTR("com.apple.dock"), &ok);
@@ -370,8 +373,9 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
* If there are no active windows, and there are minimized windows, we should
* be restoring one of them.
*/
- if ([e data2] & 0x10) // 0x10 is set when we use cmd-tab or the dock icon
+ if ([e data2] & 0x10) { // 0x10 (bfCPSOrderAllWindowsForward) is set when we use cmd-tab or the dock icon
DarwinSendDDXEvent(kXquartzBringAllToFront, 1, order_all_windows);
+ }
}
break;
@@ -381,7 +385,10 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
case NSApplicationDeactivatedEventType:
for_x = NO;
- [self activateX:NO];
+
+ x_was_active = _x_active;
+ if(_x_active)
+ [self activateX:NO];
break;
}
break;
commit 8ac651552bb70ba36238f430adab2f7a7f24db6e
Merge: 945b2ff... 47b6ba3...
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jun 22 11:03:37 2011 -0700
Merge remote-tracking branch 'alanc/master'
commit 945b2ff8141c58344fc9558ee3853fad3e86134b
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Jun 8 15:18:12 2011 -0400
docbook.am: --path is also required for xsltproc
The XSLT processor also needs to know about the entities defined
in xserver.ent. It removes error messages.
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/docbook.am b/docbook.am
index f1861c0..eb3bf0c 100644
--- a/docbook.am
+++ b/docbook.am
@@ -79,6 +79,7 @@ shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
# Flags for the XSL Transformation processor generating xref target databases
XSLTPROC_FLAGS = \
--path "$(XORG_SGML_PATH)/X11" \
+ --path "$(abs_top_builddir)" \
--stringparam targets.filename "$@" \
--stringparam collect.xref.targets "only" \
--nonet --xinclude
commit 6326b0f0746ded410672ad0270d1c8a0e9cb59f9
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Wed Jun 8 15:17:59 2011 -0400
Update .gitignore as new tests have been added
Refactor to follow the pattern one Makefile, one .gitignore
where needed.
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/test/.gitignore b/test/.gitignore
index 86e687f..48e8abe 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,15 +1,7 @@
libxservertest.c
-
-input
-list
xkb
+input
xtest
-xi2/protocol-eventconvert
-xi2/protocol-xigetclientpointer
-xi2/protocol-xigetselectedevents
-xi2/protocol-xiquerydevice
-xi2/protocol-xiquerypointer
-xi2/protocol-xiqueryversion
-xi2/protocol-xiselectevents
-xi2/protocol-xisetclientpointer
-xi2/protocol-xiwarppointer
+list
+misc
+fixes
diff --git a/test/xi2/.gitignore b/test/xi2/.gitignore
new file mode 100644
index 0000000..3e9816d
--- /dev/null
+++ b/test/xi2/.gitignore
@@ -0,0 +1,10 @@
+protocol-eventconvert
+protocol-xigetclientpointer
+protocol-xigetselectedevents
+protocol-xipassivegrabdevice
+protocol-xiquerydevice
+protocol-xiquerypointer
+protocol-xiqueryversion
+protocol-xiselectevents
+protocol-xisetclientpointer
+protocol-xiwarppointer
commit 47b6ba3204d650393a7255ce2af27b8c018bb586
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Jun 20 22:17:03 2011 -0700
Add xkeyboard-config to See Also of man pages referencing xkb
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man
index ee03539..bbce856 100644
--- a/hw/dmx/man/Xdmx.man
+++ b/hw/dmx/man/Xdmx.man
@@ -727,7 +727,7 @@ translated if it was the first core keyboard.
.BR DMX "(__libmansuffix__), " X "(__miscmansuffix__), "
.BR Xserver "(__appmansuffix__), " xdmxconfig "(__appmansuffix__), "
.BR vdltodmx "(__appmansuffix__), " xfs "(__appmansuffix__), "
-.BR xkbcomp (__appmansuffix__)
+.BR xkbcomp "(__appmansuffix__), " xkeyboard-config "(__miscmansuffix__)"
.SH AUTHORS
Kevin E. Martin
.I <kem at redhat.com>,
diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
index 6fa334c..c89b5ee 100644
--- a/hw/xfree86/man/Xorg.man
+++ b/hw/xfree86/man/Xorg.man
@@ -574,6 +574,7 @@ Initial access control list for display
.SH "SEE ALSO"
X(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xinit(__appmansuffix__),
__xconfigfile__(__filemansuffix__), xvidtune(__appmansuffix__),
+xkeyboard-config (__miscmansuffix__),
apm(__drivermansuffix__),
ati(__drivermansuffix__),
chips(__drivermansuffix__),
diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man
index aad29cf..7975fd3 100644
--- a/hw/xwin/man/XWin.man
+++ b/hw/xwin/man/XWin.man
@@ -372,7 +372,8 @@ Need some examples
.SH "SEE ALSO"
-X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), XWinrc(__filemansuffix__), setxkbmap(1)
+X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), XWinrc(__filemansuffix__),
+setxkbmap(1), xkeyboard-config (__miscmansuffix__).
.SH BUGS
diff --git a/man/Xserver.man b/man/Xserver.man
index b725949..f743912 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -561,6 +561,8 @@ Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1),
\fIxfs\fP(1), \fIxlsfonts\fP(1), \fIxfontsel\fP(1), \fIxfd\fP(1),
.I "X Logical Font Description Conventions"
.PP
+Keyboards: \fIxkeyboard-config\fP(__miscmansuffix__)
+.PP
Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
\fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
.I "Security Extension Specification"
commit cfbe471b586282aea89f7b4802c051f22301bf59
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Jun 20 22:06:00 2011 -0700
Xdmx.man: convert section references to substituted forms
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man
index 652b24f..ee03539 100644
--- a/hw/dmx/man/Xdmx.man
+++ b/hw/dmx/man/Xdmx.man
@@ -48,7 +48,7 @@ communicates to the back-end X servers using the standard X11 protocol,
and standard and/or commonly available X server extensions.
.SH OPTIONS
In addition to the normal X server options described in the
-.I Xserver(1)
+.I Xserver(__appmansuffix__)
manual page,
.I Xdmx
accepts the following command line switches:
@@ -724,8 +724,10 @@ translated if it was the first core keyboard.
.SH FILES
..
.SH "SEE ALSO"
-.BR DMX "(3X), " X "(__miscmansuffix__), " Xserver "(1), " xdmxconfig "(1), "
-.BR vdltodmx "(1), " xfs "(1), " xkbcomp (1)
+.BR DMX "(__libmansuffix__), " X "(__miscmansuffix__), "
+.BR Xserver "(__appmansuffix__), " xdmxconfig "(__appmansuffix__), "
+.BR vdltodmx "(__appmansuffix__), " xfs "(__appmansuffix__), "
+.BR xkbcomp (__appmansuffix__)
.SH AUTHORS
Kevin E. Martin
.I <kem at redhat.com>,
commit c3278f3c1786e66019a39e2612761f74782a48ee
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sat Jun 11 10:56:08 2011 -0700
Xdmx.man: additional updates to modernize XKB information
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb at laas.fr>
Reviewed-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man
index df148dd..652b24f 100644
--- a/hw/dmx/man/Xdmx.man
+++ b/hw/dmx/man/Xdmx.man
@@ -1,4 +1,3 @@
-.\" $XFree86$
.\"
.\" Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
@@ -11,7 +10,7 @@
.\" and to permit persons to whom the Software is furnished to do so,
.\" subject to the following conditions:
.\"
-.\" he above copyright notice and this permission notice (including the
+.\" The above copyright notice and this permission notice (including the
.\" next paragraph) shall be included in all copies or substantial
.\" portions of the Software.
.\"
@@ -141,6 +140,9 @@ initialize the keyboard. For an SGI keyboard, ",xkb,sgi/indy(pc102)"
might be useful. A list of keycodes, symbols, and geometries can be
found in
.IR __xkbdir__ .
+Use of keycodes, symbols and geometries for XKB configuration is
+deprecated in favor of the rules, layout, model, variant and options
+settings available via the -param command line switch.
If this option is not specified, the input device will be queried,
perhaps using the XKEYBOARD extension.
.RE
@@ -361,7 +363,7 @@ Defaults to "__XKB_DFLT_RULES__". Other values may include "sgi" and "sun".
.sp
.TP 8
.B XkbModel
-Defaults to "__XKB_DFLT_MODEL__". When used with "xfree86" rules, other values
+Defaults to "__XKB_DFLT_MODEL__". When used with "base" rules, other values
may include "pc102", "pc104", "microsoft", and many others. When
used with "sun" rules, other values may include "type4" and "type5".
.sp
commit 19e37067131175219eca7d2b11c2ee59af280575
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sat Jun 11 10:41:48 2011 -0700
Xdmx.man: Show actual configured XKB defaults instead of old hardcoded values
Passed through from configure.ac via manpages.am
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb at laas.fr>
Reviewed-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
diff --git a/configure.ac b/configure.ac
index 145e4c3..a53ab50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1203,6 +1203,11 @@ AC_DEFINE_UNQUOTED(XKB_DFLT_MODEL, ["$XKB_DFLT_MODEL"], [Default XKB model])
AC_DEFINE_UNQUOTED(XKB_DFLT_LAYOUT, ["$XKB_DFLT_LAYOUT"], [Default XKB layout])
AC_DEFINE_UNQUOTED(XKB_DFLT_VARIANT, ["$XKB_DFLT_VARIANT"], [Default XKB variant])
AC_DEFINE_UNQUOTED(XKB_DFLT_OPTIONS, ["$XKB_DFLT_OPTIONS"], [Default XKB options])
+AC_SUBST([XKB_DFLT_RULES])
+AC_SUBST([XKB_DFLT_MODEL])
+AC_SUBST([XKB_DFLT_LAYOUT])
+AC_SUBST([XKB_DFLT_VARIANT])
+AC_SUBST([XKB_DFLT_OPTIONS])
XKB_LIB='$(top_builddir)/xkb/libxkb.la'
XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man
index 9c8bdea..df148dd 100644
--- a/hw/dmx/man/Xdmx.man
+++ b/hw/dmx/man/Xdmx.man
@@ -140,7 +140,7 @@ the "xfree86" keycodes and the "pc104" symbols should be used to
initialize the keyboard. For an SGI keyboard, ",xkb,sgi/indy(pc102)"
might be useful. A list of keycodes, symbols, and geometries can be
found in
-.IR /usr/X11R6/lib/X11/xkb .
+.IR __xkbdir__ .
If this option is not specified, the input device will be queried,
perhaps using the XKEYBOARD extension.
.RE
@@ -352,31 +352,31 @@ This option specifies parameters on the command line. Currently, only
parameters dealing with XKEYBOARD configuration are supported. These
parameters apply only to the core keyboard. Parameter values are
installation-dependent. Please see
-.I /usr/X11R6/lib/X11/xkb
+.I __xkbdir__
or a similar directory for complete information.
.RS
.TP 8
.B XkbRules
-Defaults to "xfree86". Other values may include "sgi" and "sun".
+Defaults to "__XKB_DFLT_RULES__". Other values may include "sgi" and "sun".
.sp
.TP 8
.B XkbModel
-Defaults to "pc101". When used with "xfree86" rules, other values may
-include "pc102", "pc104", "pc105", "microsoft", and many others. When
+Defaults to "__XKB_DFLT_MODEL__". When used with "xfree86" rules, other values
+may include "pc102", "pc104", "microsoft", and many others. When
used with "sun" rules, other values may include "type4" and "type5".
.sp
.TP 8
.B XkbLayout
-Defaults to "us". Other country codes and "dvorak" are usually
+Defaults to "__XKB_DFLT_LAYOUT__". Other country codes and "dvorak" are usually
available.
.sp
.TP 8
.B XkbVariant
-Defaults to "".
+Defaults to "__XKB_DFLT_VARIANT__".
.sp
.TP 8
.B XkbOptions
-Defaults to "".
+Defaults to "__XKB_DFLT_OPTIONS__".
.RE
.SH "CONFIGURATION FILE GRAMMAR"
The following words and tokens are reserved:
diff --git a/manpages.am b/manpages.am
index ea969cc..dfd6719 100644
--- a/manpages.am
+++ b/manpages.am
@@ -24,6 +24,11 @@ MAN_SUBSTS += -e 's|__logdir__|$(logdir)|g' \
-e 's|__sysconfdir__|$(sysconfdir)|g' \
-e 's|__xconfigdir__|$(__XCONFIGDIR__)|g' \
-e 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' \
+ -e 's|__XKB_DFLT_RULES__|$(XKB_DFLT_RULES)|g' \
+ -e 's|__XKB_DFLT_MODEL__|$(XKB_DFLT_MODEL)|g' \
+ -e 's|__XKB_DFLT_LAYOUT__|$(XKB_DFLT_LAYOUT)|g' \
+ -e 's|__XKB_DFLT_VARIANT__|$(XKB_DFLT_VARIANT)|g' \
+ -e 's|__XKB_DFLT_OPTIONS__|$(XKB_DFLT_OPTIONS)|g' \
-e 's|__bundle_id_prefix__|$(BUNDLE_ID_PREFIX)|g' \
-e 's|__modulepath__|$(DEFAULT_MODULE_PATH)|g' \
-e 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' \
More information about the Xquartz-changes
mailing list