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

generously add tests for NULL in various menu related functions

Browse Source
This commit is contained in:
marschap
2005-02-28 20:21:40 +00:00
parent ed90f0f643
commit fcfd6b6b93
4 changed files with 572 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/menu.c
+109 -70
View File
@@ -43,12 +43,15 @@ menu_create (char *id, MenuEventFunc(*event_func),
{ {
Menu *new_menu; Menu *new_menu;
debug (RPT_DEBUG, "%s( id=\"%s\", event_func=%p, text=\"%s\", association=%p )", __FUNCTION__, id, event_func, text, association); debug (RPT_DEBUG, "%s( id=\"%s\", event_func=%p, text=\"%s\", association=%p )",
__FUNCTION__, id, event_func, text, association);
new_menu = menuitem_create (MENUITEM_MENU, id, event_func, text); new_menu = menuitem_create (MENUITEM_MENU, id, event_func, text);
new_menu->data.menu.contents = LL_new(); if (new_menu != NULL) {
new_menu->data.menu.association = association; new_menu->data.menu.contents = LL_new();
new_menu->data.menu.association = association;
}
return new_menu; return new_menu;
} }
@@ -56,6 +59,9 @@ menu_create (char *id, MenuEventFunc(*event_func),
void void
menu_destroy (Menu *menu) menu_destroy (Menu *menu)
{ {
if (menu == NULL)
return;
debug (RPT_DEBUG, "%s( menu=[%s] )", __FUNCTION__, menu->id); debug (RPT_DEBUG, "%s( menu=[%s] )", __FUNCTION__, menu->id);
menu_destroy_all_items (menu); menu_destroy_all_items (menu);
@@ -68,9 +74,10 @@ menu_destroy (Menu *menu)
void void
menu_add_item (Menu *menu, MenuItem *item) menu_add_item (Menu *menu, MenuItem *item)
{ {
debug (RPT_DEBUG, "%s( menu=[%s], item=[%s] )", __FUNCTION__, menu->id, item->id); if ((menu == NULL) || (item == NULL))
return;
if (!menu) return; debug (RPT_DEBUG, "%s( menu=[%s], item=[%s] )", __FUNCTION__, menu->id, item->id);
/* Add the item to the menu */ /* Add the item to the menu */
LL_Push (menu->data.menu.contents, item); LL_Push (menu->data.menu.contents, item);
@@ -83,15 +90,18 @@ menu_remove_item (Menu *menu, MenuItem *item)
int i; int i;
MenuItem * item2; MenuItem * item2;
if ((menu == NULL) || (item == NULL))
return
debug (RPT_DEBUG, "%s( menu=[%s], item=[%s] )", __FUNCTION__, menu->id, item->id); debug (RPT_DEBUG, "%s( menu=[%s], item=[%s] )", __FUNCTION__, menu->id, item->id);
/* Find the item */ /* Find the item */
for (item2=LL_GetFirst(menu->data.menu.contents), i=0; for (item2 = LL_GetFirst(menu->data.menu.contents), i=0;
item2; item2 != NULL;
item2=LL_GetNext(menu->data.menu.contents), i++ ) { item2 = LL_GetNext(menu->data.menu.contents), i++ ) {
if (item==item2) { if (item == item2) {
LL_DeleteNode (menu->data.menu.contents); LL_DeleteNode (menu->data.menu.contents);
if (menu->data.menu.selector_pos>=i) { if (menu->data.menu.selector_pos >= i) {
menu->data.menu.selector_pos--; menu->data.menu.selector_pos--;
if (menu->data.menu.scroll > 0) if (menu->data.menu.scroll > 0)
menu->data.menu.scroll--; menu->data.menu.scroll--;
@@ -106,9 +116,12 @@ menu_destroy_all_items (Menu *menu)
{ {
MenuItem * item; MenuItem * item;
if (menu == NULL)
return;
debug (RPT_DEBUG, "%s( menu=[%s] )", __FUNCTION__, menu->id); debug (RPT_DEBUG, "%s( menu=[%s] )", __FUNCTION__, menu->id);
for( item = menu_getfirst_item(menu); item; item = menu_getfirst_item(menu) ) { for( item = menu_getfirst_item(menu); item != NULL; item = menu_getfirst_item(menu) ) {
menuitem_destroy (item); menuitem_destroy (item);
LL_Remove (menu->data.menu.contents, item); LL_Remove (menu->data.menu.contents, item);
} }
@@ -118,9 +131,12 @@ MenuItem *menu_find_item (Menu *menu, char *id, bool recursive)
{ {
MenuItem * item; MenuItem * item;
if ((menu == NULL) || (id == NULL))
return NULL;
debug (RPT_DEBUG, "%s( menu=[%s], id=\"%s\", recursive=%d )", __FUNCTION__, menu->id, id, recursive); debug (RPT_DEBUG, "%s( menu=[%s], id=\"%s\", recursive=%d )", __FUNCTION__, menu->id, id, recursive);
for( item = menu_getfirst_item(menu); item; item = menu_getnext_item(menu) ) { for( item = menu_getfirst_item(menu); item != NULL; item = menu_getnext_item(menu) ) {
if ( strcmp(item->id, id) == 0 ) { if ( strcmp(item->id, id) == 0 ) {
return item; return item;
} }
@@ -137,6 +153,9 @@ MenuItem *menu_find_item (Menu *menu, char *id, bool recursive)
void menu_reset (Menu *menu) void menu_reset (Menu *menu)
{ {
if (menu == NULL)
return;
debug (RPT_DEBUG, "%s( menu=[%s] )", __FUNCTION__, menu->id); debug (RPT_DEBUG, "%s( menu=[%s] )", __FUNCTION__, menu->id);
menu->data.menu.selector_pos = 0; menu->data.menu.selector_pos = 0;
@@ -149,6 +168,9 @@ void menu_build_screen (MenuItem *menu, Screen *s)
MenuItem * subitem; MenuItem * subitem;
int itemnr; int itemnr;
if ((menu == NULL) || (s == NULL))
return;
debug (RPT_DEBUG, "%s( menu=[%s], screen=[%s] )", __FUNCTION__, menu->id, s->id); debug (RPT_DEBUG, "%s( menu=[%s], screen=[%s] )", __FUNCTION__, menu->id, s->id);
/* TODO: Put menu in a frame to do easy scrolling */ /* TODO: Put menu in a frame to do easy scrolling */
@@ -156,13 +178,15 @@ void menu_build_screen (MenuItem *menu, Screen *s)
/* Create menu title widget */ /* Create menu title widget */
w = widget_create ("title", WID_TITLE, s); w = widget_create ("title", WID_TITLE, s);
screen_add_widget (s, w); if (w != NULL) {
w->text = strdup(menu->text); screen_add_widget (s, w);
w->x = 1; w->text = strdup(menu->text);
w->x = 1;
}
/* Create widgets for each subitem in the menu */ /* Create widgets for each subitem in the menu */
for (subitem = LL_GetFirst (menu->data.menu.contents), itemnr = 0; for (subitem = LL_GetFirst (menu->data.menu.contents), itemnr = 0;
subitem; subitem != NULL;
subitem = LL_GetNext (menu->data.menu.contents), itemnr ++ ) subitem = LL_GetNext (menu->data.menu.contents), itemnr ++ )
{ {
char buf[10]; char buf[10];
@@ -171,72 +195,80 @@ void menu_build_screen (MenuItem *menu, Screen *s)
buf[sizeof(buf)-1] = 0; buf[sizeof(buf)-1] = 0;
w = widget_create (buf, WID_STRING, s); w = widget_create (buf, WID_STRING, s);
/* (buf will be copied) */ /* (buf will be copied) */
screen_add_widget (s, w); if (w != NULL) {
w->x = 2;
switch (subitem->type) {
case MENUITEM_CHECKBOX:
/* Limit string length */
w->text = strdup (subitem->text);
if (strlen(subitem->text) >= display_props->width-2) {
(w->text)[display_props->width-2] = 0;
}
/* Add icon for checkbox */
snprintf (buf, sizeof(buf)-1, "icon%d", itemnr);
buf[sizeof(buf)-1] = 0;
w = widget_create (buf, WID_ICON, s);
/* (buf will be copied) */
screen_add_widget (s, w); screen_add_widget (s, w);
w->x = display_props->width - 1; w->x = 2;
w->length = ICON_CHECKBOX_OFF;
break; switch (subitem->type) {
case MENUITEM_RING: case MENUITEM_CHECKBOX:
/* Create string for text + ringtext */
w->text = malloc (display_props->width); /* Limit string length */
break; w->text = strdup (subitem->text);
case MENUITEM_MENU: if (strlen(subitem->text) >= display_props->width-2) {
/* Limit string length */ (w->text)[display_props->width-2] = 0;
w->text = malloc( strlen(subitem->text) + 4 ); }
strcpy( w->text, subitem->text );
strcat( w->text, " >" ); /* Add icon for checkbox */
if (strlen(subitem->text) >= display_props->width-1) { snprintf (buf, sizeof(buf)-1, "icon%d", itemnr);
(w->text)[display_props->width-1] = 0; buf[sizeof(buf)-1] = 0;
w = widget_create (buf, WID_ICON, s);
/* (buf will be copied) */
screen_add_widget (s, w);
w->x = display_props->width - 1;
w->length = ICON_CHECKBOX_OFF;
break;
case MENUITEM_RING:
/* Create string for text + ringtext */
w->text = malloc (display_props->width);
break;
case MENUITEM_MENU:
/* Limit string length */
w->text = malloc( strlen(subitem->text) + 4 );
strcpy( w->text, subitem->text );
strcat( w->text, " >" );
if (strlen(subitem->text) >= display_props->width-1) {
(w->text)[display_props->width-1] = '\0';
}
break;
case MENUITEM_ACTION:
case MENUITEM_SLIDER:
case MENUITEM_NUMERIC:
case MENUITEM_ALPHA:
/* Limit string length */
w->text = strdup (subitem->text);
if (strlen(subitem->text) >= display_props->width-1) {
(w->text)[display_props->width-1] = '\0';
}
break;
} }
break;
case MENUITEM_ACTION:
case MENUITEM_SLIDER:
case MENUITEM_NUMERIC:
case MENUITEM_ALPHA:
/* Limit string length */
w->text = strdup (subitem->text);
if (strlen(subitem->text) >= display_props->width-1) {
(w->text)[display_props->width-1] = 0;
}
break;
} }
} }
/* Add arrow for selection on the left */ /* Add arrow for selection on the left */
w = widget_create ("selector", WID_ICON, s); w = widget_create ("selector", WID_ICON, s);
screen_add_widget (s, w); if (w != NULL) {
w->length = ICON_SELECTOR_AT_LEFT; screen_add_widget (s, w);
w->x = 1; w->length = ICON_SELECTOR_AT_LEFT;
w->x = 1;
}
/* Add scrollers on the right side on top and bottom */ /* Add scrollers on the right side on top and bottom */
/* TODO: when menu is in a frame, these can be removed */ /* TODO: when menu is in a frame, these can be removed */
w = widget_create ("upscroller", WID_ICON, s); w = widget_create ("upscroller", WID_ICON, s);
screen_add_widget (s, w); if (w != NULL) {
w->length = ICON_ARROW_UP; screen_add_widget (s, w);
w->x = display_props->width; w->length = ICON_ARROW_UP;
w->y = 1; w->x = display_props->width;
w->y = 1;
}
w = widget_create ("downscroller", WID_ICON, s); w = widget_create ("downscroller", WID_ICON, s);
screen_add_widget (s, w); if (w != NULL) {
w->length = ICON_ARROW_DOWN; screen_add_widget (s, w);
w->x = display_props->width; w->length = ICON_ARROW_DOWN;
w->y = display_props->height; w->x = display_props->width;
w->y = display_props->height;
}
} }
@@ -246,6 +278,9 @@ void menu_update_screen (MenuItem *menu, Screen *s)
MenuItem * subitem; MenuItem * subitem;
int itemnr; int itemnr;
if ((menu == NULL) || (s == NULL))
return;
debug (RPT_DEBUG, "%s( menu=[%s], screen=[%s] )", __FUNCTION__, menu->id, s->id); debug (RPT_DEBUG, "%s( menu=[%s], screen=[%s] )", __FUNCTION__, menu->id, s->id);
/* Update widgets for the title */ /* Update widgets for the title */
@@ -358,6 +393,9 @@ MenuResult menu_process_input (Menu *menu, MenuToken token, char * key)
{ {
MenuItem *subitem; MenuItem *subitem;
if (menu == NULL)
return MENURESULT_ERROR;
debug (RPT_DEBUG, "%s( menu=[%s], token=%d, key=\"%s\" )", __FUNCTION__, menu->id, token, key); debug (RPT_DEBUG, "%s( menu=[%s], token=%d, key=\"%s\" )", __FUNCTION__, menu->id, token, key);
switch (token) { switch (token) {
@@ -371,7 +409,8 @@ MenuResult menu_process_input (Menu *menu, MenuToken token, char * key)
case MENUITEM_ACTION: case MENUITEM_ACTION:
if (subitem->event_func) if (subitem->event_func)
subitem->event_func (subitem, MENUEVENT_SELECT); subitem->event_func (subitem, MENUEVENT_SELECT);
return subitem->data.action.menu_result; return MENURESULT_QUIT; return subitem->data.action.menu_result;
//return MENURESULT_QUIT;
case MENUITEM_CHECKBOX: case MENUITEM_CHECKBOX:
if (subitem->data.checkbox.allow_gray) { if (subitem->data.checkbox.allow_gray) {
subitem->data.checkbox.value = (subitem->data.checkbox.value + 1) % 3; subitem->data.checkbox.value = (subitem->data.checkbox.value + 1) % 3;
server/menu.h
+14 -9
View File
@@ -64,7 +64,9 @@ static inline MenuItem *menu_getfirst_item (Menu *menu)
* Retrieves the first item from the list of items in the menu. * Retrieves the first item from the list of items in the menu.
*/ */
{ {
return (MenuItem*) LL_GetFirst( menu->data.menu.contents ); return (MenuItem*) ((menu != NULL)
? LL_GetFirst(menu->data.menu.contents)
: NULL);
} }
static inline MenuItem *menu_getnext_item (Menu *menu) static inline MenuItem *menu_getnext_item (Menu *menu)
@@ -74,15 +76,18 @@ static inline MenuItem *menu_getnext_item (Menu *menu)
* this function, to keep the list-cursor where it is. * this function, to keep the list-cursor where it is.
*/ */
{ {
return (MenuItem*) LL_GetNext( menu->data.menu.contents ); return (MenuItem*) ((menu != NULL)
? LL_GetNext(menu->data.menu.contents)
: NULL);
} }
static inline MenuItem *menu_get_current_item (Menu *menu) static inline MenuItem *menu_get_current_item (Menu *menu)
/* Retrieves the current item from the list of items in the menu. */ /* Retrieves the current item from the list of items in the menu. */
{ {
return LL_GetByIndex( return (MenuItem*) ((menu != NULL)
menu->data.menu.contents, ? LL_GetByIndex(menu->data.menu.contents,
menu->data.menu.selector_pos); menu->data.menu.selector_pos)
: NULL);
} }
MenuItem *menu_find_item (Menu *menu, char *id, bool recursive); MenuItem *menu_find_item (Menu *menu, char *id, bool recursive);
@@ -90,23 +95,23 @@ MenuItem *menu_find_item (Menu *menu, char *id, bool recursive);
void menu_reset (Menu *menu); void menu_reset (Menu *menu);
/* Resets it to initial state. /* Resets it to initial state.
* DO NOT CALL THIS FUNCTION, CALL menuitem_build_screen INSTEAD ! * DO NOT CALL THIS FUNCTION, CALL menuitem_reset_screen INSTEAD !
*/ */
void menu_build_screen (Menu *menu, Screen *s); void menu_build_screen (Menu *menu, Screen *s);
/* Builds the selected menuitem on screen using widgets. /* Builds the selected menuitem on screen using widgets.
* DO NOT CALL THIS FUNCTION, CALL menuitem_build_screen INSTEAD ! * DO NOT CALL THIS FUNCTION, CALL menuitem_rebuild_screen INSTEAD !
*/ */
void menu_update_screen (Menu *menu, Screen *s); void menu_update_screen (Menu *menu, Screen *s);
/* Updates the widgets of the selected menuitem /* Updates the widgets of the selected menuitem
* DO NOT CALL THIS FUNCTION, CALL menuitem_build_screen INSTEAD ! * DO NOT CALL THIS FUNCTION, CALL menuitem_update_screen INSTEAD !
*/ */
MenuResult menu_process_input (Menu *menu, MenuToken token, char * key); MenuResult menu_process_input (Menu *menu, MenuToken token, char * key);
/* Does something with the given input. /* Does something with the given input.
* key is only used if token is MENUTOKEN_OTHER. * key is only used if token is MENUTOKEN_OTHER.
* DO NOT CALL THIS FUNCTION, CALL menuitem_build_screen INSTEAD ! * DO NOT CALL THIS FUNCTION, CALL menuitem_process_input INSTEAD !
*/ */
#endif #endif
server/menuitem.c
+439 -351
View File
File diff suppressed because it is too large Load Diff
server/screen.h
+6 -2
View File
@@ -65,12 +65,16 @@ int screen_remove_widget (Screen * s, Widget * w);
/* List functions */ /* List functions */
static inline Widget * screen_getfirst_widget (Screen * s) static inline Widget * screen_getfirst_widget (Screen * s)
{ {
return LL_GetFirst(s->widgetlist); return (Widget *) ((s != NULL)
? LL_GetFirst(s->widgetlist)
: NULL);
} }
static inline Widget * screen_getnext_widget (Screen * s) static inline Widget * screen_getnext_widget (Screen * s)
{ {
return LL_GetNext(s->widgetlist); return (Widget *) ((s != NULL)
? LL_GetNext(s->widgetlist)
: NULL);
} }