--- /dev/null
+// provider -> master
+// master -> client
+#define CMD_UPDATED 0x00000001
+#define CMD_LB_UPDATED 0x00000001 // same with UPDATED
+#define CMD_DESC_UPDATED 0x00000101
+#define CMD_PD_UPDATED 0x00000101 // same with DESC_UPDATED
+#define CMD_EXTRA_INFO 0x00000201
+#define CMD_DELETED 0x00000301
+#define CMD_FAULTED 0x00000401
+#define CMD_FAULT_PACKAGE 0x00000401
+#define CMD_SCROLL 0x00000501
+#define CMD_LB_UPDATE_BEGIN 0x00000601
+#define CMD_LB_UPDATE_END 0x00000701
+#define CMD_PD_UPDATE_BEGIN 0x00000801
+#define CMD_PD_UPDATE_END 0x00000901
+#define CMD_ACCESS_STATUS 0x00000A01
+#define CMD_KEY_STATUS 0x00000B01
+#define CMD_CLOSE_PD 0x00000C01
+
+// provider -> master
+// Upper list must be sync'd with client(viewer)'s result event table
+#define CMD_CALL 0x00000D01
+#define CMD_RET 0x00000E01
+#define CMD_ACQUIRE_BUFFER 0x00000F01
+#define CMD_RESIZE_BUFFER 0x00001001
+#define CMD_RELEASE_BUFFER 0x00001101
+#define CMD_HELLO 0x00001201
+#define CMD_PING 0x00001301
+#define CMD_CTRL 0x00001401
+
+// Following list is only for the viewer
+// master -> client
+#define CMD_PD_CREATED 0x00000D01
+#define CMD_PD_DESTROYED 0x00000E01
+#define CMD_CREATED 0x00000F01
+#define CMD_GROUP_CHANGED 0x00001001
+#define CMD_PERIOD_CHANGED 0x00001101
+#define CMD_SIZE_CHANGED 0x00001201
+#define CMD_RESULT_PINUP 0x00001301 // viewer
+#define CMD_RESULT_UPDATE_MODE 0x00001401 // viewer
+
+// Following list should be started after the common list of client_cmd_list
+// master -> provider
+#define CMD_PD_SHOW 0x00003701
+#define CMD_PD_HIDE 0x00003801
+#define CMD_LB_PAUSE 0x00003901
+#define CMD_LB_RESUME 0x00003A01
+#define CMD_SCRIPT 0x00003B01
+#define CMD_RENEW 0x00003C01
+#define CMD_PINUP 0x00003D01
+#define CMD_UPDATE_CONTENT 0x00003E01
+#define CMD_PAUSE 0x00003F01
+#define CMD_RESUME 0x00004001
+#define CMD_DISCONNECT 0x00004101
+
+// Live Info -> master
+#define CMD_INFO_HELLO 0x00000001
+#define CMD_INFO_SLAVE_LIST 0x00000101
+#define CMD_INFO_PKG_LIST 0x00000201
+#define CMD_INFO_INST_LIST 0x00000301
+#define CMD_INFO_SLAVE_CTRL 0x00000401
+#define CMD_INFO_PKG_CTRL 0x00000501
+#define CMD_INFO_MASTER_CTRL 0x00000601
+
+// client -> master
+// master -> provider
+#define CMD_PD_MOUSE_MOVE 0x00000001
+#define CMD_LB_MOUSE_MOVE 0x00000101
+#define CMD_PD_MOUSE_DOWN 0x00000201
+#define CMD_PD_MOUSE_UP 0x00000301
+#define CMD_LB_MOUSE_DOWN 0x00000401
+#define CMD_LB_MOUSE_UP 0x00000501
+#define CMD_PD_MOUSE_ENTER 0x00000601
+#define CMD_PD_MOUSE_LEAVE 0x00000701
+#define CMD_LB_MOUSE_ENTER 0x00000801
+#define CMD_LB_MOUSE_LEAVE 0x00000901
+#define CMD_LB_MOUSE_ON_SCROLL 0x00000A01
+#define CMD_LB_MOUSE_OFF_SCROLL 0x00000B01
+#define CMD_PD_MOUSE_ON_SCROLL 0x00000C01
+#define CMD_PD_MOUSE_OFF_SCROLL 0x00000D01
+#define CMD_LB_MOUSE_ON_HOLD 0x00000E01
+#define CMD_LB_MOUSE_OFF_HOLD 0x00000F01
+#define CMD_PD_MOUSE_ON_HOLD 0x00001001
+#define CMD_PD_MOUSE_OFF_HOLD 0x00001101
+#define CMD_CLICKED 0x00001201
+#define CMD_TEXT_SIGNAL 0x00001301
+#define CMD_DELETE 0x00001401
+#define CMD_RESIZE 0x00001501
+#define CMD_NEW 0x00001601
+#define CMD_SET_PERIOD 0x00001701
+#define CMD_CHANGE_GROUP 0x00001801
+#define CMD_PD_MOVE 0x00001901
+#define CMD_PD_ACCESS_HL 0x00001A01
+#define CMD_PD_ACCESS_ACTIVATE 0x00001B01
+#define CMD_PD_ACCESS_ACTION 0x00001C01
+#define CMD_PD_ACCESS_SCROLL 0x00001D01
+#define CMD_PD_ACCESS_VALUE_CHANGE 0x00001E01
+#define CMD_PD_ACCESS_MOUSE 0x00001F01
+#define CMD_PD_ACCESS_BACK 0x00002001
+#define CMD_PD_ACCESS_OVER 0x00002101
+#define CMD_PD_ACCESS_READ 0x00002201
+#define CMD_PD_ACCESS_ENABLE 0x00002301
+#define CMD_LB_ACCESS_HL 0x00002401
+#define CMD_LB_ACCESS_ACTIVATE 0x00002501
+#define CMD_LB_ACCESS_ACTION 0x00002601
+#define CMD_LB_ACCESS_SCROLL 0x00002701
+#define CMD_LB_ACCESS_VALUE_CHANGE 0x00002801
+#define CMD_LB_ACCESS_MOUSE 0x00002901
+#define CMD_LB_ACCESS_BACK 0x00002A01
+#define CMD_LB_ACCESS_OVER 0x00002B01
+#define CMD_LB_ACCESS_READ 0x00002C01
+#define CMD_LB_ACCESS_ENABLE 0x00002D01
+#define CMD_LB_KEY_DOWN 0x00002E01
+#define CMD_LB_KEY_UP 0x00002F01
+#define CMD_LB_KEY_FOCUS_IN 0x00003001
+#define CMD_LB_KEY_FOCUS_OUT 0x00003101
+#define CMD_PD_KEY_DOWN 0x00003201
+#define CMD_PD_KEY_UP 0x00003301
+#define CMD_PD_KEY_FOCUS_IN 0x00003401
+#define CMD_PD_KEY_FOCUS_OUT 0x00003501
+#define CMD_UPDATE_MODE 0x00003601
+
+// client -> master
+#define CMD_LB_MOUSE_SET 0x00003701
+#define CMD_LB_MOUSE_UNSET 0x00003801
+#define CMD_PD_MOUSE_SET 0x00003901
+#define CMD_PD_MOUSE_UNSET 0x00003A01
+#define CMD_CHANGE_VISIBILITY 0x00003B01
+#define CMD_LB_ACQUIRE_PIXMAP 0x00003C01
+#define CMD_LB_RELEASE_PIXMAP 0x00003D01
+#define CMD_PD_ACQUIRE_PIXMAP 0x00003E01
+#define CMD_PD_RELEASE_PIXMAP 0x00003F01
+#define CMD_ACQUIRE 0x00004001
+#define CMD_RELEASE 0x00004101
+#define CMD_PINUP_CHANGED 0x00004201
+#define CMD_CREATE_PD 0x00004301
+#define CMD_DESTROY_PD 0x00004401
+#define CMD_ACTIVATE_PACKAGE 0x00004501
+#define CMD_SUBSCRIBE 0x00004601
+#define CMD_UNSUBSCRIBE 0x00004701
+#define CMD_DELETE_CLUSTER 0x00004801
+#define CMD_DELETE_CATEGORY 0x00004901
+#define CMD_REFRESH_GROUP 0x00004A01
+#define CMD_UPDATE 0x00004B01
+#define CMD_LB_KEY_SET 0x00004C01
+#define CMD_LB_KEY_UNSET 0x00004D01
+#define CMD_PD_KEY_SET 0x00004E01
+#define CMD_PD_KEY_UNSET 0x00004F01
+#define CMD_CLIENT_PAUSED 0x00005001
+#define CMD_CLIENT_RESUMED 0x00005101
+
+// service -> master
+#define CMD_SERVICE_UPDATE 0x00000001
+#define CMD_SERVICE_CHANGE_PERIOD 0x00000101
+#define CMD_SERVICE_INST_CNT 0x00000201
#include "master_rpc.h"
#include "client.h"
#include "conf.h"
+#include "provider_cmd_list.h"
#define EAPI __attribute__((visibility("default")))
struct packet *packet;
struct cb_info *cbinfo;
const char *id;
+ unsigned int cmd = CMD_LB_ACQUIRE_PIXMAP;
int ret;
id = fb_id(handler->common->dbox.fb);
return DBOX_STATUS_ERROR_INVALID_PARAMETER;
}
- packet = packet_create("lb_acquire_pixmap", "ss", handler->common->pkgname, handler->common->id);
+ packet = packet_create((const char *)&cmd, "ss", handler->common->pkgname, handler->common->id);
if (!packet) {
ErrPrint("Failed to build a param\n");
return DBOX_STATUS_ERROR_FAULT;
{
struct packet *packet;
struct cb_info *cbinfo;
+ unsigned int cmd = CMD_PD_ACQUIRE_PIXMAP;
const char *id;
int ret;
return DBOX_STATUS_ERROR_INVALID_PARAMETER;
}
- packet = packet_create("pd_acquire_pixmap", "ss", handler->common->pkgname, handler->common->id);
+ packet = packet_create((const char *)&cmd, "ss", handler->common->pkgname, handler->common->id);
if (!packet) {
ErrPrint("Failed to build a param\n");
return DBOX_STATUS_ERROR_FAULT;
struct cb_info *cbinfo;
struct packet *packet;
struct dynamicbox_common *common;
+ unsigned int cmd = CMD_NEW;
int ret;
common = handler->common;
- packet = packet_create("new", "dssssdii",
+ packet = packet_create((const char *)&cmd, "dssssdii",
common->timestamp, common->pkgname, common->content,
common->cluster, common->category,
common->dbox.period, common->dbox.width, common->dbox.height);
{
struct packet *packet;
int need_to_add_job = 0;
+ unsigned int cmd = CMD_CHANGE_VISIBILITY;
int ret;
if (handler->common->visible != DBOX_SHOW && state == DBOX_SHOW) {
return DBOX_STATUS_ERROR_NONE;
}
- packet = packet_create_noack("change,visibility", "ssi", handler->common->pkgname, handler->common->id, (int)state);
+ packet = packet_create_noack((const char *)&cmd, "ssi", handler->common->pkgname, handler->common->id, (int)state);
if (!packet) {
ErrPrint("Failed to create a packet\n");
return DBOX_STATUS_ERROR_FAULT;
EAPI int dynamicbox_set_period(struct dynamicbox *handler, double period, dynamicbox_ret_cb_t cb, void *data)
{
struct packet *packet;
+ unsigned int cmd = CMD_SET_PERIOD;
int ret;
if (!handler || handler->state != CREATE) {
return DBOX_STATUS_ERROR_ALREADY;
}
- packet = packet_create("set_period", "ssd", handler->common->pkgname, handler->common->id, period);
+ packet = packet_create((const char *)&cmd, "ssd", handler->common->pkgname, handler->common->id, period);
if (!packet) {
ErrPrint("Failed to build a packet %s\n", handler->common->pkgname);
return DBOX_STATUS_ERROR_FAULT;
EAPI int dynamicbox_set_update_mode(struct dynamicbox *handler, int active_update, dynamicbox_ret_cb_t cb, void *data)
{
struct packet *packet;
+ unsigned int cmd = CMD_UPDATE_MODE;
int ret;
if (!handler || handler->state != CREATE) {
return DBOX_STATUS_ERROR_PERMISSION_DENIED;
}
- packet = packet_create("update_mode", "ssi", handler->common->pkgname, handler->common->id, active_update);
+ packet = packet_create((const char *)&cmd, "ssi", handler->common->pkgname, handler->common->id, active_update);
if (!packet) {
return DBOX_STATUS_ERROR_FAULT;
}
if (handler->common->refcnt <= 1) {
struct packet *packet;
+ unsigned int cmd = CMD_RESIZE;
/* Only 1 instance */
- packet = packet_create("resize", "ssii", handler->common->pkgname, handler->common->id, w, h);
+ packet = packet_create((const char *)&cmd, "ssii", handler->common->pkgname, handler->common->id, w, h);
if (!packet) {
ErrPrint("Failed to build param\n");
return DBOX_STATUS_ERROR_FAULT;
{
struct packet *packet;
double timestamp;
+ unsigned int cmd = CMD_CLICKED;
int ret;
if (!handler || handler->state != CREATE) {
timestamp = util_timestamp();
DbgPrint("CLICKED: %lf\n", timestamp);
- packet = packet_create_noack("clicked", "sssddd", handler->common->pkgname, handler->common->id, "clicked", timestamp, x, y);
+ packet = packet_create_noack((const char *)&cmd, "sssddd", handler->common->pkgname, handler->common->id, "clicked", timestamp, x, y);
if (!packet) {
ErrPrint("Failed to build param\n");
return DBOX_STATUS_ERROR_FAULT;
if (!handler->common->dbox.mouse_event && (handler->common->dbox.type == _DBOX_TYPE_BUFFER || handler->common->dbox.type == _DBOX_TYPE_SCRIPT)) {
int ret; /* Shadow variable */
- ret = send_mouse_event(handler, "lb_mouse_down", x * handler->common->dbox.width, y * handler->common->dbox.height);
+ unsigned int cmd;
+
+ cmd = CMD_LB_MOUSE_DOWN;
+ ret = send_mouse_event(handler, (const char *)&cmd, x * handler->common->dbox.width, y * handler->common->dbox.height);
if (ret < 0) {
ErrPrint("Failed to send Down: %d\n", ret);
}
- ret = send_mouse_event(handler, "lb_mouse_move", x * handler->common->dbox.width, y * handler->common->dbox.height);
+ cmd = CMD_LB_MOUSE_MOVE;
+ ret = send_mouse_event(handler, (const char *)&cmd, x * handler->common->dbox.width, y * handler->common->dbox.height);
if (ret < 0) {
ErrPrint("Failed to send Move: %d\n", ret);
}
- ret = send_mouse_event(handler, "lb_mouse_up", x * handler->common->dbox.width, y * handler->common->dbox.height);
+ cmd = CMD_LB_MOUSE_UP;
+ ret = send_mouse_event(handler, (const char *)&cmd, x * handler->common->dbox.width, y * handler->common->dbox.height);
if (ret < 0) {
ErrPrint("Failed to send Up: %d\n", ret);
}
EAPI int dynamicbox_create_glance_bar(struct dynamicbox *handler, double x, double y, dynamicbox_ret_cb_t cb, void *data)
{
struct packet *packet;
+ unsigned int cmd = CMD_CREATE_PD;
int ret;
if (!handler || handler->state != CREATE) {
}
}
- packet = packet_create("create_pd", "ssdd", handler->common->pkgname, handler->common->id, x, y);
+ packet = packet_create((const char *)&cmd, "ssdd", handler->common->pkgname, handler->common->id, x, y);
if (!packet) {
ErrPrint("Failed to build param\n");
return DBOX_STATUS_ERROR_FAULT;
EAPI int dynamicbox_move_glance_bar(struct dynamicbox *handler, double x, double y)
{
struct packet *packet;
+ unsigned int cmd = CMD_PD_MOVE;
if (!handler || handler->state != CREATE) {
ErrPrint("Handler is invalid\n");
return DBOX_STATUS_ERROR_INVALID_PARAMETER;
}
- packet = packet_create_noack("pd_move", "ssdd", handler->common->pkgname, handler->common->id, x, y);
+ packet = packet_create_noack((const char *)&cmd, "ssdd", handler->common->pkgname, handler->common->id, x, y);
if (!packet) {
ErrPrint("Failed to build param\n");
return DBOX_STATUS_ERROR_FAULT;
{
struct packet *packet;
struct cb_info *cbinfo;
+ unsigned int cmd = CMD_ACTIVATE_PACKAGE;
int ret;
if (!pkgname) {
return DBOX_STATUS_ERROR_INVALID_PARAMETER;
}
- packet = packet_create("activate_package", "s", pkgname);
+ packet = packet_create((const char *)&cmd, "s", pkgname);
if (!packet) {
ErrPrint("Failed to build a param\n");
return DBOX_STATUS_ERROR_FAULT;
{
struct packet *packet;
struct cb_info *cbinfo;
+ unsigned int cmd = CMD_DESTROY_PD;
int ret;
if (!handler || handler->state != CREATE) {
DbgPrint("[%s]\n", handler->common->pkgname);
- packet = packet_create("destroy_pd", "ss", handler->common->pkgname, handler->common->id);
+ packet = packet_create((const char *)&cmd, "ss", handler->common->pkgname, handler->common->id);
if (!packet) {
ErrPrint("Failed to build a param\n");
return DBOX_STATUS_ERROR_FAULT;
{
int w = 1;
int h = 1;
- char cmd[32] = { '\0', };
- char *ptr = cmd;
+ unsigned int cmd;
int ret = 0; /* re-used for sending event type */
if (!handler || handler->state != CREATE) {
ErrPrint("GBAR is not created\n");
return DBOX_STATUS_ERROR_INVALID_PARAMETER;
}
- *ptr++ = 'p';
- *ptr++ = 'd';
+
w = handler->common->gbar.width;
h = handler->common->gbar.height;
+
+ switch (type & ~(DBOX_ACCESS_EVENT_GBAR_MASK | DBOX_ACCESS_EVENT_DBOX_MASK)) {
+ case DBOX_ACCESS_EVENT_HIGHLIGHT:
+ cmd = CMD_PD_ACCESS_HL;
+ ret = (int)info->type;
+ break;
+ case DBOX_ACCESS_EVENT_ACTIVATE:
+ cmd = CMD_PD_ACCESS_ACTIVATE;
+ break;
+ case DBOX_ACCESS_EVENT_ACTION:
+ cmd = CMD_PD_ACCESS_ACTION;
+ ret = (int)info->type;
+ break;
+ case DBOX_ACCESS_EVENT_SCROLL:
+ cmd = CMD_PD_ACCESS_SCROLL;
+ ret = (int)info->type;
+ break;
+ case DBOX_ACCESS_EVENT_VALUE_CHANGE:
+ cmd = CMD_PD_ACCESS_VALUE_CHANGE;
+ break;
+ case DBOX_ACCESS_EVENT_MOUSE:
+ cmd = CMD_PD_ACCESS_MOUSE;
+ ret = (int)info->type;
+ break;
+ case DBOX_ACCESS_EVENT_BACK:
+ cmd = CMD_PD_ACCESS_BACK;
+ break;
+ case DBOX_ACCESS_EVENT_OVER:
+ cmd = CMD_PD_ACCESS_OVER;
+ break;
+ case DBOX_ACCESS_EVENT_READ:
+ cmd = CMD_PD_ACCESS_READ;
+ break;
+ case DBOX_ACCESS_EVENT_ENABLE:
+ cmd = CMD_PD_ACCESS_ENABLE;
+ ret = info->type;
+ break;
+ default:
+ return DBOX_STATUS_ERROR_INVALID_PARAMETER;
+ }
+
} else if (type & DBOX_ACCESS_EVENT_DBOX_MASK) {
- *ptr++ = 'l';
- *ptr++ = 'b';
w = handler->common->dbox.width;
h = handler->common->dbox.height;
+ switch (type & ~(DBOX_ACCESS_EVENT_GBAR_MASK | DBOX_ACCESS_EVENT_DBOX_MASK)) {
+ case DBOX_ACCESS_EVENT_HIGHLIGHT:
+ cmd = CMD_LB_ACCESS_HL;
+ ret = (int)info->type;
+ break;
+ case DBOX_ACCESS_EVENT_ACTIVATE:
+ cmd = CMD_LB_ACCESS_ACTIVATE;
+ break;
+ case DBOX_ACCESS_EVENT_ACTION:
+ cmd = CMD_LB_ACCESS_ACTION;
+ ret = (int)info->type;
+ break;
+ case DBOX_ACCESS_EVENT_SCROLL:
+ cmd = CMD_LB_ACCESS_SCROLL;
+ ret = (int)info->type;
+ break;
+ case DBOX_ACCESS_EVENT_VALUE_CHANGE:
+ cmd = CMD_LB_ACCESS_VALUE_CHANGE;
+ break;
+ case DBOX_ACCESS_EVENT_MOUSE:
+ cmd = CMD_LB_ACCESS_MOUSE;
+ ret = (int)info->type;
+ break;
+ case DBOX_ACCESS_EVENT_BACK:
+ cmd = CMD_LB_ACCESS_BACK;
+ break;
+ case DBOX_ACCESS_EVENT_OVER:
+ cmd = CMD_LB_ACCESS_OVER;
+ break;
+ case DBOX_ACCESS_EVENT_READ:
+ cmd = CMD_LB_ACCESS_READ;
+ break;
+ case DBOX_ACCESS_EVENT_ENABLE:
+ cmd = CMD_LB_ACCESS_ENABLE;
+ ret = info->type;
+ break;
+ default:
+ return DBOX_STATUS_ERROR_INVALID_PARAMETER;
+ }
} else {
ErrPrint("Invalid event type\n");
return DBOX_STATUS_ERROR_INVALID_PARAMETER;
}
- switch (type & ~(DBOX_ACCESS_EVENT_GBAR_MASK | DBOX_ACCESS_EVENT_DBOX_MASK)) {
- case DBOX_ACCESS_EVENT_HIGHLIGHT:
- strcpy(ptr, "_access_hl");
- ret = (int)info->type;
- break;
- case DBOX_ACCESS_EVENT_ACTIVATE:
- strcpy(ptr, "_access_activate");
- break;
- case DBOX_ACCESS_EVENT_ACTION:
- strcpy(ptr, "_access_action");
- ret = (int)info->type;
- break;
- case DBOX_ACCESS_EVENT_SCROLL:
- strcpy(ptr, "_access_scroll");
- ret = (int)info->type;
- break;
- case DBOX_ACCESS_EVENT_VALUE_CHANGE:
- strcpy(ptr, "_access_value_change");
- break;
- case DBOX_ACCESS_EVENT_MOUSE:
- strcpy(ptr, "_access_mouse");
- ret = (int)info->type;
- break;
- case DBOX_ACCESS_EVENT_BACK:
- strcpy(ptr, "_access_back");
- break;
- case DBOX_ACCESS_EVENT_OVER:
- strcpy(ptr, "_access_over");
- break;
- case DBOX_ACCESS_EVENT_READ:
- strcpy(ptr, "_access_read");
- break;
- case DBOX_ACCESS_EVENT_ENABLE:
- strcpy(ptr, "_access_enable");
- ret = info->type;
- break;
- default:
- return DBOX_STATUS_ERROR_INVALID_PARAMETER;
- }
-
if (!cb) {
cb = default_access_event_cb;
}
- ret = send_access_event(handler, cmd, info->x * w, info->y * h, ret);
+ ret = send_access_event(handler, (const char *)&cmd, info->x * w, info->y * h, ret);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
handler->cbs.access_event.cb = cb;
handler->cbs.access_event.data = data;
{
int w = 1;
int h = 1;
- char cmd[32] = { '\0', };
- char *ptr = cmd;
+ unsigned int cmd;
if (!handler || handler->state != CREATE) {
ErrPrint("Handler is invalid\n");
handler->common->gbar.x = info->x;
handler->common->gbar.y = info->y;
}
- *ptr++ = 'p';
- *ptr++ = 'd';
+
+ switch ((type & ~(DBOX_MOUSE_EVENT_GBAR_MASK | DBOX_MOUSE_EVENT_DBOX_MASK))) {
+ case DBOX_MOUSE_EVENT_ENTER | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_PD_MOUSE_ENTER;
+ break;
+ case DBOX_MOUSE_EVENT_LEAVE | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_PD_MOUSE_LEAVE;
+ break;
+ case DBOX_MOUSE_EVENT_UP | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_PD_MOUSE_UP;
+ break;
+ case DBOX_MOUSE_EVENT_DOWN | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_PD_MOUSE_DOWN;
+ break;
+ case DBOX_MOUSE_EVENT_MOVE | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_PD_MOUSE_MOVE;
+ break;
+ case DBOX_MOUSE_EVENT_SET | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_PD_MOUSE_SET;
+ break;
+ case DBOX_MOUSE_EVENT_UNSET | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_PD_MOUSE_UNSET;
+ break;
+ case DBOX_MOUSE_EVENT_ON_SCROLL | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_PD_MOUSE_ON_SCROLL;
+ break;
+ case DBOX_MOUSE_EVENT_ON_HOLD | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_PD_MOUSE_ON_HOLD;
+ break;
+ case DBOX_MOUSE_EVENT_OFF_SCROLL | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_PD_MOUSE_OFF_SCROLL;
+ break;
+ case DBOX_MOUSE_EVENT_OFF_HOLD | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_PD_MOUSE_OFF_HOLD;
+ break;
+ default:
+ ErrPrint("Invalid event type\n");
+ return DBOX_STATUS_ERROR_INVALID_PARAMETER;
+ }
+
} else if (type & DBOX_MOUSE_EVENT_DBOX_MASK) {
int flag = 1;
handler->common->dbox.x = info->x;
handler->common->dbox.y = info->y;
}
- *ptr++ = 'l';
- *ptr++ = 'b';
- } else {
- ErrPrint("Invalid event type\n");
- return DBOX_STATUS_ERROR_INVALID_PARAMETER;
- }
- /*!
- * Must be shorter than 29 bytes.
- */
- switch ((type & ~(DBOX_MOUSE_EVENT_GBAR_MASK | DBOX_MOUSE_EVENT_DBOX_MASK))) {
- case DBOX_MOUSE_EVENT_ENTER | DBOX_MOUSE_EVENT_MASK:
- strcpy(ptr, "_mouse_enter");
- break;
- case DBOX_MOUSE_EVENT_LEAVE | DBOX_MOUSE_EVENT_MASK:
- strcpy(ptr, "_mouse_leave");
- break;
- case DBOX_MOUSE_EVENT_UP | DBOX_MOUSE_EVENT_MASK:
- strcpy(ptr, "_mouse_up");
- break;
- case DBOX_MOUSE_EVENT_DOWN | DBOX_MOUSE_EVENT_MASK:
- strcpy(ptr, "_mouse_down");
- break;
- case DBOX_MOUSE_EVENT_MOVE | DBOX_MOUSE_EVENT_MASK:
- strcpy(ptr, "_mouse_move");
- break;
- case DBOX_MOUSE_EVENT_SET | DBOX_MOUSE_EVENT_MASK:
- strcpy(ptr, "_mouse_set");
- break;
- case DBOX_MOUSE_EVENT_UNSET | DBOX_MOUSE_EVENT_MASK:
- strcpy(ptr, "_mouse_unset");
- break;
- case DBOX_MOUSE_EVENT_ON_SCROLL | DBOX_MOUSE_EVENT_MASK:
- strcpy(ptr, "_mouse_on_scroll");
- break;
- case DBOX_MOUSE_EVENT_ON_HOLD | DBOX_MOUSE_EVENT_MASK:
- strcpy(ptr, "_mouse_on_hold");
- break;
- case DBOX_MOUSE_EVENT_OFF_SCROLL | DBOX_MOUSE_EVENT_MASK:
- strcpy(ptr, "_mouse_off_scroll");
- break;
- case DBOX_MOUSE_EVENT_OFF_HOLD | DBOX_MOUSE_EVENT_MASK:
- strcpy(ptr, "_mouse_off_hold");
- break;
- default:
+ switch ((type & ~(DBOX_MOUSE_EVENT_GBAR_MASK | DBOX_MOUSE_EVENT_DBOX_MASK))) {
+ case DBOX_MOUSE_EVENT_ENTER | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_LB_MOUSE_ENTER;
+ break;
+ case DBOX_MOUSE_EVENT_LEAVE | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_LB_MOUSE_LEAVE;
+ break;
+ case DBOX_MOUSE_EVENT_UP | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_LB_MOUSE_UP;
+ break;
+ case DBOX_MOUSE_EVENT_DOWN | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_LB_MOUSE_DOWN;
+ break;
+ case DBOX_MOUSE_EVENT_MOVE | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_LB_MOUSE_MOVE;
+ break;
+ case DBOX_MOUSE_EVENT_SET | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_LB_MOUSE_SET;
+ break;
+ case DBOX_MOUSE_EVENT_UNSET | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_LB_MOUSE_UNSET;
+ break;
+ case DBOX_MOUSE_EVENT_ON_SCROLL | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_LB_MOUSE_ON_SCROLL;
+ break;
+ case DBOX_MOUSE_EVENT_ON_HOLD | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_LB_MOUSE_ON_HOLD;
+ break;
+ case DBOX_MOUSE_EVENT_OFF_SCROLL | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_LB_MOUSE_OFF_SCROLL;
+ break;
+ case DBOX_MOUSE_EVENT_OFF_HOLD | DBOX_MOUSE_EVENT_MASK:
+ cmd = CMD_MOUSE_OFF_HOLD;
+ break;
+ default:
+ ErrPrint("Invalid event type\n");
+ return DBOX_STATUS_ERROR_INVALID_PARAMETER;
+ }
+ } else {
ErrPrint("Invalid event type\n");
return DBOX_STATUS_ERROR_INVALID_PARAMETER;
}
- return send_mouse_event(handler, cmd, info->x * w, info->y * h);
+ return send_mouse_event(handler, (const char *)&cmd, info->x * w, info->y * h);
}
EAPI int dynamicbox_feed_key_event(struct dynamicbox *handler, enum dynamicbox_key_event_type type, struct dynamicbox_key_event_info *info, dynamicbox_ret_cb_t cb, void *data)
{
- char cmd[32] = { '\0', };
- char *ptr = cmd;
int ret;
+ unsigned int cmd;
if (!handler || handler->state != CREATE) {
ErrPrint("Handler is invalid\n");
*/
}
- *ptr++ = 'p';
- *ptr++ = 'd';
+ /*!
+ * Must be short than 29 bytes.
+ */
+ switch ((type & ~(DBOX_MOUSE_EVENT_GBAR_MASK | DBOX_MOUSE_EVENT_DBOX_MASK))) {
+ case DBOX_KEY_EVENT_FOCUS_IN | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_PD_KEY_FOCUS_IN;
+ break;
+ case DBOX_KEY_EVENT_FOCUS_OUT | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_PD_KEY_FOCUS_OUT;
+ break;
+ case DBOX_KEY_EVENT_UP | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_PD_KEY_UP;
+ break;
+ case DBOX_KEY_EVENT_DOWN | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_PD_KEY_DOWN;
+ break;
+ case DBOX_KEY_EVENT_SET | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_PD_KEY_SET;
+ break;
+ case DBOX_KEY_EVENT_UNSET | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_PD_KEY_UNSET;
+ break;
+ default:
+ ErrPrint("Invalid event type\n");
+ return DBOX_STATUS_ERROR_INVALID_PARAMETER;
+ }
+
} else if (type & DBOX_MOUSE_EVENT_DBOX_MASK) {
if (!handler->common->dbox.mouse_event) {
return DBOX_STATUS_ERROR_INVALID_PARAMETER;
*/
}
- *ptr++ = 'l';
- *ptr++ = 'b';
+ switch ((type & ~(DBOX_MOUSE_EVENT_GBAR_MASK | DBOX_MOUSE_EVENT_DBOX_MASK))) {
+ case DBOX_KEY_EVENT_FOCUS_IN | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_LB_KEY_FOCUS_IN;
+ break;
+ case DBOX_KEY_EVENT_FOCUS_OUT | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_LB_KEY_FOCUS_OUT;
+ break;
+ case DBOX_KEY_EVENT_UP | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_LB_KEY_UP;
+ break;
+ case DBOX_KEY_EVENT_DOWN | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_LB_KEY_DOWN;
+ break;
+ case DBOX_KEY_EVENT_SET | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_LB_KEY_SET;
+ break;
+ case DBOX_KEY_EVENT_UNSET | DBOX_KEY_EVENT_MASK:
+ cmd = CMD_LB_KEY_UNSET;
+ break;
+ default:
+ ErrPrint("Invalid event type\n");
+ return DBOX_STATUS_ERROR_INVALID_PARAMETER;
+ }
} else {
ErrPrint("Invalid event type\n");
return DBOX_STATUS_ERROR_INVALID_PARAMETER;
}
- /*!
- * Must be short than 29 bytes.
- */
- switch ((type & ~(DBOX_MOUSE_EVENT_GBAR_MASK | DBOX_MOUSE_EVENT_DBOX_MASK))) {
- case DBOX_KEY_EVENT_FOCUS_IN | DBOX_KEY_EVENT_MASK:
- strcpy(ptr, "_key_focus_in");
- break;
- case DBOX_KEY_EVENT_FOCUS_OUT | DBOX_KEY_EVENT_MASK:
- strcpy(ptr, "_key_focus_out");
- break;
- case DBOX_KEY_EVENT_UP | DBOX_KEY_EVENT_MASK:
- strcpy(ptr, "_key_up");
- break;
- case DBOX_KEY_EVENT_DOWN | DBOX_KEY_EVENT_MASK:
- strcpy(ptr, "_key_down");
- break;
- case DBOX_KEY_EVENT_SET | DBOX_KEY_EVENT_MASK:
- strcpy(ptr, "_key_set");
- break;
- case DBOX_KEY_EVENT_UNSET | DBOX_KEY_EVENT_MASK:
- strcpy(ptr, "_key_unset");
- break;
- default:
- ErrPrint("Invalid event type\n");
- return DBOX_STATUS_ERROR_INVALID_PARAMETER;
- }
-
if (!cb) {
cb = default_key_event_cb;
}
- ret = send_key_event(handler, cmd, info->keycode);
+ ret = send_key_event(handler, (const char *)&cmd, info->keycode);
if (ret == (int)DBOX_STATUS_ERROR_NONE) {
handler->cbs.key_event.cb = cb;
handler->cbs.key_event.data = data;
EAPI int dynamicbox_set_group(struct dynamicbox *handler, const char *cluster, const char *category, dynamicbox_ret_cb_t cb, void *data)
{
struct packet *packet;
+ unsigned int cmd = CMD_CHANGE_GROUP;
int ret;
if (!handler) {
return DBOX_STATUS_ERROR_ALREADY;
}
- packet = packet_create("change_group", "ssss", handler->common->pkgname, handler->common->id, cluster, category);
+ packet = packet_create((const char *)&cmd, "ssss", handler->common->pkgname, handler->common->id, cluster, category);
if (!packet) {
ErrPrint("Failed to build a param\n");
return DBOX_STATUS_ERROR_FAULT;
{
struct packet *packet;
struct cb_info *cbinfo;
+ unsigned int cmd = CMD_DELETE_CLUSTER;
int ret;
- packet = packet_create("delete_cluster", "s", cluster);
+ packet = packet_create((const char *)&cmd, "s", cluster);
if (!packet) {
ErrPrint("Failed to build a param\n");
return DBOX_STATUS_ERROR_FAULT;
{
struct packet *packet;
struct cb_info *cbinfo;
+ unsigned int cmd = CMD_DELETE_CATEGORY;
int ret;
- packet = packet_create("delete_category", "ss", cluster, category);
+ packet = packet_create((const char *)&cmd, "ss", cluster, category);
if (!packet) {
ErrPrint("Failed to build a param\n");
return DBOX_STATUS_ERROR_FAULT;
struct packet *packet;
const char *pkgname;
const char *id;
- const char *cmd;
+ unsigned int cmd;
if (resource_id == 0 /* || handler->state != CREATE */) {
ErrPrint("Pixmap is invalid [%d]\n", resource_id);
id = handler->common->id;
}
- cmd = "pd_release_pixmap";
+ cmd = CMD_PD_RELEASE_PIXMAP;
} else {
if (!handler) {
/*!
id = handler->common->id;
}
- cmd = "lb_release_pixmap";
+ cmd = CMD_LB_RELEASE_PIXMAP;
}
- packet = packet_create_noack(cmd, "ssi", pkgname, id, resource_id);
+ packet = packet_create_noack((const char *)&cmd, "ssi", pkgname, id, resource_id);
if (!packet) {
ErrPrint("Failed to build a param\n");
return DBOX_STATUS_ERROR_FAULT;
EAPI int dynamicbox_set_pinup(struct dynamicbox *handler, int flag, dynamicbox_ret_cb_t cb, void *data)
{
struct packet *packet;
+ unsigned int cmd = CMD_PINUP_CHANGED;
int ret;
if (!handler || handler->state != CREATE) {
return DBOX_STATUS_ERROR_ALREADY;
}
- packet = packet_create("pinup_changed", "ssi", handler->common->pkgname, handler->common->id, flag);
+ packet = packet_create((const char *)&cmd, "ssi", handler->common->pkgname, handler->common->id, flag);
if (!packet) {
ErrPrint("Failed to build a param\n");
return DBOX_STATUS_ERROR_FAULT;
{
struct packet *packet;
struct cb_info *cbinfo;
+ unsigned int cmd = CMD_TEXT_SIGNAL;
int ret;
if (!handler || handler->state != CREATE) {
source = "";
}
- packet = packet_create("text_signal", "ssssdddd",
+ packet = packet_create((const char *)&cmd, "ssssdddd",
handler->common->pkgname, handler->common->id, emission, source, sx, sy, ex, ey);
if (!packet) {
ErrPrint("Failed to build a param\n");
EAPI int dynamicbox_subscribe_group(const char *cluster, const char *category)
{
struct packet *packet;
+ unsigned int cmd = CMD_SUBSCRIBE;
/*!
* \todo
* If the group info is not valid, do not send this request
*/
- packet = packet_create_noack("subscribe", "ss", cluster ? cluster : "", category ? category : "");
+ packet = packet_create_noack((const char *)&cmd, "ss", cluster ? cluster : "", category ? category : "");
if (!packet) {
ErrPrint("Failed to create a packet\n");
return DBOX_STATUS_ERROR_FAULT;
EAPI int dynamicbox_unsubscribe_group(const char *cluster, const char *category)
{
struct packet *packet;
+ unsigned int cmd = CMD_UNSUBSCRIBE;
/*!
* \todo
* AND Check the subscribed or not too
*/
- packet = packet_create_noack("unsubscribe", "ss", cluster ? cluster : "", category ? category : "");
+ packet = packet_create_noack((const char *)&cmd, "ss", cluster ? cluster : "", category ? category : "");
if (!packet) {
ErrPrint("Failed to create a packet\n");
return DBOX_STATUS_ERROR_FAULT;
EAPI int dynamicbox_refresh(struct dynamicbox *handler, int force)
{
struct packet *packet;
+ unsigned int cmd = CMD_UPDATE;
if (!handler || handler->state != CREATE) {
ErrPrint("Handler is invalid\n");
return DBOX_STATUS_ERROR_INVALID_PARAMETER;
}
- packet = packet_create_noack("update", "ssi", handler->common->pkgname, handler->common->id, force);
+ packet = packet_create_noack((const char *)&cmd, "ssi", handler->common->pkgname, handler->common->id, force);
if (!packet) {
ErrPrint("Failed to create a packet\n");
return DBOX_STATUS_ERROR_FAULT;
EAPI int dynamicbox_refresh_group(const char *cluster, const char *category, int force)
{
struct packet *packet;
+ unsigned int cmd = CMD_REFRESH_GROUP;
if (!cluster || !category) {
ErrPrint("Invalid argument\n");
return DBOX_STATUS_ERROR_INVALID_PARAMETER;
}
- packet = packet_create_noack("refresh_group", "ssi", cluster, category, force);
+ packet = packet_create_noack((const char *)&cmd, "ssi", cluster, category, force);
if (!packet) {
ErrPrint("Failed to create a packet\n");
return DBOX_STATUS_ERROR_FAULT;
EAPI int dynamicbox_viewer_set_paused(void)
{
struct packet *packet;
+ unsigned int cmd = CMD_CLIENT_PAUSED;
- packet = packet_create_noack("client_paused", "d", util_timestamp());
+ packet = packet_create_noack((const char *)&cmd, "d", util_timestamp());
if (!packet) {
ErrPrint("Failed to create a pause packet\n");
return DBOX_STATUS_ERROR_FAULT;
EAPI int dynamicbox_viewer_set_resumed(void)
{
struct packet *packet;
+ unsigned int cmd = CMD_CLIENT_RESUMED;
- packet = packet_create_noack("client_resumed", "d", util_timestamp());
+ packet = packet_create_noack((const char *)&cmd, "d", util_timestamp());
if (!packet) {
ErrPrint("Failed to create a resume packet\n");
return DBOX_STATUS_ERROR_FAULT;