summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-01-19 12:10:49 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-02-02 13:33:58 -0500
commitf1ccac37751625d203f2219f1e569823b3877900 (patch)
treecca7e9accc6c89f9da242d203fab16ba59ba9535
parentd37bcc887dc88e4a90d83bd8a7e72cae12ea7908 (diff)
remove need_reparent, reparented, first_damage flags from wl client comp_data
these flags, and related code, have no functional purpose in wayland
-rw-r--r--src/bin/e_comp_wl.c119
-rw-r--r--src/bin/e_comp_wl.h3
2 files changed, 0 insertions, 122 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index f6c81c0e5..a464af9d3 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -122,12 +122,6 @@ _e_comp_wl_evas_cb_show(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EIN
122 122
123 if (!ec->override) e_hints_window_visible_set(ec); 123 if (!ec->override) e_hints_window_visible_set(ec);
124 124
125 if ((!ec->override) && (!ec->re_manage) && (!ec->comp_data->reparented) &&
126 (!ec->comp_data->need_reparent))
127 {
128 ec->comp_data->need_reparent = EINA_TRUE;
129 ec->visible = EINA_TRUE;
130 }
131 125
132 if (!ec->ignored) 126 if (!ec->ignored)
133 { 127 {
@@ -135,17 +129,6 @@ _e_comp_wl_evas_cb_show(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EIN
135 EC_CHANGED(ec); 129 EC_CHANGED(ec);
136 } 130 }
137 131
138 if (!ec->comp_data->need_reparent)
139 {
140 if ((ec->hidden) || (ec->iconic))
141 {
142 evas_object_hide(ec->frame);
143 e_comp_object_damage(ec->frame, 0, 0, ec->w, ec->h);
144 }
145 else if (!ec->internal_elm_win)
146 evas_object_show(ec->frame);
147 }
148
149 EINA_LIST_FOREACH(ec->e.state.video_child, l, tmp) 132 EINA_LIST_FOREACH(ec->e.state.video_child, l, tmp)
150 evas_object_show(tmp->frame); 133 evas_object_show(tmp->frame);
151} 134}
@@ -700,11 +683,6 @@ _e_comp_wl_evas_cb_kill_request(void *data, Evas_Object *obj EINA_UNUSED, void *
700 /* if (ec->netwm.ping) e_client_ping(ec); */ 683 /* if (ec->netwm.ping) e_client_ping(ec); */
701 684
702 e_comp_ignore_win_del(E_PIXMAP_TYPE_WL, e_pixmap_window_get(ec->pixmap)); 685 e_comp_ignore_win_del(E_PIXMAP_TYPE_WL, e_pixmap_window_get(ec->pixmap));
703 if (ec->comp_data)
704 {
705 if (ec->comp_data->reparented)
706 e_client_comp_hidden_set(ec, EINA_TRUE);
707 }
708 686
709 evas_object_pass_events_set(ec->frame, EINA_TRUE); 687 evas_object_pass_events_set(ec->frame, EINA_TRUE);
710 if (ec->visible) evas_object_hide(ec->frame); 688 if (ec->visible) evas_object_hide(ec->frame);
@@ -2236,9 +2214,6 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec)
2236 2214
2237 /* set initial client data properties */ 2215 /* set initial client data properties */
2238 ec->comp_data->mapped = EINA_FALSE; 2216 ec->comp_data->mapped = EINA_FALSE;
2239 ec->comp_data->first_damage = ec->internal;
2240
2241 ec->comp_data->need_reparent = !ec->internal;
2242 2217
2243 /* add this client to the hash */ 2218 /* add this client to the hash */
2244 /* eina_hash_add(clients_win_hash, &win, ec); */ 2219 /* eina_hash_add(clients_win_hash, &win, ec); */
@@ -2254,16 +2229,6 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
2254 /* make sure this is a wayland client */ 2229 /* make sure this is a wayland client */
2255 if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return; 2230 if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
2256 2231
2257 if ((!ec->already_unparented) && (ec->comp_data->reparented))
2258 _e_comp_wl_focus_down_set(ec);
2259
2260 ec->already_unparented = EINA_TRUE;
2261 if (ec->comp_data->reparented)
2262 {
2263 /* reset pixmap parent window */
2264 e_pixmap_parent_window_set(ec->pixmap, 0);
2265 }
2266
2267 /* remove sub list */ 2232 /* remove sub list */
2268 EINA_LIST_FREE(ec->comp_data->sub.list, subc) 2233 EINA_LIST_FREE(ec->comp_data->sub.list, subc)
2269 subc->comp_data->sub.data->parent = NULL; 2234 subc->comp_data->sub.data->parent = NULL;
@@ -2289,87 +2254,6 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
2289 _e_comp_wl_focus_check(); 2254 _e_comp_wl_focus_check();
2290} 2255}
2291 2256
2292#if 0
2293static void
2294_e_comp_wl_client_cb_pre_frame(void *data EINA_UNUSED, E_Client *ec)
2295{
2296 uint64_t parent;
2297
2298 if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
2299 if (!ec->comp_data->need_reparent) return;
2300
2301 DBG("Client Pre Frame: %d", wl_resource_get_id(ec->comp_data->surface));
2302
2303 parent = e_client_util_pwin_get(ec);
2304
2305 /* set pixmap parent window */
2306 e_pixmap_parent_window_set(ec->pixmap, parent);
2307
2308 ec->border_size = 0;
2309 ec->border.changed = EINA_TRUE;
2310 ec->changes.shape = EINA_TRUE;
2311 ec->changes.shape_input = EINA_TRUE;
2312 EC_CHANGED(ec);
2313
2314 if (ec->visible)
2315 {
2316 if ((ec->comp_data->set_win_type) && (ec->internal_elm_win))
2317 {
2318 int type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
2319
2320 switch (ec->netwm.type)
2321 {
2322 case E_WINDOW_TYPE_DIALOG:
2323 /* NB: If there is No transient set, then dialogs get
2324 * treated as Normal Toplevel windows */
2325 if (ec->icccm.transient_for)
2326 type = ECORE_WL_WINDOW_TYPE_TRANSIENT;
2327 break;
2328 case E_WINDOW_TYPE_DESKTOP:
2329 type = ECORE_WL_WINDOW_TYPE_FULLSCREEN;
2330 break;
2331 case E_WINDOW_TYPE_DND:
2332 type = ECORE_WL_WINDOW_TYPE_DND;
2333 break;
2334 case E_WINDOW_TYPE_MENU:
2335 case E_WINDOW_TYPE_DROPDOWN_MENU:
2336 case E_WINDOW_TYPE_POPUP_MENU:
2337 type = ECORE_WL_WINDOW_TYPE_MENU;
2338 break;
2339 case E_WINDOW_TYPE_NORMAL:
2340 default:
2341 break;
2342 }
2343
2344 ecore_evas_wayland_type_set(e_win_ee_get(ec->internal_elm_win), type);
2345 ec->comp_data->set_win_type = EINA_FALSE;
2346 }
2347 }
2348
2349 e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, parent);
2350 e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, parent);
2351
2352 _e_comp_wl_client_evas_init(ec);
2353
2354 /* if ((ec->netwm.ping) && (!ec->ping_poller)) */
2355 /* e_client_ping(ec); */
2356
2357 if (ec->visible) evas_object_show(ec->frame);
2358
2359 ec->comp_data->need_reparent = EINA_FALSE;
2360 ec->redirected = EINA_TRUE;
2361
2362 if (ec->comp_data->change_icon)
2363 {
2364 ec->comp_data->change_icon = EINA_FALSE;
2365 ec->changes.icon = EINA_TRUE;
2366 EC_CHANGED(ec);
2367 }
2368
2369 ec->comp_data->reparented = EINA_TRUE;
2370}
2371#endif
2372
2373static void 2257static void
2374_e_comp_wl_client_cb_focus_set(void *data EINA_UNUSED, E_Client *ec) 2258_e_comp_wl_client_cb_focus_set(void *data EINA_UNUSED, E_Client *ec)
2375{ 2259{
@@ -2783,9 +2667,6 @@ e_comp_wl_init(void)
2783 e_client_hook_add(E_CLIENT_HOOK_NEW_CLIENT, _e_comp_wl_client_cb_new, NULL); 2667 e_client_hook_add(E_CLIENT_HOOK_NEW_CLIENT, _e_comp_wl_client_cb_new, NULL);
2784 e_client_hook_add(E_CLIENT_HOOK_DEL, _e_comp_wl_client_cb_del, NULL); 2668 e_client_hook_add(E_CLIENT_HOOK_DEL, _e_comp_wl_client_cb_del, NULL);
2785 2669
2786 /* e_client_hook_add(E_CLIENT_HOOK_EVAL_PRE_FRAME_ASSIGN, */
2787 /* _e_comp_wl_client_cb_pre_frame, NULL); */
2788
2789 e_client_hook_add(E_CLIENT_HOOK_FOCUS_SET, 2670 e_client_hook_add(E_CLIENT_HOOK_FOCUS_SET,
2790 _e_comp_wl_client_cb_focus_set, NULL); 2671 _e_comp_wl_client_cb_focus_set, NULL);
2791 e_client_hook_add(E_CLIENT_HOOK_FOCUS_UNSET, 2672 e_client_hook_add(E_CLIENT_HOOK_FOCUS_UNSET,
diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index 893c490c8..a4426e174 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -296,10 +296,7 @@ struct _E_Comp_Wl_Client_Data
296 Eina_Bool keep_buffer : 1; 296 Eina_Bool keep_buffer : 1;
297 Eina_Bool mapped : 1; 297 Eina_Bool mapped : 1;
298 Eina_Bool change_icon : 1; 298 Eina_Bool change_icon : 1;
299 Eina_Bool need_reparent : 1;
300 Eina_Bool reparented : 1;
301 Eina_Bool evas_init : 1; 299 Eina_Bool evas_init : 1;
302 Eina_Bool first_damage : 1;
303 Eina_Bool set_win_type : 1; 300 Eina_Bool set_win_type : 1;
304 Eina_Bool frame_update : 1; 301 Eina_Bool frame_update : 1;
305 Eina_Bool maximize_pre : 1; 302 Eina_Bool maximize_pre : 1;