e_comp functions no longer require E_Comp param

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index b1fa1c1..06508f0 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -439,7 +439,7 @@ _e_client_free(E_Client *ec)
      {
         ec->desk->fullscreen_clients = eina_list_remove(ec->desk->fullscreen_clients, ec);
         if (!ec->desk->fullscreen_clients)
-          e_comp_render_queue(e_comp);
+          e_comp_render_queue();
      }
    if (ec->new_client)
      e_comp->new_clients--;
@@ -3901,7 +3901,7 @@ e_client_unfullscreen(E_Client *ec)
 
    e_remember_update(ec);
    if (!ec->desk->fullscreen_clients)
-     e_comp_render_queue(e_comp);
+     e_comp_render_queue();
 }
 
 ///////////////////////////////////////

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 81063cf..5a68072 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -253,7 +253,7 @@ _e_comp_cb_nocomp_begin(E_Comp *c)
    evas_render_dump(c->evas);
 
    DBG("JOB2...");
-   e_comp_render_queue(c);
+   e_comp_render_queue();
    e_comp_shape_queue_block(c, 1);
    ecore_event_add(E_EVENT_COMPOSITOR_DISABLE, NULL, NULL, NULL);
 }
@@ -277,7 +277,7 @@ _e_comp_cb_nocomp_end(E_Comp *c)
 #ifndef HAVE_WAYLAND_ONLY
    e_comp_x_nocomp_end(c);
 #endif
-   e_comp_render_queue(c);
+   e_comp_render_queue();
    e_comp_shape_queue_block(c, 0);
    ecore_event_add(E_EVENT_COMPOSITOR_ENABLE, NULL, NULL, NULL);
 }
@@ -854,7 +854,7 @@ _e_comp_screensaver_on(void *data EINA_UNUSED, int type EINA_UNUSED, void *event
    printf("_e_comp_screensaver_on\n");
    ecore_frametime = ecore_animator_frametime_get();
    if (e_comp->saver) return ECORE_CALLBACK_RENEW;
-   e_comp_override_add(e_comp);
+   e_comp_override_add();
    e_comp->saver = EINA_TRUE;
    if (e_comp->render_animator)
      ecore_animator_freeze(e_comp->render_animator);
@@ -878,7 +878,7 @@ _e_comp_screensaver_off(void *data EINA_UNUSED, int type EINA_UNUSED, void *even
    printf("_e_comp_screensaver_off\n");
    ecore_animator_frametime_set(ecore_frametime);
    if (!e_comp->saver) return ECORE_CALLBACK_RENEW;
-   e_comp_override_del(e_comp);
+   e_comp_override_del();
    e_comp->saver = EINA_FALSE;
    if (!e_comp->nocomp)
      ecore_evas_manual_render_set(e_comp->ee, EINA_FALSE);
@@ -1309,47 +1309,47 @@ e_comp_shutdown(void)
 }
 
 EAPI void
-e_comp_render_queue(E_Comp *c)
+e_comp_render_queue()
 {
-   E_OBJECT_CHECK(c);
-   E_OBJECT_TYPE_CHECK(c, E_COMP_TYPE);
+   E_OBJECT_CHECK(e_comp);
+   E_OBJECT_TYPE_CHECK(e_comp, E_COMP_TYPE);
 
    if (conf->lock_fps)
      {
-        ecore_animator_thaw(c->render_animator);
+        ecore_animator_thaw(e_comp->render_animator);
      }
    else
      {
-        if (c->update_job)
+        if (e_comp->update_job)
           {
              DBG("UPDATE JOB DEL...");
-             E_FREE_FUNC(c->update_job, ecore_job_del);
+             E_FREE_FUNC(e_comp->update_job, ecore_job_del);
           }
         DBG("UPDATE JOB ADD...");
-        c->update_job = ecore_job_add(_e_comp_cb_job, c);
+        e_comp->update_job = ecore_job_add(_e_comp_cb_job, e_comp);
      }
 }
 
 EAPI void
-e_comp_shape_queue(E_Comp *c)
+e_comp_shape_queue()
 {
-   EINA_SAFETY_ON_NULL_RETURN(c);
+   EINA_SAFETY_ON_NULL_RETURN(e_comp);
 
-   if (c->comp_type != E_PIXMAP_TYPE_X) return;
-   if (!c->shape_job)
-     c->shape_job = ecore_job_add((Ecore_Cb)_e_comp_shapes_update_job, c);
+   if (e_comp->comp_type != E_PIXMAP_TYPE_X) return;
+   if (!e_comp->shape_job)
+     e_comp->shape_job = ecore_job_add((Ecore_Cb)_e_comp_shapes_update_job, e_comp);
 }
 
 EAPI void
-e_comp_shape_queue_block(E_Comp *c, Eina_Bool block)
+e_comp_shape_queue_block(Eina_Bool block)
 {
-   EINA_SAFETY_ON_NULL_RETURN(c);
+   EINA_SAFETY_ON_NULL_RETURN(e_comp);
 
-   c->shape_queue_blocked = !!block;
+   e_comp->shape_queue_blocked = !!block;
    if (block)
-     E_FREE_FUNC(c->shape_job, ecore_job_del);
+     E_FREE_FUNC(e_comp->shape_job, ecore_job_del);
    else
-     e_comp_shape_queue(c);
+     e_comp_shape_queue();
 }
 
 EAPI E_Comp_Config *
@@ -1370,21 +1370,21 @@ e_comp_shadows_reset(void)
 }
 
 EAPI Ecore_Window
-e_comp_top_window_at_xy_get(E_Comp *c, Evas_Coord x, Evas_Coord y)
+e_comp_top_window_at_xy_get(Evas_Coord x, Evas_Coord y)
 {
    E_Client *ec;
    Evas_Object *o;
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(c, 0);
-   o = evas_object_top_at_xy_get(c->evas, x, y, 0, 0);
-   if (!o) return c->ee_win;
+   EINA_SAFETY_ON_NULL_RETURN_VAL(e_comp, 0);
+   o = evas_object_top_at_xy_get(e_comp->evas, x, y, 0, 0);
+   if (!o) return e_comp->ee_win;
    ec = evas_object_data_get(o, "E_Client");
    if (ec) return e_client_util_pwin_get(ec);
-   return c->ee_win;
+   return e_comp->ee_win;
 }
 
 EAPI void
-e_comp_util_wins_print(const E_Comp *c EINA_UNUSED)
+e_comp_util_wins_print()
 {
    Evas_Object *o;
 
@@ -1439,21 +1439,21 @@ e_comp_ignore_win_find(Ecore_Window win)
 }
 
 EAPI void
-e_comp_override_del(E_Comp *c)
+e_comp_override_del()
 {
-   c->nocomp_override--;
-   if (c->nocomp_override <= 0)
+   e_comp->nocomp_override--;
+   if (e_comp->nocomp_override <= 0)
      {
-        c->nocomp_override = 0;
-        if (c->nocomp_want) _e_comp_cb_nocomp_begin(c);
+        e_comp->nocomp_override = 0;
+        if (e_comp->nocomp_want) _e_comp_cb_nocomp_begin(e_comp);
      }
 }
 
 EAPI void
-e_comp_override_add(E_Comp *c)
+e_comp_override_add()
 {
-   c->nocomp_override++;
-   if ((c->nocomp_override > 0) && (c->nocomp)) _e_comp_cb_nocomp_end(c);
+   e_comp->nocomp_override++;
+   if ((e_comp->nocomp_override > 0) && (e_comp->nocomp)) _e_comp_cb_nocomp_end(e_comp);
 }
 
 #if 0
@@ -1492,14 +1492,14 @@ e_comp_find_by_window(Ecore_Window win)
 }
 
 EAPI void
-e_comp_override_timed_pop(E_Comp *c)
+e_comp_override_timed_pop()
 {
-   EINA_SAFETY_ON_NULL_RETURN(c);
-   if (c->nocomp_override <= 0) return;
-   if (c->nocomp_override_timer)
-     c->nocomp_override--;
+   EINA_SAFETY_ON_NULL_RETURN(e_comp);
+   if (e_comp->nocomp_override <= 0) return;
+   if (e_comp->nocomp_override_timer)
+     e_comp->nocomp_override--;
    else
-     c->nocomp_override_timer = ecore_timer_add(1.0, _e_comp_override_expire, c);
+     e_comp->nocomp_override_timer = ecore_timer_add(1.0, _e_comp_override_expire, e_comp);
 }
 
 EAPI unsigned int
@@ -1537,48 +1537,48 @@ e_comp_e_object_layer_get(const E_Object *obj)
 }
 
 EAPI Eina_Bool
-e_comp_grab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd)
+e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd)
 {
    Eina_Bool ret = EINA_FALSE;
    Ecore_Window mwin = 0, kwin = 0;
 
    mouse = !!mouse;
    kbd = !!kbd;
-   if (mouse || c->input_mouse_grabs)
-     mwin = c->ee_win;
-   if (kbd || c->input_mouse_grabs)
-     kwin = c->ee_win;
-   e_comp_override_add(c);
-   if ((c->input_mouse_grabs && c->input_key_grabs) ||
+   if (mouse || e_comp->input_mouse_grabs)
+     mwin = e_comp->ee_win;
+   if (kbd || e_comp->input_mouse_grabs)
+     kwin = e_comp->ee_win;
+   e_comp_override_add();
+   if ((e_comp->input_mouse_grabs && e_comp->input_key_grabs) ||
        e_grabinput_get(mwin, 0, kwin))
      {
         ret = EINA_TRUE;
-        c->input_mouse_grabs += mouse;
-        c->input_key_grabs += kbd;
+        e_comp->input_mouse_grabs += mouse;
+        e_comp->input_key_grabs += kbd;
      }
    return ret;
 }
 
 EAPI void
-e_comp_ungrab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd)
+e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd)
 {
    Ecore_Window mwin = 0, kwin = 0;
 
    mouse = !!mouse;
    kbd = !!kbd;
-   if (mouse && (c->input_mouse_grabs == 1))
-     mwin = c->ee_win;
-   if (kbd && (c->input_key_grabs == 1))
-     kwin = c->ee_win;
-   if (c->input_mouse_grabs)
-     c->input_mouse_grabs -= mouse;
-   if (c->input_key_grabs)
-     c->input_key_grabs -= kbd;
-   e_comp_override_timed_pop(c);
+   if (mouse && (e_comp->input_mouse_grabs == 1))
+     mwin = e_comp->ee_win;
+   if (kbd && (e_comp->input_key_grabs == 1))
+     kwin = e_comp->ee_win;
+   if (e_comp->input_mouse_grabs)
+     e_comp->input_mouse_grabs -= mouse;
+   if (e_comp->input_key_grabs)
+     e_comp->input_key_grabs -= kbd;
+   e_comp_override_timed_pop();
    if ((!mwin) && (!kwin)) return;
    e_grabinput_release(mwin, kwin);
-   evas_event_feed_mouse_out(c->evas, 0, NULL);
-   evas_event_feed_mouse_in(c->evas, 0, NULL);
+   evas_event_feed_mouse_out(e_comp->evas, 0, NULL);
+   evas_event_feed_mouse_in(e_comp->evas, 0, NULL);
    if (e_client_focused_get()) return;
    if (e_config->focus_policy != E_FOCUS_MOUSE)
      e_client_refocus();
@@ -1619,7 +1619,7 @@ e_comp_client_redirect_toggle(E_Client *ec)
    ec->unredirected_single = !ec->unredirected_single;
    e_client_redirected_set(ec, !ec->redirected);
    ec->no_shape_cut = !ec->redirected;
-   e_comp_shape_queue(e_comp);
+   e_comp_shape_queue();
 }
 
 EAPI Eina_Bool

diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index 2807ab8..c05951e 100644 (file)
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -160,26 +160,26 @@ EINTERN Eina_Bool e_comp_init(void);
 EAPI E_Comp *e_comp_new(void);
 EAPI int e_comp_internal_save(void);
 EINTERN int e_comp_shutdown(void);
-EAPI void e_comp_render_queue(E_Comp *c);
-EAPI void e_comp_shape_queue(E_Comp *c);
-EAPI void e_comp_shape_queue_block(E_Comp *c, Eina_Bool block);
+EAPI void e_comp_render_queue(void);
+EAPI void e_comp_shape_queue(void);
+EAPI void e_comp_shape_queue_block(Eina_Bool block);
 EAPI E_Comp_Config *e_comp_config_get(void);
 EAPI const Eina_List *e_comp_list(void);
 EAPI void e_comp_shadows_reset(void);
-EAPI Ecore_Window e_comp_top_window_at_xy_get(E_Comp *c, Evas_Coord x, Evas_Coord y);
-EAPI void e_comp_util_wins_print(const E_Comp *c);
+EAPI Ecore_Window e_comp_top_window_at_xy_get(Evas_Coord x, Evas_Coord y);
+EAPI void e_comp_util_wins_print(void);
 EAPI void e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win);
 EAPI void e_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win);
 EAPI Eina_Bool e_comp_ignore_win_find(Ecore_Window win);
-EAPI void e_comp_override_del(E_Comp *c);
-EAPI void e_comp_override_add(E_Comp *c);
+EAPI void e_comp_override_del(void);
+EAPI void e_comp_override_add(void);
 EAPI void e_comp_block_window_add(void);
 EAPI void e_comp_block_window_del(void);
 EAPI E_Comp *e_comp_find_by_window(Ecore_Window win);
-EAPI void e_comp_override_timed_pop(E_Comp *c);
+EAPI void e_comp_override_timed_pop(void);
 EAPI unsigned int e_comp_e_object_layer_get(const E_Object *obj);
-EAPI Eina_Bool e_comp_grab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd);
-EAPI void e_comp_ungrab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd);
+EAPI Eina_Bool e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd);
+EAPI void e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd);
 EAPI void e_comp_gl_set(Eina_Bool set);
 EAPI Eina_Bool e_comp_gl_get(void);
 

diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 59e3fb2..2b23d9b 100644 (file)
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -489,7 +489,7 @@ e_comp_canvas_fps_toggle(void)
 
    conf->fps_show = !conf->fps_show;
    e_comp_internal_save();
-   e_comp_render_queue(e_comp);
+   e_comp_render_queue();
 }
 
 EAPI E_Layer

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index e437804..3b44955 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -656,7 +656,7 @@ _e_comp_object_done_defer(void *data, Evas_Object *obj EINA_UNUSED, const char *
    if (cw->defer_hide && (!strcmp(emission, "e,action,hide,done")))
      evas_object_hide(cw->smart_obj);
    else if (!cw->animating)
-     e_comp_shape_queue(e_comp);
+     e_comp_shape_queue();
 }
 
 /////////////////////////////////////////////
@@ -987,8 +987,8 @@ _e_comp_intercept_layer_set(void *data, Evas_Object *obj, int layer)
 
              if (cw->visible)
                {
-                  e_comp_shape_queue(e_comp);
-                  e_comp_render_queue(e_comp);
+                  e_comp_shape_queue();
+                  e_comp_render_queue();
                }
              ec = e_client_above_get(cw->ec);
              if (ec && (evas_object_layer_get(ec->frame) != evas_object_layer_get(obj)))
@@ -1060,8 +1060,8 @@ _e_comp_intercept_layer_set(void *data, Evas_Object *obj, int layer)
         CRI("STACKING ERROR!!!");
      }
    if (!cw->visible) return;
-   e_comp_render_queue(e_comp);
-   e_comp_shape_queue(e_comp);
+   e_comp_render_queue();
+   e_comp_shape_queue();
 }
 
 typedef void (*E_Comp_Object_Stack_Func)(Evas_Object *obj, Evas_Object *stack);
@@ -1164,8 +1164,8 @@ _e_comp_intercept_stack_helper(E_Comp_Object *cw, Evas_Object *stack, E_Comp_Obj
    if (cw->ec->new_client || (!ecstack) || (ecstack->frame != o))
      evas_object_data_del(cw->smart_obj, "client_restack");
    if (!cw->visible) return;
-   e_comp_render_queue(e_comp);
-   e_comp_shape_queue(e_comp);
+   e_comp_render_queue();
+   e_comp_shape_queue();
 }
 
 static void
@@ -1206,8 +1206,8 @@ _e_comp_intercept_lower(void *data, Evas_Object *obj)
    evas_object_lower(obj);
    evas_object_data_del(obj, "client_restack");
    if (!cw->visible) return;
-   e_comp_render_queue(e_comp);
-   e_comp_shape_queue(e_comp);
+   e_comp_render_queue();
+   e_comp_shape_queue();
 }
 
 static void
@@ -1239,8 +1239,8 @@ _e_comp_intercept_raise(void *data, Evas_Object *obj)
           e_client_raise_latest_set(cw->ec); //modify raise list if necessary
      }
    if (!cw->visible) return;
-   e_comp_render_queue(e_comp);
-   e_comp_shape_queue(e_comp);
+   e_comp_render_queue();
+   e_comp_shape_queue();
 }
 
 static void
@@ -1962,8 +1962,8 @@ _e_comp_smart_hide(Evas_Object *obj)
    /* ensure focus-out */
    if (cw->ec->focused)
      evas_object_focus_set(cw->ec->frame, 0);
-   e_comp_render_queue(e_comp); //force nocomp recheck
-   e_comp_shape_queue(e_comp);
+   e_comp_render_queue(); //force nocomp recheck
+   e_comp_shape_queue();
 }
 
 static void
@@ -1988,10 +1988,10 @@ _e_comp_smart_show(Evas_Object *obj)
    evas_object_show(cw->effect_obj);
    if (cw->ec->internal_elm_win && (!evas_object_visible_get(cw->ec->internal_elm_win)))
      evas_object_show(cw->ec->internal_elm_win);
-   e_comp_render_queue(e_comp);
+   e_comp_render_queue();
    if (cw->ec->input_only)
      {
-        e_comp_shape_queue(e_comp);
+        e_comp_shape_queue();
         return;
      }
    if (cw->ec->iconic && (!cw->ec->new_client))
@@ -2007,7 +2007,7 @@ _e_comp_smart_show(Evas_Object *obj)
    if (!cw->animating)
      {
         e_comp_object_effect_set(obj, NULL);
-        e_comp_shape_queue(e_comp);
+        e_comp_shape_queue();
      }
 }
 
@@ -2051,7 +2051,7 @@ _e_comp_smart_del(Evas_Object *obj)
    evas_object_del(cw->zoomobj);
    evas_object_del(cw->input_obj);
    evas_object_del(cw->obj);
-   e_comp_shape_queue(e_comp);
+   e_comp_shape_queue();
    eina_stringshare_del(cw->frame_theme);
    eina_stringshare_del(cw->frame_name);
    free(cw);
@@ -2069,7 +2069,7 @@ _e_comp_smart_move(Evas_Object *obj, int x, int y)
      evas_object_geometry_set(cw->input_obj, cw->x + cw->input_rect.x, cw->y + cw->input_rect.y, cw->input_rect.w, cw->input_rect.h);
    /* this gets called once during setup to init coords offscreen and guarantee first move */
    if (e_comp && cw->visible)
-     e_comp_shape_queue(e_comp);
+     e_comp_shape_queue();
 }
 
 static void
@@ -2121,9 +2121,9 @@ _e_comp_smart_resize(Evas_Object *obj, int w, int h)
         evas_object_resize(cw->effect_obj, w, h);
      }
    if (!cw->visible) return;
-   e_comp_render_queue(e_comp);
+   e_comp_render_queue();
    if (!cw->animating)
-     e_comp_shape_queue(e_comp);
+     e_comp_shape_queue();
 }
 
 static void
@@ -2200,8 +2200,8 @@ _e_comp_object_util_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object
 
         o = edje_object_part_swallow_get(obj, "e.swallow.content");
         evas_object_del(o);
-        e_comp_render_queue(e_comp);
-        e_comp_shape_queue(e_comp);
+        e_comp_render_queue();
+        e_comp_shape_queue();
      }
    l = evas_object_data_get(obj, "comp_object-to_del");
    E_FREE_LIST(l, evas_object_del);
@@ -2214,7 +2214,7 @@ _e_comp_object_util_restack(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Ob
        (!evas_object_data_get(obj, "comp_override")))
      {
         evas_object_data_set(obj, "comp_override", (void*)1);
-        e_comp_override_add(e_comp);
+        e_comp_override_add();
      }
 }
 
@@ -2235,7 +2235,7 @@ _e_comp_object_util_show(void *data EINA_UNUSED, Evas_Object *obj)
           return;
      }
    else
-     e_comp_shape_queue(e_comp);
+     e_comp_shape_queue();
    
    evas_object_show(obj);
    if (ref)
@@ -2248,7 +2248,7 @@ _e_comp_object_util_show(void *data EINA_UNUSED, Evas_Object *obj)
    if (e_comp_util_object_is_above_nocomp(obj))
      {
         evas_object_data_set(obj, "comp_override", (void*)1);
-        e_comp_override_add(e_comp);
+        e_comp_override_add();
      }
 }
 
@@ -2267,7 +2267,7 @@ _e_comp_object_util_hide(void *data EINA_UNUSED, Evas_Object *obj)
    evas_object_data_set(obj, "comp_hiding", (void*)1);
 
    if (evas_object_data_del(obj, "comp_override"))
-     e_comp_override_timed_pop(e_comp);
+     e_comp_override_timed_pop();
 }
 
 static void
@@ -2278,7 +2278,7 @@ _e_comp_object_util_done_defer(void *data, Evas_Object *obj, const char *emissio
         if (!evas_object_data_del(obj, "comp_hiding")) return;
         evas_object_intercept_hide_callback_del(obj, _e_comp_object_util_hide);
         evas_object_hide(obj);
-        e_comp_shape_queue(e_comp);
+        e_comp_shape_queue();
         evas_object_intercept_hide_callback_add(obj, _e_comp_object_util_hide, data);
      }
    else
@@ -2299,7 +2299,7 @@ _e_comp_object_util_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
      }
      
    if (evas_object_visible_get(obj))
-     e_comp_shape_queue(e_comp);
+     e_comp_shape_queue();
 }
 
 EAPI Evas_Object *
@@ -3020,7 +3020,7 @@ e_comp_object_render_update_add(Evas_Object *obj)
         cw->update = 1;
         e_comp->updates = eina_list_append(e_comp->updates, cw->ec);
      }
-   e_comp_render_queue(e_comp);
+   e_comp_render_queue();
 }
 
 EAPI void
@@ -3530,7 +3530,7 @@ _e_comp_object_effect_end_cb(void *data, Evas_Object *obj, const char *emission,
         e_comp->animating--;
         cw->animating--;
         if (e_object_unref(E_OBJECT(cw->ec)))
-          e_comp_shape_queue(e_comp);
+          e_comp_shape_queue();
      }
 
    end_cb = evas_object_data_get(obj, "_e_comp.end_cb");
@@ -3656,7 +3656,7 @@ _e_comp_object_autoclose_cleanup(Eina_Bool already_del)
    e_comp->autoclose.del_cb = NULL;
    e_comp->autoclose.key_cb = NULL;
    E_FREE_FUNC(e_comp->autoclose.key_handler, ecore_event_handler_del);
-   e_comp_shape_queue(e_comp);
+   e_comp_shape_queue();
 }
 
 static Eina_Bool
@@ -3694,7 +3694,7 @@ _e_comp_object_autoclose_setup(Evas_Object *obj)
         e_comp_grab_input(e_comp, 0, 1);
      }
    evas_object_layer_set(e_comp->autoclose.rect, evas_object_layer_get(obj) - 1);
-   e_comp_shape_queue(e_comp);
+   e_comp_shape_queue();
    if (!e_comp->autoclose.key_handler)
      e_comp->autoclose.key_handler = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _e_comp_object_autoclose_key_down_cb, e_comp);
 }

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 80678be..e3532b0 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2137,7 +2137,7 @@ _e_comp_wl_client_cb_post_new(void *data EINA_UNUSED, E_Client *ec)
    if (ec->need_shape_export)
      {
 //        ec->shape_changed = EINA_TRUE;
-        e_comp_shape_queue(e_comp);
+        e_comp_shape_queue();
         ec->need_shape_export = EINA_FALSE;
      }
 }

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 57d39da..0badeab 100644 (file)
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -2564,7 +2564,7 @@ _e_comp_x_damage_win(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event
    E_Comp *c;
 
    c = e_comp_find_by_window(ev->win);
-   if (c) e_comp_render_queue(c);
+   if (c) e_comp_render_queue();
    return ECORE_CALLBACK_PASS_ON;
 }
 
@@ -2633,7 +2633,7 @@ _e_comp_x_client_shape_rects_check(E_Client *ec, Ecore_X_Rectangle *rects, int n
         ec->shape_rects = (Eina_Rectangle*)rects;
         ec->shape_rects_num = num;
         ec->shape_changed = 1;
-        e_comp_shape_queue(e_comp);
+        e_comp_shape_queue();
      }
    else
      free(rects);
@@ -3713,7 +3713,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
         if (changed || (pshaped != ec->shaped_input))
           {
              ec->need_shape_merge = 1;
-             e_comp_shape_queue(e_comp);
+             e_comp_shape_queue();
           }
      }
    if (ec->changes.prop || ec->mwm.fetch.hints)
@@ -4948,7 +4948,7 @@ _e_comp_x_desklock_hide(void)
      ecore_x_window_show(e_comp->x_comp_data->lock_grab_break_wnd);
    e_comp->x_comp_data->lock_grab_break_wnd = 0;
    E_FREE_FUNC(e_comp->x_comp_data->lock_key_handler, ecore_event_handler_del);
-   e_comp_override_del(e_comp);
+   e_comp_override_del();
 }
 
 static Eina_Bool
@@ -4987,7 +4987,7 @@ _e_comp_x_desklock_show(void)
         free(windows);
      }
 works:
-   e_comp_override_add(e_comp);
+   e_comp_override_add();
    e_comp_ignore_win_add(E_PIXMAP_TYPE_X, e_comp->x_comp_data->lock_win);
    e_comp->x_comp_data->lock_key_handler =
      ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, (Ecore_Event_Handler_Cb)_e_comp_x_desklock_key_down, e_comp);

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 75ee8a1..5cc8329 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -673,7 +673,7 @@ e_desk_flip_end(E_Desk *desk)
    ecore_event_add(E_EVENT_DESK_AFTER_SHOW, ev,
                    _e_desk_event_desk_after_show_free, NULL);
 
-   e_comp_shape_queue(e_comp);
+   e_comp_shape_queue();
    if (!e_config->focus_last_focused_per_desktop) return;
    if ((e_config->focus_policy == E_FOCUS_MOUSE) ||
        (e_config->focus_policy == E_FOCUS_SLOPPY))

diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index 8a72f50..5278c83 100644 (file)
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -333,8 +333,8 @@ e_desklock_hide(void)
 
    if ((!_e_desklock_state) && (!_e_custom_desklock_exe)) return;
 
-   e_comp_override_del(e_comp);
-   e_comp_shape_queue(e_comp);
+   e_comp_override_del();
+   e_comp_shape_queue();
    E_FREE_LIST(block_rects, evas_object_del);
    //e_comp_block_window_del();
    if (e_config->desklock_language)

diff --git a/src/bin/e_init.c b/src/bin/e_init.c
index e61b467..9bd3e88 100644 (file)
--- a/src/bin/e_init.c
+++ b/src/bin/e_init.c
@@ -83,7 +83,7 @@ EAPI void
 e_init_hide(void)
 {
    E_FREE_LIST(splash_objs, evas_object_del);
-   e_comp_shape_queue(e_comp);
+   e_comp_shape_queue();
    _e_init_object = NULL;
    E_FREE_FUNC(_e_init_timeout_timer, ecore_timer_del);
 }

diff --git a/src/bin/e_int_client_menu.c b/src/bin/e_int_client_menu.c
index aeba0d5..bdf0d81 100644 (file)
--- a/src/bin/e_int_client_menu.c
+++ b/src/bin/e_int_client_menu.c
@@ -974,7 +974,7 @@ _e_client_menu_cb_align_setup(E_Client *ec, Evas_Object_Event_Cb cb)
    evas_object_layer_set(o, E_LAYER_POPUP);
    evas_object_show(o);
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, cb, ec);
-   e_comp_shape_queue(e_comp);
+   e_comp_shape_queue();
 }
 
 static Evas_Object *
@@ -982,7 +982,7 @@ _e_client_menu_cb_align_cb(Evas *e, Evas_Object *obj, Evas_Event_Mouse_Down *ev)
 {
    evas_object_hide(obj);
    evas_object_del(obj);
-   e_comp_shape_queue(e_comp);
+   e_comp_shape_queue();
    return evas_object_top_at_xy_get(e, ev->output.x, ev->output.y, 0, 0);
 }
 

diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
index 3d6c916..70cd352 100644 (file)
--- a/src/bin/e_sys.c
+++ b/src/bin/e_sys.c
@@ -112,8 +112,8 @@ _e_sys_comp_emit_cb_wait(E_Sys_Action a, const char *sig, const char *rep, Eina_
    E_Zone *zone;
    Eina_Bool first = EINA_TRUE;
 
-   if (nocomp_push) e_comp_override_add(e_comp);
-   else e_comp_override_timed_pop(e_comp);
+   if (nocomp_push) e_comp_override_add();
+   else e_comp_override_timed_pop();
    printf("_e_sys_comp_emit_cb_wait - [%x] %s %s\n", a, sig, rep);
    EINA_LIST_FOREACH(e_comp->zones, l, zone)
      {

diff --git a/src/modules/notification/e_mod_popup.c b/src/modules/notification/e_mod_popup.c
index d6cdd25..6a66007 100644 (file)
--- a/src/modules/notification/e_mod_popup.c
+++ b/src/modules/notification/e_mod_popup.c
@@ -623,7 +623,7 @@ _notification_popdown(Popup_Data                  *popup,
    if (popup->pending) return;
    popups_displayed--;
    free(popup);
-   e_comp_shape_queue(e_comp);
+   e_comp_shape_queue();
 }
 
 static void

diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index 2bc94d7..eaa061d 100644 (file)
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -31,7 +31,7 @@ _e_mod_drm_cb_activate(void *data, int type EINA_UNUSED, void *event)
              if (ec->visible && (!ec->input_only))
                e_comp_object_damage(ec->frame, 0, 0, ec->w, ec->h);
           }
-        e_comp_render_queue(c);
+        e_comp_render_queue();
         e_comp_shape_queue_block(c, 0);
         ecore_event_add(E_EVENT_COMPOSITOR_ENABLE, NULL, NULL, NULL);
      }
@@ -45,7 +45,7 @@ _e_mod_drm_cb_activate(void *data, int type EINA_UNUSED, void *event)
         evas_font_cache_flush(c->evas);
         evas_render_dump(c->evas);
 
-        e_comp_render_queue(c);
+        e_comp_render_queue();
         e_comp_shape_queue_block(c, 1);
         ecore_event_add(E_EVENT_COMPOSITOR_DISABLE, NULL, NULL, NULL);
      }