summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorHermet Park <chuneon.park@samsung.com>2020-10-05 12:43:06 +0900
committerHermet Park <chuneon.park@samsung.com>2020-10-05 12:43:06 +0900
commitb881f47b9155dccce4e0badbbbea7f7d77af74b2 (patch)
tree0f3ff2556ec1c338a0e540b957e47bc1d3b5073d /src/modules
parent223a303847ea162a025b060679d76e196bddee7b (diff)
parent42c123d1d7b4b5fa1251b3ae7768912f480d36a3 (diff)
Merge branch 'master' into devs/hermet/lottie
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/ecore_evas/engines/win32/ecore_evas_win32.c9
-rw-r--r--src/modules/ecore_imf/scim/meson.build2
-rw-r--r--src/modules/ecore_imf/xim/meson.build2
-rw-r--r--src/modules/evas/engines/software_x11/meson.build2
4 files changed, 9 insertions, 6 deletions
diff --git a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
index 638d4e74f7..debb7f263c 100644
--- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
+++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
@@ -1219,7 +1219,7 @@ _delivery(void *data, const Eina_Value value EINA_UNUSED, const Eina_Future *dea
1219 } 1219 }
1220 if (mime_type) 1220 if (mime_type)
1221 { 1221 {
1222 edata->clipboard.delivery(ee, 0, ECORE_EVAS_SELECTION_BUFFER_COPY_AND_PASTE_BUFFER, mime_type, &slice); 1222 edata->clipboard.delivery(ee, 1, ECORE_EVAS_SELECTION_BUFFER_COPY_AND_PASTE_BUFFER, mime_type, &slice);
1223 EINA_SAFETY_ON_FALSE_GOTO(ecore_win32_clipboard_set((Ecore_Win32_Window *)ee->prop.window, slice.mem, slice.len, mime_type), end); 1223 EINA_SAFETY_ON_FALSE_GOTO(ecore_win32_clipboard_set((Ecore_Win32_Window *)ee->prop.window, slice.mem, slice.len, mime_type), end);
1224 } 1224 }
1225 else 1225 else
@@ -1234,18 +1234,21 @@ end:
1234static Eina_Bool 1234static Eina_Bool
1235_ecore_evas_win32_selection_claim(Ecore_Evas *ee, unsigned int seat, Ecore_Evas_Selection_Buffer selection, Eina_Array *available_types, Ecore_Evas_Selection_Internal_Delivery delivery, Ecore_Evas_Selection_Internal_Cancel cancel) 1235_ecore_evas_win32_selection_claim(Ecore_Evas *ee, unsigned int seat, Ecore_Evas_Selection_Buffer selection, Eina_Array *available_types, Ecore_Evas_Selection_Internal_Delivery delivery, Ecore_Evas_Selection_Internal_Cancel cancel)
1236{ 1236{
1237 Ecore_Evas_Engine_Data_Win32 *edata = ee->engine.data;
1238
1237 if (selection != ECORE_EVAS_SELECTION_BUFFER_COPY_AND_PASTE_BUFFER) 1239 if (selection != ECORE_EVAS_SELECTION_BUFFER_COPY_AND_PASTE_BUFFER)
1238 return EINA_FALSE; 1240 return EINA_FALSE;
1239 1241
1240 if (!delivery && !cancel) 1242 if (!delivery && !cancel)
1241 { 1243 {
1244 edata->clipboard.delivery = NULL;
1245 edata->clipboard.cancel = NULL;
1246 eina_array_clean(edata->clipboard.available_types);
1242 ecore_win32_clipboard_clear((Ecore_Win32_Window *)ee->prop.window); 1247 ecore_win32_clipboard_clear((Ecore_Win32_Window *)ee->prop.window);
1243 return EINA_TRUE; 1248 return EINA_TRUE;
1244 } 1249 }
1245 else 1250 else
1246 { 1251 {
1247 Ecore_Evas_Engine_Data_Win32 *edata = ee->engine.data;
1248
1249 if (edata->clipboard.cancel) 1252 if (edata->clipboard.cancel)
1250 { 1253 {
1251 edata->clipboard.cancel(ee, seat, selection); 1254 edata->clipboard.cancel(ee, seat, selection);
diff --git a/src/modules/ecore_imf/scim/meson.build b/src/modules/ecore_imf/scim/meson.build
index 6f67ebc69d..68d94793e5 100644
--- a/src/modules/ecore_imf/scim/meson.build
+++ b/src/modules/ecore_imf/scim/meson.build
@@ -9,7 +9,7 @@ if not scim_dep.found()
9 scim_dep = dependency('scim-1.0') 9 scim_dep = dependency('scim-1.0')
10endif 10endif
11 11
12mod_deps = [ecore, ecore_imf, ecore_x, ecore_x_deps, ecore_evas, scim_dep, dependency('glib-2.0')] 12mod_deps = [ecore, ecore_imf, ecore_x, ecore_x_ext_deps, ecore_evas, scim_dep, dependency('glib-2.0')]
13 13
14shared_module(mod_name, 14shared_module(mod_name,
15 mod_src, 15 mod_src,
diff --git a/src/modules/ecore_imf/xim/meson.build b/src/modules/ecore_imf/xim/meson.build
index d5411c77d9..928f396a10 100644
--- a/src/modules/ecore_imf/xim/meson.build
+++ b/src/modules/ecore_imf/xim/meson.build
@@ -2,7 +2,7 @@ mod_src = files([
2 'ecore_imf_xim.c', 2 'ecore_imf_xim.c',
3]) 3])
4 4
5mod_deps = [ecore, ecore_imf, ecore_input, ecore_x, ecore_x_deps, ecore_evas] 5mod_deps = [ecore, ecore_imf, ecore_input, ecore_x, ecore_x_ext_deps, ecore_evas]
6 6
7shared_module(mod_name, 7shared_module(mod_name,
8 mod_src, 8 mod_src,
diff --git a/src/modules/evas/engines/software_x11/meson.build b/src/modules/evas/engines/software_x11/meson.build
index 6ddaeee37b..ed0a3e4b46 100644
--- a/src/modules/evas/engines/software_x11/meson.build
+++ b/src/modules/evas/engines/software_x11/meson.build
@@ -26,7 +26,7 @@ config_h.set('BUILD_ENGINE_SOFTWARE_XLIB', '1')
26 26
27#ecore_x_deps carries all the extensions etc. so we dont have to search them twice 27#ecore_x_deps carries all the extensions etc. so we dont have to search them twice
28#it looks weird but is right, gl_deps is needed for evas_x_egl.c 28#it looks weird but is right, gl_deps is needed for evas_x_egl.c
29engine_deps += [x11, ecore_x, ecore_x_deps, gl_deps] 29engine_deps += [x11, ecore_x, ecore_x_ext_deps, gl_deps]
30 30
31shared_module(mod_full_name, engine_src, 31shared_module(mod_full_name, engine_src,
32 include_directories : config_dir + [engine_include_dir], 32 include_directories : config_dir + [engine_include_dir],