diff options
author | Sung-jae Park <nicesj.park@samsung.com> | 2013-03-21 04:54:47 +0000 |
---|---|---|
committer | Sung-jae Park <nicesj.park@samsung.com> | 2013-03-21 04:54:47 +0000 |
commit | b20f2aab8859ce23869a36868272378e9e0ae674 (patch) | |
tree | 8f580863923b65c6f33748aff5f1b1f2a7f8e57c | |
parent | 459bb902b66f337cbb79c992717dc0ff6a0efb84 (diff) | |
download | data-provider-master-b20f2aab8859ce23869a36868272378e9e0ae674.tar.gz data-provider-master-b20f2aab8859ce23869a36868272378e9e0ae674.tar.bz2 data-provider-master-b20f2aab8859ce23869a36868272378e9e0ae674.zip |
Fix the invalid arrow position handling code.
Issue is followed by reducing IPC patch patch.
Change-Id: I33d1b3e6e8eb58c8e29e4df01998902148ad583d
-rw-r--r-- | packaging/data-provider-master.spec | 2 | ||||
-rw-r--r-- | src/server.c | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index a982b4d..293a6d7 100644 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -1,6 +1,6 @@ Name: data-provider-master Summary: Master service provider for liveboxes. -Version: 0.18.0 +Version: 0.18.1 Release: 1 Group: framework/livebox License: Flora License diff --git a/src/server.c b/src/server.c index 012fd9b..973c61e 100644 --- a/src/server.c +++ b/src/server.c @@ -3937,8 +3937,13 @@ static struct packet *client_pd_move(pid_t pid, int handle, const struct packet "pd,move", util_uri_to_path(instance_id(inst)), 0.0, 0.0, 0.0, 0.0, x, y, 0); } else if (package_pd_type(instance_package(inst)) == PD_TYPE_SCRIPT) { + int ix; + int iy; + instance_slave_set_pd_pos(inst, x, y); - script_handler_update_pointer(instance_pd_script(inst), x, y, 0); + ix = x * instance_pd_width(inst); + iy = y * instance_pd_height(inst); + script_handler_update_pointer(instance_pd_script(inst), ix, iy, 0); ret = instance_signal_emit(inst, "pd,move", util_uri_to_path(instance_id(inst)), 0.0, 0.0, 0.0, 0.0, x, y, 0); @@ -4005,6 +4010,8 @@ static struct packet *client_create_pd(pid_t pid, int handle, const struct packe * instance_client_pd_created(inst); */ } else if (package_pd_type(instance_package(inst)) == PD_TYPE_SCRIPT) { + int ix; + int iy; /*! * \note * ret value should be cared but in this case, @@ -4015,7 +4022,9 @@ static struct packet *client_create_pd(pid_t pid, int handle, const struct packe * so we can hanle it later. */ instance_slave_set_pd_pos(inst, x, y); - script_handler_update_pointer(instance_pd_script(inst), x, y, 0); + ix = x * instance_pd_width(inst); + iy = y * instance_pd_height(inst); + script_handler_update_pointer(instance_pd_script(inst), ix, iy, 0); ret = instance_slave_open_pd(inst, client); ret = script_handler_load(instance_pd_script(inst), 1); |