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

Menu stuff update. Fixed some of the probably many bugs and made things a

Browse Source 
bit more consistent.
This commit is contained in:
robijn
2002-07-09 22:56:05 +00:00
parent 012a4cb483
commit 1156c51062
8 changed files with 131 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/commands/menu_commands.c
+20 -7
View File
@@ -157,6 +157,7 @@ menu_add_item_func (Client * c, int argc, char **argv)
break;
}
menu_add_item (menu, item);
menuscreen_inform_item_modified (menu);
sock_send_string(c->sock, "success\n");
return 0;
}
@@ -181,7 +182,7 @@ menu_del_item_func (Client * c, int argc, char **argv)
if (!c->ack)
return 1;
if ((argc < 4 )) {
if ((argc < 3 )) {
sock_send_string (c->sock, "huh? Usage: menu_del_item <menuid> <itemid>\n");
return 0;
}
@@ -189,6 +190,12 @@ menu_del_item_func (Client * c, int argc, char **argv)
menu_id = argv[1];
item_id = argv[2];
/* Does the client have a menu already ? */
if (!c->menu) {
sock_send_string (c->sock, "huh? Client has no menu\n");
return 0;
}
if ( menu_id[0] == 0 ) {
/* No menu specified = client's main menu */
menu = c->menu;
@@ -206,9 +213,19 @@ menu_del_item_func (Client * c, int argc, char **argv)
sock_send_string (c->sock, "huh? 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);
/* 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);
c->menu = NULL;
}
sock_send_string(c->sock, "success\n");
return 0;
}
@@ -580,11 +597,7 @@ menu_set_item_func (Client * c, int argc, char **argv)
argnr ++;
continue; /* Skip current option and the invalid value */
}
if( active_menuitem && menuscreen ) {
/* We need to rebuild the screen */
menuitem_build_screen( active_menuitem, menuscreen );
menuitem_update_screen( active_menuitem, menuscreen );
}
menuscreen_inform_item_modified (item);
if( option_table[option_nr].attr_type != NOVALUE ) {
/* Skip the now used argument */
argnr ++;
@@ -645,7 +658,7 @@ MenuEventFunc (menu_commands_handler)
buf[sizeof(buf)-1] = 0;
/* Where should the message go to ? */
for( i = item; i && i->parent != main_menu; i = item->parent );
for( i = item; i && i->parent != main_menu; i = i->parent );
c = (Client *) i->data.menu.association;
if( !c ) {
report( RPT_ERR, "%s: Could not find client of item \"%s\"", __FUNCTION__, item->id );