mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code & style cleanup

Browse Source
This commit is contained in:
marschap
2007-06-23 21:41:50 +00:00
parent 2f9f70e87e
commit a5bdc61ad8
12 changed files with 665 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/commands/menu_commands.c
+246 -257
View File
@@ -1,5 +1,8 @@
/* \file menu_commands.c
* Defines handlers for client commands concerning menus.
*/
/*
* menu_commands.c
* This file is part of LCDd, the lcdproc server.
*
* This file is released under the GNU General Public License. Refer to the
@@ -16,9 +19,6 @@
*
* The client's available function set is defined here, as is the syntax
* for each command.
*
* This particular file defines actions concerning client supplied menus.
*
*/
#include <stdlib.h>
@@ -51,12 +51,11 @@ static char *argv2string(int argc, char **argv)
char *rtn = NULL;
int len;
int i;
for (i = len = 0; i < argc; ++i)
for (i = len = 0; i < argc; i++)
len += strlen(argv[i]) + 1;
rtn = malloc(len + 1);
rtn[0] = '\0';
for (i = len = 0; i < argc; ++i)
{
for (i = len = 0; i < argc; i++) {
strcat(rtn, argv[i]);
strcat(rtn, " ");
}
@@ -87,27 +86,27 @@ static char *argv2string(int argc, char **argv)
* - ip
*/
int
menu_add_item_func (Client * c, int argc, char **argv)
menu_add_item_func(Client *c, int argc, char **argv)
{
char * menu_id;
char * item_id;
char * text = NULL;
Menu * menu = NULL;
MenuItem * item;
char *menu_id;
char *item_id;
char *text = NULL;
Menu *menu = NULL;
MenuItem *item;
MenuItemType itemtype;
char** argv_set = NULL;
char **argv_set = NULL;
debug (RPT_DEBUG, "%s( Client [%d], %s, %s )",
debug(RPT_DEBUG, "%s(Client [%d], %s, %s)",
__FUNCTION__, c->sock, argv[1], argv[2]);
if (!c->ack)
return 1;
if (!c->name) {
if (c->name == NULL) {
sock_send_error(c->sock, "You need to give your client a name first\n");
return 0;
}
if ((argc < 4 )) {
if (argc < 4) {
sock_send_error(c->sock, "Usage: menu_add_item <menuid> <newitemid> <type> [<text>]\n");
return 0;
}
@@ -116,40 +115,37 @@ menu_add_item_func (Client * c, int argc, char **argv)
item_id = argv[2];
/* Does the client have a menu already ? */
if (!c->menu) {
if (c->menu == NULL) {
/* We need to create it */
report( RPT_INFO, "Client [%d] is using the menu", c->sock );
c->menu = menu_create ("_client_menu_", menu_commands_handler, c->name, c);
menu_add_item (main_menu, c->menu);
report(RPT_INFO, "Client [%d] is using the menu", c->sock);
c->menu = menu_create("_client_menu_", menu_commands_handler, c->name, c);
menu_add_item(main_menu, c->menu);
}
if ( menu_id[0] == 0 ) {
/* No menu specified = client's main menu */
menu = c->menu;
} else {
/* A specified menu */
menu = menu_find_item (c->menu, menu_id, true);
}
if (!menu) {
/* use either the given menu or the client's main menu if none was specified */
menu = (menu_id[0] != '\0')
? menu_find_item(c->menu, menu_id, true)
: c->menu;
if (menu == NULL) {
sock_send_error(c->sock, "Cannot find menu id\n");
return 0;
}
item = menu_find_item (c->menu, item_id, true);
if (item) {
item = menu_find_item(c->menu, item_id, true);
if (item != NULL) {
sock_send_error(c->sock, "Item id already in use\n");
return 0;
}
/* Find menuitem type */
itemtype = menuitem_typename_to_type (argv[3]);
itemtype = menuitem_typename_to_type(argv[3]);
if (itemtype == -1) {
sock_send_error(c->sock, "Invalid menuitem type\n");
return 0;
}
/* Is a text given (options don't count)? */
if (argc >= 5 && argv[4][0] != '-') {
if ((argc >= 5) && (argv[4][0] != '-')) {
text = argv[4];
}
else {
@@ -159,59 +155,58 @@ menu_add_item_func (Client * c, int argc, char **argv)
/* Create the menuitem */
switch (itemtype) {
case MENUITEM_MENU:
item = menu_create (item_id, menu_commands_handler, text, c);
item = menu_create(item_id, menu_commands_handler, text, c);
break;
case MENUITEM_ACTION:
item = menuitem_create_action (item_id, menu_commands_handler, text, c,
item = menuitem_create_action(item_id, menu_commands_handler, text, c,
MENURESULT_NONE);
break;
case MENUITEM_CHECKBOX:
item = menuitem_create_checkbox (item_id, menu_commands_handler, text, c,
item = menuitem_create_checkbox(item_id, menu_commands_handler, text, c,
false, false);
break;
case MENUITEM_RING:
item = menuitem_create_ring (item_id, menu_commands_handler, text, c,
item = menuitem_create_ring(item_id, menu_commands_handler, text, c,
"", 0);
break;
case MENUITEM_SLIDER:
item = menuitem_create_slider (item_id, menu_commands_handler, text, c,
item = menuitem_create_slider(item_id, menu_commands_handler, text, c,
"", "", 0, 100, 1, 25);
break;
case MENUITEM_NUMERIC:
item = menuitem_create_numeric (item_id, menu_commands_handler, text, c,
item = menuitem_create_numeric(item_id, menu_commands_handler, text, c,
0, 100, 0);
break;
case MENUITEM_ALPHA:
item = menuitem_create_alpha (item_id, menu_commands_handler, text, c,
item = menuitem_create_alpha(item_id, menu_commands_handler, text, c,
0, 0, 10, true, false, true, "-./", "");
break;
case MENUITEM_IP:
item = menuitem_create_ip (item_id, menu_commands_handler, text, c,
item = menuitem_create_ip(item_id, menu_commands_handler, text, c,
0, "192.168.1.245");
break;
default:
assert(!"unexpected menuitem type");
}
menu_add_item (menu, item);
menuscreen_inform_item_modified (menu);
menu_add_item(menu, item);
menuscreen_inform_item_modified(menu);
sock_send_string(c->sock, "success\n");
/* are there any options (starting with '-')?
* - create a temporary argv for menu_set_item() call */
if (argc > 5 || argv[4][0] == '-') {
if ((argc > 5) || (argv[4][0] == '-')) {
// menu_add_item <menuid> <newitemid> <type> [<text>]
// menu_set_item <menuid> <itemid> {<option>}+
int i, j;
argv_set = malloc(argc * sizeof(char*));
argv_set = malloc(argc * sizeof(char *));
assert(argv_set);
argv_set[0] = "menu_set_item";
for (i = j = 1; i < argc; ++i)
{
for (i = j = 1; i < argc; i++) {
/* skip "type" */
if (i == 3)
continue;
/* skip "text" */
if (i == 4 && argv[4][0] != '-')
if ((i == 4) && (argv[4][0] != '-'))
continue;
argv_set[j++] = argv[i];
@@ -232,17 +227,17 @@ menu_add_item_func (Client * c, int argc, char **argv)
* the items from your client menu, that menu will automatically be removed.
*/
int
menu_del_item_func (Client * c, int argc, char **argv)
menu_del_item_func(Client *c, int argc, char **argv)
{
Menu * menu;
MenuItem * item;
char * menu_id;
char * item_id;
Menu *menu;
MenuItem *item;
char *menu_id;
char *item_id;
if (!c->ack)
return 1;
if (argc != 3 ) {
if (argc != 3) {
sock_send_error(c->sock, "Usage: menu_del_item <menuid> <itemid>\n");
return 0;
}
@@ -251,39 +246,36 @@ menu_del_item_func (Client * c, int argc, char **argv)
item_id = argv[2];
/* Does the client have a menu already ? */
if (!c->menu) {
if (c->menu == NULL) {
sock_send_error(c->sock, "Client has no menu\n");
return 0;
}
if ( menu_id[0] == 0 ) {
/* No menu specified = client's main menu */
menu = c->menu;
} else {
/* A specified menu */
menu = menu_find_item (c->menu, menu_id, true);
}
if (!menu) {
/* use either the given menu or the client's main menu if none was specified */
menu = (menu_id[0] != '\0')
? menu_find_item(c->menu, menu_id, true)
: c->menu;
if (menu == NULL) {
sock_send_error(c->sock, "Cannot find menu id\n");
return 0;
}
item = menu_find_item (c->menu, item_id, true);
if (!item) {
item = menu_find_item(c->menu, item_id, true);
if (item == NULL) {
sock_send_error(c->sock, "Cannot find item\n");
return 0;
}
menuscreen_inform_item_destruction (item);
menu_remove_item (menu, item);
menuscreen_inform_item_modified (item->parent);
menuitem_destroy (item);
menuscreen_inform_item_destruction(item);
menu_remove_item(menu, item);
menuscreen_inform_item_modified(item->parent);
menuitem_destroy(item);
/* Was it the last item in the client's menu ? */
if (menu_getfirst_item(c->menu) == NULL) {
menuscreen_inform_item_destruction (c->menu);
menu_remove_item (main_menu, c->menu);
menuscreen_inform_item_modified (main_menu);
menu_destroy (c->menu);
menuscreen_inform_item_destruction(c->menu);
menu_remove_item(main_menu, c->menu);
menuscreen_inform_item_modified(main_menu);
menu_destroy(c->menu);
c->menu = NULL;
}
sock_send_string(c->sock, "success\n");
@@ -377,7 +369,7 @@ menu_del_item_func (Client * c, int argc, char **argv)
* Hmm, this is getting very big. We might need a some real parser after all.
*/
int
menu_set_item_func (Client * c, int argc, char **argv)
menu_set_item_func(Client *c, int argc, char **argv)
{
typedef enum AttrType { NOVALUE, BOOLEAN, CHECKBOX_VALUE, SHORT, INT,
FLOAT, STRING } AttrType;
@@ -391,7 +383,7 @@ menu_set_item_func (Client * c, int argc, char **argv)
MenuItemType menuitem_type; /* For what MenuItem type is
the option ?
Use -1 for ALL types. */
char * name; /* The option concerned */
char *name; /* The option concerned */
AttrType attr_type; /* Type of value */
int attr_offset; /* Where to put the value
in the structure.
@@ -403,7 +395,7 @@ menu_set_item_func (Client * c, int argc, char **argv)
} option_table[] = {
{ -1, "text", STRING, offsetof(MenuItem,text) },
{ -1, "is_hidden", BOOLEAN, offsetof(MenuItem,is_hidden) },
{ -1, "prev", STRING, -1 },
{ -1, "prev", STRING, -1 },
{ -1, "next", STRING, -1 },
{ MENUITEM_ACTION, "menu_result", STRING, -1 },
{ MENUITEM_CHECKBOX, "value", CHECKBOX_VALUE, offsetof(MenuItem,data.checkbox.value) },
@@ -438,20 +430,20 @@ menu_set_item_func (Client * c, int argc, char **argv)
short short_value = 0;
int int_value = 0;
float float_value = 0;
char * string_value = NULL;
char *string_value = NULL;
Menu * menu;
MenuItem * item;
char * menu_id;
char * item_id;
Menu *menu;
MenuItem *item;
char *menu_id;
char *item_id;
int argnr;
debug (RPT_DEBUG, "%s( Client [%d]: %s)",
debug(RPT_DEBUG, "%s(Client [%d]: %s)",
__FUNCTION__, c->sock, argv2string(argc, argv));
if (!c->ack)
return 1;
if (argc < 4 ) {
if (argc < 4) {
sock_send_error(c->sock, "Usage: menu_set_item <menuid> <itemid> {<option>}+\n");
return 0;
}
@@ -459,40 +451,38 @@ menu_set_item_func (Client * c, int argc, char **argv)
menu_id = argv[1];
item_id = argv[2];
if ( menu_id[0] == 0 ) {
/* No menu specified = client's main menu */
menu = c->menu;
} else {
/* A specified menu */
menu = menu_find_item (c->menu, menu_id, true);
}
if (!menu) {
/* use either the given menu or the client's main menu if none was specified */
menu = (menu_id[0] != '\0')
? menu_find_item(c->menu, menu_id, true)
: c->menu;
if (menu == NULL) {
sock_send_error(c->sock, "Cannot find menu id\n");
return 0;
}
item = menu_find_item (c->menu, item_id, true);
if (!item) {
item = menu_find_item(c->menu, item_id, true);
if (item == NULL) {
sock_send_error(c->sock, "Cannot find item\n");
return 0;
}
/* Scan all arguments */
for( argnr = 3; argnr < argc; argnr ++) {
for (argnr = 3; argnr < argc; argnr++) {
int option_nr = -1;
int found_option_name = 0;
int error = 0;
void * location;
char * p;
void *location;
char *p;
/* Find the option in the table */
if( argv[argnr][0] == '-' ) {
if (argv[argnr][0] == '-') {
int i;
for( i=0; option_table[i].name; i++ ) {
if( strcmp( argv[argnr]+1, option_table[i].name ) == 0 ) {
for (i = 0; option_table[i].name != NULL; i++) {
if (strcmp(argv[argnr]+1, option_table[i].name) == 0) {
found_option_name = 1;
if( item->type == option_table[i].menuitem_type
|| option_table[i].menuitem_type == -1 ) {
if (item->type == option_table[i].menuitem_type
|| option_table[i].menuitem_type == -1) {
option_nr = i;
}
}
@@ -502,10 +492,11 @@ menu_set_item_func (Client * c, int argc, char **argv)
sock_printf_error(c->sock, "Found non-option: \"%.40s\"\n", argv[argnr]);
continue; /* Skip to next arg */
}
if( option_nr == -1 ) {
if( found_option_name ) {
if (option_nr == -1) {
if (found_option_name) {
sock_printf_error(c->sock, "Option not valid for menuitem type: \"%.40s\"\n", argv[argnr]);
} else {
}
else {
sock_printf_error(c->sock, "Unknown option: \"%.40s\"\n", argv[argnr]);
}
continue; /* Skip to next arg */
@@ -514,80 +505,85 @@ menu_set_item_func (Client * c, int argc, char **argv)
/* OK, we now know we have an option that is valid for the item type. */
/* Check for value */
if( option_table[option_nr].attr_type != NOVALUE ) {
if( argnr + 1 >= argc ) {
if (option_table[option_nr].attr_type != NOVALUE) {
if (argnr + 1 >= argc) {
sock_printf_error(c->sock, "Missing value at option: \"%.40s\"\n", argv[argnr]);
continue; /* Skip to next arg (probably is not existing :) */
}
}
/* Process the value that goes with the option */
location = (void*)item + option_table[option_nr].attr_offset;
switch( option_table[option_nr].attr_type ) {
location = (void *) item + option_table[option_nr].attr_offset;
switch (option_table[option_nr].attr_type) {
case NOVALUE:
break;
case BOOLEAN:
if( strcmp( argv[argnr+1], "false" ) == 0 ) {
if (strcmp(argv[argnr+1], "false") == 0) {
bool_value = false;
} else if( strcmp( argv[argnr+1], "true" ) == 0 ) {
}
else if (strcmp(argv[argnr+1], "true") == 0) {
bool_value = true;
} else {
}
else {
error = 1;
break;
}
if( option_table[option_nr].attr_offset != -1 ) {
*(bool *)location = bool_value;
if (option_table[option_nr].attr_offset != -1) {
*(bool *) location = bool_value;
}
break;
case CHECKBOX_VALUE:
if( strcmp( argv[argnr+1], "off" ) == 0 ) {
if (strcmp(argv[argnr+1], "off") == 0) {
checkbox_value = CHECKBOX_OFF;
} else if( strcmp( argv[argnr+1], "on" ) == 0 ) {
}
else if (strcmp(argv[argnr+1], "on") == 0) {
checkbox_value = CHECKBOX_ON;
} else if( strcmp( argv[argnr+1], "gray" ) == 0 ) {
}
else if (strcmp(argv[argnr+1], "gray") == 0) {
checkbox_value = CHECKBOX_GRAY;
} else {
}
else {
error = 1;
break;
}
if( option_table[option_nr].attr_offset != -1 ) {
*(CheckboxValue *)location = checkbox_value;
if (option_table[option_nr].attr_offset != -1) {
*(CheckboxValue *) location = checkbox_value;
}
break;
case SHORT:
short_value = strtol( argv[argnr+1], &p, 0 );
if( argv[argnr+1][0] == '\0' || *p != '\0' ) {
short_value = strtol(argv[argnr+1], &p, 0);
if ((argv[argnr+1][0] == '\0') || (*p != '\0')) {
error = 1;
break;
}
if( option_table[option_nr].attr_offset != -1 ) {
*(short*)location = short_value;
if (option_table[option_nr].attr_offset != -1) {
*(short *) location = short_value;
}
break;
case INT:
int_value = strtol( argv[argnr+1], &p, 0 );
if( argv[argnr+1][0] == '\0' || *p != '\0' ) {
int_value = strtol(argv[argnr+1], &p, 0);
if ((argv[argnr+1][0] == '\0') || (*p != '\0')) {
error = 1;
break;
}
if( option_table[option_nr].attr_offset != -1 ) {
*(int*)location = int_value;
if (option_table[option_nr].attr_offset != -1) {
*(int *) location = int_value;
}
break;
case FLOAT:
float_value = strtod( argv[argnr+1], &p );
if( argv[argnr+1][0] == '\0' || *p != '\0' ) {
float_value = strtod(argv[argnr+1], &p);
if ((argv[argnr+1][0] == '\0') || (*p != '\0')) {
error = 1;
break;
}
if( option_table[option_nr].attr_offset != -1 ) {
*(float*)location = float_value;
if (option_table[option_nr].attr_offset != -1) {
*(float *) location = float_value;
}
break;
case STRING:
string_value = argv[argnr+1];
if( option_table[option_nr].attr_offset != -1 ) {
free( *(char**)location );
*(char**)location = strdup( string_value );
if (option_table[option_nr].attr_offset != -1) {
free(*(char **) location);
*(char **) location = strdup(string_value);
}
else if (strcmp(argv[argnr], "-prev") == 0) {
set_predecessor(item, string_value, c);
@@ -597,7 +593,7 @@ menu_set_item_func (Client * c, int argc, char **argv)
}
break;
}
switch( error ) {
switch (error) {
case 1:
sock_printf_error(c->sock, "Could not interpret value at option: \"%.40s\"\n", argv[argnr]);
argnr ++;
@@ -608,86 +604,90 @@ menu_set_item_func (Client * c, int argc, char **argv)
* Most useful for the attr_offset==-1 stuff. */
switch (item->type) {
case MENUITEM_ACTION:
if( strcmp( argv[argnr]+1, "menu_result" ) == 0 ) {
if( strcmp( argv[argnr+1], "none" ) == 0 ) {
if (strcmp(argv[argnr]+1, "menu_result") == 0) {
if (strcmp(argv[argnr+1], "none") == 0) {
set_successor(item, "_none_", c);
} else if( strcmp( argv[argnr+1], "close" ) == 0 ) {
}
else if (strcmp(argv[argnr+1], "close") == 0) {
set_successor(item, "_close_", c);
} else if( strcmp( argv[argnr+1], "quit" ) == 0 ) {
}
else if (strcmp(argv[argnr+1], "quit") == 0) {
set_successor(item, "_quit_", c);
} else {
}
else {
error = 1;
}
}
break;
case MENUITEM_SLIDER:
if( item->data.slider.value < item->data.slider.minvalue ) {
if (item->data.slider.value < item->data.slider.minvalue) {
item->data.slider.value = item->data.slider.minvalue;
} else if( item->data.slider.value > item->data.slider.maxvalue ) {
}
else if (item->data.slider.value > item->data.slider.maxvalue) {
item->data.slider.value = item->data.slider.maxvalue;
}
break;
case MENUITEM_RING:
if( strcmp( argv[argnr]+1, "strings" ) == 0 ) {
free (item->data.ring.strings);
item->data.ring.strings = tablist2linkedlist (string_value);
if (strcmp(argv[argnr]+1, "strings") == 0) {
free(item->data.ring.strings);
item->data.ring.strings = tablist2linkedlist(string_value);
}
item->data.ring.value %= LL_Length( item->data.ring.strings );
item->data.ring.value %= LL_Length(item->data.ring.strings);
break;
case MENUITEM_NUMERIC:
menuitem_reset (item);
menuitem_reset(item);
break;
case MENUITEM_ALPHA:
if( strcmp( argv[argnr]+1, "password_char" ) == 0 ) {
if (strcmp(argv[argnr]+1, "password_char") == 0) {
item->data.alpha.password_char = string_value[0];
}
else if( strcmp( argv[argnr]+1, "maxlength" ) == 0 ) {
else if (strcmp(argv[argnr]+1, "maxlength") == 0) {
char * new_buf;
if( short_value < 0 || short_value > 1000 ) {
if ((short_value < 0) || (short_value > 1000)) {
error = 2;
break;
}
new_buf = malloc( short_value + 1 );
strncpy( new_buf, item->data.alpha.value, short_value );
new_buf = malloc(short_value + 1);
strncpy(new_buf, item->data.alpha.value, short_value);
new_buf[short_value] = '\0'; /* terminate */
free( item->data.alpha.value );
free(item->data.alpha.value);
item->data.alpha.value = new_buf;
free( item->data.alpha.edit_str );
item->data.alpha.edit_str = malloc( short_value + 1 );
free(item->data.alpha.edit_str);
item->data.alpha.edit_str = malloc(short_value + 1);
item->data.alpha.edit_str[0] = '\0';
}
else if( strcmp( argv[argnr]+1, "value" ) == 0 ) {
strncpy( item->data.alpha.value, string_value, item->data.alpha.maxlength );
else if (strcmp(argv[argnr]+1, "value") == 0) {
strncpy(item->data.alpha.value, string_value, item->data.alpha.maxlength);
item->data.alpha.value[ item->data.alpha.maxlength ] = 0; /* terminate */
}
menuitem_reset (item);
menuitem_reset(item);
break;
case MENUITEM_IP:
if( strcmp( argv[argnr]+1, "v6" ) == 0 ) {
if (strcmp(argv[argnr]+1, "v6") == 0) {
char * new_buf;
/* set max lenth depending ob boolean option v6 */
item->data.ip.maxlength = (bool_value == 0) ? 15 : 39;
new_buf = malloc(item->data.ip.maxlength + 1 );
strncpy( new_buf, item->data.ip.value, item->data.ip.maxlength);
new_buf = malloc(item->data.ip.maxlength + 1);
strncpy(new_buf, item->data.ip.value, item->data.ip.maxlength);
new_buf[item->data.ip.maxlength] = '\0'; /* terminate */
free( item->data.ip.value );
free(item->data.ip.value);
item->data.ip.value = new_buf;
free( item->data.ip.edit_str );
item->data.ip.edit_str = malloc( item->data.ip.maxlength +1);
free(item->data.ip.edit_str);
item->data.ip.edit_str = malloc(item->data.ip.maxlength +1);
item->data.ip.edit_str[0] = '\0';
}
else if( strcmp( argv[argnr]+1, "value" ) == 0 ) {
strncpy( item->data.ip.value, string_value, item->data.ip.maxlength );
else if (strcmp(argv[argnr]+1, "value") == 0) {
strncpy(item->data.ip.value, string_value, item->data.ip.maxlength);
item->data.ip.value[item->data.ip.maxlength] = '\0'; /* terminate */
}
menuitem_reset (item);
menuitem_reset(item);
break;
default:
break;
}
switch( error ) {
switch (error) {
case 1:
sock_printf_error(c->sock, "Could not interpret value at option: \"%.40s\"\n", argv[argnr]);
continue; /* Skip to next arg and retry it as an option */
@@ -696,8 +696,8 @@ menu_set_item_func (Client * c, int argc, char **argv)
argnr ++;
continue; /* Skip current option and the invalid value */
}
menuscreen_inform_item_modified (item);
if( option_table[option_nr].attr_type != NOVALUE ) {
menuscreen_inform_item_modified(item);
if (option_table[option_nr].attr_type != NOVALUE) {
/* Skip the now used argument */
argnr ++;
}
@@ -715,41 +715,37 @@ menu_set_item_func (Client * c, int argc, char **argv)
* Usage: menu_goto <id> [<predecessor_id>]
*/
int
menu_goto_func (Client * c, int argc, char **argv)
menu_goto_func(Client * c, int argc, char **argv)
{
char * menu_id;
Menu * menu;
char *menu_id;
Menu *menu;
debug (RPT_DEBUG, "%s( Client [%d], %s, %s )",
__FUNCTION__, c->sock, (argc > 1 ? argv[1] : "<null>"),
(argc > 2 ? argv[2] : "<null>") );
debug(RPT_DEBUG, "%s(Client [%d], %s, %s)",
__FUNCTION__, c->sock, ((argc > 1) ? argv[1] : "<null>"),
((argc > 2) ? argv[2] : "<null>"));
if (!c->ack)
return 1;
if ((argc < 2 ) || (argc > 3)) {
if ((argc < 2) || (argc > 3)) {
sock_send_error(c->sock, "Usage: menu_goto <menuid> [<predecessor_id>]\n");
return 0;
}
menu_id = argv[1];
if ( menu_id[0] == 0 ) {
/* No menu specified = client's main menu */
menu = c->menu;
} else {
/* A specified menu */
menu = menuitem_search(menu_id, c);
}
if (!menu) {
/* use either the given menu or the client's main menu if none was specified */
menu = (menu_id[0] != '\0')
? menuitem_search(menu_id, c)
: c->menu;
if (menu == NULL) {
sock_send_error(c->sock, "Cannot find menu id\n");
return 0;
}
if (argc > 2 )
if (argc > 2)
set_predecessor(menu, argv[2], c);
menuscreen_goto (menu);
menuscreen_goto(menu);
/* Failure is not returned (Robijn) */
sock_send_string(c->sock, "success\n");
return 0;
@@ -766,24 +762,24 @@ int set_predecessor(MenuItem *item, char *itemid, Client *c)
assert(item != NULL);
debug(RPT_DEBUG, "%s(%s, %s, %d)", __FUNCTION__,
item->id, itemid, c->sock);
// handle these special
if (strcmp("_quit_", itemid) != 0
&& strcmp("_close_", itemid) != 0
&& strcmp("_none_", itemid) != 0)
{
if ((strcmp("_quit_", itemid) != 0) &&
(strcmp("_close_", itemid) != 0) &&
(strcmp("_none_", itemid) != 0)) {
MenuItem *predecessor = menuitem_search(itemid, c);
if ( ! predecessor)
{
if (predecessor == NULL) {
sock_printf_error(c->sock, "Cannot find predecessor '%s'"
" for item '%s'\n", itemid, item->id);
return -1;
}
}
debug(RPT_DEBUG, "%s( Client [%d], ... )"
debug(RPT_DEBUG, "%s(Client [%d], ...)"
" setting '%s's predecessor from '%s' to '%s'",
__FUNCTION__, c->sock, item->id,
item->predecessor_id, itemid);
if (item->predecessor_id)
if (item->predecessor_id != NULL)
free(item->predecessor_id);
item->predecessor_id = strdup(itemid);
return 0;
@@ -803,31 +799,30 @@ int set_successor(MenuItem *item, char *itemid, Client *c)
assert(item != NULL);
debug(RPT_DEBUG, "%s(%s, %s, %d)", __FUNCTION__,
item->id, itemid, c->sock);
// handle these special
if (strcmp("_quit_", itemid) != 0
&& strcmp("_close_", itemid) != 0
&& strcmp("_none_", itemid) != 0)
{
if ((strcmp("_quit_", itemid) != 0) &&
(strcmp("_close_", itemid) != 0) &&
(strcmp("_none_", itemid) != 0)) {
MenuItem *successor = menuitem_search(itemid, c);
if ( ! successor)
{
if (successor == NULL) {
sock_printf_error(c->sock, "Cannot find successor '%s'"
" for item '%s'\n", itemid, item->id);
return -1;
}
}
if (item->type == MENUITEM_MENU)
{
if (item->type == MENUITEM_MENU) {
sock_printf_error(c->sock, "Cannot set successor of '%s':"
" wrong type '%s'\n", item->id,
menuitem_type_to_typename(item->type));
return -1;
}
debug (RPT_DEBUG, "%s( Client [%d], ... )"
debug(RPT_DEBUG, "%s(Client [%d], ...)"
" setting '%s's successor from '%s' to '%s'",
__FUNCTION__, c->sock, item->id,
item->successor_id, itemid);
if (item->successor_id)
if (item->successor_id != NULL)
free(item->successor_id);
item->successor_id = strdup(itemid);
return 0;
@@ -839,25 +834,25 @@ int set_successor(MenuItem *item, char *itemid, Client *c)
* Usage: menu_set_main <id>
*/
int
menu_set_main_func (Client * c, int argc, char **argv)
menu_set_main_func(Client *c, int argc, char **argv)
{
char * menu_id;
Menu * menu;
char *menu_id;
Menu *menu;
debug (RPT_DEBUG, "%s( Client [%d], %s, %s )",
__FUNCTION__, c->sock, (argc > 1 ? argv[1] : "<null>"),
(argc > 2 ? argv[2] : "<null>") );
debug(RPT_DEBUG, "%s(Client [%d], %s, %s)",
__FUNCTION__, c->sock, ((argc > 1) ? argv[1] : "<null>"),
((argc > 2) ? argv[2] : "<null>"));
if (!c->ack)
return 1;
if (argc != 2 ) {
if (argc != 2) {
sock_send_error(c->sock, "Usage: menu_set_main <menuid>\n");
return 0;
}
menu_id = argv[1];
if ( menu_id[0] == 0 ) {
if (menu_id[0] == '\0') {
/* No menu specified = client's main menu */
menu = c->menu;
}
@@ -866,8 +861,8 @@ menu_set_main_func (Client * c, int argc, char **argv)
}
else {
/* A specified menu */
menu = menu_find_item (c->menu, menu_id, true);
if ( ! menu) {
menu = menu_find_item(c->menu, menu_id, true);
if (menu == NULL) {
sock_send_error(c->sock, "Cannot find menu id\n");
return 0;
}
@@ -880,80 +875,74 @@ menu_set_main_func (Client * c, int argc, char **argv)
}
/***************************************************************
* This function cathes the event for the menus that have been
* This function catches the event for the menus that have been
* created on behalf of the clients. It informs the client with
* an event message.
*/
MenuEventFunc (menu_commands_handler)
MenuEventFunc(menu_commands_handler)
{
char buf[80] = "";
Client * c;
Client *c;
/* Compose message */
if( event == MENUEVENT_UPDATE
|| event == MENUEVENT_MINUS
|| event == MENUEVENT_PLUS) {
switch( item->type ) {
/* Where should the message go to ? */
c = menuitem_get_client(item);
if (c == NULL) {
report(RPT_ERR, "%s: Could not find client of item \"%s\"",
__FUNCTION__, item->id);
return -1;
}
/* Compose & send message */
if ((event == MENUEVENT_UPDATE) ||
(event == MENUEVENT_MINUS) ||
(event == MENUEVENT_PLUS)) {
switch (item->type) {
case MENUITEM_CHECKBOX:
snprintf (buf, sizeof(buf)-1, "menuevent %s %.40s %s\n",
sock_printf(c->sock, "menuevent %s %.40s %s\n",
menuitem_eventtype_to_eventtypename(event),
item->id, ((char*[]){"off","on","gray"})[item->data.checkbox.value] );
item->id, ((char *[]) {"off","on","gray"})[item->data.checkbox.value]);
break;
case MENUITEM_SLIDER:
snprintf (buf, sizeof(buf)-1, "menuevent %s %.40s %d\n",
sock_printf(c->sock, "menuevent %s %.40s %d\n",
menuitem_eventtype_to_eventtypename(event),
item->id, item->data.slider.value );
item->id, item->data.slider.value);
break;
case MENUITEM_RING:
snprintf (buf, sizeof(buf)-1, "menuevent %s %.40s %d\n",
sock_printf(c->sock, "menuevent %s %.40s %d\n",
menuitem_eventtype_to_eventtypename(event),
item->id, item->data.ring.value );
item->id, item->data.ring.value);
break;
case MENUITEM_NUMERIC:
snprintf (buf, sizeof(buf)-1, "menuevent %s %.40s %d\n",
sock_printf(c->sock, "menuevent %s %.40s %d\n",
menuitem_eventtype_to_eventtypename(event),
item->id, item->data.numeric.value );
item->id, item->data.numeric.value);
break;
case MENUITEM_ALPHA:
snprintf (buf, sizeof(buf)-1, "menuevent %s %.40s %.40s\n",
sock_printf(c->sock, "menuevent %s %.40s %.40s\n",
menuitem_eventtype_to_eventtypename(event),
item->id, item->data.alpha.value );
item->id, item->data.alpha.value);
break;
case MENUITEM_IP:
snprintf (buf, sizeof(buf)-1, "menuevent %s %.40s %.40s\n",
sock_printf(c->sock, "menuevent %s %.40s %.40s\n",
menuitem_eventtype_to_eventtypename(event),
item->id, item->data.ip.value );
item->id, item->data.ip.value);
break;
default:
snprintf (buf, sizeof(buf)-1, "menuevent %s %.40s\n",
sock_printf(c->sock, "menuevent %s %.40s\n",
menuitem_eventtype_to_eventtypename(event),
item->id);
}
}
else if (event == MENUEVENT_ENTER
|| event == MENUEVENT_LEAVE)
{
snprintf (buf, sizeof(buf)-1, "menuevent %s %.40s\n",
menuitem_eventtype_to_eventtypename(event),
item->id);
else if ((event == MENUEVENT_ENTER) ||
(event == MENUEVENT_LEAVE)) {
sock_printf(c->sock, "menuevent %s %.40s\n",
menuitem_eventtype_to_eventtypename(event),
item->id);
}
else {
snprintf (buf, sizeof(buf)-1, "menuevent %s %.40s\n",
sock_printf(c->sock, "menuevent %s %.40s\n",
menuitem_eventtype_to_eventtypename(event),
item->id);
}
buf[sizeof(buf)-1] = 0;
/* Where should the message go to ? */
c = menuitem_get_client(item);
if( !c ) {
report( RPT_ERR, "%s: Could not find client of item \"%s\"",
__FUNCTION__, item->id );
return -1;
}
/* Send it */
sock_send_string (c->sock, buf);
return 0;
}