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

Convert text cursor position protocol to use fixed types.

Browse Source
This commit is contained in:
Scott Moreau 2012-06-01 12:46:09 -06:00 committed by Kristian Høgsberg
parent bbf63bf92c
commit ae71220fc9
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/window.c
View File

@ -2701,7 +2701,9 @@ window_set_text_cursor_position(struct window *window, int32_t x, int32_t y)
return;
text_cursor_position_notify(text_cursor_position,
window->surface, x, y);
window->surface,
wl_fixed_from_int(x),
wl_fixed_from_int(y));
window->send_cursor_position = 0;
}

4
protocol/text-cursor-position.xml
View File

@ -3,8 +3,8 @@
<interface name="text_cursor_position" version="1">
<request name="notify">
<arg name="surface" type="object" interface="wl_surface"/>
<arg name="x" type="uint"/>
<arg name="y" type="uint"/>
<arg name="x" type="fixed"/>
<arg name="y" type="fixed"/>
</request>
</interface>

18
src/compositor.c
View File

@ -2739,23 +2739,23 @@ weston_output_destroy(struct weston_output *output)
WL_EXPORT void
weston_text_cursor_position_notify(struct weston_surface *surface,
int32_t cur_pos_x,
int32_t cur_pos_y)
wl_fixed_t cur_pos_x,
wl_fixed_t cur_pos_y)
{
struct weston_output *output;
int32_t global_x, global_y;
wl_fixed_t global_x, global_y;
weston_surface_to_global(surface, cur_pos_x, cur_pos_y,
weston_surface_to_global_fixed(surface, cur_pos_x, cur_pos_y,
&global_x, &global_y);
wl_list_for_each(output, &surface->compositor->output_list, link)
if (output->zoom.active &&
pixman_region32_contains_point(&output->region,
global_x, global_y, NULL))
weston_output_update_zoom(output,
wl_fixed_from_int(global_x),
wl_fixed_from_int(global_y),
ZOOM_TEXT_CURSOR);
wl_fixed_to_int(global_x),
wl_fixed_to_int(global_y),
NULL))
weston_output_update_zoom(output, global_x, global_y,
ZOOM_TEXT_CURSOR);
}
WL_EXPORT void

8
src/compositor.h
View File

@ -631,10 +631,12 @@ weston_compositor_init(struct weston_compositor *ec, struct wl_display *display,
void
weston_compositor_shutdown(struct weston_compositor *ec);
void
weston_output_update_zoom(struct weston_output *output,
int x, int y, uint32_t type);
weston_text_cursor_position_notify(struct weston_surface *surface,
wl_fixed_t x, wl_fixed_t y);
void
weston_text_cursor_position_notify(struct weston_surface *surface, int x, int y);
weston_output_update_zoom(struct weston_output *output,
wl_fixed_t x, wl_fixed_t y,
uint32_t type);
void
weston_output_update_matrix(struct weston_output *output);
void

2
src/text-cursor-position.c
View File

@ -37,7 +37,7 @@ static void
text_cursor_position_notify(struct wl_client *client,
struct wl_resource *resource,
struct wl_resource *surface_resource,
uint32_t x, uint32_t y)
wl_fixed_t x, wl_fixed_t y)
{
weston_text_cursor_position_notify((struct weston_surface *) surface_resource, x, y);
}