From a32308d4e8d8b2c5c3c0de65f0ef213a34f2f886 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Mon, 23 Jul 2012 14:04:17 +0000 Subject: [PATCH] Ecore_wayland: Fix calls to update_modifier state and pass the proper paramaters. Only set input & opaque regions during resize. SVN revision: 74325 --- .../src/lib/ecore_wayland/ecore_wl_input.c | 1 + .../src/lib/ecore_wayland/ecore_wl_window.c | 28 +++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c index 0c5036eacd..679854f42d 100644 --- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c +++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c @@ -252,6 +252,7 @@ _ecore_wl_input_del(Ecore_Wl_Input *input) input->selection_source = NULL; if (input->data_device) wl_data_device_destroy(input->data_device); + if (input->xkb.state) xkb_state_unref(input->xkb.state); if (input->xkb.keymap) diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c index f642aece25..5cdf010a27 100644 --- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c +++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_window.c @@ -356,21 +356,21 @@ ecore_wl_window_show(Ecore_Wl_Window *win) break; } - if (win->type != ECORE_WL_WINDOW_TYPE_FULLSCREEN) - { - win->region.input = - wl_compositor_create_region(_ecore_wl_disp->wl.compositor); - wl_region_add(win->region.input, win->allocation.x, win->allocation.y, - win->allocation.w, win->allocation.h); - } + /* if (win->type != ECORE_WL_WINDOW_TYPE_FULLSCREEN) */ + /* { */ + /* win->region.input = */ + /* wl_compositor_create_region(_ecore_wl_disp->wl.compositor); */ + /* wl_region_add(win->region.input, win->allocation.x, win->allocation.y, */ + /* win->allocation.w, win->allocation.h); */ + /* } */ - if (!win->transparent) - { - win->region.opaque = - wl_compositor_create_region(_ecore_wl_disp->wl.compositor); - wl_region_add(win->region.opaque, win->allocation.x, win->allocation.y, - win->allocation.w, win->allocation.h); - } + /* if (!win->transparent) */ + /* { */ + /* win->region.opaque = */ + /* wl_compositor_create_region(_ecore_wl_disp->wl.compositor); */ + /* wl_region_add(win->region.opaque, win->allocation.x, win->allocation.y, */ + /* win->allocation.w, win->allocation.h); */ + /* } */ } /**