aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/dix/events.c27
-rw-r--r--xorg-server/hw/xfree86/parser/Device.c2
-rw-r--r--xorg-server/hw/xfree86/parser/Files.c2
-rw-r--r--xorg-server/hw/xfree86/parser/Flags.c2
-rw-r--r--xorg-server/hw/xfree86/parser/Input.c2
-rw-r--r--xorg-server/hw/xfree86/parser/InputClass.c2
-rw-r--r--xorg-server/hw/xfree86/parser/Layout.c2
-rw-r--r--xorg-server/hw/xfree86/parser/Module.c2
-rw-r--r--xorg-server/hw/xfree86/parser/Monitor.c2
-rw-r--r--xorg-server/hw/xfree86/parser/Pointer.c2
-rw-r--r--xorg-server/hw/xfree86/parser/Screen.c2
-rw-r--r--xorg-server/hw/xfree86/parser/Vendor.c2
-rw-r--r--xorg-server/hw/xfree86/parser/Video.c2
-rw-r--r--xorg-server/hw/xfree86/parser/read.c2
-rw-r--r--xorg-server/hw/xfree86/parser/scan.c2
-rw-r--r--xorg-server/hw/xfree86/parser/write.c2
16 files changed, 12 insertions, 45 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index 49894fa26..89877a144 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/Device.c b/xorg-server/hw/xfree86/parser/Device.c
index f27b56fef..bb1ba88fb 100644
--- a/xorg-server/hw/xfree86/parser/Device.c
+++ b/xorg-server/hw/xfree86/parser/Device.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/Files.c b/xorg-server/hw/xfree86/parser/Files.c
index d8152c008..0d3e47ac5 100644
--- a/xorg-server/hw/xfree86/parser/Files.c
+++ b/xorg-server/hw/xfree86/parser/Files.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/Flags.c b/xorg-server/hw/xfree86/parser/Flags.c
index 29a60a2e1..2461476d1 100644
--- a/xorg-server/hw/xfree86/parser/Flags.c
+++ b/xorg-server/hw/xfree86/parser/Flags.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/Input.c b/xorg-server/hw/xfree86/parser/Input.c
index 6e0073437..ff2b9acbc 100644
--- a/xorg-server/hw/xfree86/parser/Input.c
+++ b/xorg-server/hw/xfree86/parser/Input.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/InputClass.c b/xorg-server/hw/xfree86/parser/InputClass.c
index 8493685cd..de6a816ea 100644
--- a/xorg-server/hw/xfree86/parser/InputClass.c
+++ b/xorg-server/hw/xfree86/parser/InputClass.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/Layout.c b/xorg-server/hw/xfree86/parser/Layout.c
index bd33d6dfc..cbd8d247a 100644
--- a/xorg-server/hw/xfree86/parser/Layout.c
+++ b/xorg-server/hw/xfree86/parser/Layout.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/Module.c b/xorg-server/hw/xfree86/parser/Module.c
index 1c458ae6c..87ddfc635 100644
--- a/xorg-server/hw/xfree86/parser/Module.c
+++ b/xorg-server/hw/xfree86/parser/Module.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/Monitor.c b/xorg-server/hw/xfree86/parser/Monitor.c
index b237dfb32..36b4ebe35 100644
--- a/xorg-server/hw/xfree86/parser/Monitor.c
+++ b/xorg-server/hw/xfree86/parser/Monitor.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/Pointer.c b/xorg-server/hw/xfree86/parser/Pointer.c
index cdbc09c1a..ff748d99a 100644
--- a/xorg-server/hw/xfree86/parser/Pointer.c
+++ b/xorg-server/hw/xfree86/parser/Pointer.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/Screen.c b/xorg-server/hw/xfree86/parser/Screen.c
index 71778d88d..f294ec490 100644
--- a/xorg-server/hw/xfree86/parser/Screen.c
+++ b/xorg-server/hw/xfree86/parser/Screen.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/Vendor.c b/xorg-server/hw/xfree86/parser/Vendor.c
index b4e2165b0..9b7695c8e 100644
--- a/xorg-server/hw/xfree86/parser/Vendor.c
+++ b/xorg-server/hw/xfree86/parser/Vendor.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/Video.c b/xorg-server/hw/xfree86/parser/Video.c
index fc1f1e544..68d611ae7 100644
--- a/xorg-server/hw/xfree86/parser/Video.c
+++ b/xorg-server/hw/xfree86/parser/Video.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/read.c b/xorg-server/hw/xfree86/parser/read.c
index eef873e89..6545bcdae 100644
--- a/xorg-server/hw/xfree86/parser/read.c
+++ b/xorg-server/hw/xfree86/parser/read.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c
index 795da615f..f852b83ec 100644
--- a/xorg-server/hw/xfree86/parser/scan.c
+++ b/xorg-server/hw/xfree86/parser/scan.c
@@ -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
diff --git a/xorg-server/hw/xfree86/parser/write.c b/xorg-server/hw/xfree86/parser/write.c
index c001c3d51..9c706a062 100644
--- a/xorg-server/hw/xfree86/parser/write.c
+++ b/xorg-server/hw/xfree86/parser/write.c
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 11:49:26 +0000