[Scummvm-cvs-logs] SF.net SVN: scummvm:[39659] scummvm/trunk/engines/sci
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Mar 24 12:31:17 CET 2009
Revision: 39659
http://scummvm.svn.sourceforge.net/scummvm/?rev=39659&view=rev
Author: fingolfin
Date: 2009-03-24 11:31:16 +0000 (Tue, 24 Mar 2009)
Log Message:
-----------
SCI: C++ify menu code
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/game.cpp
scummvm/trunk/engines/sci/engine/kmenu.cpp
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/engine/state.cpp
scummvm/trunk/engines/sci/engine/state.h
scummvm/trunk/engines/sci/gfx/menubar.cpp
scummvm/trunk/engines/sci/gfx/menubar.h
scummvm/trunk/engines/sci/gfx/sci_widgets.cpp
scummvm/trunk/engines/sci/gfx/sci_widgets.h
Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp 2009-03-24 11:30:52 UTC (rev 39658)
+++ scummvm/trunk/engines/sci/engine/game.cpp 2009-03-24 11:31:16 UTC (rev 39659)
@@ -649,7 +649,7 @@
s->parser_nodes[0].type = PARSE_TREE_NODE_LEAF;
s->parser_nodes[0].content.value = 0;
- s->menubar = menubar_new(); // Create menu bar
+ s->_menubar = new Menubar(); // Create menu bar
if (s->sfx_init_flags & SFX_STATE_FLAG_NOSOUND)
game_init_sound(s, 0);
@@ -680,7 +680,7 @@
// TODO Free scripts here
- menubar_free(s->menubar);
+ delete s->_menubar;
_free_graphics_input(s);
Modified: scummvm/trunk/engines/sci/engine/kmenu.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmenu.cpp 2009-03-24 11:30:52 UTC (rev 39658)
+++ scummvm/trunk/engines/sci/engine/kmenu.cpp 2009-03-24 11:31:16 UTC (rev 39659)
@@ -36,7 +36,7 @@
char *name = kernel_dereference_char_pointer(s, argv[0], 0);
char *contents = kernel_dereference_char_pointer(s, argv[1], 0);
- menubar_add_menu(s->gfx_state, s->menubar, name,
+ s->_menubar->addMenu(s->gfx_state, name,
contents, s->titlebar_port->font_nr, argv[1]);
return s->r_acc;
@@ -49,7 +49,7 @@
int i = 2;
while (i < argc) {
- menubar_set_attribute(s, (index >> 8) - 1, (index & 0xff) - 1, UKPV(i - 1), argv[i]);
+ s->_menubar->setAttribute(s, (index >> 8) - 1, (index & 0xff) - 1, UKPV(i - 1), argv[i]);
i += 2;
}
@@ -59,7 +59,7 @@
reg_t kGetMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int index = UKPV(0);
- return menubar_get_attribute(s, (index >> 8) - 1, (index & 0xff) - 1, UKPV(1));
+ return s->_menubar->getAttribute((index >> 8) - 1, (index & 0xff) - 1, UKPV(1));
}
@@ -95,7 +95,7 @@
reg_t kDrawMenuBar(EngineState *s, int funct_nr, int argc, reg_t *argv) {
if (SKPV(0))
- sciw_set_menubar(s, s->titlebar_port, s->menubar, -1);
+ sciw_set_menubar(s, s->titlebar_port, s->_menubar, -1);
else
sciw_set_status_bar(s, s->titlebar_port, NULL, 0, 0);
@@ -106,11 +106,12 @@
}
-static int _menu_go_down(EngineState *s, int menu_nr, int item_nr) {
- int seeker, max = s->menubar->menus[menu_nr].items_nr;
+static int _menu_go_down(Menubar *menubar, int menu_nr, int item_nr) {
+ int seeker;
+ const int max = menubar->_menus[menu_nr]._items.size();
seeker = item_nr + 1;
- while ((seeker < max) && !menubar_item_valid(s, menu_nr, seeker))
+ while ((seeker < max) && !menubar->itemValid(menu_nr, seeker))
++seeker;
if (seeker != max)
@@ -127,12 +128,12 @@
reg_t kMenuSelect(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t event = argv[0];
/*int pause_sound = UKPV_OR_ALT(1, 1);*/ /* FIXME: Do this eventually */
- int claimed = 0;
+ bool claimed = false;
int type = GET_SEL32V(event, type);
int message = GET_SEL32V(event, message);
int modifiers = GET_SEL32V(event, modifiers);
int menu_nr = -1, item_nr = 0;
- menu_item_t *item;
+ MenuItem *item;
int menu_mode = 0; /* Menu is active */
int mouse_down = 0;
@@ -150,27 +151,27 @@
SCIkdebug(SCIkMENU, "Menu: Got %s event: %04x/%04x\n",
((type == SCI_EVT_SAID) ? "SAID" : "KBD"), message, modifiers);
- for (menuc = 0; menuc < s->menubar->menus_nr; menuc++)
- for (itemc = 0; itemc < s->menubar->menus[menuc].items_nr; itemc++) {
- item = s->menubar->menus[menuc].items + itemc;
+ for (menuc = 0; menuc < (int)s->_menubar->_menus.size(); menuc++)
+ for (itemc = 0; itemc < (int)s->_menubar->_menus[menuc]._items.size(); itemc++) {
+ item = &s->_menubar->_menus[menuc]._items[itemc];
SCIkdebug(SCIkMENU, "Menu: Checking against %s: %04x/%04x (type %d, %s)\n",
- item->text ? item->text : "--bar--", item->key, item->modifiers,
- item->type, item->enabled ? "enabled" : "disabled");
+ !item->_text.empty() ? item->_text.c_str() : "--bar--", item->_key, item->_modifiers,
+ item->_type, item->_enabled ? "enabled" : "disabled");
- if (((item->type == MENU_TYPE_NORMAL)
- && (item->enabled))
+ if (((item->_type == MENU_TYPE_NORMAL)
+ && (item->_enabled))
&& (((type == SCI_EVT_KEYBOARD) /* keyboard event */
- && menubar_match_key(item, message, modifiers))
+ && item->matchKey(message, modifiers))
|| ((type == SCI_EVT_SAID) /* Said event */
- && (item->flags & MENU_ATTRIBUTE_FLAGS_SAID)
- && (said(s, item->said, (s->debug_mode & (1 << SCIkPARSER_NR))) != SAID_NO_MATCH)
+ && (item->_flags & MENU_ATTRIBUTE_FLAGS_SAID)
+ && (said(s, item->_said, (s->debug_mode & (1 << SCIkPARSER_NR))) != SAID_NO_MATCH)
)
)
) {
/* Claim the event */
SCIkdebug(SCIkMENU, "Menu: Event CLAIMED for %d/%d\n", menuc, itemc);
- claimed = 1;
+ claimed = true;
menu_nr = menuc;
item_nr = itemc;
}
@@ -192,11 +193,11 @@
/* Default to menu 0, unless the mouse was used to generate this effect */
if (mouse_down)
- menubar_map_pointer(s, &menu_nr, &item_nr, port);
+ s->_menubar->mapPointer(s->gfx_state, &menu_nr, &item_nr, port);
else
menu_nr = 0;
- sciw_set_menubar(s, s->titlebar_port, s->menubar, menu_nr);
+ sciw_set_menubar(s, s->titlebar_port, s->_menubar, menu_nr);
FULL_REDRAW;
old_item = -1;
@@ -205,7 +206,7 @@
while (menu_mode) {
sci_event_t ev = gfxop_get_event(s->gfx_state, SCI_EVT_ANY);
- claimed = 0;
+ claimed = false;
switch (ev.type) {
case SCI_EVT_QUIT:
@@ -227,37 +228,37 @@
case SCI_K_ENTER:
menu_mode = 0;
if ((item_nr >= 0) && (menu_nr >= 0))
- claimed = 1;
+ claimed = true;
break;
case SCI_K_LEFT:
if (menu_nr > 0)
--menu_nr;
else
- menu_nr = s->menubar->menus_nr - 1;
+ menu_nr = s->_menubar->_menus.size() - 1;
- item_nr = _menu_go_down(s, menu_nr, -1);
+ item_nr = _menu_go_down(s->_menubar, menu_nr, -1);
break;
case SCI_K_RIGHT:
- if (menu_nr < (s->menubar->menus_nr - 1))
+ if (menu_nr < ((int)s->_menubar->_menus.size() - 1))
++menu_nr;
else
menu_nr = 0;
- item_nr = _menu_go_down(s, menu_nr, -1);
+ item_nr = _menu_go_down(s->_menubar, menu_nr, -1);
break;
case SCI_K_UP:
if (item_nr > -1) {
do { --item_nr; }
- while ((item_nr > -1) && !menubar_item_valid(s, menu_nr, item_nr));
+ while ((item_nr > -1) && !s->_menubar->itemValid(menu_nr, item_nr));
}
break;
case SCI_K_DOWN: {
- item_nr = _menu_go_down(s, menu_nr, item_nr);
+ item_nr = _menu_go_down(s->_menubar, menu_nr, item_nr);
}
break;
@@ -266,7 +267,7 @@
case SCI_EVT_MOUSE_RELEASE:
menu_mode = (s->gfx_state->pointer_pos.y < 10);
- claimed = !menu_mode && !menubar_map_pointer(s, &menu_nr, &item_nr, port);
+ claimed = !menu_mode && !s->_menubar->mapPointer(s->gfx_state, &menu_nr, &item_nr, port);
mouse_down = 0;
break;
@@ -280,16 +281,16 @@
}
if (mouse_down)
- menubar_map_pointer(s, &menu_nr, &item_nr, port);
+ s->_menubar->mapPointer(s->gfx_state, &menu_nr, &item_nr, port);
if ((item_nr > -1 && old_item == -1) || (menu_nr != old_menu)) { /* Update menu */
- sciw_set_menubar(s, s->titlebar_port, s->menubar, menu_nr);
+ sciw_set_menubar(s, s->titlebar_port, s->_menubar, menu_nr);
if (port)
port->widfree(GFXW(port));
- port = sciw_new_menu(s, s->titlebar_port, s->menubar, menu_nr);
+ port = sciw_new_menu(s, s->titlebar_port, s->_menubar, menu_nr);
s->wm_port->add(GFXWC(s->wm_port), GFXW(port));
if (item_nr > -1)
@@ -302,8 +303,8 @@
/* Remove the active menu item, if neccessary */
if (item_nr != old_item) {
- port = sciw_unselect_item(s, port, s->menubar->menus + menu_nr, old_item);
- port = sciw_select_item(s, port, s->menubar->menus + menu_nr, item_nr);
+ port = sciw_unselect_item(s, port, &(s->_menubar->_menus[menu_nr]), old_item);
+ port = sciw_select_item(s, port, &(s->_menubar->_menus[menu_nr]), item_nr);
FULL_REDRAW;
}
@@ -331,7 +332,8 @@
s->r_acc = NULL_REG;
SCIkdebug(SCIkMENU, "Menu: Claim -> %04x\n", s->r_acc.offset);
- } else s->r_acc = NULL_REG; /* Not claimed */
+ } else
+ s->r_acc = NULL_REG; /* Not claimed */
return s->r_acc;
}
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-03-24 11:30:52 UTC (rev 39658)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-03-24 11:31:16 UTC (rev 39659)
@@ -95,42 +95,67 @@
obj.saveLoadWithSerializer(s);
}
-static void sync_menu_item_t(Common::Serializer &s, menu_item_t &obj) {
- s.syncAsSint32LE(obj.type);
- syncCStr(s, &obj.keytext);
- s.syncAsSint32LE(obj.keytext_size);
- s.syncAsSint32LE(obj.flags);
- s.syncBytes(obj.said, MENU_SAID_SPEC_SIZE);
- sync_reg_t(s, obj.said_pos);
- syncCStr(s, &obj.text);
- sync_reg_t(s, obj.text_pos);
- s.syncAsSint32LE(obj.modifiers);
- s.syncAsSint32LE(obj.key);
- s.syncAsSint32LE(obj.enabled);
- s.syncAsSint32LE(obj.tag);
+/**
+ * Sync a Common::Array using a Common::Serializer.
+ * When saving, this writes the length of the array, then syncs (writes) all entries.
+ * When loading, it loads the length of the array, then resizes it accordingly, before
+ * syncing all entries.
+ *
+ * TODO: Right now, this can only sync arrays containing objects which subclass Serializable.
+ * To sync arrays containing e.g. ints, we have to tell it how to sync those. There are
+ * ways to do that, I just haven't decided yet how to approach it. One way would be to use
+ * the same preprocessors tricks as in common/serializer.h. Another is to rely on template
+ * specialization (that one could be rather elegant, in fact).
+ *
+ *
+ * Note: I didn't add this as a member method to Common::Array (and subclass that from Serializable)
+ * on purpose, as not all code using Common::Array wants to do deal with serializers...
+ *
+ * TODO: Add something like this for lists, queues....
+ */
+template<typename T>
+void syncArray(Common::Serializer &s, Common::Array<T> &arr) {
+ uint len = arr.size();
+ s.syncAsUint32LE(len);
+
+ // Resize the array if loading.
+ if (s.isLoading())
+ arr.resize(len);
+
+ typename Common::Array<T>::iterator i;
+ for (i = arr.begin(); i != arr.end(); ++i) {
+ i->saveLoadWithSerializer(s);
+ }
}
-static void sync_menu_t(Common::Serializer &s, menu_t &obj) {
- syncCStr(s, &obj.title);
- s.syncAsSint32LE(obj.title_width);
- s.syncAsSint32LE(obj.width);
+void MenuItem::saveLoadWithSerializer(Common::Serializer &s) {
+ s.syncAsSint32LE(_type);
+ s.syncString(_keytext);
+ s.skip(4); // Used to be keytext_size (an already unused field)
- s.syncAsSint32LE(obj.items_nr);
+ s.syncAsSint32LE(_flags);
+ s.syncBytes(_said, MENU_SAID_SPEC_SIZE);
+ sync_reg_t(s, _saidPos);
+ s.syncString(_text);
+ sync_reg_t(s, _textPos);
+ s.syncAsSint32LE(_modifiers);
+ s.syncAsSint32LE(_key);
+ s.syncAsSint32LE(_enabled);
+ s.syncAsSint32LE(_tag);
+}
- if (!obj.items && obj.items_nr)
- obj.items = (menu_item_t *)sci_calloc(obj.items_nr, sizeof(menu_item_t));
- for (int i = 0; i < obj.items_nr; ++i)
- sync_menu_item_t(s, obj.items[i]);
+void Menu::saveLoadWithSerializer(Common::Serializer &s) {
+ s.syncString(_title);
+ s.syncAsSint32LE(_titleWidth);
+ s.syncAsSint32LE(_width);
+
+ syncArray<MenuItem>(s, _items);
}
-static void sync_menubar_t(Common::Serializer &s, menubar_t &obj) {
- s.syncAsSint32LE(obj.menus_nr);
- if (!obj.menus && obj.menus_nr)
- obj.menus = (menu_t *)sci_calloc(obj.menus_nr, sizeof(menu_t));
- for (int i = 0; i < obj.menus_nr; ++i)
- sync_menu_t(s, obj.menus[i]);
+void Menubar::saveLoadWithSerializer(Common::Serializer &s) {
+ syncArray<Menu>(s, _menus);
}
static void sync_SegManager(Common::Serializer &s, SegManager &obj) {
@@ -205,10 +230,10 @@
// FIXME: Do in-place loading at some point, instead of creating a new EngineState instance from scratch.
if (s.isLoading()) {
//free(menubar);
- menubar = (menubar_t *)sci_calloc(1, sizeof(menubar_t));
+ _menubar = new Menubar();
} else
- assert(menubar);
- sync_menubar_t(s, *menubar);
+ assert(_menubar);
+ _menubar->saveLoadWithSerializer(s);
s.syncAsSint32LE(status_bar_foreground);
s.syncAsSint32LE(status_bar_background);
Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp 2009-03-24 11:30:52 UTC (rev 39658)
+++ scummvm/trunk/engines/sci/engine/state.cpp 2009-03-24 11:31:16 UTC (rev 39659)
@@ -97,7 +97,7 @@
animation_delay = 0;
animation_granularity = 0;
- menubar = 0;
+ _menubar = 0;
priority_first = 0;
priority_last = 0;
Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h 2009-03-24 11:30:52 UTC (rev 39658)
+++ scummvm/trunk/engines/sci/engine/state.h 2009-03-24 11:31:16 UTC (rev 39659)
@@ -46,7 +46,7 @@
namespace Sci {
-struct menubar_t;
+class Menubar;
struct kfunct_sig_pair_t; // from kernel.h
struct gfx_state_t;
@@ -183,7 +183,7 @@
long animation_delay; /* A delay factor for pic opening animations. Defaults to 500. */
int animation_granularity; /* Number of animation steps to perform betwen updates for transition animations */
- menubar_t *menubar; /* The menu bar */
+ Menubar *_menubar; /* The menu bar */
int priority_first; /* The line where priority zone 0 ends */
int priority_last; /* The line where the highest priority zone starts */
Modified: scummvm/trunk/engines/sci/gfx/menubar.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/menubar.cpp 2009-03-24 11:30:52 UTC (rev 39658)
+++ scummvm/trunk/engines/sci/gfx/menubar.cpp 2009-03-24 11:31:16 UTC (rev 39659)
@@ -38,87 +38,68 @@
#define SIZE_INF 32767
-menubar_t *menubar_new() {
- menubar_t *tmp = (menubar_t*)sci_malloc(sizeof(menubar_t));
- tmp->menus_nr = 0;
-
- return tmp;
+Menu::Menu() {
+ _titleWidth = 0;
+ _width = 0;
}
-void menubar_free(menubar_t *menubar) {
- int i;
-
- for (i = 0; i < menubar->menus_nr; i++) {
- menu_t *menu = &(menubar->menus[i]);
- int j;
-
- for (j = 0; j < menu->items_nr; j++) {
- free(menu->items[j].keytext);
- free(menu->items[j].text);
- }
-
- free(menu->items);
- free(menu->title);
- }
-
- if (menubar->menus_nr)
- free(menubar->menus);
-
- free(menubar);
+MenuItem::MenuItem() {
+ _type = MENU_TYPE_NORMAL;
+ _flags = 0;
+ memset(_said, 0, sizeof(_said));
+ _saidPos = NULL_REG;
+ _textPos = NULL_REG;
+ _modifiers = 0;
+ _key = 0;
+ _enabled = 0;
+ _tag = 0;
}
-int _menubar_add_menu_item(gfx_state_t *state, menu_t *menu, int type, char *left, char *right,
+
+int Menu::addMenuItem(gfx_state_t *state, MenuType type, const char *left, const char *right,
int font, int key, int modifiers, int tag, reg_t text_pos) {
// Returns the total text size, plus MENU_BOX_CENTER_PADDING if (right != NULL)
- menu_item_t *item;
+ MenuItem newItem;
+ MenuItem *item;
int total_left_size = 0;
int width, height;
- if (menu->items_nr == 0) {
- menu->items = (menu_item_t *)sci_malloc(sizeof(menu_item_t));
- menu->items_nr = 1;
- } else
- menu->items = (menu_item_t *)sci_realloc(menu->items, sizeof(menu_item_t) * ++(menu->items_nr));
+ item = &newItem;
+ item->_type = type;
- item = &(menu->items[menu->items_nr - 1]);
-
- memset(item, 0, sizeof(menu_item_t));
-
- if ((item->type = type) == MENU_TYPE_HBAR)
+ if (type == MENU_TYPE_HBAR) {
+ _items.push_back(newItem);
return 0;
+ }
// else assume MENU_TYPE_NORMAL
- item->text = left;
+ item->_text = left;
if (right) {
- int end = strlen(right);
- item->keytext = right;
- while (end && isspace(right[end]))
- right[end--] = 0; // Remove trailing whitespace
- item->flags = MENU_ATTRIBUTE_FLAGS_KEY;
- item->key = key;
- item->modifiers = modifiers;
+ item->_keytext = right;
+ item->_keytext.trim(); // Remove trailing whitespace
+ item->_flags = MENU_ATTRIBUTE_FLAGS_KEY;
+ item->_key = key;
+ item->_modifiers = modifiers;
} else {
- item->keytext = NULL;
- item->flags = 0;
+ item->_flags = 0;
}
if (right) {
- gfxop_get_text_params(state, font, right, SIZE_INF, &width, &height, 0, NULL, NULL, NULL);
- item->keytext_size = width;
+ gfxop_get_text_params(state, font, item->_keytext.c_str(), SIZE_INF, &width, &height, 0, NULL, NULL, NULL);
total_left_size = MENU_BOX_CENTER_PADDING + width;
}
- item->enabled = 1;
- item->tag = tag;
- item->text_pos = text_pos;
+ item->_enabled = 1;
+ item->_tag = tag;
+ item->_textPos = text_pos;
gfxop_get_text_params(state, font, left, SIZE_INF, &width, &height, 0, NULL, NULL, NULL);
+ _items.push_back(newItem);
+
return total_left_size + width;
}
-void menubar_add_menu(gfx_state_t *state, menubar_t *menubar, char *title, char *entries, int font, reg_t entries_base) {
- int i;
- menu_t *menu;
+void Menubar::addMenu(gfx_state_t *state, const char *title, const char *entries, int font, reg_t entries_base) {
char tracker;
char *left = NULL, *right;
reg_t left_origin = entries_base;
@@ -126,18 +107,11 @@
int tag = 0, c_width, max_width = 0;
int height;
- if (menubar->menus_nr == 0) {
- menubar->menus = (menu_t *)sci_malloc(sizeof(menu_t));
- menubar->menus_nr = 1;
- } else
- menubar->menus = (menu_t *)sci_realloc(menubar->menus, ++(menubar->menus_nr) * sizeof(menu_t));
+ Menu menu;
- menu = &(menubar->menus[menubar->menus_nr-1]);
- memset(menu, 0, sizeof(menu_t));
- menu->items_nr = 0;
- menu->title = sci_strdup(title);
+ menu._title = title;
- gfxop_get_text_params(state, font, menu->title, SIZE_INF, &(menu->title_width), &height, 0, NULL, NULL, NULL);
+ gfxop_get_text_params(state, font, title, SIZE_INF, &(menu._titleWidth), &height, 0, NULL, NULL, NULL);
do {
tracker = *entries++;
@@ -150,7 +124,7 @@
tracker = *entries++;
}
if ((tracker == 0 && string_len > 0) || (tracker == '=') || (tracker == ':')) { // End of entry
- int entrytype = MENU_TYPE_NORMAL;
+ MenuType entrytype = MENU_TYPE_NORMAL;
char *inleft;
reg_t beginning;
@@ -171,7 +145,7 @@
beginning = entries_base;
beginning.offset -= string_len + 1;
- c_width = _menubar_add_menu_item(state, menu, entrytype, left, NULL, font, 0, 0, tag, beginning);
+ c_width = menu.addMenuItem(state, entrytype, left, NULL, font, 0, 0, tag, beginning);
if (c_width > max_width)
max_width = c_width;
@@ -244,12 +218,12 @@
key = key - 'A' + 'a'; // Lowercase the key
}
- i = strlen(right);
+ int i = strlen(right);
while (i > 0 && right[--i] == ' ')
right[i] = 0; // Cut off chars to the right
- c_width = _menubar_add_menu_item(state, menu, MENU_TYPE_NORMAL, left, right, font, key,
+ c_width = menu.addMenuItem(state, MENU_TYPE_NORMAL, left, right, font, key,
modifiers, tag, left_origin);
tag = 0;
if (c_width > max_width)
@@ -263,78 +237,74 @@
} // right string finished
} while (tracker);
- menu->width = max_width;
+ menu._width = max_width;
+
+ _menus.push_back(menu);
}
-int menubar_match_key(menu_item_t *item, int message, int modifiers) {
- if ((item->key == message) && ((modifiers & (SCI_EVM_CTRL | SCI_EVM_ALT)) == item->modifiers))
- return 1;
+bool MenuItem::matchKey(int message, int modifiers) {
+ if ((_key == message) && ((modifiers & (SCI_EVM_CTRL | SCI_EVM_ALT)) == _modifiers))
+ return true;
- if (message == '\t' && item->key == 'i' && ((modifiers & (SCI_EVM_CTRL | SCI_EVM_ALT)) == 0) && item->modifiers == SCI_EVM_CTRL)
- return 1; // Match TAB to ^I
+ if (message == '\t' && _key == 'i' && ((modifiers & (SCI_EVM_CTRL | SCI_EVM_ALT)) == 0) && _modifiers == SCI_EVM_CTRL)
+ return true; // Match TAB to ^I
return 0;
}
-int menubar_set_attribute(EngineState *s, int menu_nr, int item_nr, int attribute, reg_t value) {
- menubar_t *menubar = s->menubar;
- menu_item_t *item;
+int Menubar::setAttribute(EngineState *s, int menu_nr, int item_nr, int attribute, reg_t value) {
+ MenuItem *item;
if ((menu_nr < 0) || (item_nr < 0))
return 1;
- if ((menu_nr >= menubar->menus_nr) || (item_nr >= menubar->menus[menu_nr].items_nr))
+ if ((menu_nr >= (int)_menus.size()) || (item_nr >= (int)_menus[menu_nr]._items.size()))
return 1;
- item = menubar->menus[menu_nr].items + item_nr;
+ item = &_menus[menu_nr]._items[item_nr];
switch (attribute) {
case MENU_ATTRIBUTE_SAID:
if (value.segment) {
- item->said_pos = value;
- memcpy(item->said, kernel_dereference_bulk_pointer(s, value, 0), MENU_SAID_SPEC_SIZE); // Copy Said spec
- item->flags |= MENU_ATTRIBUTE_FLAGS_SAID;
+ item->_saidPos = value;
+ memcpy(item->_said, kernel_dereference_bulk_pointer(s, value, 0), MENU_SAID_SPEC_SIZE); // Copy Said spec
+ item->_flags |= MENU_ATTRIBUTE_FLAGS_SAID;
} else
- item->flags &= ~MENU_ATTRIBUTE_FLAGS_SAID;
+ item->_flags &= ~MENU_ATTRIBUTE_FLAGS_SAID;
break;
case MENU_ATTRIBUTE_TEXT:
- free(item->text);
assert(value.segment);
- item->text = sci_strdup(kernel_dereference_char_pointer(s, value, 0));
- item->text_pos = value;
+ item->_text = kernel_dereference_char_pointer(s, value, 0);
+ item->_textPos = value;
break;
case MENU_ATTRIBUTE_KEY:
- free(item->keytext);
- item->keytext = 0;
+ item->_keytext.clear();
if (value.segment) {
// FIXME: What happens here if <value> is an extended key? Potential bug. LS
- item->key = value.offset;
- item->modifiers = 0;
- item->keytext = (char *)sci_malloc(2);
- item->keytext[0] = value.offset;
- item->keytext[1] = 0;
- item->flags |= MENU_ATTRIBUTE_FLAGS_KEY;
- if ((item->key >= 'A') && (item->key <= 'Z'))
- item->key = item->key - 'A' + 'a'; // Lowercase the key
+ item->_key = value.offset;
+ item->_modifiers = 0;
+ item->_keytext = value.offset;
+ item->_flags |= MENU_ATTRIBUTE_FLAGS_KEY;
+ if ((item->_key >= 'A') && (item->_key <= 'Z'))
+ item->_key = item->_key - 'A' + 'a'; // Lowercase the key
} else {
- item->keytext = NULL;
- item->flags &= ~MENU_ATTRIBUTE_FLAGS_KEY;
+ item->_flags &= ~MENU_ATTRIBUTE_FLAGS_KEY;
}
break;
case MENU_ATTRIBUTE_ENABLED:
- item->enabled = value.offset;
+ item->_enabled = value.offset;
break;
case MENU_ATTRIBUTE_TAG:
- item->tag = value.offset;
+ item->_tag = value.offset;
break;
default:
@@ -345,33 +315,30 @@
return 0;
}
-reg_t menubar_get_attribute(EngineState *s, int menu_nr, int item_nr, int attribute) {
- menubar_t *menubar = s->menubar;
- menu_item_t *item;
-
+reg_t Menubar::getAttribute(int menu_nr, int item_nr, int attribute) const {
if ((menu_nr < 0) || (item_nr < 0))
return make_reg(0, -1);
- if ((menu_nr >= menubar->menus_nr) || (item_nr >= menubar->menus[menu_nr].items_nr))
+ if ((menu_nr >= (int)_menus.size()) || (item_nr >= (int)_menus[menu_nr]._items.size()))
return make_reg(0, -1);
- item = menubar->menus[menu_nr].items + item_nr;
+ const MenuItem &item = _menus[menu_nr]._items[item_nr];
switch (attribute) {
case MENU_ATTRIBUTE_SAID:
- return item->said_pos;
+ return item._saidPos;
case MENU_ATTRIBUTE_TEXT:
- return item->text_pos;
+ return item._textPos;
case MENU_ATTRIBUTE_KEY:
- return make_reg(0, item->key);
+ return make_reg(0, item._key);
case MENU_ATTRIBUTE_ENABLED:
- return make_reg(0, item->enabled);
+ return make_reg(0, item._enabled);
case MENU_ATTRIBUTE_TAG:
- return make_reg(0, item->tag);
+ return make_reg(0, item._tag);
default:
sciprintf("Attempt to read invalid attribute from menu %d, item %d: 0x%04x\n", menu_nr, item_nr, attribute);
@@ -379,65 +346,59 @@
}
}
-int menubar_item_valid(EngineState *s, int menu_nr, int item_nr) {
- menubar_t *menubar = s->menubar;
- menu_item_t *item;
-
+bool Menubar::itemValid(int menu_nr, int item_nr) const {
if ((menu_nr < 0) || (item_nr < 0))
- return 0;
+ return false;
- if ((menu_nr >= menubar->menus_nr) || (item_nr >= menubar->menus[menu_nr].items_nr))
- return 0;
+ if ((menu_nr >= (int)_menus.size()) || (item_nr >= (int)_menus[menu_nr]._items.size()))
+ return false;
- item = menubar->menus[menu_nr].items + item_nr;
+ const MenuItem &item = _menus[menu_nr]._items[item_nr];
- if ((item->type == MENU_TYPE_NORMAL) && item->enabled)
- return 1;
+ if ((item._type == MENU_TYPE_NORMAL) && item._enabled)
+ return true;
- return 0; // May not be selected
+ return false; // May not be selected
}
-int menubar_map_pointer(EngineState *s, int *menu_nr, int *item_nr, gfxw_port_t *port) {
- menubar_t *menubar = s->menubar;
- menu_t *menu;
+bool Menubar::mapPointer(gfx_state_t *state, int *menu_nr, int *item_nr, gfxw_port_t *port) const {
- if (s->gfx_state->pointer_pos.y <= 10) { // Re-evaulate menu
+ if (state->pointer_pos.y <= 10) { // Re-evaulate menu
int x = MENU_LEFT_BORDER;
- int i;
- for (i = 0; i < menubar->menus_nr; i++) {
- int newx = x + MENU_BORDER_SIZE * 2 + menubar->menus[i].title_width;
+ for (uint i = 0; i < _menus.size(); i++) {
+ int newx = x + MENU_BORDER_SIZE * 2 + _menus[i]._titleWidth;
- if (s->gfx_state->pointer_pos.x < x)
- return 0;
+ if (state->pointer_pos.x < x)
+ return false;
- if (s->gfx_state->pointer_pos.x < newx) {
+ if (state->pointer_pos.x < newx) {
*menu_nr = i;
*item_nr = -1;
}
x = newx;
}
- return 0;
} else {
- int row = (s->gfx_state->pointer_pos.y / 10) - 1;
+ int row = (state->pointer_pos.y / 10) - 1;
- if ((*menu_nr < 0) || (*menu_nr >= menubar->menus_nr))
- return 1; // No menu
- else
- menu = menubar->menus + *menu_nr; // Menu is valid, assume that it's popped up
+ if ((*menu_nr < 0) || (*menu_nr >= (int)_menus.size()))
+ return true; // No menu
- if (menu->items_nr <= row)
- return 1;
+ const Menu &menu = _menus[*menu_nr]; // Menu is valid, assume that it's popped up
- if ((s->gfx_state->pointer_pos.x < port->bounds.x) || (s->gfx_state->pointer_pos.x > port->bounds.x + port->bounds.width))
- return 1;
+ if ((int)menu._items.size() <= row)
+ return true;
- if (menubar_item_valid(s, *menu_nr, row))
+ if ((state->pointer_pos.x < port->bounds.x) || (state->pointer_pos.x > port->bounds.x + port->bounds.width))
+ return true;
+
+ if (itemValid(*menu_nr, row))
*item_nr = row; // Only modify if we'll be hitting a valid element
- return 0;
}
+
+ return false;
}
} // End of namespace Sci
Modified: scummvm/trunk/engines/sci/gfx/menubar.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/menubar.h 2009-03-24 11:30:52 UTC (rev 39658)
+++ scummvm/trunk/engines/sci/gfx/menubar.h 2009-03-24 11:31:16 UTC (rev 39659)
@@ -32,6 +32,8 @@
#include "sci/gfx/operations.h"
#include "sci/gfx/gfx_widgets.h"
+#include "common/array.h"
+
namespace Sci {
struct EngineState;
@@ -60,9 +62,6 @@
#define MENU_BAR_HEIGHT 10
-#define MENU_TYPE_NORMAL 0
-#define MENU_TYPE_HBAR 1 /* Horizontal bar */
-
/* Special characters used while building the menu bar */
#define SCI_SPECIAL_CHAR_FUNCTION 'F'
#define SCI_SPECIAL_CHAR_CTRL 3
@@ -77,131 +76,143 @@
#define MENU_ATTRIBUTE_ENABLED 0x70
#define MENU_ATTRIBUTE_TAG 0x71
-/* Those flags determine whether the corresponding menu_item_t entries are valid */
+/* Those flags determine whether the corresponding MenuItem entries are valid */
#define MENU_ATTRIBUTE_FLAGS_KEY 0x01
#define MENU_ATTRIBUTE_FLAGS_SAID 0x02
-struct menu_item_t {
- int type; /* Normal or hbar */
- char *keytext; /* right-centered part of the text (the key) */
- int keytext_size; // FIXME: Essentially unused
- int flags;
- byte said[MENU_SAID_SPEC_SIZE]; /* Said spec for this item */
- reg_t said_pos;
- char *text;
- reg_t text_pos;
- int modifiers, key; /* Hotkey for this item */
- int enabled;
- int tag;
-
+enum MenuType {
+ MENU_TYPE_NORMAL = 0,
+ MENU_TYPE_HBAR = 1 /* Horizontal bar */
};
+class MenuItem : public Common::Serializable {
+public:
+ MenuType _type; /* Normal or hbar */
+ Common::String _keytext; /* right-centered part of the text (the key) */
-struct menu_t {
- char *title;
+ int _flags;
+ byte _said[MENU_SAID_SPEC_SIZE]; /* Said spec for this item */
+ reg_t _saidPos;
+ Common::String _text;
+ reg_t _textPos;
+ int _modifiers; /* Hotkey for this item */
+ int _key; /* Hotkey for this item */
+ int _enabled;
+ int _tag;
- int title_width; /* Width of the title in pixels */
- int width; /* Pixel width of the menu window */
+public:
+ MenuItem();
- int items_nr; /* Window height equals to intems_nr * 10 */
- menu_item_t *items; /* Actual entries into the menu */
+ virtual void saveLoadWithSerializer(Common::Serializer &ser);
+ /**
+ * Determines whether a message/modifiers key pair matches a menu item's key parameters.
+ * @param message The message to match
+ * @param modifiers The modifier flags to match
+ * @return true on match, false otherwise
+ */
+ bool matchKey(int message, int modifiers);
};
+class Menu : public Common::Serializable {
+public:
+ Common::String _title;
-struct menubar_t {
+ /** Width of the title in pixels */
+ int _titleWidth;
- int menus_nr;
- menu_t *menus; /* The actual menus */
+ /** Pixel width of the menu window */
+ int _width;
-};
+ /**
+ * Actual entries into the menu.
+ * Window height equals to number of items times 10.
+ */
+ Common::Array<MenuItem> _items;
-struct gfx_port;
-struct gfx_picture; /* forward declarations for graphics.h */
+public:
+ Menu();
+ virtual void saveLoadWithSerializer(Common::Serializer &ser);
-/********** function definitions *********/
+//protected:
+ // FIXME: This should be (partially) turned into a MenuItem constructor
+ int addMenuItem(gfx_state_t *state, MenuType type, const char *left, const char *right,
+ int font, int key, int modifiers, int tag, reg_t text_pos);
+};
-menubar_t *menubar_new();
-/* Creates a new menubar struct
-** Parameters: (void)
-** Returns : (menubar_t *) A pointer to the new menubar entity
-** To free the entity, call menubar_free.
-*/
-void menubar_free(menubar_t *menubar);
-/* Frees all memory associated with a menubar
-** Parameters: (menubar_t *) menubar: The menubar to free
-** Returns : (void)
-*/
+class Menubar : public Common::Serializable {
+public:
+ /** The actual menus. */
+ Common::Array<Menu> _menus;
-void menubar_add_menu(gfx_state_t *state, menubar_t *menubar, char *title, char *entries, int font, reg_t entries_base);
-/* Adds a menu to the menubar.
-** Parameters: (gfx_state_t *) state: The state the fonts are stored in
-** (menubar_t *) menubar: The menubar to operate on
-** (char *) title: The menu title
-** (char *) entries: A string of menu entries
-** (int) font: The font which is to be used for drawing
-** (reg_t) entries_base: Segmented VM address of the entries string
-** Returns : (void)
-** The menu entries use the following special characters:
-** '`' : Right justify the following part
-** ':' : End of this entry
-** '#' : Function key (replaced by 'F')
-** '^' : Control key (replaced by \002, which looks like "CTRL")
-** '=' : Initial tag value
-** and the special string "--!", which represents a horizontal bar in the menu.
-*/
+public:
+ virtual void saveLoadWithSerializer(Common::Serializer &ser);
+ /**
+ * Adds a menu to the menubar.
+ * Parameters: (gfx_state_t *) state: The state the fonts are stored in
+ * (char *) title: The menu title
+ * (char *) entries: A string of menu entries
+ * (int) font: The font which is to be used for drawing
+ * (reg_t) entries_base: Segmented VM address of the entries string
+ * Returns : (void)
+ * The menu entries use the following special characters:
+ * '`' : Right justify the following part
+ * ':' : End of this entry
+ * '#' : Function key (replaced by 'F')
+ * '^' : Control key (replaced by \002, which looks like "CTRL")
+ * '=' : Initial tag value
+ * and the special string "--!", which represents a horizontal bar in the menu.
+ */
+ void addMenu(gfx_state_t *state, const char *title, const char *entries, int font, reg_t entries_base);
-int menubar_set_attribute(EngineState *s, int menu, int item, int attribute, reg_t value);
-/* Sets the (currently unidentified) foo and bar values.
-** Parameters: (state_t *) s: The current state
-** (int) menu: The menu number to edit
-** (int) item: The menu item to change
-** (int) attribute: The attribute to modify
-** (int) value: The value the attribute should be set to
-** Returns : (int) 0 on success, 1 if either menu or item were invalid
-*/
+ /**
+ * Sets the (currently unidentified) foo and bar values.
+ * Parameters: (state_t *) s: The current state
+ * (int) menu: The menu number to edit
+ * (int) item: The menu item to change
+ * (int) attribute: The attribute to modify
+ * (int) value: The value the attribute should be set to
+ * Returns : (int) 0 on success, 1 if either menu or item were invalid
+ */
+ int setAttribute(EngineState *s, int menu, int item, int attribute, reg_t value);
-reg_t menubar_get_attribute(EngineState *s, int menu, int item, int attribute);
-/* Sets the (currently unidentified) foo and bar values.
-** Parameters: (state_t *) s: The current state
-** (int) menu: The menu number
-** (int) item: The menu item to read
-** (int) attribute: The attribute to read from
-** Returns : (int) The attribute value, or -1 on error
-*/
+ /**
+ * Sets the (currently unidentified) foo and bar values.
+ * Parameters: (int) menu: The menu number
+ * (int) item: The menu item to read
+ * (int) attribute: The attribute to read from
+ * Returns : (int) The attribute value, or -1 on error
+ */
+ reg_t getAttribute(int menu, int item, int attribute) const;
-int menubar_item_valid(EngineState *s, int menu, int item);
-/* Determines whether the specified menu entry may be activated
-** Parameters: (state_t *) s: The current state
-** (int x int) (menu, item): The menu item to check
-** Returns : (int) 1 if the menu item may be selected, 0 otherwise
-*/
+ /**
+ * Determines whether the specified menu entry may be activated.
+ * @return true if the menu item may be selected, false otherwise
+ */
+ bool itemValid(int menu, int item) const;
-int menubar_map_pointer(EngineState *s, int *menu_nr, int *item_nr, gfxw_port_t *port);
-/* Maps the pointer position to a (menu,item) tuple.
-** Parameters: (state_t *) s: The current state
-** ((int *) x (int *)) (menu_nr, item_nr): Pointers to the current menu/item tuple
-** (port_t *) port: The port of the currently active menu (if any)
-** Returns : (int) 1 if the pointer is outside a valid port, 0 otherwise.
-*/
-int menubar_match_key(menu_item_t *item, int message, int modifiers);
-/* Determines whether a message/modifiers key pair matches a menu item's key parameters
-** Parameters: (menu_item_t *) item: The menu item to match
-** (int x int) message, modifiers: The input to compare
-** Returns : (int) 1 on match, 0 otherwise
-*/
+ /**
+ * Maps the pointer position to a (menu,item) tuple.
+ * Parameters: (gfx_state_t *) state: The current state
+ * ((int *) x (int *)) (menu_nr, item_nr): Pointers to the current menu/item tuple
+ * (port_t *) port: The port of the currently active menu (if any)
+ * @return true if the pointer is outside a valid port, false otherwise.
+ */
+ bool mapPointer(gfx_state_t *state, int *menu_nr, int *item_nr, gfxw_port_t *port) const;
+};
+
} // End of namespace Sci
#endif // SCI_GFX_SCI_MENUBAR_H
Modified: scummvm/trunk/engines/sci/gfx/sci_widgets.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/sci_widgets.cpp 2009-03-24 11:30:52 UTC (rev 39658)
+++ scummvm/trunk/engines/sci/gfx/sci_widgets.cpp 2009-03-24 11:31:16 UTC (rev 39659)
@@ -72,7 +72,7 @@
return list;
}
-void sciw_set_status_bar(EngineState *s, gfxw_port_t *status_bar, char *text, int fgcolor, int bgcolor) {
+void sciw_set_status_bar(EngineState *s, gfxw_port_t *status_bar, const char *text, int fgcolor, int bgcolor) {
gfx_state_t *state;
gfxw_list_t *list;
gfx_color_t bg = status_bar->bgcolor;
@@ -129,8 +129,11 @@
rect->y -= (rect->y + rect->height) - (parent->bounds.y + parent->bounds.height) + 2;
}
-gfxw_port_t *sciw_new_window(EngineState *s, rect_t area, int font, gfx_color_t color, gfx_color_t bgcolor,
- int title_font, gfx_color_t title_color, gfx_color_t title_bgcolor, const char *title, int flags) {
+gfxw_port_t *sciw_new_window(EngineState *s,
+ rect_t area, int font,
+ gfx_color_t color, gfx_color_t bgcolor,
+ int title_font, gfx_color_t title_color, gfx_color_t title_bgcolor,
+ const char *title, int flags) {
gfxw_visual_t *visual = s->visual;
gfx_state_t *state = s->gfx_state;
int shadow_offset = 2;
@@ -525,26 +528,26 @@
return list;
}
-void sciw_set_menubar(EngineState *s, gfxw_port_t *status_bar, menubar_t *menubar, int selection) {
+void sciw_set_menubar(EngineState *s, gfxw_port_t *status_bar, Menubar *menubar, int selection) {
gfxw_list_t *list = make_titlebar_list(s, status_bar->bounds, status_bar);
int offset = MENU_LEFT_BORDER;
int i;
clear_titlebar(status_bar);
- for (i = 0; i < menubar->menus_nr; i++) {
- menu_t *menu = menubar->menus + i;
- int width = menu->title_width + (MENU_BORDER_SIZE * 2);
+ for (i = 0; i < (int)menubar->_menus.size(); i++) {
+ Menu *menu = &menubar->_menus[i];
+ int width = menu->_titleWidth + (MENU_BORDER_SIZE * 2);
if (i == selection) {
list->add(GFXWC(list), GFXW(gfxw_new_box(status_bar->visual->gfx_state, gfx_rect(offset, 0, width, MENU_BAR_HEIGHT),
status_bar->color, status_bar->color, GFX_BOX_SHADE_FLAT)));
list->add(GFXWC(list), GFXW(gfxw_new_text(s->gfx_state, gfx_rect(offset, 0, width, MENU_BAR_HEIGHT),
- status_bar->font_nr, menu->title, ALIGN_CENTER, ALIGN_CENTER,
+ status_bar->font_nr, menu->_title.c_str(), ALIGN_CENTER, ALIGN_CENTER,
status_bar->bgcolor, status_bar->bgcolor, status_bar->color, GFXR_FONT_FLAG_NO_NEWLINES)));
} else
list->add(GFXWC(list), GFXW(gfxw_new_text(s->gfx_state, gfx_rect(offset, 0, width, MENU_BAR_HEIGHT),
- status_bar->font_nr, menu->title, ALIGN_CENTER, ALIGN_CENTER,
+ status_bar->font_nr, menu->_title.c_str(), ALIGN_CENTER, ALIGN_CENTER,
status_bar->color, status_bar->color, status_bar->bgcolor, GFXR_FONT_FLAG_NO_NEWLINES)));
offset += width;
}
@@ -553,32 +556,32 @@
finish_titlebar_list(s, list, status_bar);
}
-gfxw_port_t *sciw_new_menu(EngineState *s, gfxw_port_t *status_bar, menubar_t *menubar, int selection) {
+gfxw_port_t *sciw_new_menu(EngineState *s, gfxw_port_t *status_bar, Menubar *menubar, int selection) {
gfxw_port_t *retval;
- menu_t *menu = menubar->menus + selection;
+ Menu *menu = &menubar->_menus[selection];
rect_t area = gfx_rect(MENU_LEFT_BORDER, 10, 0, 0);
int i;
if (selection < -1)
return NULL;
- if (selection >= menubar->menus_nr) {
- GFXERROR("Attempt to make menu #%d of %d\n", selection, menubar->menus_nr);
+ if (selection >= (int)menubar->_menus.size()) {
+ GFXERROR("Attempt to make menu #%d of %d\n", selection, menubar->_menus.size());
return NULL;
}
for (i = 0; i < selection; i++)
- area.x += menubar->menus[i].title_width;
+ area.x += menubar->_menus[i]._titleWidth;
- area.width = menu->width - 1;
- area.height = menu->items_nr * 10;
+ area.width = menu->_width - 1;
+ area.height = menu->_items.size() * 10;
retval = sciw_new_window(s, area, status_bar->font_nr, status_bar->color, status_bar->bgcolor,
0, status_bar->color, status_bar->bgcolor, NULL, WINDOW_FLAG_NO_DROP_SHADOW | WINDOW_FLAG_TRANSPARENT);
retval->set_visual(GFXW(retval), s->visual);
- for (i = 0; i < menu->items_nr; i++)
+ for (i = 0; i < (int)menu->_items.size(); i++)
sciw_unselect_item(s, retval, menu, i);
return retval;
@@ -593,7 +596,7 @@
return col;
}
-gfxw_widget_t *_make_menu_entry(menu_item_t *item, int offset, int width, gfxw_port_t *port, gfx_color_t color, gfx_color_t bgcolor, int ID, int gray) {
+gfxw_widget_t *_make_menu_entry(MenuItem *item, int offset, int width, gfxw_port_t *port, gfx_color_t color, gfx_color_t bgcolor, int ID, int gray) {
rect_t area = gfx_rect(MENU_BOX_LEFT_PADDING, 0, width - MENU_BOX_LEFT_PADDING, 10);
rect_t list_area = gfx_rect(port->zone.x, area.y + offset + port->zone.y, width, area.height);
gfxw_list_t *list = (gfxw_list_t *) gfxw_set_id(GFXW(gfxw_new_list(list_area, 0)), ID, GFXW_NO_ID);
@@ -605,12 +608,12 @@
xcolor = gray ? color : bgcolor;
list->add(GFXWC(list), GFXW(gfxw_new_box(port->visual->gfx_state, area, bgcolor, bgcolor, GFX_BOX_SHADE_FLAT)));
- list->add(GFXWC(list), GFXW(gfxw_new_text(port->visual->gfx_state, area, port->font_nr, item->text, ALIGN_LEFT, ALIGN_CENTER,
+ list->add(GFXWC(list), GFXW(gfxw_new_text(port->visual->gfx_state, area, port->font_nr, item->_text.c_str(), ALIGN_LEFT, ALIGN_CENTER,
color, xcolor, bgcolor, GFXR_FONT_FLAG_NO_NEWLINES)));
- if (item->keytext) {
+ if (!item->_keytext.empty()) {
area.width -= MENU_BOX_RIGHT_PADDING;
- list->add(GFXWC(list), GFXW(gfxw_new_text(port->visual->gfx_state, area, port->font_nr, item->keytext, ALIGN_RIGHT, ALIGN_CENTER,
+ list->add(GFXWC(list), GFXW(gfxw_new_text(port->visual->gfx_state, area, port->font_nr, item->_keytext.c_str(), ALIGN_RIGHT, ALIGN_CENTER,
color, xcolor, bgcolor, GFXR_FONT_FLAG_NO_NEWLINES)));
}
@@ -632,16 +635,16 @@
return GFXW(list);
}
-gfxw_port_t *sciw_unselect_item(EngineState *s, gfxw_port_t *menu_port, menu_t *menu, int selection) {
- menu_item_t *item = menu->items + selection;
-
- if (selection < 0 || selection >= menu->items_nr)
+gfxw_port_t *sciw_unselect_item(EngineState *s, gfxw_port_t *menu_port, Menu *menu, int selection) {
+ if (selection < 0 || selection >= (int)menu->_items.size())
return menu_port;
- if (item->type == MENU_TYPE_NORMAL)
+ MenuItem *item = &menu->_items[selection];
+
+ if (item->_type == MENU_TYPE_NORMAL)
menu_port->add(GFXWC(menu_port), GFXW(_make_menu_entry(item, selection * 10, menu_port->zone.width + 1,
menu_port, menu_port->color, menu_port->bgcolor, selection + MAGIC_ID_OFFSET,
- item->enabled)));
+ item->_enabled)));
else
menu_port->add(GFXWC(menu_port), GFXW(_make_menu_hbar(selection * 10, menu_port->zone.width + 1,
menu_port, menu_port->color, menu_port->bgcolor, selection + MAGIC_ID_OFFSET)));
@@ -649,16 +652,16 @@
return menu_port;
}
-gfxw_port_t *sciw_select_item(EngineState *s, gfxw_port_t *menu_port, menu_t *menu, int selection) {
- menu_item_t *item = menu->items + selection;
-
- if (selection < 0 || selection >= menu->items_nr)
+gfxw_port_t *sciw_select_item(EngineState *s, gfxw_port_t *menu_port, Menu *menu, int selection) {
+ if (selection < 0 || selection >= (int)menu->_items.size())
return menu_port;
- if (item->type == MENU_TYPE_NORMAL)
+ MenuItem *item = &menu->_items[selection];
+
+ if (item->_type == MENU_TYPE_NORMAL)
menu_port->add(GFXWC(menu_port), GFXW(_make_menu_entry(item, selection * 10, menu_port->zone.width + 1,
menu_port, menu_port->bgcolor, menu_port->color, selection + MAGIC_ID_OFFSET,
- item->enabled)));
+ item->_enabled)));
else
menu_port->add(GFXWC(menu_port), GFXW(_make_menu_hbar(selection * 10, menu_port->zone.width + 1,
menu_port, menu_port->bgcolor, menu_port->color, selection + MAGIC_ID_OFFSET)));
Modified: scummvm/trunk/engines/sci/gfx/sci_widgets.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/sci_widgets.h 2009-03-24 11:30:52 UTC (rev 39658)
+++ scummvm/trunk/engines/sci/gfx/sci_widgets.h 2009-03-24 11:31:16 UTC (rev 39659)
@@ -32,7 +32,7 @@
namespace Sci {
-struct menu_t;
+class Menu;
/* The following flags are applicable to windows in SCI0: */
#define WINDOW_FLAG_TRANSPARENT 0x01
@@ -62,11 +62,11 @@
/* Used by the interpreter to flag buttons that are enabled */
#define CONTROL_STATE_ENABLED 0x0001
-void sciw_set_status_bar(EngineState *s, gfxw_port_t *status_bar, char *text, int fgcolor, int bgcolor);
+void sciw_set_status_bar(EngineState *s, gfxw_port_t *status_bar, const char *text, int fgcolor, int bgcolor);
/* Sets the contents of a port used as status bar
** Parmeters: (EngineState *) s: The affected game state
** (gfxw_port_t *) status_bar: The status bar port
-** (char *) text: The text to draw
+** (const char *) text: The text to draw
** Returns : (void)
*/
@@ -163,39 +163,39 @@
/*** Menubar widgets ***/
/*---------------------*/
-void sciw_set_menubar(EngineState *s, gfxw_port_t *status_bar, menubar_t *menubar, int selection);
+void sciw_set_menubar(EngineState *s, gfxw_port_t *status_bar, Menubar *menubar, int selection);
/* Draws the menu bar
** Parameters: (EngineState *) s: The state to operate on
** (gfxw_port_t *) status_bar: The status bar port to modify
-** (menubar_t *) menubar: The menu bar to use
+** (Menubar *) menubar: The menu bar to use
** (int) selection: Number of the menu to hightlight, or -1 for 'none'
** Returns : (void)
*/
-gfxw_port_t *sciw_new_menu(EngineState *s, gfxw_port_t *status_bar, menubar_t *menubar, int selection);
+gfxw_port_t *sciw_new_menu(EngineState *s, gfxw_port_t *status_bar, Menubar *menubar, int selection);
/* Creates a menu port
** Parameters: (EngineState *) s: The state to operate on
** (gfxw_port_t *) status_bar: The status bar
-** (menubar_t *) menubar: The menu bar to use
+** (Menubar *) menubar: The menu bar to use
** (int) selection: Number of the menu to interpret
** Returns : (gfxw_port_t *) The result port
*/
-gfxw_port_t *sciw_unselect_item(EngineState *s, gfxw_port_t *menu_port, menu_t *menu, int selection);
+gfxw_port_t *sciw_unselect_item(EngineState *s, gfxw_port_t *menu_port, Menu *menu, int selection);
/* Unselects a previously selected item from a menu port
** Parameters: (EngineState *) s: The state to operate on
** (gfxw_port_t *) menu_port: The port modify
-** (menu_t *) menu: The menu the menu port corresponds to
+** (Menu *) menu: The menu the menu port corresponds to
** (int) selection: Number of the menu entry to unselect, or -1 to do a NOP
** Returns : (gfxw_port_t *) The modified menu
*/
gfxw_port_t *
-sciw_select_item(EngineState *s, gfxw_port_t *menu_port, menu_t *menu, int selection);
+sciw_select_item(EngineState *s, gfxw_port_t *menu_port, Menu *menu, int selection);
/* Selects a menu item from a menu port
** Parameters: (EngineState *) s: The state to operate on
** (gfxw_port_t *) menu_port: The port modify
-** (menu_t *) menu: The menu the menu port corresponds to
+** (Menu *) menu: The menu the menu port corresponds to
** (int) selection: Number of the menu entry to select, or -1 to do a NOP
** Returns : (gfxw_port_t *) The modified menu
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list