openttd-ottdgrfs: comparison src/window.h

equal deleted inserted replaced

-:4bf29d14edba
+:c30fe89622df
 enum WindowWidgetBehaviours {
 	WWB_PUSHBUTTON  = 1 << 5,
 	WWB_MASK        = 0xE0,
 };
 enum WindowWidgetTypes {
 	WWT_EMPTY,
 	WWT_PANEL,      /* simple depressed panel */
 	WWT_INSET,      /* pressed (inset) panel, most commonly used as combo box _text_ area */
 	WWT_IMGBTN_2,   /* button with diff image when clicked */
 	WWT_TEXTBTN,    /* button with text */
 	WWT_TEXTBTN_2,  /* button with diff text when clicked */
 	WWT_LABEL,      /* centered label */
+	WWT_TEXT,       /* pure simple text */
 	WWT_MATRIX,
 	WWT_SCROLLBAR,
 	WWT_FRAME,      /* frame */
 	WWT_CAPTION,
 	} we;
 };
 struct OldWidget;
-typedef struct WindowDesc {
+struct WindowDesc {
 	int16 left, top, width, height;
 	WindowClass cls;
 	WindowClass parent_cls;
 	uint32 flags;
 	const OldWidget *widgets;
 	WindowProc *proc;
-} WindowDesc;
+};
 enum WindowDefaultFlag {
 	WDF_STD_TOOLTIPS    =   1, ///< use standard routine when displaying tooltips
 	WDF_DEF_WIDGET      =   2, ///< default widget control for some widgets in the on click event
 	WDF_STD_BTN         =   4, ///< default handling for close and drag widgets (widget no 0 and 1)
 	WDP_CENTER    = -2, ///< Center the window (left/right or top/bottom)
 	WDP_ALIGN_TBR = -3, ///< Align the right side of the window with the right side of the main toolbar
 	WDP_ALIGN_TBL = -4, ///< Align the left side of the window with the left side of the main toolbar
 };
-typedef struct Textbuf {
+struct Textbuf {
 	char *buf;                  ///< buffer in which text is saved
 	uint16 maxlength, maxwidth; ///< the maximum size of the buffer. Maxwidth specifies screensize in pixels, maxlength is in bytes
 	uint16 length, width;       ///< the current size of the string. Width specifies screensize in pixels, length is in bytes
 	bool caret;                 ///< is the caret ("_") visible or not
 	uint16 caretpos;            ///< the current position of the caret in the buffer, in bytes
 	uint16 caretxoffs;          ///< the current position of the caret in pixels
-} Textbuf;
+};
 #define WP(ptr,str) (*(str*)(ptr)->custom)
 /* You cannot 100% reliably calculate the biggest custom struct as
 * the number of pointers in it and alignment will have a huge impact.
 * 96 is the largest window-size for 64-bit machines currently */
 #define WINDOW_CUSTOM_SIZE 96
-typedef struct Scrollbar {
+struct Scrollbar {
 	uint16 count, cap, pos;
-} Scrollbar;
+};
-typedef struct ResizeInfo {
+struct ResizeInfo {
 	uint width; ///< Minimum width and height
 	uint height;
 	uint step_width; ///< In how big steps the width and height go
 	uint step_height;
-} ResizeInfo;
+};
-typedef struct WindowMessage {
+struct WindowMessage {
-		int msg;
+	int msg;
-		int wparam;
+	int wparam;
-		int lparam;
+	int lparam;
-} WindowMessage;
+};
 struct OldWidget {
 	WindowWidgetTypes type;           ///< OldWidget type, see @WindowWidgetTypes
 	byte m_display_flags;             ///< Resize direction, alignment, etc. during resizing, see @ResizeFlags
 	byte color;                       ///< OldWidget colour, see docs/ottd-colourtext-palette.png
 #define REVERSED_FOR_ALL_WINDOWS(wz) \
 	for (WindowList::ReverseIterator it = BaseWindow::s_list.m_list.rbegin(); it != BaseWindow::s_list.m_list.rend() && (wz = (*it).w) != NULL; it++)
-typedef struct querystr_d {
+struct querystr_d {
 	StringID caption;
 	Textbuf text;
 	const char *orig;
 	CharSetFilter afilter;
 	bool handled;
-} querystr_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(querystr_d));
-typedef struct {
+struct menu_d {
 	byte item_count;      ///< follow_vehicle
 	byte sel_index;       ///< scrollpos_x
 	byte main_button;     ///< scrollpos_y
 	byte action_id;
 	StringID string_id;   ///< unk30
 	uint16 checked_items; ///< unk32
 	byte disabled_items;
-} menu_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(menu_d));
-typedef struct {
+struct def_d {
 	int16 data_1, data_2, data_3;
 	int16 data_4, data_5;
 	bool close;
 	byte byte_1;
-} def_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(def_d));
-typedef struct {
+struct void_d {
 	void *data;
-} void_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(void_d));
-typedef struct {
+struct tree_d {
 	uint16 base;
 	uint16 count;
-} tree_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(tree_d));
-typedef struct {
+struct tooltips_d {
 	StringID string_id;
 	byte paramcount;
 	uint32 params[5];
-} tooltips_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(tooltips_d));
-typedef struct {
+struct buildvehicle_d {
 	byte vehicle_type;
 	union {
 		RailTypeByte railtype;
 		AirportFTAClass::Flags flags;
 	} filter;
 	byte sort_criteria;
 	bool regenerate_list;
 	EngineID sel_engine;
 	EngineID rename_engine;
 	EngineList eng_list;
-} buildvehicle_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(buildvehicle_d));
-typedef struct {
+struct replaceveh_d {
 	byte sel_index[2];
 	EngineID sel_engine[2];
 	uint16 count[2];
 	bool wagon_btnstate; ///< true means engine is selected
 	EngineList list[2];
 	bool update_left;
 	bool update_right;
 	bool init_lists;
-} replaceveh_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(replaceveh_d));
-typedef struct {
+struct depot_d {
 	VehicleID sel;
 	byte type;
 	bool generate_list;
 	uint16 engine_list_length;
 	uint16 wagon_list_length;
 	uint16 engine_count;
 	uint16 wagon_count;
 	Vehicle **vehicle_list;
 	Vehicle **wagon_list;
-} depot_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(depot_d));
-typedef struct {
+struct order_d {
 	int sel;
-} order_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(order_d));
-typedef struct {
+struct traindetails_d {
 	byte tab;
-} traindetails_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(traindetails_d));
-typedef struct {
+struct smallmap_d {
 	int32 scroll_x;
 	int32 scroll_y;
 	int32 subscroll;
-} smallmap_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(smallmap_d));
-typedef struct {
+struct facesel_d {
 	uint32 face;
 	byte gender;
-} facesel_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(facesel_d));
-typedef struct {
+struct refit_d {
 	int sel;
 	struct RefitOption *cargo;
 	struct RefitList *list;
 	uint length;
 	VehicleOrderID order;
-} refit_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(refit_d));
-typedef struct {
+struct vp_d {
 	VehicleID follow_vehicle;
 	int32 scrollpos_x;
 	int32 scrollpos_y;
-} vp_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vp_d));
 /* vp2_d is the same as vp_d, except for the data_# values.. */
-typedef struct {
+struct vp2_d {
 	VehicleID follow_vehicle;
 	int32 scrollpos_x;
 	int32 scrollpos_y;
 	byte data_1;
 	byte data_2;
 	byte data_3;
-} vp2_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vp2_d));
-typedef struct {
+struct news_d {
 	uint16 follow_vehicle;
 	int32 scrollpos_x;
 	int32 scrollpos_y;
 	NewsItem *ni;
-} news_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(news_d));
-typedef struct {
+struct highscore_d {
 	uint32 background_img;
 	int8 rank;
-} highscore_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(highscore_d));
-typedef struct {
+struct scroller_d {
 	int height;
 	uint16 counter;
-} scroller_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(scroller_d));
-typedef enum SortListFlags {
+enum SortListFlags {
 	VL_NONE    = 0x00,  ///< no sort
 	VL_DESC    = 0x01,  ///< sort descending or ascending
 	VL_RESORT  = 0x02,  ///< instruct the code to resort the list in the next loop
 	VL_REBUILD = 0x04,  ///< create sort-listing to use for qsort and friends
 	VL_END     = 0x08
-} SortListFlags;
+};
 DECLARE_ENUM_AS_BIT_SET(SortListFlags);
-typedef struct Listing {
+struct Listing {
 	bool order;    ///< Ascending/descending
 	byte criteria; ///< Sorting criteria
-} Listing;
+};
-typedef struct list_d {
+struct list_d {
 	uint16 list_length;  ///< length of the list being sorted
 	byte sort_type;      ///< what criteria to sort on
 	SortListFlags flags; ///< used to control sorting/resorting/etc.
 	uint16 resort_timer; ///< resort list after a given amount of ticks if set
-} list_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(list_d));
-typedef struct message_d {
+struct message_d {
 	int msg;
 	int wparam;
 	int lparam;
-} message_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(message_d));
-typedef struct dropdown_d {
+struct dropdown_d {
 	uint32 disabled_state;
 	uint32 hidden_state;
 	WindowClass parent_wnd_class;
 	WindowNumber parent_wnd_num;
 	byte parent_button;
 	byte num_items;
 	byte selected_index;
 	const StringID *items;
 	byte click_delay;
 	bool drag_mode;
-} dropdown_d;
+};
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(dropdown_d));
 /* window.cpp */
 //void CallWindowEventNP(BaseWindow *w, int event);
-void CallWindowTickEvent(void);
+void CallWindowTickEvent();
 //void SetWindowDirty(const BaseWindow *w);
 void SendWindowMessage(WindowClass wnd_class, WindowNumber wnd_num, int msg, int wparam, int lparam);
 void SendWindowMessageClass(WindowClass wnd_class, int msg, int wparam, int lparam);
 //BaseWindow *FindWindowById(WindowClass cls, WindowNumber number);
 {
 	assert(widget_index < widget_count);
 	return HASBIT(widget[widget_index].m_display_flags, WIDG_LOWERED);
 }
-void InitWindowSystem(void);
+void InitWindowSystem();
-void UnInitWindowSystem(void);
+void UnInitWindowSystem();
-void ResetWindowSystem(void);
+void ResetWindowSystem();
-void InputLoop(void);
+void InputLoop();
 //void InvalidateThisWindowData(BaseWindow *w);
 void InvalidateWindowData(WindowClass cls, WindowNumber number);
 //void RaiseWindowButtons(BaseWindow *w);
 void RelocateAllWindows(int neww, int newh);
 int PositionMainToolbar(BaseWindow *w);

branch	cpp_gui
changeset 6298	c30fe89622df
parent 6297	4bf29d14edba
child 6301	e0251f797d59