aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-08-08 16:32:36 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-08-08 17:34:58 -0400
commitea5d2dc64089f6bd85ac92f292cc3304b08f74df (patch)
tree4d71a07b1b4bf31656c5e4b229eb1ee38b1340d3
parentee_drm: Fix tick job timestamps for funny GPU clocks (diff)
downloadefl-ea5d2dc64089f6bd85ac92f292cc3304b08f74df.tar.gz
Revert "ecore-evas x - solve internal window size flickrs in e"
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c25
1 files changed, 6 insertions, 19 deletions
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 4cfafcdd67..f1646cbe40 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -83,7 +83,6 @@ struct _Ecore_Evas_Engine_Data_X11 {
Ecore_X_Sync_Counter sync_counter;
Ecore_X_Window leader;
Ecore_X_Sync_Counter netwm_sync_counter;
- int configure_reqs;
int netwm_sync_val_hi;
unsigned int netwm_sync_val_lo;
int sync_val; // bigger! this will screw up at 2 billion fram~
@@ -1669,8 +1668,6 @@ _ecore_evas_x_event_window_configure(void *data EINA_UNUSED, int type EINA_UNUSE
cursor = eina_hash_find(ee->prop.cursors, &pointer);
EINA_SAFETY_ON_NULL_RETURN_VAL(cursor, ECORE_CALLBACK_PASS_ON);
- if (edata->configure_reqs > 0) edata->configure_reqs--;
-
edata->configure_coming = 0;
if ((e->from_wm) || (ee->prop.override))
{
@@ -1704,11 +1701,8 @@ _ecore_evas_x_event_window_configure(void *data EINA_UNUSED, int type EINA_UNUSE
h = e->h;
ee->w = w - fw;
ee->h = h - fh;
- if (edata->configure_reqs == 0)
- {
- ee->req.w = ee->w;
- ee->req.h = ee->h;
- }
+ ee->req.w = ee->w;
+ ee->req.h = ee->h;
if (ECORE_EVAS_PORTRAIT(ee))
{
evas_output_size_set(ee->evas, w, h);
@@ -2150,11 +2144,9 @@ static void
_ecore_evas_x_move(Ecore_Evas *ee, int x, int y)
{
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
- Eina_Bool changed = EINA_FALSE;
if ((ee->req.x != x) || (ee->req.y != y))
{
- changed = EINA_TRUE;
ee->req.x = x;
ee->req.y = y;
}
@@ -2167,7 +2159,6 @@ _ecore_evas_x_move(Ecore_Evas *ee, int x, int y)
{
ee->x = x;
ee->y = y;
- if (changed) edata->configure_reqs++;
ecore_x_window_move(ee->prop.window, x, y);
if (!ee->should_be_visible)
{
@@ -2190,7 +2181,6 @@ _ecore_evas_x_move(Ecore_Evas *ee, int x, int y)
ee->x = x;
ee->y = y;
}
- if (changed) edata->configure_reqs++;
ecore_x_window_move(ee->prop.window, x, y);
}
if (!ee->should_be_visible)
@@ -2260,7 +2250,6 @@ _ecore_evas_x_resize(Ecore_Evas *ee, int w, int h)
{
ee->w = w;
ee->h = h;
- if (changed) edata->configure_reqs++;
if (ee->prop.window) ecore_x_window_resize(ee->prop.window, vw, vh);
if (ECORE_EVAS_PORTRAIT(ee))
{
@@ -2284,10 +2273,10 @@ _ecore_evas_x_resize(Ecore_Evas *ee, int w, int h)
_ecore_evas_x_resize_shape(ee);
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
- else
+ else if (((ee->w != w) || (ee->h != h)) ||
+ (edata->configure_coming))
{
edata->configure_coming = 1;
- if (changed) edata->configure_reqs++;
if (ee->prop.window) ecore_x_window_resize(ee->prop.window, vw, vh);
}
}
@@ -2326,7 +2315,6 @@ _ecore_evas_x_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
{
if ((x != ee->x) || (y != ee->y)) change_pos = 1;
}
- if (changed) edata->configure_reqs++;
ecore_x_window_move_resize(ee->prop.window, x, y, vw, vh);
if (!edata->managed)
{
@@ -2365,12 +2353,12 @@ _ecore_evas_x_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
}
}
}
- else
+ else if (((ee->w != w) || (ee->h != h) || (ee->x != x) || (ee->y != y)) ||
+ (edata->configure_coming))
{
if ((ee->x != x) || (ee->y != y) || (edata->configure_coming))
{
edata->configure_coming = 1;
- if (changed) edata->configure_reqs++;
ecore_x_window_move_resize(ee->prop.window, x, y, vw, vh);
if (!edata->managed)
{
@@ -2382,7 +2370,6 @@ _ecore_evas_x_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
{
if ((!changed) && (ee->w == w) && (ee->h == h)) return;
edata->configure_coming = 1;
- if (changed) edata->configure_reqs++;
if (ee->prop.window) ecore_x_window_resize(ee->prop.window, vw, vh);
}
}