openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-18 16:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

split dm from libwm

Browse Source 
Signed-off-by: xiahaiqin <xiahaiqin1@huawei.com>
Change-Id: Ie85820c79b1d6fe9e551f34346b6b3beb362deda
This commit is contained in:
xiahaiqin
2022-01-19 16:42:47 +08:00
parent d4a19b46ea
commit 29bbe30581
15 changed files with 53 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundle.json
+2 -1
View File
@@ -2,13 +2,14 @@
"name": "@openharmony/window_manager",
"version": "3.1.0",
"description": "window_manager",
"author": {},
"repository": "",
"license": "Apache License 2.0",
"component": {
"name": "window_manager",
"subsystem": "window",
"adapted_system_type": [ "standard" ],
"rom": {},
"ram": {},
"deps": {
"components": [
],
dm/BUILD.gn
+4 -1
View File
@@ -29,7 +29,10 @@ config("libdm_private_config") {
}
config("libdm_public_config") {
include_dirs = [ "../interfaces/innerkits/dm" ]
include_dirs = [
"../interfaces/innerkits/dm",
"../utils/include",
]
}
## Build libdm.so
dmserver/BUILD.gn
+2 -2
View File
@@ -52,12 +52,13 @@ ohos_shared_library("libdms") {
deps = [
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/utils:libwmutil",
"//utils/native/base:utils",
# RSSurface
"//foundation/graphic/standard:libsurface",
"//foundation/graphic/standard/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
# todo need delete it
"//foundation/windowmanager/wmserver:libwms",
@@ -67,7 +68,6 @@ ohos_shared_library("libdms") {
"bytrace_standard:bytrace_core",
"hilog_native:libhilog",
"ipc:ipc_core",
"window_manager:libdm",
]
part_name = "window_manager"
interfaces/innerkits/dm/display_manager.h
-2
View File
@@ -19,14 +19,12 @@
#include <vector>
#include <mutex>
#include <pixel_map.h>
#include <surface.h>
#include "display.h"
#include "dm_common.h"
#include "singleton_delegator.h"
// #include "wm_common.h"
namespace OHOS::Rosen {
class DisplayManagerAdapter;
class DisplayManagerAgent;
interfaces/innerkits/wm/window.h
+8 -8
View File
@@ -16,31 +16,31 @@
#ifndef OHOS_ROSEN_WINDOW_H
#define OHOS_ROSEN_WINDOW_H
#include <i_input_event_consumer.h>
#include <iremote_object.h>
#include <input_event.h>
#include <refbase.h>
#include <ui/rs_surface_node.h>
#include <key_event.h>
#include <pointer_event.h>
#include <axis_event.h>
#include "foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context/context.h"
#include "wm_common.h"
#include "window_option.h"
#include "window_life_cycle_interface.h"
class NativeValue;
class NativeEngine;
namespace OHOS::MMI {
struct IInputEventConsumer;
class PointerEvent;
class KeyEvent;
}
namespace OHOS::AppExecFwk {
class Configuration;
}
namespace OHOS::AbilityRuntime {
class AbilityContext;
class Context;
}
namespace OHOS {
namespace Rosen {
class RSSurfaceNode;
class IWindowChangeListener : virtual public RefBase {
public:
virtual void OnSizeChange(Rect rect) = 0;
interfaces/kits/napi/display/BUILD.gn
+1
View File
@@ -19,6 +19,7 @@ ohos_shared_library("display") {
deps = [
"../common:wm_napi_common",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",
]
interfaces/kits/napi/screenshot/BUILD.gn
+3 -1
View File
@@ -20,14 +20,16 @@ ohos_shared_library("screenshot") {
deps = [
"../common:wm_napi_common",
"//foundation/multimedia/image_standard/interfaces/innerkits:image",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
]
external_deps = [
"ability_runtime:runtime",
"hiviewdfx_hilog_native:libhilog",
"napi:ace_napi",
"window_manager:libwm",
]
relative_install_dir = "module"
interfaces/kits/napi/window_runtime/window_napi/js_window_utils.h
+1
View File
@@ -15,6 +15,7 @@
#ifndef OHOS_JS_WINDOW_UTILS_H
#define OHOS_JS_WINDOW_UTILS_H
#include <map>
#include "native_engine/native_engine.h"
#include "native_engine/native_value.h"
#include "window.h"
snapshot/BUILD.gn
+1
View File
@@ -33,6 +33,7 @@ ohos_executable("snapshot_display") {
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//third_party/libpng:libpng", # png
"//utils/native/base:utils",
]
part_name = "window_manager"
wm/BUILD.gn
+15 -56
View File
@@ -13,30 +13,17 @@
import("//build/ohos.gni")
config("libwm_config") {
config("libwm_private_config") {
visibility = [ ":*" ]
include_dirs = [
"include",
"//utils/system/safwk/native/include",
"//foundation/windowmanager/wmserver/include",
"//foundation/windowmanager/dm/include",
"//foundation/windowmanager/dmserver/include",
"//foundation/windowmanager/utils/include",
"../wmserver/include",
# for abilityContext
# todo for abilitycontext need delete it
"//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/include",
"//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
"//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
"//base/global/resmgr_standard/interfaces/innerkits/include",
"//third_party/node/deps/icu-small/source/common",
"//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
"//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
"//foundation/aafwk/standard/interfaces/innerkits/base/include",
# abilityContext end
"//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
"//third_party/jsoncpp/include",
"//third_party/json/include",
]
@@ -50,31 +37,14 @@ config("libwm_config") {
config("libwm_public_config") {
include_dirs = [
"//foundation/windowmanager/interfaces/innerkits/wm",
"//foundation/windowmanager/wmserver/include",
"//foundation/windowmanager/dm/include",
"//foundation/windowmanager/dmserver/include",
"//foundation/windowmanager/utils/include",
"../interfaces/innerkits/dm",
"../interfaces/innerkits/wm",
"../utils/include",
]
}
config("libwm_public_config_test") {
include_dirs = [ "//foundation/windowmanager/interfaces/innerkits" ]
}
## Build libwm.so
ohos_shared_library("libwm") {
sources = [
"../dm/src/display.cpp",
"../dm/src/display_manager.cpp",
"../dm/src/display_manager_adapter.cpp",
"../dm/src/display_manager_agent.cpp",
"../dm/src/screen.cpp",
"../dm/src/screen_group.cpp",
"../dm/src/screen_manager.cpp",
"../dm/src/zidl/display_manager_agent_stub.cpp",
"../dmserver/src/display_manager_proxy.cpp",
"../wmserver/src/window_manager_proxy.cpp",
"src/input_transfer_station.cpp",
"src/static_call.cpp",
@@ -92,12 +62,11 @@ ohos_shared_library("libwm") {
"src/zidl/window_manager_agent_stub.cpp",
]
configs = [ ":libwm_config" ]
configs = [ ":libwm_private_config" ]
public_configs = [ ":libwm_public_config" ]
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
@@ -108,35 +77,25 @@ ohos_shared_library("libwm") {
"//foundation/ace/ace_engine/interfaces/innerkits/ace:ace_uicontent",
"//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core",
"//foundation/graphic/standard:libsurface",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
]
public_deps = [
# native value
# RSSurface
"//foundation/ace/napi:ace_napi",
"//foundation/graphic/standard:libsurface",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
# vsync
"//foundation/graphic/standard:libvsync_client",
"//foundation/graphic/standard/rosen/modules/render_service_base:librender_service_base",
"//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
# IMS
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
# context
"//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
"//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
# todo need delete it for abilitycontext
"//foundation/ace/napi:ace_napi",
]
external_deps = [
"ability_runtime:ability_context_native",
"ability_runtime:want",
"appexecfwk_standard:appexecfwk_base",
"bytrace_standard:bytrace_core",
"hilog_native:libhilog",
"inputmethod_native:inputmethod_client",
"ipc:ipc_core",
"multimedia_image_standard:image_native",
"multimodalinput_base:libmmi-client",
"window_manager:libdm",
]
wm/include/window_impl.h
+2
View File
@@ -17,6 +17,8 @@
#define OHOS_ROSEN_WINDOW_IMPL_H
#include <map>
#include <ability_context.h>
#include <i_input_event_consumer.h>
#include <key_event.h>
#include <refbase.h>
#include <ui_content.h>
#include "input_transfer_station.h"
wm/include/window_input_channel.h
+2
View File
@@ -14,6 +14,8 @@
*/
#include <window.h>
#include <i_input_event_consumer.h>
#include <key_event.h>
#include "refbase.h"
#include "vsync_station.h"
#ifndef OHOS_WINDOW_INPUT_CHANNEL
wm/src/window_impl.cpp
+2
View File
@@ -16,6 +16,8 @@
#include "window_impl.h"
#include <cmath>
#include <ui/rs_surface_node.h>
#include "display_manager.h"
#include "singleton_container.h"
#include "window_adapter.h"
wm/test/systemtest/BUILD.gn
+5
View File
@@ -139,7 +139,12 @@ ohos_static_library("wm_systemtest_common") {
public_deps = [
"//foundation/ace/ace_engine/interfaces/innerkits/ace:ace_uicontent",
# todo need delete it for abilitycontext
"//foundation/ace/napi:ace_napi",
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/dmserver:libdms",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",
wm/test/unittest/BUILD.gn
+5
View File
@@ -161,8 +161,13 @@ ohos_static_library("wm_unittest_common") {
public_deps = [
"//foundation/ace/ace_engine/interfaces/innerkits/ace:ace_uicontent",
# todo need delete it for abilitycontext
"//foundation/ace/napi:ace_napi",
"//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
"//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
"//foundation/windowmanager/dm:libdm",
"//foundation/windowmanager/dmserver:libdms",
"//foundation/windowmanager/utils:libwmutil",
"//foundation/windowmanager/wm:libwm",
"//foundation/windowmanager/wmserver:libwms",