summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorRafael Antognolli <rafael.antognolli@intel.com>2013-11-01 11:38:05 -0200
committerRafael Antognolli <rafael.antognolli@intel.com>2013-11-01 15:07:48 -0200
commit1c33a1a57b964d9080909c3e9e93f109d11c674f (patch)
tree156a5924b520c50a03b449ff06a95507e48dd894 /src/modules
parenta63c69cac5e49a122cb1fa1bcf8187cff1198dcf (diff)
ecore/wayland: Add title_set and class_name_set APIs.
These two APIs will save the title and class_name inside Ecore_Wl_Window, so if they are called before the shell surface is created, the stored names will be used later when the window is finally shown (shell surface is created). This way we are also hiding the shell surface from ecore_evas modules.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c10
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c7
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c7
3 files changed, 4 insertions, 20 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 4a1628e4b8..705d5883e8 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -920,9 +920,8 @@ _ecore_evas_wl_common_title_set(Ecore_Evas *ee, const char *title)
920 evas_object_text_text_set(sd->text, ee->prop.title); 920 evas_object_text_text_set(sd->text, ee->prop.title);
921 } 921 }
922 922
923 if ((ee->prop.title) && (wdata->win->shell_surface)) 923 if (ee->prop.title)
924 wl_shell_surface_set_title(wdata->win->shell_surface, 924 ecore_wl_window_title_set(wdata->win, ee->prop.title);
925 ee->prop.title);
926} 925}
927 926
928void 927void
@@ -941,9 +940,8 @@ _ecore_evas_wl_common_name_class_set(Ecore_Evas *ee, const char *n, const char *
941 if (n) ee->prop.name = strdup(n); 940 if (n) ee->prop.name = strdup(n);
942 if (c) ee->prop.clas = strdup(c); 941 if (c) ee->prop.clas = strdup(c);
943 942
944 if ((ee->prop.clas) && (wdata->win->shell_surface)) 943 if (ee->prop.clas)
945 wl_shell_surface_set_class(wdata->win->shell_surface, 944 ecore_wl_window_class_name_set(wdata->win, ee->prop.clas);
946 ee->prop.clas);
947} 945}
948 946
949void 947void
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index e0bb74319d..4e32009bf9 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -389,13 +389,6 @@ _ecore_evas_wl_show(Ecore_Evas *ee)
389 /* einfo->info.surface = ecore_wl_window_surface_get(wdata->win); */ 389 /* einfo->info.surface = ecore_wl_window_surface_get(wdata->win); */
390 /* evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); */ 390 /* evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); */
391 /* } */ 391 /* } */
392
393 if ((ee->prop.clas) && (wdata->win->shell_surface))
394 wl_shell_surface_set_class(wdata->win->shell_surface,
395 ee->prop.clas);
396 if ((ee->prop.title) && (wdata->win->shell_surface))
397 wl_shell_surface_set_title(wdata->win->shell_surface,
398 ee->prop.title);
399 } 392 }
400 393
401 if (wdata->frame) 394 if (wdata->frame)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index 55421736d4..2e3a352780 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -388,13 +388,6 @@ _ecore_evas_wl_show(Ecore_Evas *ee)
388 evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); 388 evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
389 } 389 }
390 } 390 }
391
392 if ((ee->prop.clas) && (wdata->win->shell_surface))
393 wl_shell_surface_set_class(wdata->win->shell_surface,
394 ee->prop.clas);
395 if ((ee->prop.title) && (wdata->win->shell_surface))
396 wl_shell_surface_set_title(wdata->win->shell_surface,
397 ee->prop.title);
398 } 391 }
399 392
400 if (wdata->frame) 393 if (wdata->frame)