enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

fix formatting 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-06-13 08:27:33 -04:00 committed by Chris Michael
parent 4a5387df60
commit 118f4eb05e
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/bin/e_comp_wl.c
View File

@ -14,10 +14,11 @@ static Ecore_Idle_Enterer *_client_idler = NULL;
static Eina_List *_idle_clients = NULL;
static void
_e_comp_wl_client_event_free(void *d EINA_UNUSED, void *e)
_e_comp_wl_client_event_free(void *d EINA_UNUSED, void *event)
{
E_Event_Client *ev = e;
E_Event_Client *ev;
if (!(ev = event)) return;
e_object_unref(E_OBJECT(ev->ec));
free(ev);
}
@ -1367,23 +1368,23 @@ _e_comp_wl_evas_cb_resize(void *data, Evas_Object *obj EINA_UNUSED, void *event
cdata = ec->comp->wl_comp_data;
/* if ((ec->changes.pos) || (ec->changes.size)) */
if ((ec->wl_comp_data) && (ec->wl_comp_data->shell.configure_send))
ec->wl_comp_data->shell.configure_send(ec->wl_comp_data->shell.surface,
cdata->resize.edges,
ec->client.w, ec->client.h);
if (ec->wl_comp_data)
{
if ((ec->wl_comp_data) && (ec->wl_comp_data->shell.configure_send))
ec->wl_comp_data->shell.configure_send(ec->wl_comp_data->shell.surface,
cdata->resize.edges,
ec->client.w, ec->client.h);
if (ec->wl_comp_data)
{
if (ec->wl_comp_data->pending.damage)
eina_tiler_area_size_set(ec->wl_comp_data->pending.damage, ec->client.w, ec->client.h);
if (ec->wl_comp_data->pending.damage)
eina_tiler_area_size_set(ec->wl_comp_data->pending.damage,
ec->client.w, ec->client.h);
if (ec->wl_comp_data->pending.input)
eina_tiler_area_size_set(ec->wl_comp_data->pending.input, ec->client.w, ec->client.h);
if (ec->wl_comp_data->pending.input)
eina_tiler_area_size_set(ec->wl_comp_data->pending.input,
ec->client.w, ec->client.h);
if (ec->wl_comp_data->pending.opaque)
eina_tiler_area_size_set(ec->wl_comp_data->pending.opaque, ec->client.w, ec->client.h);
}
if (ec->wl_comp_data->pending.opaque)
eina_tiler_area_size_set(ec->wl_comp_data->pending.opaque,
ec->client.w, ec->client.h);
}
ec->post_resize = EINA_TRUE;
@ -1777,6 +1778,8 @@ _e_comp_wl_cb_hook_client_new(void *data EINA_UNUSED, E_Client *ec)
static void
_e_comp_wl_cb_hook_client_eval_fetch(void *data EINA_UNUSED, E_Client *ec)
{
E_Event_Client_Property *ev;
E_COMP_WL_PIXMAP_CHECK;
/* DBG("COMP_WL HOOK CLIENT EVAL FETCH !!"); */
@ -1843,11 +1846,13 @@ _e_comp_wl_cb_hook_client_eval_fetch(void *data EINA_UNUSED, E_Client *ec)
/* TODO: transient set */
}
E_Event_Client_Property *ev = E_NEW(E_Event_Client_Property, 1);
ev = E_NEW(E_Event_Client_Property, 1);
ev->ec = ec;
e_object_ref(E_OBJECT(ec));
ev->property = E_CLIENT_PROPERTY_NETWM_STATE;
ecore_event_add(E_EVENT_CLIENT_PROPERTY, ev, _e_comp_wl_client_event_free, NULL);
ecore_event_add(E_EVENT_CLIENT_PROPERTY, ev,
_e_comp_wl_client_event_free, NULL);
ec->netwm.fetch.type = EINA_FALSE;
}

12
src/modules/wl_desktop_shell/e_mod_main.c
View File

@ -546,7 +546,8 @@ _e_xdg_shell_surface_cb_transient_for_set(struct wl_client *client EINA_UNUSED,
pc = e_pixmap_find_client(E_PIXMAP_TYPE_WL, e_pixmap_window_get(pp));
if (!pc)
{
wl_resource_post_error(parent_resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
wl_resource_post_error(parent_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
"No Client For Shell Surface");
return;
}
@ -560,7 +561,8 @@ _e_xdg_shell_surface_cb_transient_for_set(struct wl_client *client EINA_UNUSED,
{
if (pc != ec->parent)
{
ec->parent->transients = eina_list_remove(ec->parent->transients, ec);
ec->parent->transients =
eina_list_remove(ec->parent->transients, ec);
if (ec->parent->modal == ec) ec->parent->modal = NULL;
ec->parent = NULL;
}
@ -584,8 +586,10 @@ _e_xdg_shell_surface_cb_transient_for_set(struct wl_client *client EINA_UNUSED,
ec->parent->lock_close = 1;
}
if (e_config->focus_setting == E_FOCUS_NEW_DIALOG ||
(ec->parent->focused && (e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED)))
if ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||
(ec->parent->focused &&
(e_config->focus_setting ==
E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED)))
ec->take_focus = 1;
}