diff options
| author | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2015-03-23 17:02:16 +0100 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2015-03-23 17:02:16 +0100 |
| commit | 15a44961f3d4285537c4c210176138b4e0368ba1 (patch) | |
| tree | 90f9611adebbf6c1066ce2b44dcc8a6f2b160108 | |
| parent | d32942db24a02debf5a4b026ba82609cef4fe3b6 (diff) | |
| download | weston-common-15a44961f3d4285537c4c210176138b4e0368ba1.tar.gz weston-common-15a44961f3d4285537c4c210176138b4e0368ba1.tar.bz2 weston-common-15a44961f3d4285537c4c210176138b4e0368ba1.zip | |
tz-launcher: fix abort() in toytoolkit due to timerfd errors on tooltipssubmit/tizen_common/20150324.074131submit/tizen_3.0.2015.q1_common/20150324.075322accepted/tizen/common/20150324.075255accepted/tizen/3.0.2015.q1/common/20150324.075413tizen_3.0.2015.q1_commonaccepted/tizen_3.0.2015.q1_common
Change-Id: I62b99cd108eef2d29e88df623cfbe94d92cbd3a4
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
| -rw-r--r-- | src/toytoolkit/window.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/toytoolkit/window.c b/src/toytoolkit/window.c index 5b5dc0b..3a1a7f5 100644 --- a/src/toytoolkit/window.c +++ b/src/toytoolkit/window.c @@ -1491,7 +1491,7 @@ window_destroy(struct window *window) wl_list_remove(&window->redraw_task.link); - wl_list_for_each(input, &display->input_list, link) { + wl_list_for_each(input, &display->input_list, link) { if (input->touch_focus == window) input->touch_focus = NULL; if (input->pointer_focus == window) @@ -2025,8 +2025,9 @@ tooltip_func(struct task *task, uint32_t events) uint64_t exp; if (read(tooltip->tooltip_fd, &exp, sizeof (uint64_t)) != sizeof (uint64_t)) - abort(); - window_create_tooltip(tooltip); + fprintf(stderr, "bad read from tooltip_fd %d\n",tooltip->tooltip_fd); + else + window_create_tooltip(tooltip); } #define TOOLTIP_TIMEOUT 500 @@ -3007,7 +3008,7 @@ touch_handle_down(void *data, struct wl_touch *wl_touch, wl_list_insert(&input->touch_point_list, &tp->link); if (widget->touch_down_handler) - (*widget->touch_down_handler)(widget, input, + (*widget->touch_down_handler)(widget, input, serial, time, id, sx, sy, widget->user_data); @@ -3088,7 +3089,7 @@ touch_handle_frame(void *data, struct wl_touch *wl_touch) wl_list_for_each_safe(tp, tmp, &input->touch_point_list, link) { if (tp->widget->touch_frame_handler) - (*tp->widget->touch_frame_handler)(tp->widget, input, + (*tp->widget->touch_frame_handler)(tp->widget, input, tp->widget->user_data); } } |