virtual ~TextDest() {};
// This is deprecated I guess? -celeron55
virtual void gotText(std::wstring text){}
- virtual void gotText(std::map<std::string, std::string> fields) = 0;
+ virtual void gotText(const StringMap &fields) = 0;
virtual void setFormName(std::string formname)
{ m_formname = formname;};
s32 start_item_i;
};
+ struct ListRingSpec
+ {
+ ListRingSpec()
+ {
+ }
+ ListRingSpec(const InventoryLocation &a_inventoryloc,
+ const std::string &a_listname):
+ inventoryloc(a_inventoryloc),
+ listname(a_listname)
+ {
+ }
+
+ InventoryLocation inventoryloc;
+ std::string listname;
+ };
+
struct ImageDrawSpec
{
ImageDrawSpec()
{
}
ImageDrawSpec(const std::string &a_name,
- v2s32 a_pos, v2s32 a_geom):
+ const std::string &a_item_name,
+ const v2s32 &a_pos, const v2s32 &a_geom):
name(a_name),
+ item_name (a_item_name),
pos(a_pos),
geom(a_geom)
{
scale = true;
}
ImageDrawSpec(const std::string &a_name,
- v2s32 a_pos):
+ const v2s32 &a_pos, const v2s32 &a_geom):
+ name(a_name),
+ pos(a_pos),
+ geom(a_geom)
+ {
+ scale = true;
+ }
+ ImageDrawSpec(const std::string &a_name,
+ const v2s32 &a_pos):
name(a_name),
pos(a_pos)
{
scale = false;
}
std::string name;
+ std::string item_name;
v2s32 pos;
v2s32 geom;
bool scale;
FieldSpec()
{
}
- FieldSpec(const std::wstring &name, const std::wstring &label,
+ FieldSpec(const std::string &name, const std::wstring &label,
const std::wstring &fdeflt, int id) :
fname(name),
flabel(label),
ftype = f_Unknown;
is_exit = false;
}
- std::wstring fname;
+ std::string fname;
std::wstring flabel;
std::wstring fdefault;
int fid;
irr::video::SColor color;
};
+ struct StaticTextSpec {
+ StaticTextSpec()
+ {
+ }
+ StaticTextSpec(const std::wstring &a_text,
+ const core::rect<s32> &a_rect):
+ text(a_text),
+ rect(a_rect)
+ {
+ }
+ std::wstring text;
+ core::rect<s32> rect;
+ };
+
public:
GUIFormSpecMenu(irr::IrrlichtDevice* dev,
gui::IGUIElement* parent, s32 id,
ISimpleTextureSource *tsrc,
IFormSource* fs_src,
TextDest* txt_dst,
- Client* client
- );
+ Client* client,
+ bool remap_dbl_click = true);
~GUIFormSpecMenu();
void removeChildren();
void setInitialFocus();
- void setFocus(std::wstring elementname)
+ void setFocus(std::string &elementname)
{
m_focused_element = elementname;
}
void regenerateGui(v2u32 screensize);
ItemSpec getItemAtPos(v2s32 p) const;
- void drawList(const ListDrawSpec &s, int phase);
+ void drawList(const ListDrawSpec &s, int phase, bool &item_hovered);
void drawSelectedItem();
void drawMenu();
void updateSelectedItem();
bool doPause;
bool pausesGame() { return doPause; }
- GUITable* getTable(std::wstring tablename);
+ GUITable* getTable(const std::string &tablename);
#ifdef __ANDROID__
bool getAndroidUIInput();
std::vector<ListDrawSpec> m_inventorylists;
+ std::vector<ListRingSpec> m_inventory_rings;
std::vector<ImageDrawSpec> m_backgrounds;
std::vector<ImageDrawSpec> m_images;
std::vector<ImageDrawSpec> m_itemimages;
std::vector<BoxDrawSpec> m_boxes;
std::vector<FieldSpec> m_fields;
+ std::vector<StaticTextSpec> m_static_texts;
std::vector<std::pair<FieldSpec,GUITable*> > m_tables;
std::vector<std::pair<FieldSpec,gui::IGUICheckBox*> > m_checkboxes;
- std::map<std::wstring, TooltipSpec> m_tooltips;
+ std::map<std::string, TooltipSpec> m_tooltips;
std::vector<std::pair<FieldSpec,gui::IGUIScrollBar*> > m_scrollbars;
ItemSpec *m_selected_item;
+ f32 m_timer1;
+ f32 m_timer2;
u32 m_selected_amount;
bool m_selected_dragging;
IFormSource *m_form_src;
TextDest *m_text_dst;
unsigned int m_formspec_version;
- std::wstring m_focused_element;
+ std::string m_focused_element;
+ bool m_selection_active;
typedef struct {
bool explicit_size;
core::rect<s32> rect;
v2s32 basepos;
v2u32 screensize;
- std::wstring focused_fieldname;
+ std::string focused_fieldname;
GUITable::TableOptions table_options;
GUITable::TableColumns table_columns;
// used to restore table selection/scroll/treeview state
- std::map<std::wstring,GUITable::DynamicData> table_dyndata;
+ std::map<std::string, GUITable::DynamicData> table_dyndata;
} parserData;
typedef struct {
void parseSize(parserData* data,std::string element);
void parseList(parserData* data,std::string element);
+ void parseListRing(parserData* data,std::string element);
void parseCheckbox(parserData* data,std::string element);
void parseImage(parserData* data,std::string element);
void parseItemImage(parserData* data,std::string element);
gui::IGUIFont *m_font;
std::wstring getLabelByID(s32 id);
- std::wstring getNameByID(s32 id);
+ std::string getNameByID(s32 id);
#ifdef __ANDROID__
v2s32 m_down_pos;
- std::wstring m_JavaDialogFieldName;
+ std::string m_JavaDialogFieldName;
#endif
+ /* If true, remap a double-click (or double-tap) action to ESC. This is so
+ * that, for example, Android users can double-tap to close a formspec.
+ *
+ * This value can (currently) only be set by the class constructor
+ * and the default value for the setting is true.
+ */
+ bool m_remap_dbl_click;
+
};
class FormspecFormSource: public IFormSource