From a34d1df1c116188f8407a4649b85ae0c27f01004 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 13 Jun 2005 17:20:44 +0000 Subject: [PATCH] - add the -border-shade-*-get/set back into enlightenment_remote - remove so already ported code SVN revision: 15309 --- src/bin/e_ipc.c | 39 --------- src/bin/e_ipc_handlers.h | 120 ++++++++++++++++++++++++++ src/bin/e_remote_main.c | 179 --------------------------------------- 3 files changed, 120 insertions(+), 218 deletions(-) diff --git a/src/bin/e_ipc.c b/src/bin/e_ipc.c index 68a2c054c..b9529b16a 100644 --- a/src/bin/e_ipc.c +++ b/src/bin/e_ipc.c @@ -344,45 +344,6 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event) } } break; - case E_IPC_OP_BORDER_SHADE_ANIMATE_SET: - if (e_ipc_codec_int_dec(e->data, e->size, - &(e_config->border_shade_animate))) - { - E_CONFIG_LIMIT(e_config->border_shade_animate, 0, 1); - e_config_save_queue(); - } - break; - case E_IPC_OP_BORDER_SHADE_ANIMATE_GET: - _e_ipc_reply_int_send(e->client, - e_config->border_shade_animate, - E_IPC_OP_BORDER_SHADE_ANIMATE_GET_REPLY); - break; - case E_IPC_OP_BORDER_SHADE_TRANSITION_SET: - if (e_ipc_codec_int_dec(e->data, e->size, - &(e_config->border_shade_transition))) - { - E_CONFIG_LIMIT(e_config->border_shade_transition, 0, 3); - e_config_save_queue(); - } - break; - case E_IPC_OP_BORDER_SHADE_TRANSITION_GET: - _e_ipc_reply_int_send(e->client, - e_config->border_shade_transition, - E_IPC_OP_BORDER_SHADE_TRANSITION_GET_REPLY); - break; - case E_IPC_OP_BORDER_SHADE_SPEED_SET: - if (e_ipc_codec_double_dec(e->data, e->size, - &(e_config->border_shade_speed))) - { - E_CONFIG_LIMIT(e_config->border_shade_speed, 1.0, 20000.0); - e_config_save_queue(); - } - break; - case E_IPC_OP_BORDER_SHADE_SPEED_GET: - _e_ipc_reply_double_send(e->client, - e_config->border_shade_speed, - E_IPC_OP_BORDER_SHADE_SPEED_GET_REPLY); - break; case E_IPC_OP_DESKS_SET: if (e_ipc_codec_2int_dec(e->data, e->size, &(e_config->zone_desks_x_count), diff --git a/src/bin/e_ipc_handlers.h b/src/bin/e_ipc_handlers.h index 9e11bdc1b..c892dc452 100644 --- a/src/bin/e_ipc_handlers.h +++ b/src/bin/e_ipc_handlers.h @@ -1194,6 +1194,126 @@ break; #endif #undef HDL +/****************************************************************************/ +#define HDL E_IPC_OP_BORDER_SHADE_ANIMATE_SET +#if (TYPE == E_REMOTE_OPTIONS) + OP("-border-shade-animate-set", 1, "Set the shading animation flag (0/1)", 0, HDL) +#elif (TYPE == E_REMOTE_OUT) + REQ_INT(atoi(params[0]), HDL); +#elif (TYPE == E_WM_IN) + START_INT(val, HDL); + e_config->border_shade_animate = val; + E_CONFIG_LIMIT(e_config->border_shade_animate, 0, 1); + SAVE; + END_INT; +#elif (TYPE == E_REMOTE_IN) +#endif +#undef HDL + +/****************************************************************************/ +#define HDL E_IPC_OP_BORDER_SHADE_ANIMATE_GET +#if (TYPE == E_REMOTE_OPTIONS) + OP("-border-shade-animate-get", 0, "Get the shading animation flag (0/1)", 1, HDL) +#elif (TYPE == E_REMOTE_OUT) + REQ_NULL(HDL) +#elif (TYPE == E_WM_IN) + SEND_INT(e_config->border_shade_animate, E_IPC_OP_BORDER_SHADE_ANIMATE_GET_REPLY, HDL); +#elif (TYPE == E_REMOTE_IN) +#endif +#undef HDL + +/****************************************************************************/ +#define HDL E_IPC_OP_BORDER_SHADE_ANIMATE_GET_REPLY +#if (TYPE == E_REMOTE_OPTIONS) +#elif (TYPE == E_REMOTE_OUT) +#elif (TYPE == E_WM_IN) +#elif (TYPE == E_REMOTE_IN) + START_INT(val, HDL) + printf("REPLY: %i\n", val); + END_INT; +#endif +#undef HDL + + /****************************************************************************/ +#define HDL E_IPC_OP_BORDER_SHADE_TRANSITION_SET +#if (TYPE == E_REMOTE_OPTIONS) + OP("-border-shade-transition-set", 1, "Set the shading animation algorithm (0, 1, 2 or 3)", 0, HDL) +#elif (TYPE == E_REMOTE_OUT) + REQ_INT(atoi(params[0]), HDL); +#elif (TYPE == E_WM_IN) + START_INT(val, HDL); + e_config->border_shade_transition = val; + E_CONFIG_LIMIT(e_config->border_shade_transition, 0, 3); + SAVE; + END_INT; +#elif (TYPE == E_REMOTE_IN) +#endif +#undef HDL + +/****************************************************************************/ +#define HDL E_IPC_OP_BORDER_SHADE_TRANSITION_GET +#if (TYPE == E_REMOTE_OPTIONS) + OP("-border-shade-transition-get", 0, "Get the shading animation algorithm (0, 1, 2 or 3)", 1, HDL) +#elif (TYPE == E_REMOTE_OUT) + REQ_NULL(HDL) +#elif (TYPE == E_WM_IN) + SEND_INT(e_config->border_shade_transition, E_IPC_OP_BORDER_SHADE_TRANSITION_GET_REPLY, HDL); +#elif (TYPE == E_REMOTE_IN) +#endif +#undef HDL + +/****************************************************************************/ +#define HDL E_IPC_OP_BORDER_SHADE_TRANSITION_GET_REPLY +#if (TYPE == E_REMOTE_OPTIONS) +#elif (TYPE == E_REMOTE_OUT) +#elif (TYPE == E_WM_IN) +#elif (TYPE == E_REMOTE_IN) + START_INT(val, HDL) + printf("REPLY: %i\n", val); + END_INT; +#endif +#undef HDL + +/****************************************************************************/ +#define HDL E_IPC_OP_BORDER_SHADE_SPEED_SET +#if (TYPE == E_REMOTE_OPTIONS) + OP("-border-shade-speed-set", 1, "Set the shading speed (pixels/sec)", 0, HDL) +#elif (TYPE == E_REMOTE_OUT) + REQ_DOUBLE(atof(params[0]), HDL); +#elif (TYPE == E_WM_IN) + START_DOUBLE(val, HDL); + e_config->border_shade_speed = val; + E_CONFIG_LIMIT(e_config->border_shade_speed, 1.0, 20000.0); + SAVE; + END_DOUBLE; +#elif (TYPE == E_REMOTE_IN) +#endif +#undef HDL + +/****************************************************************************/ +#define HDL E_IPC_OP_BORDER_SHADE_SPEED_GET +#if (TYPE == E_REMOTE_OPTIONS) + OP("-border-shade-speed-get", 0, "Get the shading speed (pixels/sec)", 1, HDL) +#elif (TYPE == E_REMOTE_OUT) + REQ_NULL(HDL) +#elif (TYPE == E_WM_IN) + SEND_DOUBLE(e_config->border_shade_speed, E_IPC_OP_BORDER_SHADE_SPEED_GET_REPLY, HDL); +#elif (TYPE == E_REMOTE_IN) +#endif +#undef HDL + +/****************************************************************************/ +#define HDL E_IPC_OP_BORDER_SHADE_SPEED_GET_REPLY +#if (TYPE == E_REMOTE_OPTIONS) +#elif (TYPE == E_REMOTE_OUT) +#elif (TYPE == E_WM_IN) +#elif (TYPE == E_REMOTE_IN) + START_DOUBLE(val, HDL) + printf("REPLY: %3.3f\n", val); + END_DOUBLE; +#endif +#undef HDL + #if 0 } #endif diff --git a/src/bin/e_remote_main.c b/src/bin/e_remote_main.c index 52931fd30..1bd832c37 100644 --- a/src/bin/e_remote_main.c +++ b/src/bin/e_remote_main.c @@ -580,12 +580,6 @@ E_IPC_Opt_Handler handlers[] = OREQ("-binding-key-list", "List all key bindings", E_IPC_OP_BINDING_KEY_LIST, 1), OFNC("-binding-key-add", "Add an existing key binding. OPT1 = Context, OPT2 = key, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters", 6, _e_opt_binding_key_add, 0), OFNC("-binding-key-del", "Delete an existing key binding. OPT1 = Context, OPT2 = key, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters", 6, _e_opt_binding_key_del, 0), - OINT("-border-shade-animate-set", "Set the shading animation flag (0/1)", E_IPC_OP_BORDER_SHADE_ANIMATE_SET, 0), - OREQ("-border-shade-animate-get", "Get the shading animation flag", E_IPC_OP_BORDER_SHADE_ANIMATE_GET, 1), - OINT("-border-shade-transition-set", "Set the shading animation algorithm (0, 1, 2 or 3)", E_IPC_OP_BORDER_SHADE_TRANSITION_SET, 0), - OREQ("-border-shade-transition-get", "Get the above value", E_IPC_OP_BORDER_SHADE_TRANSITION_GET, 1), - ODBL("-border-shade-speed-set", "Set the shading speed (pixels/sec)", E_IPC_OP_BORDER_SHADE_SPEED_SET, 0), - OREQ("-border-shade-speed-get", "Get the shading speed", E_IPC_OP_BORDER_SHADE_SPEED_GET, 1), O2INT("-desks-set", "Set the number of virtual desktops (X x Y. OPT1 = X, OPT2 = Y)", E_IPC_OP_DESKS_SET, 0), OREQ("-desks-get", "Get the number of virtual desktops", E_IPC_OP_DESKS_GET, 1), }; @@ -968,179 +962,6 @@ _e_ipc_cb_server_data(void *data, int type, void *event) else printf("REPLY: AVAILABLE NONE\n"); break; - case E_IPC_OP_DATA_DIRS_LIST_REPLY: - if (e->data) - { - Evas_List *dirs; - E_Path_Dir *dir; - - dirs = _e_ipc_path_list_dec(e->data, e->size); - while (dirs) - { - dir = dirs->data; - printf("REPLY: DATA DIR=\"%s\"\n", dir->dir); - dirs = evas_list_remove_list(dirs, dirs); - E_FREE(dir); - } - } - break; - case E_IPC_OP_IMAGE_DIRS_LIST_REPLY: - if (e->data) - { - Evas_List *dirs; - E_Path_Dir *dir; - - dirs = _e_ipc_path_list_dec(e->data, e->size); - while (dirs) - { - dir = dirs->data; - printf("REPLY: IMAGE DIR=\"%s\"\n", dir->dir); - dirs = evas_list_remove_list(dirs, dirs); - E_FREE(dir); - } - } - break; - case E_IPC_OP_FONT_DIRS_LIST_REPLY: - if (e->data) - { - Evas_List *dirs; - E_Path_Dir *dir; - - dirs = _e_ipc_path_list_dec(e->data, e->size); - while (dirs) - { - dir = dirs->data; - printf("REPLY: FONT DIR=\"%s\"\n", dir->dir); - dirs = evas_list_remove_list(dirs, dirs); - E_FREE(dir); - } - } - break; - case E_IPC_OP_THEME_DIRS_LIST_REPLY: - if (e->data) - { - Evas_List *dirs; - E_Path_Dir *dir; - - dirs = _e_ipc_path_list_dec(e->data, e->size); - while (dirs) - { - dir = dirs->data; - printf("REPLY: THEME DIR=\"%s\"\n", dir->dir); - dirs = evas_list_remove_list(dirs, dirs); - E_FREE(dir); - } - } - break; - case E_IPC_OP_INIT_DIRS_LIST_REPLY: - if (e->data) - { - Evas_List *dirs; - E_Path_Dir *dir; - - dirs = _e_ipc_path_list_dec(e->data, e->size); - while (dirs) - { - dir = dirs->data; - printf("REPLY: INIT DIR=\"%s\"\n", dir->dir); - dirs = evas_list_remove_list(dirs, dirs); - E_FREE(dir); - } - } - break; - case E_IPC_OP_ICON_DIRS_LIST_REPLY: - if (e->data) - { - Evas_List *dirs; - E_Path_Dir *dir; - - dirs = _e_ipc_path_list_dec(e->data, e->size); - while (dirs) - { - dir = dirs->data; - printf("REPLY: ICON DIR=\"%s\"\n", dir->dir); - dirs = evas_list_remove_list(dirs, dirs); - E_FREE(dir); - } - } - break; - case E_IPC_OP_MODULE_DIRS_LIST_REPLY: - if (e->data) - { - Evas_List *dirs; - E_Path_Dir *dir; - - dirs = _e_ipc_path_list_dec(e->data, e->size); - while (dirs) - { - dir = dirs->data; - printf("REPLY: MODULE DIR=\"%s\"\n", dir->dir); - dirs = evas_list_remove_list(dirs, dirs); - E_FREE(dir); - } - } - break; - case E_IPC_OP_BG_DIRS_LIST_REPLY: - if (e->data) - { - Evas_List *dirs; - E_Path_Dir *dir; - - dirs = _e_ipc_path_list_dec(e->data, e->size); - while (dirs) - { - dir = dirs->data; - printf("REPLY: BACKGROUND DIR=\"%s\"\n", dir->dir); - dirs = evas_list_remove_list(dirs, dirs); - E_FREE(dir); - } - } - break; - case E_IPC_OP_MENUS_SCROLL_SPEED_GET_REPLY: - if (e->data) - { - double val; - - if (e_ipc_codec_double_dec(e->data, e->size, &val)) - printf("REPLY: %3.3f\n", val); - } - break; - case E_IPC_OP_BORDER_SHADE_ANIMATE_GET_REPLY: - if (e->data) - { - int val; - - if (e_ipc_codec_int_dec(e->data, e->size, &val)) - printf("REPLY: %i\n", val); - } - break; - case E_IPC_OP_BORDER_SHADE_TRANSITION_GET_REPLY: - if (e->data) - { - int val; - - if (e_ipc_codec_int_dec(e->data, e->size, &val)) - printf("REPLY: %i\n", val); - } - break; - case E_IPC_OP_BORDER_SHADE_SPEED_GET_REPLY: - if (e->data) - { - double val; - - if (e_ipc_codec_double_dec(e->data, e->size, &val)) - printf("REPLY: %3.3f\n", val); - } - break; - case E_IPC_OP_FRAMERATE_GET_REPLY: - if (e->data) - { - double val; - - if (e_ipc_codec_double_dec(e->data, e->size, &val)) - printf("REPLY: %3.3f\n", val); - } - break; case E_IPC_OP_DESKS_GET_REPLY: if (e->data) {