From: Sung-jae Park Date: Wed, 3 Sep 2014 15:22:40 +0000 (+0900) Subject: Fix build error X-Git-Tag: submit/tizen_mobile/20150527.071719~1^2~30^2~15^2~47 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=889740c7bded29317a8d461cadf883876389224a;p=platform%2Fcore%2Fappfw%2Fwidget-viewer.git Fix build error [model] Redwood,Kiran,B3(Wearable) [binary_type] AP [customer] Docomo/Orange/ATT/Open [issue#] N/A [problem] [cause] [solution] [team] HomeTF [request] [horizontal_expansion] Change-Id: I0e52e55b4bb6b5cda2275ed3024163f33dc42b98 --- diff --git a/include/provider_cmd_list.h b/include/provider_cmd_list.h index 91e5771..9c0d594 100644 --- a/include/provider_cmd_list.h +++ b/include/provider_cmd_list.h @@ -1,21 +1,21 @@ // provider -> master // master -> client #define CMD_UPDATED 0x00000001 -#define CMD_LB_UPDATED 0x00000001 // same with UPDATED +#define CMD_DBOX_UPDATED 0x00000001 // same with UPDATED #define CMD_DESC_UPDATED 0x00000101 -#define CMD_PD_UPDATED 0x00000101 // same with DESC_UPDATED +#define CMD_GBAR_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_DBOX_UPDATE_BEGIN 0x00000601 +#define CMD_DBOX_UPDATE_END 0x00000701 +#define CMD_GBAR_UPDATE_BEGIN 0x00000801 +#define CMD_GBAR_UPDATE_END 0x00000901 #define CMD_ACCESS_STATUS 0x00000A01 #define CMD_KEY_STATUS 0x00000B01 -#define CMD_CLOSE_PD 0x00000C01 +#define CMD_CLOSE_GBAR 0x00000C01 // provider -> master // Upper list must be sync'd with client(viewer)'s result event table @@ -30,8 +30,8 @@ // Following list is only for the viewer // master -> client -#define CMD_PD_CREATED 0x00000D01 -#define CMD_PD_DESTROYED 0x00000E01 +#define CMD_GBAR_CREATED 0x00000D01 +#define CMD_GBAR_DESTROYED 0x00000E01 #define CMD_CREATED 0x00000F01 #define CMD_GROUP_CHANGED 0x00001001 #define CMD_PERIOD_CHANGED 0x00001101 @@ -41,10 +41,10 @@ // 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_GBAR_SHOW 0x00003701 +#define CMD_GBAR_HIDE 0x00003801 +#define CMD_DBOX_PAUSE 0x00003901 +#define CMD_DBOX_RESUME 0x00003A01 #define CMD_SCRIPT 0x00003B01 #define CMD_RENEW 0x00003C01 #define CMD_PINUP 0x00003D01 @@ -64,24 +64,24 @@ // 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_GBAR_MOUSE_MOVE 0x00000001 +#define CMD_DBOX_MOUSE_MOVE 0x00000101 +#define CMD_GBAR_MOUSE_DOWN 0x00000201 +#define CMD_GBAR_MOUSE_UP 0x00000301 +#define CMD_DBOX_MOUSE_DOWN 0x00000401 +#define CMD_DBOX_MOUSE_UP 0x00000501 +#define CMD_GBAR_MOUSE_ENTER 0x00000601 +#define CMD_GBAR_MOUSE_LEAVE 0x00000701 +#define CMD_DBOX_MOUSE_ENTER 0x00000801 +#define CMD_DBOX_MOUSE_LEAVE 0x00000901 +#define CMD_DBOX_MOUSE_ON_SCROLL 0x00000A01 +#define CMD_DBOX_MOUSE_OFF_SCROLL 0x00000B01 +#define CMD_GBAR_MOUSE_ON_SCROLL 0x00000C01 +#define CMD_GBAR_MOUSE_OFF_SCROLL 0x00000D01 +#define CMD_DBOX_MOUSE_ON_HOLD 0x00000E01 +#define CMD_DBOX_MOUSE_OFF_HOLD 0x00000F01 +#define CMD_GBAR_MOUSE_ON_HOLD 0x00001001 +#define CMD_GBAR_MOUSE_OFF_HOLD 0x00001101 #define CMD_CLICKED 0x00001201 #define CMD_TEXT_SIGNAL 0x00001301 #define CMD_DELETE 0x00001401 @@ -89,52 +89,52 @@ #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_GBAR_MOVE 0x00001901 +#define CMD_GBAR_ACCESS_HL 0x00001A01 +#define CMD_GBAR_ACCESS_ACTIVATE 0x00001B01 +#define CMD_GBAR_ACCESS_ACTION 0x00001C01 +#define CMD_GBAR_ACCESS_SCROLL 0x00001D01 +#define CMD_GBAR_ACCESS_VALUE_CHANGE 0x00001E01 +#define CMD_GBAR_ACCESS_MOUSE 0x00001F01 +#define CMD_GBAR_ACCESS_BACK 0x00002001 +#define CMD_GBAR_ACCESS_OVER 0x00002101 +#define CMD_GBAR_ACCESS_READ 0x00002201 +#define CMD_GBAR_ACCESS_ENABLE 0x00002301 +#define CMD_DBOX_ACCESS_HL 0x00002401 +#define CMD_DBOX_ACCESS_ACTIVATE 0x00002501 +#define CMD_DBOX_ACCESS_ACTION 0x00002601 +#define CMD_DBOX_ACCESS_SCROLL 0x00002701 +#define CMD_DBOX_ACCESS_VALUE_CHANGE 0x00002801 +#define CMD_DBOX_ACCESS_MOUSE 0x00002901 +#define CMD_DBOX_ACCESS_BACK 0x00002A01 +#define CMD_DBOX_ACCESS_OVER 0x00002B01 +#define CMD_DBOX_ACCESS_READ 0x00002C01 +#define CMD_DBOX_ACCESS_ENABLE 0x00002D01 +#define CMD_DBOX_KEY_DOWN 0x00002E01 +#define CMD_DBOX_KEY_UP 0x00002F01 +#define CMD_DBOX_KEY_FOCUS_IN 0x00003001 +#define CMD_DBOX_KEY_FOCUS_OUT 0x00003101 +#define CMD_GBAR_KEY_DOWN 0x00003201 +#define CMD_GBAR_KEY_UP 0x00003301 +#define CMD_GBAR_KEY_FOCUS_IN 0x00003401 +#define CMD_GBAR_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_DBOX_MOUSE_SET 0x00003701 +#define CMD_DBOX_MOUSE_UNSET 0x00003801 +#define CMD_GBAR_MOUSE_SET 0x00003901 +#define CMD_GBAR_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_DBOX_ACQUIRE_PIXMAP 0x00003C01 +#define CMD_DBOX_RELEASE_PIXMAP 0x00003D01 +#define CMD_GBAR_ACQUIRE_PIXMAP 0x00003E01 +#define CMD_GBAR_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_CREATE_GBAR 0x00004301 +#define CMD_DESTROY_GBAR 0x00004401 #define CMD_ACTIVATE_PACKAGE 0x00004501 #define CMD_SUBSCRIBE 0x00004601 #define CMD_UNSUBSCRIBE 0x00004701 @@ -142,10 +142,10 @@ #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_DBOX_KEY_SET 0x00004C01 +#define CMD_DBOX_KEY_UNSET 0x00004D01 +#define CMD_GBAR_KEY_SET 0x00004E01 +#define CMD_GBAR_KEY_UNSET 0x00004F01 #define CMD_CLIENT_PAUSED 0x00005001 #define CMD_CLIENT_RESUMED 0x00005101 diff --git a/src/client.c b/src/client.c index 4a0c968..268152e 100644 --- a/src/client.c +++ b/src/client.c @@ -1766,11 +1766,11 @@ static int disconnected_cb(int handle, void *data) static struct method s_direct_table[] = { { .cmd = "lb_updated", /* pkgname, id, lb_w, lb_h, priority, ret */ - .handler = master_lb_updated, + .handler = master_dbox_updated, }, { .cmd = "pd_updated", /* pkgname, id, descfile, pd_w, pd_h, ret */ - .handler = master_pd_updated, + .handler = master_gbar_updated, }, { .cmd = NULL, diff --git a/src/dynamicbox.c b/src/dynamicbox.c index 8a5a453..ce1de33 100644 --- a/src/dynamicbox.c +++ b/src/dynamicbox.c @@ -449,7 +449,7 @@ static int dbox_acquire_dbox_pixmap(struct dynamicbox *handler, dynamicbox_ret_c struct packet *packet; struct cb_info *cbinfo; const char *id; - unsigned int cmd = CMD_LB_ACQUIRE_PIXMAP; + unsigned int cmd = CMD_DBOX_ACQUIRE_PIXMAP; int ret; id = fb_id(handler->common->dbox.fb); @@ -517,7 +517,7 @@ static int dbox_acquire_gbar_pixmap(struct dynamicbox *handler, dynamicbox_ret_c { struct packet *packet; struct cb_info *cbinfo; - unsigned int cmd = CMD_PD_ACQUIRE_PIXMAP; + unsigned int cmd = CMD_GBAR_ACQUIRE_PIXMAP; const char *id; int ret; @@ -1721,19 +1721,19 @@ EAPI int dynamicbox_click(struct dynamicbox *handler, double x, double y) int ret; /* Shadow variable */ unsigned int cmd; - cmd = CMD_LB_MOUSE_DOWN; + cmd = CMD_DBOX_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); } - cmd = CMD_LB_MOUSE_MOVE; + cmd = CMD_DBOX_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); } - cmd = CMD_LB_MOUSE_UP; + cmd = CMD_DBOX_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); @@ -1786,7 +1786,7 @@ EAPI int dynamicbox_glance_bar_is_created(struct dynamicbox *handler) 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; + unsigned int cmd = CMD_CREATE_GBAR; int ret; if (!handler || handler->state != CREATE) { @@ -1852,7 +1852,7 @@ EAPI int dynamicbox_create_glance_bar(struct dynamicbox *handler, double x, doub EAPI int dynamicbox_move_glance_bar(struct dynamicbox *handler, double x, double y) { struct packet *packet; - unsigned int cmd = CMD_PD_MOVE; + unsigned int cmd = CMD_GBAR_MOVE; if (!handler || handler->state != CREATE) { ErrPrint("Handler is invalid\n"); @@ -1919,7 +1919,7 @@ EAPI int dynamicbox_destroy_glance_bar(struct dynamicbox *handler, dynamicbox_re { struct packet *packet; struct cb_info *cbinfo; - unsigned int cmd = CMD_DESTROY_PD; + unsigned int cmd = CMD_DESTROY_GBAR; int ret; if (!handler || handler->state != CREATE) { @@ -2029,38 +2029,38 @@ EAPI int dynamicbox_feed_access_event(struct dynamicbox *handler, enum dynamicbo switch (type & ~(DBOX_ACCESS_EVENT_GBAR_MASK | DBOX_ACCESS_EVENT_DBOX_MASK)) { case DBOX_ACCESS_EVENT_HIGHLIGHT: - cmd = CMD_PD_ACCESS_HL; + cmd = CMD_GBAR_ACCESS_HL; ret = (int)info->type; break; case DBOX_ACCESS_EVENT_ACTIVATE: - cmd = CMD_PD_ACCESS_ACTIVATE; + cmd = CMD_GBAR_ACCESS_ACTIVATE; break; case DBOX_ACCESS_EVENT_ACTION: - cmd = CMD_PD_ACCESS_ACTION; + cmd = CMD_GBAR_ACCESS_ACTION; ret = (int)info->type; break; case DBOX_ACCESS_EVENT_SCROLL: - cmd = CMD_PD_ACCESS_SCROLL; + cmd = CMD_GBAR_ACCESS_SCROLL; ret = (int)info->type; break; case DBOX_ACCESS_EVENT_VALUE_CHANGE: - cmd = CMD_PD_ACCESS_VALUE_CHANGE; + cmd = CMD_GBAR_ACCESS_VALUE_CHANGE; break; case DBOX_ACCESS_EVENT_MOUSE: - cmd = CMD_PD_ACCESS_MOUSE; + cmd = CMD_GBAR_ACCESS_MOUSE; ret = (int)info->type; break; case DBOX_ACCESS_EVENT_BACK: - cmd = CMD_PD_ACCESS_BACK; + cmd = CMD_GBAR_ACCESS_BACK; break; case DBOX_ACCESS_EVENT_OVER: - cmd = CMD_PD_ACCESS_OVER; + cmd = CMD_GBAR_ACCESS_OVER; break; case DBOX_ACCESS_EVENT_READ: - cmd = CMD_PD_ACCESS_READ; + cmd = CMD_GBAR_ACCESS_READ; break; case DBOX_ACCESS_EVENT_ENABLE: - cmd = CMD_PD_ACCESS_ENABLE; + cmd = CMD_GBAR_ACCESS_ENABLE; ret = info->type; break; default: @@ -2072,38 +2072,38 @@ EAPI int dynamicbox_feed_access_event(struct dynamicbox *handler, enum dynamicbo 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; + cmd = CMD_DBOX_ACCESS_HL; ret = (int)info->type; break; case DBOX_ACCESS_EVENT_ACTIVATE: - cmd = CMD_LB_ACCESS_ACTIVATE; + cmd = CMD_DBOX_ACCESS_ACTIVATE; break; case DBOX_ACCESS_EVENT_ACTION: - cmd = CMD_LB_ACCESS_ACTION; + cmd = CMD_DBOX_ACCESS_ACTION; ret = (int)info->type; break; case DBOX_ACCESS_EVENT_SCROLL: - cmd = CMD_LB_ACCESS_SCROLL; + cmd = CMD_DBOX_ACCESS_SCROLL; ret = (int)info->type; break; case DBOX_ACCESS_EVENT_VALUE_CHANGE: - cmd = CMD_LB_ACCESS_VALUE_CHANGE; + cmd = CMD_DBOX_ACCESS_VALUE_CHANGE; break; case DBOX_ACCESS_EVENT_MOUSE: - cmd = CMD_LB_ACCESS_MOUSE; + cmd = CMD_DBOX_ACCESS_MOUSE; ret = (int)info->type; break; case DBOX_ACCESS_EVENT_BACK: - cmd = CMD_LB_ACCESS_BACK; + cmd = CMD_DBOX_ACCESS_BACK; break; case DBOX_ACCESS_EVENT_OVER: - cmd = CMD_LB_ACCESS_OVER; + cmd = CMD_DBOX_ACCESS_OVER; break; case DBOX_ACCESS_EVENT_READ: - cmd = CMD_LB_ACCESS_READ; + cmd = CMD_DBOX_ACCESS_READ; break; case DBOX_ACCESS_EVENT_ENABLE: - cmd = CMD_LB_ACCESS_ENABLE; + cmd = CMD_DBOX_ACCESS_ENABLE; ret = info->type; break; default: @@ -2184,37 +2184,37 @@ EAPI int dynamicbox_feed_mouse_event(struct dynamicbox *handler, enum dynamicbox 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; + cmd = CMD_GBAR_MOUSE_ENTER; break; case DBOX_MOUSE_EVENT_LEAVE | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_PD_MOUSE_LEAVE; + cmd = CMD_GBAR_MOUSE_LEAVE; break; case DBOX_MOUSE_EVENT_UP | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_PD_MOUSE_UP; + cmd = CMD_GBAR_MOUSE_UP; break; case DBOX_MOUSE_EVENT_DOWN | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_PD_MOUSE_DOWN; + cmd = CMD_GBAR_MOUSE_DOWN; break; case DBOX_MOUSE_EVENT_MOVE | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_PD_MOUSE_MOVE; + cmd = CMD_GBAR_MOUSE_MOVE; break; case DBOX_MOUSE_EVENT_SET | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_PD_MOUSE_SET; + cmd = CMD_GBAR_MOUSE_SET; break; case DBOX_MOUSE_EVENT_UNSET | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_PD_MOUSE_UNSET; + cmd = CMD_GBAR_MOUSE_UNSET; break; case DBOX_MOUSE_EVENT_ON_SCROLL | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_PD_MOUSE_ON_SCROLL; + cmd = CMD_GBAR_MOUSE_ON_SCROLL; break; case DBOX_MOUSE_EVENT_ON_HOLD | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_PD_MOUSE_ON_HOLD; + cmd = CMD_GBAR_MOUSE_ON_HOLD; break; case DBOX_MOUSE_EVENT_OFF_SCROLL | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_PD_MOUSE_OFF_SCROLL; + cmd = CMD_GBAR_MOUSE_OFF_SCROLL; break; case DBOX_MOUSE_EVENT_OFF_HOLD | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_PD_MOUSE_OFF_HOLD; + cmd = CMD_GBAR_MOUSE_OFF_HOLD; break; default: ErrPrint("Invalid event type\n"); @@ -2250,37 +2250,37 @@ EAPI int dynamicbox_feed_mouse_event(struct dynamicbox *handler, enum dynamicbox 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; + cmd = CMD_DBOX_MOUSE_ENTER; break; case DBOX_MOUSE_EVENT_LEAVE | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_LB_MOUSE_LEAVE; + cmd = CMD_DBOX_MOUSE_LEAVE; break; case DBOX_MOUSE_EVENT_UP | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_LB_MOUSE_UP; + cmd = CMD_DBOX_MOUSE_UP; break; case DBOX_MOUSE_EVENT_DOWN | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_LB_MOUSE_DOWN; + cmd = CMD_DBOX_MOUSE_DOWN; break; case DBOX_MOUSE_EVENT_MOVE | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_LB_MOUSE_MOVE; + cmd = CMD_DBOX_MOUSE_MOVE; break; case DBOX_MOUSE_EVENT_SET | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_LB_MOUSE_SET; + cmd = CMD_DBOX_MOUSE_SET; break; case DBOX_MOUSE_EVENT_UNSET | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_LB_MOUSE_UNSET; + cmd = CMD_DBOX_MOUSE_UNSET; break; case DBOX_MOUSE_EVENT_ON_SCROLL | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_LB_MOUSE_ON_SCROLL; + cmd = CMD_DBOX_MOUSE_ON_SCROLL; break; case DBOX_MOUSE_EVENT_ON_HOLD | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_LB_MOUSE_ON_HOLD; + cmd = CMD_DBOX_MOUSE_ON_HOLD; break; case DBOX_MOUSE_EVENT_OFF_SCROLL | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_LB_MOUSE_OFF_SCROLL; + cmd = CMD_DBOX_MOUSE_OFF_SCROLL; break; case DBOX_MOUSE_EVENT_OFF_HOLD | DBOX_MOUSE_EVENT_MASK: - cmd = CMD_MOUSE_OFF_HOLD; + cmd = CMD_DBOX_MOUSE_OFF_HOLD; break; default: ErrPrint("Invalid event type\n"); @@ -2352,22 +2352,22 @@ EAPI int dynamicbox_feed_key_event(struct dynamicbox *handler, enum dynamicbox_k */ 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; + cmd = CMD_GBAR_KEY_FOCUS_IN; break; case DBOX_KEY_EVENT_FOCUS_OUT | DBOX_KEY_EVENT_MASK: - cmd = CMD_PD_KEY_FOCUS_OUT; + cmd = CMD_GBAR_KEY_FOCUS_OUT; break; case DBOX_KEY_EVENT_UP | DBOX_KEY_EVENT_MASK: - cmd = CMD_PD_KEY_UP; + cmd = CMD_GBAR_KEY_UP; break; case DBOX_KEY_EVENT_DOWN | DBOX_KEY_EVENT_MASK: - cmd = CMD_PD_KEY_DOWN; + cmd = CMD_GBAR_KEY_DOWN; break; case DBOX_KEY_EVENT_SET | DBOX_KEY_EVENT_MASK: - cmd = CMD_PD_KEY_SET; + cmd = CMD_GBAR_KEY_SET; break; case DBOX_KEY_EVENT_UNSET | DBOX_KEY_EVENT_MASK: - cmd = CMD_PD_KEY_UNSET; + cmd = CMD_GBAR_KEY_UNSET; break; default: ErrPrint("Invalid event type\n"); @@ -2397,22 +2397,22 @@ EAPI int dynamicbox_feed_key_event(struct dynamicbox *handler, enum dynamicbox_k 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; + cmd = CMD_DBOX_KEY_FOCUS_IN; break; case DBOX_KEY_EVENT_FOCUS_OUT | DBOX_KEY_EVENT_MASK: - cmd = CMD_LB_KEY_FOCUS_OUT; + cmd = CMD_DBOX_KEY_FOCUS_OUT; break; case DBOX_KEY_EVENT_UP | DBOX_KEY_EVENT_MASK: - cmd = CMD_LB_KEY_UP; + cmd = CMD_DBOX_KEY_UP; break; case DBOX_KEY_EVENT_DOWN | DBOX_KEY_EVENT_MASK: - cmd = CMD_LB_KEY_DOWN; + cmd = CMD_DBOX_KEY_DOWN; break; case DBOX_KEY_EVENT_SET | DBOX_KEY_EVENT_MASK: - cmd = CMD_LB_KEY_SET; + cmd = CMD_DBOX_KEY_SET; break; case DBOX_KEY_EVENT_UNSET | DBOX_KEY_EVENT_MASK: - cmd = CMD_LB_KEY_UNSET; + cmd = CMD_DBOX_KEY_UNSET; break; default: ErrPrint("Invalid event type\n"); @@ -2956,7 +2956,7 @@ EAPI int dynamicbox_release_resource_id(struct dynamicbox *handler, int gbar, un id = handler->common->id; } - cmd = CMD_PD_RELEASE_PIXMAP; + cmd = CMD_GBAR_RELEASE_PIXMAP; } else { if (!handler) { /*! @@ -2996,7 +2996,7 @@ EAPI int dynamicbox_release_resource_id(struct dynamicbox *handler, int gbar, un id = handler->common->id; } - cmd = CMD_LB_RELEASE_PIXMAP; + cmd = CMD_DBOX_RELEASE_PIXMAP; } packet = packet_create_noack((const char *)&cmd, "ssi", pkgname, id, resource_id); @@ -3752,7 +3752,7 @@ EAPI int dynamicbox_option(enum dynamicbox_option_type option) case DBOX_OPTION_SHARED_CONTENT: ret = conf_shared_content(); break; - case LB_OPTION_DIRECT_UPDATE: + case DBOX_OPTION_DIRECT_UPDATE: ret = conf_direct_update(); break; default: diff --git a/src/fb_wayland.c b/src/fb_wayland.c index cb9584b..4a89f86 100644 --- a/src/fb_wayland.c +++ b/src/fb_wayland.c @@ -28,7 +28,7 @@ #include #include -#include /* For error code */ +#include /* For error code */ #include "debug.h" #include "util.h"