Replace qtkey-extension with qt-key-unstable-v1

- Remove the "dummy" request, which seems to be just leftover test code.
- Rename the event from "qtkey" to "key". We've already prefixed the
  global interface, no need to also prefix the event.
- Prefix the global with `zqt_` and suffix it with "_v1". If we make
  backwards incompatible changes, we should bump the suffix, rename the
  xml-file and reset the version number.
- Add some documentation to the xml file.
- Add notice about (lack of) compatibility guarantees.
- Four spaces for indentation

Task-number: QTBUG-68423
Change-Id: I78f0eaff4cac22f27318ba32c83c83feb2de857a
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

3 files changed, 13 insertions, 13 deletions

diff --git a/src/compositor/extensions/extensions.pri b/src/compositor/extensions/extensions.pri
index 233b4bb41..77c09aa23 100644
--- a/src/compositor/extensions/extensions.pri
+++ b/src/compositor/extensions/extensions.pri
@@ -3,7 +3,7 @@ CONFIG += generated_privates
 
 WAYLANDSERVERSOURCES += \
     ../extensions/touch-extension.xml \
-    ../extensions/qtkey-extension.xml \
+    ../extensions/qt-key-unstable-v1.xml \
     ../extensions/qt-windowmanager.xml \
     ../3rdparty/protocol/text-input-unstable-v2.xml \
     ../3rdparty/protocol/xdg-shell-unstable-v5.xml \
diff --git a/src/compositor/extensions/qwlqtkey.cpp b/src/compositor/extensions/qwlqtkey.cpp
index 73d06ae6b..94a2b5a77 100644
--- a/src/compositor/extensions/qwlqtkey.cpp
+++ b/src/compositor/extensions/qwlqtkey.cpp
@@ -48,7 +48,7 @@ namespace QtWayland {
 
 QtKeyExtensionGlobal::QtKeyExtensionGlobal(QWaylandCompositor *compositor)
     : QWaylandCompositorExtensionTemplate(compositor)
-    , QtWaylandServer::qt_key_extension(compositor->display(), 2)
+    , QtWaylandServer::zqt_key_v1(compositor->display(), 1)
     , m_compositor(compositor)
 {
 }
@@ -60,15 +60,15 @@ bool QtKeyExtensionGlobal::postQtKeyEvent(QKeyEvent *event, QWaylandSurface *sur
     Resource *target = surface ? resourceMap().value(surface->waylandClient()) : 0;
 
     if (target) {
-        send_qtkey(target->handle,
-                   surface ? surface->resource() : nullptr,
-                   time, event->type(), event->key(), event->modifiers(),
-                   event->nativeScanCode(),
-                   event->nativeVirtualKey(),
-                   event->nativeModifiers(),
-                   event->text(),
-                   event->isAutoRepeat(),
-                   event->count());
+        send_key(target->handle,
+                 surface ? surface->resource() : nullptr,
+                 time, event->type(), event->key(), event->modifiers(),
+                 event->nativeScanCode(),
+                 event->nativeVirtualKey(),
+                 event->nativeModifiers(),
+                 event->text(),
+                 event->isAutoRepeat(),
+                 event->count());
 
         return true;
     }
diff --git a/src/compositor/extensions/qwlqtkey_p.h b/src/compositor/extensions/qwlqtkey_p.h
index d3f573757..4944829ef 100644
--- a/src/compositor/extensions/qwlqtkey_p.h
+++ b/src/compositor/extensions/qwlqtkey_p.h
@@ -53,7 +53,7 @@
 
 #include <QtWaylandCompositor/QWaylandCompositorExtensionTemplate>
 #include <QtWaylandCompositor/QWaylandCompositor>
-#include <QtWaylandCompositor/private/qwayland-server-qtkey-extension.h>
+#include <QtWaylandCompositor/private/qwayland-server-qt-key-unstable-v1.h>
 
 #include <wayland-util.h>
 
@@ -64,7 +64,7 @@ class QKeyEvent;
 
 namespace QtWayland {
 
-class QtKeyExtensionGlobal : public QWaylandCompositorExtensionTemplate<QtKeyExtensionGlobal>, public QtWaylandServer::qt_key_extension
+class QtKeyExtensionGlobal : public QWaylandCompositorExtensionTemplate<QtKeyExtensionGlobal>, public QtWaylandServer::zqt_key_v1
 {
     Q_OBJECT
 public: