wayland: Eliminate extraneous E_COMP_WL_PIXMAP_CHECK macro
Summary: Many of the functions in the compositor do some preliminary checks, to ensure objects are valid and the right type. Most of the checks follow a consistent pattern, for example: if (!(ec = data)) return; if (e_object_is_del(E_OBJECT(ec))) return; if (ec->iconic) return; This style makes it pretty straightforward to review the pre-conditions of the function. The one exception is the check to see if an object is a wayland pixmap; this is implemented as a C macro. E_COMP_WL_PIXMAP_CHECK; The name of the macro is descriptive enough, but it conceals what is actually being checked. I think that it is clearer and fits better with the style of the rest of the pre-condition checks for this check to just be shown as regular C code: if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return; Reviewers: zmike, cedric, devilhorns Reviewed By: devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2066
This commit is contained in:
parent
82e155eac6
commit
8441520030
|
@ -7,9 +7,6 @@
|
||||||
|
|
||||||
#define COMPOSITOR_VERSION 3
|
#define COMPOSITOR_VERSION 3
|
||||||
|
|
||||||
#define E_COMP_WL_PIXMAP_CHECK \
|
|
||||||
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return
|
|
||||||
|
|
||||||
/* Resource Data Mapping: (wl_resource_get_user_data)
|
/* Resource Data Mapping: (wl_resource_get_user_data)
|
||||||
*
|
*
|
||||||
* wl_surface == e_pixmap
|
* wl_surface == e_pixmap
|
||||||
|
@ -497,8 +494,7 @@ _e_comp_wl_evas_cb_focus_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj
|
||||||
if (!(ec = data)) return;
|
if (!(ec = data)) return;
|
||||||
if (e_object_is_del(E_OBJECT(ec))) return;
|
if (e_object_is_del(E_OBJECT(ec))) return;
|
||||||
if (ec->iconic) return;
|
if (ec->iconic) return;
|
||||||
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
|
||||||
E_COMP_WL_PIXMAP_CHECK;
|
|
||||||
|
|
||||||
/* block spurious focus events */
|
/* block spurious focus events */
|
||||||
focused = e_client_focused_get();
|
focused = e_client_focused_get();
|
||||||
|
@ -522,8 +518,7 @@ _e_comp_wl_evas_cb_focus_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *ob
|
||||||
|
|
||||||
if (!(ec = data)) return;
|
if (!(ec = data)) return;
|
||||||
if (e_object_is_del(E_OBJECT(ec))) return;
|
if (e_object_is_del(E_OBJECT(ec))) return;
|
||||||
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
|
||||||
E_COMP_WL_PIXMAP_CHECK;
|
|
||||||
|
|
||||||
/* lower client priority */
|
/* lower client priority */
|
||||||
_e_comp_wl_client_priority_normal(ec);
|
_e_comp_wl_client_priority_normal(ec);
|
||||||
|
@ -553,8 +548,7 @@ _e_comp_wl_evas_cb_resize(void *data, Evas_Object *obj EINA_UNUSED, void *event
|
||||||
E_Client *ec;
|
E_Client *ec;
|
||||||
|
|
||||||
if (!(ec = data)) return;
|
if (!(ec = data)) return;
|
||||||
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
|
||||||
E_COMP_WL_PIXMAP_CHECK;
|
|
||||||
|
|
||||||
if ((ec->shading) || (ec->shaded)) return;
|
if ((ec->shading) || (ec->shaded)) return;
|
||||||
ec->post_resize = EINA_TRUE;
|
ec->post_resize = EINA_TRUE;
|
||||||
|
@ -769,7 +763,7 @@ _e_comp_wl_cb_comp_object_add(void *data EINA_UNUSED, int type EINA_UNUSED, E_Ev
|
||||||
if (e_object_is_del(E_OBJECT(ec))) return ECORE_CALLBACK_RENEW;
|
if (e_object_is_del(E_OBJECT(ec))) return ECORE_CALLBACK_RENEW;
|
||||||
|
|
||||||
/* check for wayland pixmap */
|
/* check for wayland pixmap */
|
||||||
E_COMP_WL_PIXMAP_CHECK ECORE_CALLBACK_RENEW;
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return ECORE_CALLBACK_RENEW;
|
||||||
|
|
||||||
/* if we have not setup evas callbacks for this client, do it */
|
/* if we have not setup evas callbacks for this client, do it */
|
||||||
if (!ec->comp_data->evas_init) _e_comp_wl_client_evas_init(ec);
|
if (!ec->comp_data->evas_init) _e_comp_wl_client_evas_init(ec);
|
||||||
|
@ -2008,7 +2002,7 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec)
|
||||||
uint64_t win;
|
uint64_t win;
|
||||||
|
|
||||||
/* make sure this is a wayland client */
|
/* make sure this is a wayland client */
|
||||||
E_COMP_WL_PIXMAP_CHECK;
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
|
||||||
|
|
||||||
/* get window id from pixmap */
|
/* get window id from pixmap */
|
||||||
win = e_pixmap_window_get(ec->pixmap);
|
win = e_pixmap_window_get(ec->pixmap);
|
||||||
|
@ -2061,7 +2055,7 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
|
||||||
struct wl_resource *cb;
|
struct wl_resource *cb;
|
||||||
|
|
||||||
/* make sure this is a wayland client */
|
/* make sure this is a wayland client */
|
||||||
E_COMP_WL_PIXMAP_CHECK;
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
|
||||||
|
|
||||||
if ((!ec->already_unparented) && (ec->comp_data->reparented))
|
if ((!ec->already_unparented) && (ec->comp_data->reparented))
|
||||||
_e_comp_wl_focus_down_set(ec);
|
_e_comp_wl_focus_down_set(ec);
|
||||||
|
@ -2099,8 +2093,7 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
|
||||||
static void
|
static void
|
||||||
_e_comp_wl_client_cb_post_new(void *data EINA_UNUSED, E_Client *ec)
|
_e_comp_wl_client_cb_post_new(void *data EINA_UNUSED, E_Client *ec)
|
||||||
{
|
{
|
||||||
E_COMP_WL_PIXMAP_CHECK;
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
|
||||||
|
|
||||||
if (e_object_is_del(E_OBJECT(ec))) return;
|
if (e_object_is_del(E_OBJECT(ec))) return;
|
||||||
|
|
||||||
ec->need_shape_merge = EINA_FALSE;
|
ec->need_shape_merge = EINA_FALSE;
|
||||||
|
@ -2118,8 +2111,7 @@ _e_comp_wl_client_cb_pre_frame(void *data EINA_UNUSED, E_Client *ec)
|
||||||
{
|
{
|
||||||
uint64_t parent;
|
uint64_t parent;
|
||||||
|
|
||||||
E_COMP_WL_PIXMAP_CHECK;
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
|
||||||
|
|
||||||
if (!ec->comp_data->need_reparent) return;
|
if (!ec->comp_data->need_reparent) return;
|
||||||
|
|
||||||
DBG("Client Pre Frame: %d", wl_resource_get_id(ec->comp_data->surface));
|
DBG("Client Pre Frame: %d", wl_resource_get_id(ec->comp_data->surface));
|
||||||
|
@ -2196,7 +2188,7 @@ _e_comp_wl_client_cb_pre_frame(void *data EINA_UNUSED, E_Client *ec)
|
||||||
static void
|
static void
|
||||||
_e_comp_wl_client_cb_focus_set(void *data EINA_UNUSED, E_Client *ec)
|
_e_comp_wl_client_cb_focus_set(void *data EINA_UNUSED, E_Client *ec)
|
||||||
{
|
{
|
||||||
E_COMP_WL_PIXMAP_CHECK;
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
|
||||||
|
|
||||||
/* send configure */
|
/* send configure */
|
||||||
if (ec->comp_data->shell.configure_send)
|
if (ec->comp_data->shell.configure_send)
|
||||||
|
@ -2225,7 +2217,7 @@ _e_comp_wl_client_cb_focus_set(void *data EINA_UNUSED, E_Client *ec)
|
||||||
static void
|
static void
|
||||||
_e_comp_wl_client_cb_focus_unset(void *data EINA_UNUSED, E_Client *ec)
|
_e_comp_wl_client_cb_focus_unset(void *data EINA_UNUSED, E_Client *ec)
|
||||||
{
|
{
|
||||||
E_COMP_WL_PIXMAP_CHECK;
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
|
||||||
|
|
||||||
/* send configure */
|
/* send configure */
|
||||||
if (ec->comp_data->shell.configure_send)
|
if (ec->comp_data->shell.configure_send)
|
||||||
|
@ -2244,7 +2236,7 @@ _e_comp_wl_client_cb_focus_unset(void *data EINA_UNUSED, E_Client *ec)
|
||||||
static void
|
static void
|
||||||
_e_comp_wl_client_cb_resize_begin(void *data EINA_UNUSED, E_Client *ec)
|
_e_comp_wl_client_cb_resize_begin(void *data EINA_UNUSED, E_Client *ec)
|
||||||
{
|
{
|
||||||
E_COMP_WL_PIXMAP_CHECK;
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
|
||||||
|
|
||||||
switch (ec->resize_mode)
|
switch (ec->resize_mode)
|
||||||
{
|
{
|
||||||
|
@ -2282,8 +2274,7 @@ static void
|
||||||
_e_comp_wl_client_cb_resize_end(void *data EINA_UNUSED, E_Client *ec)
|
_e_comp_wl_client_cb_resize_end(void *data EINA_UNUSED, E_Client *ec)
|
||||||
{
|
{
|
||||||
if (e_object_is_del(E_OBJECT(ec))) return;
|
if (e_object_is_del(E_OBJECT(ec))) return;
|
||||||
|
if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
|
||||||
E_COMP_WL_PIXMAP_CHECK;
|
|
||||||
|
|
||||||
ec->comp->wl_comp_data->resize.edges = 0;
|
ec->comp->wl_comp_data->resize.edges = 0;
|
||||||
ec->comp->wl_comp_data->resize.resource = NULL;
|
ec->comp->wl_comp_data->resize.resource = NULL;
|
||||||
|
|
Loading…
Reference in New Issue