Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_ipc.c e_ipc_handlers.h e_remote_main.c
Log Message:
Port lang to new IPC - added in get/set to lib, but not list as I am too tired
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- e_ipc.c 5 Jun 2005 20:55:40 -0000 1.43
+++ e_ipc.c 8 Jun 2005 20:43:46 -0000 1.44
@@ -215,47 +215,6 @@
free(data);
}
break;
- case E_IPC_OP_LANG_LIST:
- {
- Evas_List *langs;
- int bytes;
- char *data;
-
- langs = (Evas_List *)e_intl_language_list();
- data = _e_ipc_str_list_get(langs, &bytes);
- ecore_ipc_client_send(e->client,
- E_IPC_DOMAIN_REPLY,
- E_IPC_OP_LANG_LIST_REPLY,
- 0/*ref*/, 0/*ref_to*/, 0/*response*/,
- data, bytes);
- free(data);
- }
- break;
- case E_IPC_OP_LANG_SET:
- {
- char *lang;
-
- lang = _e_ipc_simple_str_dec(e->data, e->size);
- IF_FREE(e_config->language);
- e_config->language = lang;
- e_intl_language_set(e_config->language);
- e_config_save_queue();
- }
- break;
- case E_IPC_OP_LANG_GET:
- {
- char *lang;
-
- lang = e_config->language;
- if (!lang) lang = "";
- ecore_ipc_client_send(e->client,
- E_IPC_DOMAIN_REPLY,
- E_IPC_OP_LANG_GET_REPLY,
- 0/*ref*/, 0/*ref_to*/, 0/*response*/,
- lang, strlen(lang) + 1);
- free(data);
- }
- break;
case E_IPC_OP_BINDING_MOUSE_LIST:
{
Evas_List *bindings;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_ipc_handlers.h 6 Jun 2005 02:38:21 -0000 1.33
+++ e_ipc_handlers.h 8 Jun 2005 20:43:46 -0000 1.34
@@ -539,6 +539,7 @@
+
/****************************************************************************/
#define HDL E_IPC_OP_RESTART
#if (TYPE == E_REMOTE_OPTIONS)
@@ -567,6 +568,86 @@
#endif
#undef HDL
+/****************************************************************************/
+#define HDL E_IPC_OP_LANG_LIST
+#if (TYPE == E_REMOTE_OPTIONS)
+ OP("-lang-list", 0, "List all available languages", 1, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+ REQ_NULL(HDL);
+#elif (TYPE == E_WM_IN)
+ GENERIC(HDL);
+ LIST_DATA();
+ ENCODE((Evas_List *)e_intl_language_list(), e_ipc_codec_str_list_enc);
+ SEND_DATA(E_IPC_OP_LANG_LIST_REPLY);
+ END_GENERIC();
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_LANG_LIST_REPLY
+#if (TYPE == E_REMOTE_OPTIONS)
+#elif (TYPE == E_REMOTE_OUT)
+#elif (TYPE == E_WM_IN)
+#elif (TYPE == E_REMOTE_IN)
+ GENERIC(HDL);
+ LIST();
+ DECODE(e_ipc_codec_str_list_dec) {
+ FOR(dat) {
+ printf("REPLY: \"%s\"\n", (char *)(l->data));
+ }
+ FREE_LIST(dat);
+ }
+ END_GENERIC();
+#endif
+#undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_LANG_SET
+#if (TYPE == E_REMOTE_OPTIONS)
+ OP("-lang-set", 1, "Set the current language to 'OPT1'", 0, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+ REQ_STRING(params[0], HDL);
+#elif (TYPE == E_WM_IN)
+ STRING(s, HDL);
+ IF_FREE(e_config->language);
+ e_config->language = strdup(s);
+ e_intl_language_set(e_config->language);
+ SAVE;
+ END_STRING(s);
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_LANG_GET
+#if (TYPE == E_REMOTE_OPTIONS)
+ OP("-lang-get", 0, "Get the current language", 1, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+ REQ_NULL(HDL);
+#elif (TYPE == E_WM_IN)
+ SEND_STRING(e_config->language, E_IPC_OP_LANG_GET_REPLY, HDL);
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_LANG_GET_REPLY
+#if (TYPE == E_REMOTE_OPTIONS)
+#elif (TYPE == E_REMOTE_OUT)
+#elif (TYPE == E_WM_IN)
+#elif (TYPE == E_REMOTE_IN)
+ STRING(s, HDL);
+ printf("REPLY: \"%s\"\n", s);
+ END_STRING(s);
+#elif (TYPE == E_LIB_IN)
+ STRING(s, HDL);
+ RESPONSE(r, E_Response_Language_Get, HDL);
+ r->lang = strdup(s);
+ END_RESPONSE(r, E_RESPONSE_LANGUAGE_GET);
+ END_STRING(s);
+#endif
+#undef HDL
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_remote_main.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- e_remote_main.c 5 Jun 2005 20:55:40 -0000 1.44
+++ e_remote_main.c 8 Jun 2005 20:43:46 -0000 1.45
@@ -574,9 +574,6 @@
OSTR("-font-default-remove", "Remove the default text class OPT1",
E_IPC_OP_FONT_DEFAULT_REMOVE, 0),
OREQ("-font-default-list", "List all configured text classes",
E_IPC_OP_FONT_DEFAULT_LIST, 1),
OMUL("-font-default-set", "Set textclass (OPT1) font (OPT2) and size
(OPT3)", E_IPC_OP_FONT_DEFAULT_SET, 0, 3),
- OREQ("-lang-get", "Get the current language", E_IPC_OP_LANG_GET, 1),
- OREQ("-lang-list", "List all available languages", E_IPC_OP_LANG_LIST, 1),
- OSTR("-lang-set", "Set the current language", E_IPC_OP_LANG_SET, 0),
OREQ("-binding-mouse-list", "List all mouse bindings",
E_IPC_OP_BINDING_MOUSE_LIST, 1),
OFNC("-binding-mouse-add", "Add an existing mouse binding. OPT1 = Context,
OPT2 = button, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 =
action parameters", 6, _e_opt_binding_mouse_add, 0),
OFNC("-binding-mouse-del", "Delete an existing mouse binding. OPT1 =
Context, OPT2 = button, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 =
action, OPT6 = action parameters", 6, _e_opt_binding_mouse_del, 0),
@@ -921,30 +918,6 @@
else
printf("REPLY: DEFAULT NONE\n");
break;
- case E_IPC_OP_LANG_LIST_REPLY:
- if (e->data)
- {
- Evas_List *langs;
-
- langs = _e_ipc_str_list_dec(e->data, e->size);
- if (langs)
- {
- Evas_List *l;
-
- for (l = langs; l; l = l->next)
- printf("REPLY: LANG=\"%s\"\n", (char *)l->data);
- evas_list_free(langs);
- }
- }
- else
- printf("REPLY: AVAILABLE NONE\n");
- break;
- case E_IPC_OP_LANG_GET_REPLY:
- if (e->data)
- {
- printf("REPLY: %s\n", (char *)e->data);
- }
- break;
case E_IPC_OP_BINDING_MOUSE_LIST_REPLY:
if (e->data)
{
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
