From df969706f4cd479a525a69a13f86589d6b313b5b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 16 Apr 2020 15:57:07 +1000 Subject: [PATCH] Replace initial 8 spaces with a tab for all xml files This is the style used in wayland.xml which is the only file we really care about for git blame information. So let's adjust all others to that style for consistency and fix editorconfig to avoid messing this up in the future. Signed-off-by: Peter Hutterer --- .editorconfig | 2 +- doc/publican/sources/Book_Info.xml | 6 +++--- doc/publican/sources/Compositors.xml | 4 ++-- doc/publican/sources/Foreword.xml | 4 ++-- doc/publican/sources/Introduction.xml | 12 ++++++------ doc/publican/sources/Preface.xml | 2 +- doc/publican/sources/Xwayland.xml | 34 +++++++++++++++++----------------- protocol/tests.xml | 4 ++-- protocol/wayland.xml | 14 +++++++------- tests/data/small.xml | 6 +++--- 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.editorconfig b/.editorconfig index 803abf3..50b7740 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,7 +10,7 @@ indent_size = 8 max_line_length = 80 [*.xml] -indent_style = space +indent_style = tab indent_size = 2 tab_width = 8 diff --git a/doc/publican/sources/Book_Info.xml b/doc/publican/sources/Book_Info.xml index 0b7bf07..897673a 100644 --- a/doc/publican/sources/Book_Info.xml +++ b/doc/publican/sources/Book_Info.xml @@ -28,9 +28,9 @@ - - Wayland logo - + + Wayland logo + diff --git a/doc/publican/sources/Compositors.xml b/doc/publican/sources/Compositors.xml index ad27f61..7a7bdaa 100644 --- a/doc/publican/sources/Compositors.xml +++ b/doc/publican/sources/Compositors.xml @@ -61,8 +61,8 @@ Possible examples for session compositors include - - + + gnome-shell diff --git a/doc/publican/sources/Foreword.xml b/doc/publican/sources/Foreword.xml index e6875a3..46fda2b 100644 --- a/doc/publican/sources/Foreword.xml +++ b/doc/publican/sources/Foreword.xml @@ -22,7 +22,7 @@ Yours, - the Wayland open-source community - November 2012 + the Wayland open-source community + November 2012 diff --git a/doc/publican/sources/Introduction.xml b/doc/publican/sources/Introduction.xml index 7516c33..276db2d 100644 --- a/doc/publican/sources/Introduction.xml +++ b/doc/publican/sources/Introduction.xml @@ -33,9 +33,9 @@ - - X architecture diagram - + + X architecture diagram + @@ -96,9 +96,9 @@ - - Wayland architecture diagram - + + Wayland architecture diagram + diff --git a/doc/publican/sources/Preface.xml b/doc/publican/sources/Preface.xml index 61720a9..17c6ebf 100644 --- a/doc/publican/sources/Preface.xml +++ b/doc/publican/sources/Preface.xml @@ -15,6 +15,6 @@ Best, - Kristian Høgsberg + Kristian Høgsberg diff --git a/doc/publican/sources/Xwayland.xml b/doc/publican/sources/Xwayland.xml index a39866f..e439991 100644 --- a/doc/publican/sources/Xwayland.xml +++ b/doc/publican/sources/Xwayland.xml @@ -78,11 +78,11 @@
Xwayland architecture diagram - - - - - + + + + +
@@ -150,20 +150,20 @@
Window identification - In Xwayland, an X11 window may have a corresponding wl_surface object - in Wayland. The wl_surface object is used for input and output: it is - referenced by input events and used to provide the X11 window content - to the Wayland compositor. The X11 window and the wl_surface live in - different protocol streams, and they need to be matched for XWM to do - its job. + In Xwayland, an X11 window may have a corresponding wl_surface object + in Wayland. The wl_surface object is used for input and output: it is + referenced by input events and used to provide the X11 window content + to the Wayland compositor. The X11 window and the wl_surface live in + different protocol streams, and they need to be matched for XWM to do + its job. - When Xwayland creates a wl_surface on Wayland, it will also send an X11 - ClientMessage of type atom "WL_SURFACE_ID" to the X11 window carrying - the wl_surface Wayland object ID as the first 32-bit data element. This - is how XWM can associate a wl_surface with an X11 window. Note that - the request to create a wl_surface and the ID message may arrive in any - order in the Wayland compositor. + When Xwayland creates a wl_surface on Wayland, it will also send an X11 + ClientMessage of type atom "WL_SURFACE_ID" to the X11 window carrying + the wl_surface Wayland object ID as the first 32-bit data element. This + is how XWM can associate a wl_surface with an X11 window. Note that + the request to create a wl_surface and the ID message may arrive in any + order in the Wayland compositor.
diff --git a/protocol/tests.xml b/protocol/tests.xml index ea56ae4..22d80a1 100644 --- a/protocol/tests.xml +++ b/protocol/tests.xml @@ -43,8 +43,8 @@ - Tells this fd passer object about another one to send events - to for more complicated fd leak tests. + Tells this fd passer object about another one to send events + to for more complicated fd leak tests. diff --git a/protocol/wayland.xml b/protocol/wayland.xml index d3e54ee..5dce532 100644 --- a/protocol/wayland.xml +++ b/protocol/wayland.xml @@ -298,7 +298,7 @@ will be reported by the format event. + run the automated script that keeps it in sync with drm_fourcc.h. --> @@ -594,9 +594,9 @@ will be raised otherwise. + enum="wl_data_device_manager.dnd_action"/> + enum="wl_data_device_manager.dnd_action"/> @@ -606,7 +606,7 @@ side changes its offered actions through wl_data_source.set_actions. + enum="wl_data_device_manager.dnd_action"/> @@ -648,7 +648,7 @@ must happen before the call to wl_data_offer.finish. + enum="wl_data_device_manager.dnd_action"/> @@ -746,7 +746,7 @@ for drag-and-drop will raise a protocol error. + enum="wl_data_device_manager.dnd_action"/> @@ -803,7 +803,7 @@ they reflect the current action. + enum="wl_data_device_manager.dnd_action"/> diff --git a/tests/data/small.xml b/tests/data/small.xml index a6e62ad..832ed0e 100644 --- a/tests/data/small.xml +++ b/tests/data/small.xml @@ -50,9 +50,9 @@ - - - + + + -- 2.7.4