sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

stk: Add icon ID information in stk_menu

This commit is contained in:
Andrzej Zaborowski 2010-10-13 15:54:10 +02:00 committed by Denis Kenzior
parent c1eb40e979
commit 5b1f4d1216
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/stk.c
View File

@ -256,19 +256,28 @@ void __ofono_cbs_sim_download(struct ofono_stk *stk, const struct cbs *msg)
} }
static struct stk_menu *stk_menu_create(const char *title, static struct stk_menu *stk_menu_create(const char *title,
const struct stk_text_attribute *title_attr, GSList *items, const struct stk_text_attribute *title_attr,
const struct stk_icon_id *icon, GSList *items,
const struct stk_item_text_attribute_list *item_attrs, const struct stk_item_text_attribute_list *item_attrs,
const struct stk_item_icon_id_list *item_icon_ids,
int default_id, gboolean soft_key, gboolean has_help) int default_id, gboolean soft_key, gboolean has_help)
{ {
struct stk_menu *ret = g_new(struct stk_menu, 1); struct stk_menu *ret = g_new(struct stk_menu, 1);
unsigned int len = g_slist_length(items);
GSList *l; GSList *l;
int i; int i;
DBG(""); DBG("");
if (item_attrs && item_attrs->len && item_attrs->len != len * 4)
goto error;
if (item_icon_ids && item_icon_ids->len && item_icon_ids->len != len)
goto error;
ret->title = g_strdup(title ? title : ""); ret->title = g_strdup(title ? title : "");
ret->icon_id = 0; memcpy(&ret->icon, icon, sizeof(ret->icon));
ret->items = g_new0(struct stk_menu_item, g_slist_length(items) + 1); ret->items = g_new0(struct stk_menu_item, len + 1);
ret->default_item = -1; ret->default_item = -1;
ret->soft_key = soft_key; ret->soft_key = soft_key;
ret->has_help = has_help; ret->has_help = has_help;
@ -278,12 +287,18 @@ static struct stk_menu *stk_menu_create(const char *title,
ret->items[i].text = g_strdup(item->text); ret->items[i].text = g_strdup(item->text);
ret->items[i].item_id = item->id; ret->items[i].item_id = item->id;
if (item_icon_ids && item_icon_ids->len)
ret->items[i].icon_id = item_icon_ids->list[i];
if (item->id == default_id) if (item->id == default_id)
ret->default_item = i; ret->default_item = i;
} }
return ret; return ret;
error:
g_free(ret);
return NULL;
} }
static struct stk_menu *stk_menu_create_from_set_up_menu( static struct stk_menu *stk_menu_create_from_set_up_menu(
@ -294,8 +309,10 @@ static struct stk_menu *stk_menu_create_from_set_up_menu(
return stk_menu_create(cmd->setup_menu.alpha_id, return stk_menu_create(cmd->setup_menu.alpha_id,
&cmd->setup_menu.text_attr, &cmd->setup_menu.text_attr,
&cmd->setup_menu.icon_id,
cmd->setup_menu.items, cmd->setup_menu.items,
&cmd->setup_menu.item_text_attr_list, &cmd->setup_menu.item_text_attr_list,
&cmd->setup_menu.item_icon_id_list,
0, soft_key, has_help); 0, soft_key, has_help);
} }
@ -307,8 +324,10 @@ static struct stk_menu *stk_menu_create_from_select_item(
return stk_menu_create(cmd->select_item.alpha_id, return stk_menu_create(cmd->select_item.alpha_id,
&cmd->select_item.text_attr, &cmd->select_item.text_attr,
&cmd->select_item.icon_id,
cmd->select_item.items, cmd->select_item.items,
&cmd->select_item.item_text_attr_list, &cmd->select_item.item_text_attr_list,
&cmd->select_item.item_icon_id_list,
cmd->select_item.item_id, soft_key, has_help); cmd->select_item.item_id, soft_key, has_help);
} }

2
src/stkagent.c
View File

@ -345,7 +345,7 @@ int stk_agent_request_selection(struct stk_agent *agent,
dbus_message_iter_init_append(agent->msg, &iter); dbus_message_iter_init_append(agent->msg, &iter);
dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &menu->title); dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &menu->title);
dbus_message_iter_append_basic(&iter, DBUS_TYPE_BYTE, &menu->icon_id); dbus_message_iter_append_basic(&iter, DBUS_TYPE_BYTE, &menu->icon.id);
append_menu_items(&iter, menu->items); append_menu_items(&iter, menu->items);
dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT16, &default_item); dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT16, &default_item);

2
src/stkagent.h
View File

@ -36,7 +36,7 @@ struct stk_menu_item {
struct stk_menu { struct stk_menu {
char *title; char *title;
uint8_t icon_id; struct stk_icon_id icon;
struct stk_menu_item *items; struct stk_menu_item *items;
int default_item; int default_item;
gboolean soft_key; gboolean soft_key;