system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-09 04:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

cairo-util: return theme location from frame_touch_down

Browse Source 
I'll be using this in a follow up patch that adds touch input to weston's
wayland backend.

Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Derek Foreman 2015-11-06 15:56:07 -06:00
parent 3375ccaa27
commit 9690641bfc
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/cairo-util.h
View File

@ -210,7 +210,7 @@ enum theme_location
frame_pointer_button(struct frame *frame, void *pointer,
uint32_t button, enum frame_button_state state);
void
enum theme_location
frame_touch_down(struct frame *frame, void *data, int32_t id, int x, int y);
void

21
shared/frame.c
View File

@ -786,27 +786,27 @@ frame_pointer_button(struct frame *frame, void *data,
return location;
}
void
enum theme_location
frame_touch_down(struct frame *frame, void *data, int32_t id, int x, int y)
{
struct frame_touch *touch = frame_touch_get(frame, data);
struct frame_button *button = frame_find_button(frame, x, y);
enum theme_location location;
if (id > 0)
return;
if (touch && button) {
touch->button = button;
frame_button_press(touch->button);
return;
}
location = theme_get_location(frame->theme, x, y,
frame->width, frame->height,
frame->flags & FRAME_FLAG_MAXIMIZED ?
THEME_FRAME_MAXIMIZED : 0);
if (id > 0)
return location;
if (touch && button) {
touch->button = button;
frame_button_press(touch->button);
return location;
}
switch (location) {
case THEME_LOCATION_TITLEBAR:
frame->status |= FRAME_STATUS_MOVE;
@ -824,6 +824,7 @@ frame_touch_down(struct frame *frame, void *data, int32_t id, int x, int y)
default:
break;
}
return location;
}
void