From 2e69e4c6cfdd2a02b7aa1595ac5b58c722fc048f Mon Sep 17 00:00:00 2001
From: Zhang Dingyuan <zhangdingyuan@deepin.org>
Date: Mon, 8 May 2023 13:35:42 +0800
Subject: [PATCH] chore: use deepin-kwin_wayland_wrapper

deepin-kwin provide files
---
 debian/control                               |  2 +-
 files/wayland/deepin-greeter-wayland         | 10 ----------
 files/wayland/kwin_wayland_helper-wayland    | 21 --------------------
 files/wayland/lightdm-deepin-greeter-wayland |  9 +++------
 4 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100755 files/wayland/deepin-greeter-wayland
 delete mode 100755 files/wayland/kwin_wayland_helper-wayland

diff --git a/debian/control b/debian/control
index 0111543e1..09b5c6d88 100644
--- a/debian/control
+++ b/debian/control
@@ -67,6 +67,6 @@ Description: deepin desktop-environment - dde-session-shell module development f
 
 Package: deepin-greeter-wayland
 Architecture: any
-Depends: dde-session-shell (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, dde-wayland-config
+Depends: dde-session-shell (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, deepin-kwin-wayland
 Description: deepin desktop-environment - dde-session-shell module config files
  DDE Session Shell module configuration package adapted to the wayland environment for lightdm-deepin-greeter
diff --git a/files/wayland/deepin-greeter-wayland b/files/wayland/deepin-greeter-wayland
deleted file mode 100755
index 0a07aba91..000000000
--- a/files/wayland/deepin-greeter-wayland
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-export XDG_CONFIG_DIRS=/etc/xdg
-export QML2_IMPORT_PATH=/usr/lib/x86_64-linux-gnu/qt5/qml
-export XDG_DATA_DIRS=/usr/share
-export GDK_BACKEND=x11
-export QT_QPA_PLATFORM=wayland
-export KWIN_COMPOSE=O2ES
-
-/usr/bin/kwin_wayland --drm --no-lockscreen /etc/deepin/greeters.d/lightdm-deepin-greeter
diff --git a/files/wayland/kwin_wayland_helper-wayland b/files/wayland/kwin_wayland_helper-wayland
deleted file mode 100755
index c0287c0cb..000000000
--- a/files/wayland/kwin_wayland_helper-wayland
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-export KWIN_COMPOSE=O2ES
-export GDK_BACKEND=x11
-export KWIN_USE_BUFFER_AGE=1
-
-if [ ! -f "$HOME/.config/kglobalshortcutsrc" ]; then
-    cp -n /etc/xdg/kglobalshortcutsrc $HOME/.config/kglobalshortcutsrc
-fi
-
-export QT_LOGGING_RULES="kwin*=true;kwin_libinput=false;"
-export QT_WAYLAND_FORCE_DPI=$(expr `gsettings get com.deepin.xsettings xft-dpi` / 1024)
-export QT_MESSAGE_PATTERN="[%{time yyyy-MM-dd hh:mm:ss.zzz}] %{function}:%{line} - %{message}"
-
-if [ -f "$HOME/.config/locale.conf" ]; then
-    source $HOME/.config/locale.conf
-fi
-
-#崩溃后重新登录会冲掉崩溃时候的kwin日志，此处加入一次拷贝，保证可以获取到kwin崩溃时候的那次日志
-cp $HOME/.kwin.log $HOME/.kwin-old.log
-exec /usr/bin/kwin_wayland -platform dde-kwin-wayland --xwayland --drm --no-lockscreen  startdde-wayland 1> $HOME/.kwin.log 2>&1
diff --git a/files/wayland/lightdm-deepin-greeter-wayland b/files/wayland/lightdm-deepin-greeter-wayland
index 038224391..6bcc31dd1 100755
--- a/files/wayland/lightdm-deepin-greeter-wayland
+++ b/files/wayland/lightdm-deepin-greeter-wayland
@@ -5,11 +5,8 @@ if [ -x $display_daemon ]; then
 fi
 
 export QT_QPA_PLATFORM=wayland
-export QT_QPA_PLATFORM_PLUGIN_PATH=/usr/plugins/platforms
-export QT_PLUGIN_PATH=/usr/lib/x86_64-linux-gnu/qt5/plugins
-export QML2_IMPORT_PATH=/usr/lib/x86_64-linux-gnu/qt5/qml
+export QT_WAYLAND_INTEGRATION_SHELL=kwayland-shell
 export XDG_DATA_DIRS=/usr/share
-export XDG_CURRENT_DESKTOP=Deepin
-export QT_DEBUG_PLUGINS=1
+export XDG_CURRENT_DESKTOP=DDE
 
-/usr/bin/lightdm-deepin-greeter
+/usr/bin/deepin-kwin_wayland_wrapper --xwayland --drm --no-lockscreen /usr/bin/lightdm-deepin-greeter