enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests 1 Projects Releases Wiki Activity

ipc/main: restore ability to set multiple commands at startup. 

Closes T8563
This commit is contained in:
Boris Faure 2020-02-09 23:10:39 +01:00
parent 0eb8948d67
commit 91e6ae31fc
Signed by: borisfaure
GPG Key ID: 35C0410516166BE8
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/ipc.c
View File

@ -6,6 +6,9 @@
#include <Eet.h> #include <Eet.h>
#include "ipc.h" #include "ipc.h"
#define TY_IPC_MAJOR 3
#define TY_IPC_MINOR 8
static Ecore_Ipc_Server *ipc = NULL; static Ecore_Ipc_Server *ipc = NULL;
static Ecore_Event_Handler *hnd_data = NULL; static Ecore_Event_Handler *hnd_data = NULL;
static void (*func_new_inst) (Ipc_Instance *inst) = NULL; static void (*func_new_inst) (Ipc_Instance *inst) = NULL;
@ -20,7 +23,9 @@ _ipc_cb_client_data(void *_data EINA_UNUSED,
if (ecore_ipc_client_server_get(e->client) != ipc) if (ecore_ipc_client_server_get(e->client) != ipc)
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
if ((e->major == 3) && (e->minor == 7) && (e->data) && (e->size > 0)) if ((e->major == TY_IPC_MAJOR) &&
(e->minor == TY_IPC_MINOR) &&
(e->data) && (e->size > 0))
{ {
Ipc_Instance *inst; Ipc_Instance *inst;
@ -79,16 +84,19 @@ void
ipc_init(void) ipc_init(void)
{ {
Eet_Data_Descriptor_Class eddc; Eet_Data_Descriptor_Class eddc;
ecore_ipc_init(); ecore_ipc_init();
eet_init(); eet_init();
eet_eina_stream_data_descriptor_class_set(&eddc, sizeof(eddc), eet_eina_stream_data_descriptor_class_set(&eddc, sizeof(eddc),
"inst", sizeof(Ipc_Instance)); "inst", sizeof(Ipc_Instance));
new_inst_edd = eet_data_descriptor_stream_new(&eddc); new_inst_edd = eet_data_descriptor_stream_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(new_inst_edd, Ipc_Instance, EET_DATA_DESCRIPTOR_ADD_BASIC(new_inst_edd, Ipc_Instance,
"cmd", cmd, EET_T_STRING); "cmd", cmd, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(new_inst_edd, Ipc_Instance, EET_DATA_DESCRIPTOR_ADD_BASIC(new_inst_edd, Ipc_Instance,
"cd", cd, EET_T_STRING); "cd", cd, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_LIST_STRING(new_inst_edd, Ipc_Instance,
"cmds", cmds);
EET_DATA_DESCRIPTOR_ADD_BASIC(new_inst_edd, Ipc_Instance, EET_DATA_DESCRIPTOR_ADD_BASIC(new_inst_edd, Ipc_Instance,
"background", background, EET_T_STRING); "background", background, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(new_inst_edd, Ipc_Instance, EET_DATA_DESCRIPTOR_ADD_BASIC(new_inst_edd, Ipc_Instance,
@ -216,7 +224,8 @@ ipc_instance_add(Ipc_Instance *inst)
ipcsrv = ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, hash, 0, NULL); ipcsrv = ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, hash, 0, NULL);
if (ipcsrv) if (ipcsrv)
{ {
ecore_ipc_server_send(ipcsrv, 3, 7, 0, 0, 0, data, size); ecore_ipc_server_send(ipcsrv, TY_IPC_MAJOR, TY_IPC_MINOR,
0, 0, 0, data, size);
ecore_ipc_server_flush(ipcsrv); ecore_ipc_server_flush(ipcsrv);
free(data); free(data);
free(hash); free(hash);

1
src/bin/ipc.h
View File

@ -33,6 +33,7 @@ struct _Ipc_Instance
Eina_Bool active_links; Eina_Bool active_links;
Eina_Bool cursor_blink; Eina_Bool cursor_blink;
Eina_Bool visual_bell; Eina_Bool visual_bell;
Eina_List *cmds;
Config *config; Config *config;
}; };

16
src/bin/main.c
View File

@ -611,7 +611,6 @@ _start(Ipc_Instance *instance)
if (instance->startup_split) if (instance->startup_split)
{ {
unsigned int i = 0; unsigned int i = 0;
Eina_List *cmds_list = NULL;
Term *next = term; Term *next = term;
for (i = 0; i < strlen(instance->startup_split); i++) for (i = 0; i < strlen(instance->startup_split); i++)
@ -620,17 +619,19 @@ _start(Ipc_Instance *instance)
if (instance->startup_split[i] == 'v') if (instance->startup_split[i] == 'v')
{ {
cmd = cmds_list ? cmds_list->data : NULL; cmd = eina_list_data_get(instance->cmds);
split_vertically(win_evas_object_get(term_win_get(next)), split_vertically(win_evas_object_get(term_win_get(next)),
term_termio_get(next), cmd); term_termio_get(next), cmd);
cmds_list = eina_list_remove_list(cmds_list, cmds_list); instance->cmds = eina_list_remove_list(instance->cmds,
instance->cmds);
} }
else if (instance->startup_split[i] == 'h') else if (instance->startup_split[i] == 'h')
{ {
cmd = cmds_list ? cmds_list->data : NULL; cmd = eina_list_data_get(instance->cmds);
split_horizontally(win_evas_object_get(term_win_get(next)), split_horizontally(win_evas_object_get(term_win_get(next)),
term_termio_get(next), cmd); term_termio_get(next), cmd);
cmds_list = eina_list_remove_list(cmds_list, cmds_list); instance->cmds = eina_list_remove_list(instance->cmds,
instance->cmds);
} }
else if (instance->startup_split[i] == '-') else if (instance->startup_split[i] == '-')
next = term_next_get(next); next = term_next_get(next);
@ -641,8 +642,6 @@ _start(Ipc_Instance *instance)
goto end; goto end;
} }
} }
if (cmds_list)
eina_list_free(cmds_list);
} }
if (instance->pos) if (instance->pos)
{ {
@ -909,7 +908,6 @@ elm_main(int argc, char **argv)
if (cmd_options) if (cmd_options)
{ {
Eina_List *cmds_list = NULL;
int i; int i;
if (args == argc) if (args == argc)
@ -922,7 +920,7 @@ elm_main(int argc, char **argv)
if (instance.startup_split) if (instance.startup_split)
{ {
for(i = args+1; i < argc; i++) for(i = args+1; i < argc; i++)
cmds_list = eina_list_append(cmds_list, argv[i]); instance.cmds = eina_list_append(instance.cmds, argv[i]);
instance.cmd = argv[args]; instance.cmd = argv[args];
} }
else else