mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

editor: Add missing touch-to-activate for the entries

Browse Source 
Closes: https://bugs.freedesktop.org/show_bug.cgi?id=72996
This commit is contained in:
Kristian Høgsberg 2014-01-07 10:41:50 -08:00
parent 917711bd59
commit 966e3ed247
1 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
clients/editor.c
View File

@ -115,6 +115,9 @@ static void text_entry_button_handler(struct widget *widget,
struct input *input, uint32_t time,
uint32_t button,
enum wl_pointer_button_state state, void *data);
static void text_entry_touch_handler(struct widget *widget, struct input *input,
uint32_t serial, uint32_t time, int32_t id,
float tx, float ty, void *data);
static int text_entry_motion_handler(struct widget *widget,
struct input *input, uint32_t time,
float x, float y, void *data);
@ -516,6 +519,7 @@ text_entry_create(struct editor *editor, const char *text)
widget_set_redraw_handler(entry->widget, text_entry_redraw_handler);
widget_set_button_handler(entry->widget, text_entry_button_handler);
widget_set_motion_handler(entry->widget, text_entry_motion_handler);
widget_set_touch_down_handler(entry->widget, text_entry_touch_handler);
return entry;
}
@ -1077,6 +1081,29 @@ text_entry_button_handler(struct widget *widget,
}
}
static void
text_entry_touch_handler(struct widget *widget, struct input *input,
uint32_t serial, uint32_t time, int32_t id,
float tx, float ty, void *data)
{
struct text_entry *entry = data;
struct wl_seat *seat = input_get_seat(input);
struct rectangle allocation;
struct editor *editor;
int32_t x, y;
widget_get_allocation(entry->widget, &allocation);
x = tx - (allocation.x + text_offset_left);
y = ty - (allocation.y + text_offset_left);
editor = window_get_user_data(entry->window);
text_entry_activate(entry, seat);
editor->active_entry = entry;
text_entry_set_cursor_position(entry, x, y, true);
}
static void
editor_button_handler(struct widget *widget,
struct input *input, uint32_t time,
@ -1098,6 +1125,19 @@ editor_button_handler(struct widget *widget,
}
}
static void
editor_touch_handler(struct widget *widget, struct input *input,
uint32_t serial, uint32_t time, int32_t id,
float tx, float ty, void *data)
{
struct editor *editor = data;
struct wl_seat *seat = input_get_seat(input);
text_entry_deactivate(editor->entry, seat);
text_entry_deactivate(editor->editor, seat);
editor->active_entry = NULL;
}
static void
keyboard_focus_handler(struct window *window,
@ -1250,6 +1290,7 @@ main(int argc, char *argv[])
widget_set_redraw_handler(editor.widget, redraw_handler);
widget_set_resize_handler(editor.widget, resize_handler);
widget_set_button_handler(editor.widget, editor_button_handler);
widget_set_touch_down_handler(editor.widget, editor_touch_handler);
window_schedule_resize(editor.window, 500, 400);