}
static void
-_e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
+_e_comp_wl_client_buffer_viewport_set(E_Client *ec, E_Comp_Wl_Buffer_Viewport *new_vp)
{
- Eina_Bool placed = EINA_TRUE;
- int x = 0, y = 0;
- int w, h;
- int nw, nh;
- E_Comp_Wl_Buffer *buffer;
- E_Comp_Wl_Client_Data *cdata = e_client_cdata_get(ec);
- E_Comp_Wl_Buffer_Viewport *vp = &cdata->scaler.buffer_viewport;
- E_Surface *surface = e_surface_from_ec(ec);
- E_Comp_Wl_Data *comp_wl;
-
- _e_comp_wl_client_unignore(ec, state->new_attach);
+ E_Comp_Wl_Buffer_Viewport *vp = &ec->comp_data->scaler.buffer_viewport;
+ int transform_change;
- /* buffer transform */
- if (vp->buffer.transform != state->buffer_viewport.buffer.transform)
+ if (vp->buffer.transform != new_vp->buffer.transform)
{
- int transform_change = (4 + state->buffer_viewport.buffer.transform - vp->buffer.transform) & 0x3;
+ transform_change = (4 + new_vp->buffer.transform - vp->buffer.transform) & 0x3;
/* when buffer is transformed, we have to apply the new evas-map */
- state->buffer_viewport.changed = EINA_TRUE;
+ new_vp->changed = EINA_TRUE;
ELOGF("TRANSFORM", "buffer_transform changed: old(%d) new(%d)",
ec,
- vp->buffer.transform, state->buffer_viewport.buffer.transform);
+ vp->buffer.transform, new_vp->buffer.transform);
if (transform_change == vp->wait_for_transform_change)
vp->wait_for_transform_change = 0;
}
- /* assign a new buffer_vieport to cdata->scaler.buffer_viewport */
- cdata->scaler.buffer_viewport = state->buffer_viewport;
+ ec->comp_data->scaler.buffer_viewport = *new_vp;
+}
+
+static void
+_e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
+{
+ Eina_Bool placed = EINA_TRUE;
+ int x = 0, y = 0;
+ int w, h;
+ int nw, nh;
+ E_Comp_Wl_Buffer *buffer;
+ E_Comp_Wl_Client_Data *cdata = e_client_cdata_get(ec);
+ E_Surface *surface = e_surface_from_ec(ec);
+ E_Comp_Wl_Data *comp_wl;
+
+ _e_comp_wl_client_unignore(ec, state->new_attach);
+ _e_comp_wl_client_buffer_viewport_set(ec, &state->buffer_viewport);
if (state->new_attach)
{