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

Merge remote-tracking branch 'alanc/master'

Browse Source
This commit is contained in:
Keith Packard 2012-06-21 08:52:34 -07:00
commit 3ef3ce069d
16 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dix/events.c
View File

@ -4325,7 +4325,6 @@ OtherClientGone(pointer value, XID id)
prev = other;
}
FatalError("client not on event list");
/*NOTREACHED*/ return -1; /* make compiler happy */
}
int
@ -4348,12 +4347,10 @@ EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)
return rc;
}
check = (mask & AtMostOneClient);
if (check & (pWin->eventMask | wOtherEventMasks(pWin))) { /* It is illegal for two different
clients to select on any of the
events for AtMostOneClient. However,
it is OK, for some client to
continue selecting on one of those
events. */
if (check & (pWin->eventMask | wOtherEventMasks(pWin))) {
/* It is illegal for two different clients to select on any of the
events for AtMostOneClient. However, it is OK, for some client to
continue selecting on one of those events. */
if ((wClient(pWin) != client) && (check & pWin->eventMask))
return BadAccess;
for (others = wOtherClients(pWin); others; others = others->next) {
@ -5633,8 +5630,8 @@ DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources)
if (IsKeyboardDevice(keybd)) {
focus = keybd->focus;
/* If the focus window is a root window (ie. has no parent) then don't
delete the focus from it. */
/* If the focus window is a root window (ie. has no parent)
then don't delete the focus from it. */
if ((pWin == focus->win) && (pWin->parent != NullWindow)) {
int focusEventMode = NotifyNormal;
@ -5656,12 +5653,12 @@ DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources)
parent = parent->parent;
focus->traceGood--;
} while (!parent->realized
/* This would be a good protocol change -- windows being reparented
during SaveSet processing would cause the focus to revert to the
nearest enclosing window which will survive the death of the exiting
client, instead of ending up reverting to a dying window and thence
to None
*/
/* This would be a good protocol change -- windows being
reparented during SaveSet processing would cause the
focus to revert to the nearest enclosing window which
will survive the death of the exiting client, instead
of ending up reverting to a dying window and thence
to None */
#ifdef NOTDEF
|| wClient(parent)->clientGone
#endif

2
hw/xfree86/parser/Device.c
View File

@ -52,8 +52,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/Files.c
View File

@ -51,8 +51,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/Flags.c
View File

@ -51,8 +51,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/Input.c
View File

@ -52,8 +52,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/InputClass.c
View File

@ -23,8 +23,6 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/Layout.c
View File

@ -52,8 +52,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/Module.c
View File

@ -52,8 +52,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/Monitor.c
View File

@ -52,8 +52,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/Pointer.c
View File

@ -52,8 +52,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/Screen.c
View File

@ -52,8 +52,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/Vendor.c
View File

@ -52,8 +52,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/Video.c
View File

@ -52,8 +52,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/read.c
View File

@ -52,8 +52,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/scan.c
View File

@ -51,8 +51,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

2
hw/xfree86/parser/write.c
View File

@ -51,8 +51,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* View/edit this file with tab stops set to 4 */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif