gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 06:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r13046) -Codechange: make classes of the VehicleListWindow and the VehicleGroupWindow.

Browse Source
This commit is contained in:
rubidium 2008-05-11 15:00:11 +00:00
parent 75e3792aa3
commit c47926311b
3 changed files with 905 additions and 936 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

589
src/group_gui.cpp
View File

@ -30,16 +30,6 @@
typedef GUIList<const Group*> GUIGroupList; typedef GUIList<const Group*> GUIGroupList;
struct groupveh_d : vehiclelist_d {
GroupID group_sel;
VehicleID vehicle_sel;
GUIGroupList groups;
};
assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(groupveh_d));
assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vehiclelist_d));
static void BuildGroupList(GUIGroupList *gl, PlayerID owner, VehicleType vehicle_type) static void BuildGroupList(GUIGroupList *gl, PlayerID owner, VehicleType vehicle_type)
{ {
uint n = 0; uint n = 0;
@ -132,6 +122,35 @@ enum GroupListWidgets {
GRP_WIDGET_RESIZE, GRP_WIDGET_RESIZE,
}; };
enum GroupActionListFunction {
GALF_REPLACE,
GALF_SERVICE,
GALF_DEPOT,
GALF_ADD_SHARED,
GALF_REMOVE_ALL,
};
/**
* Update/redraw the group action dropdown
* @param w the window the dropdown belongs to
* @param gid the currently selected group in the window
*/
static void ShowGroupActionDropdown(Window *w, GroupID gid)
{
DropDownList *list = new DropDownList();
list->push_back(new DropDownListStringItem(STR_REPLACE_VEHICLES, GALF_REPLACE, false));
list->push_back(new DropDownListStringItem(STR_SEND_FOR_SERVICING, GALF_SERVICE, false));
list->push_back(new DropDownListStringItem(STR_SEND_TRAIN_TO_DEPOT, GALF_DEPOT, false));
if (IsValidGroupID(gid)) {
list->push_back(new DropDownListStringItem(STR_GROUP_ADD_SHARED_VEHICLE, GALF_ADD_SHARED, false));
list->push_back(new DropDownListStringItem(STR_GROUP_REMOVE_ALL_VEHICLES, GALF_REMOVE_ALL, false));
}
ShowDropDownList(w, list, 0, GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN);
}
static const Widget _group_widgets[] = { static const Widget _group_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
@ -163,191 +182,156 @@ static const Widget _group_widgets[] = {
}; };
static void CreateVehicleGroupWindow(Window *w) struct VehicleGroupWindow : public Window, public VehicleListBase {
{ GroupID group_sel;
const PlayerID owner = (PlayerID)GB(w->window_number, 0, 8); VehicleID vehicle_sel;
groupveh_d *gv = &WP(w, groupveh_d); GUIGroupList groups;
GUIVehicleList *vl = &gv->vehicles;
GUIGroupList *gl = &gv->groups;
w->caption_color = owner; VehicleGroupWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, NULL, window_number)
w->hscroll.cap = 224; {
w->resize.step_width = 1; const PlayerID owner = (PlayerID)GB(this->window_number, 0, 8);
switch (gv->vehicle_type) { this->caption_color = owner;
this->hscroll.cap = 224;
this->resize.step_width = 1;
switch (this->vehicle_type) {
default: NOT_REACHED(); default: NOT_REACHED();
case VEH_TRAIN: case VEH_TRAIN:
case VEH_ROAD: case VEH_ROAD:
w->vscroll.cap = 9; this->vscroll.cap = 9;
w->vscroll2.cap = 6; this->vscroll2.cap = 6;
w->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_SMALL; this->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_SMALL;
break; break;
case VEH_SHIP: case VEH_SHIP:
case VEH_AIRCRAFT: case VEH_AIRCRAFT:
w->vscroll.cap = 9; this->vscroll.cap = 9;
w->vscroll2.cap = 4; this->vscroll2.cap = 4;
w->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_BIG2; this->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_BIG2;
break; break;
} }
w->widget[GRP_WIDGET_LIST_GROUP].data = (w->vscroll.cap << 8) + 1; this->widget[GRP_WIDGET_LIST_GROUP].data = (this->vscroll.cap << 8) + 1;
w->widget[GRP_WIDGET_LIST_VEHICLE].data = (w->vscroll2.cap << 8) + 1; this->widget[GRP_WIDGET_LIST_VEHICLE].data = (this->vscroll2.cap << 8) + 1;
switch (gv->vehicle_type) { switch (this->vehicle_type) {
default: NOT_REACHED(); default: NOT_REACHED();
case VEH_TRAIN: gv->sorting = &_sorting.train; break; case VEH_TRAIN: this->sorting = &_sorting.train; break;
case VEH_ROAD: gv->sorting = &_sorting.roadveh; break; case VEH_ROAD: this->sorting = &_sorting.roadveh; break;
case VEH_SHIP: gv->sorting = &_sorting.ship; break; case VEH_SHIP: this->sorting = &_sorting.ship; break;
case VEH_AIRCRAFT: gv->sorting = &_sorting.aircraft; break; case VEH_AIRCRAFT: this->sorting = &_sorting.aircraft; break;
} }
gv->vehicle_type = (VehicleType)GB(w->window_number, 11, 5); this->vehicle_type = (VehicleType)GB(this->window_number, 11, 5);
vl->sort_list = NULL; this->vehicles.sort_list = NULL;
vl->sort_type = gv->sorting->criteria; this->vehicles.sort_type = this->sorting->criteria;
vl->flags = VL_REBUILD | (gv->sorting->order ? VL_DESC : VL_NONE); this->vehicles.flags = VL_REBUILD | (this->sorting->order ? VL_DESC : VL_NONE);
vl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer this->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer
gl->sort_list = NULL; this->groups.sort_list = NULL;
gl->flags = VL_REBUILD | VL_NONE; this->groups.flags = VL_REBUILD | VL_NONE;
gl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer this->groups.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer
gv->group_sel = ALL_GROUP; this->group_sel = ALL_GROUP;
gv->vehicle_sel = INVALID_VEHICLE; this->vehicle_sel = INVALID_VEHICLE;
switch (gv->vehicle_type) { switch (this->vehicle_type) {
case VEH_TRAIN: case VEH_TRAIN:
w->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR; this->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR;
w->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS; this->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS;
w->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_TRAIN; this->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_TRAIN;
w->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_TRAIN; this->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_TRAIN;
w->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_TRAIN; this->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_TRAIN;
break; break;
case VEH_ROAD: case VEH_ROAD:
w->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_901A_ROAD_VEHICLES_CLICK_ON; this->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_901A_ROAD_VEHICLES_CLICK_ON;
w->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_ROAD_VEHICLES; this->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_ROAD_VEHICLES;
w->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_ROADVEH; this->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_ROADVEH;
w->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_ROADVEH; this->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_ROADVEH;
w->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_ROADVEH; this->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_ROADVEH;
break; break;
case VEH_SHIP: case VEH_SHIP:
w->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_9823_SHIPS_CLICK_ON_SHIP_FOR; this->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_9823_SHIPS_CLICK_ON_SHIP_FOR;
w->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_SHIPS; this->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_SHIPS;
w->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_SHIP; this->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_SHIP;
w->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_SHIP; this->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_SHIP;
w->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_SHIP; this->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_SHIP;
break; break;
case VEH_AIRCRAFT: case VEH_AIRCRAFT:
w->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT; this->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT;
w->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_AIRCRAFT; this->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_AIRCRAFT;
w->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_AIRCRAFT; this->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_AIRCRAFT;
w->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_AIRCRAFT; this->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_AIRCRAFT;
w->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_AIRCRAFT; this->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_AIRCRAFT;
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
}
enum GroupActionListFunction { this->FindWindowPlacementAndResize(desc);
GALF_REPLACE,
GALF_SERVICE,
GALF_DEPOT,
GALF_ADD_SHARED,
GALF_REMOVE_ALL,
};
/**
* Update/redraw the group action dropdown
* @param w the window the dropdown belongs to
* @param gid the currently selected group in the window
*/
static void ShowGroupActionDropdown(Window *w, GroupID gid)
{
DropDownList *list = new DropDownList();
list->push_back(new DropDownListStringItem(STR_REPLACE_VEHICLES, GALF_REPLACE, false));
list->push_back(new DropDownListStringItem(STR_SEND_FOR_SERVICING, GALF_SERVICE, false));
list->push_back(new DropDownListStringItem(STR_SEND_TRAIN_TO_DEPOT, GALF_DEPOT, false));
if (IsValidGroupID(gid)) {
list->push_back(new DropDownListStringItem(STR_GROUP_ADD_SHARED_VEHICLE, GALF_ADD_SHARED, false));
list->push_back(new DropDownListStringItem(STR_GROUP_REMOVE_ALL_VEHICLES, GALF_REMOVE_ALL, false));
} }
ShowDropDownList(w, list, 0, GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN); ~VehicleGroupWindow()
} {
free((void*)this->vehicles.sort_list);
/** free((void*)this->groups.sort_list);
* bitmask for w->window_number
* 0-7 PlayerID (owner)
* 11-15 vehicle type
**/
static void GroupWndProc(Window *w, WindowEvent *e)
{
const PlayerID owner = (PlayerID)GB(w->window_number, 0, 8);
groupveh_d *gv = &WP(w, groupveh_d);
GUIVehicleList *vl = &gv->vehicles;
GUIGroupList *gl = &gv->groups;
gv->vehicle_type = (VehicleType)GB(w->window_number, 11, 5);
switch(e->event) {
case WE_INVALIDATE_DATA:
vl->flags |= VL_REBUILD;
gl->flags |= VL_REBUILD;
if (!(IsAllGroupID(gv->group_sel) || IsDefaultGroupID(gv->group_sel) || IsValidGroupID(gv->group_sel))) {
gv->group_sel = ALL_GROUP;
HideDropDownMenu(w);
} }
w->SetDirty();
break;
case WE_CREATE: virtual void OnInvalidateData(int data)
CreateVehicleGroupWindow(w); {
break; this->vehicles.flags |= VL_REBUILD;
this->groups.flags |= VL_REBUILD;
if (!(IsAllGroupID(this->group_sel) || IsDefaultGroupID(this->group_sel) || IsValidGroupID(this->group_sel))) {
this->group_sel = ALL_GROUP;
HideDropDownMenu(this);
}
this->SetDirty();
}
case WE_PAINT: { virtual void OnPaint()
{
const PlayerID owner = (PlayerID)GB(this->window_number, 0, 8);
int x = 203; int x = 203;
int y2 = PLY_WND_PRC__OFFSET_TOP_WIDGET; int y2 = PLY_WND_PRC__OFFSET_TOP_WIDGET;
int y1 = PLY_WND_PRC__OFFSET_TOP_WIDGET + 2; int y1 = PLY_WND_PRC__OFFSET_TOP_WIDGET + 2;
int max; int max;
int i; int i;
/* If we select the all vehicles, gv->list will contain all vehicles of the player /* If we select the all vehicles, this->list will contain all vehicles of the player
* else gv->list will contain all vehicles which belong to the selected group */ * else this->list will contain all vehicles which belong to the selected group */
BuildVehicleList(gv, owner, gv->group_sel, IsAllGroupID(gv->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST); BuildVehicleList(this, owner, this->group_sel, IsAllGroupID(this->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST);
SortVehicleList(gv); SortVehicleList(this);
BuildGroupList(gl, owner, gv->vehicle_type); BuildGroupList(&this->groups, owner, this->vehicle_type);
SortGroupList(gl); SortGroupList(&this->groups);
SetVScrollCount(w, gl->list_length); SetVScrollCount(this, this->groups.list_length);
SetVScroll2Count(w, vl->list_length); SetVScroll2Count(this, this->vehicles.list_length);
/* The drop down menu is out, *but* it may not be used, retract it. */ /* The drop down menu is out, *but* it may not be used, retract it. */
if (vl->list_length == 0 && w->IsWidgetLowered(GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN)) { if (this->vehicles.list_length == 0 && this->IsWidgetLowered(GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN)) {
w->RaiseWidget(GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN); this->RaiseWidget(GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN);
HideDropDownMenu(w); HideDropDownMenu(this);
} }
/* Disable all lists management button when the list is empty */ /* Disable all lists management button when the list is empty */
w->SetWidgetsDisabledState(vl->list_length == 0 || _local_player != owner, this->SetWidgetsDisabledState(this->vehicles.list_length == 0 || _local_player != owner,
GRP_WIDGET_STOP_ALL, GRP_WIDGET_STOP_ALL,
GRP_WIDGET_START_ALL, GRP_WIDGET_START_ALL,
GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN, GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN,
WIDGET_LIST_END); WIDGET_LIST_END);
/* Disable the group specific function when we select the default group or all vehicles */ /* Disable the group specific function when we select the default group or all vehicles */
w->SetWidgetsDisabledState(IsDefaultGroupID(gv->group_sel) || IsAllGroupID(gv->group_sel) || _local_player != owner, this->SetWidgetsDisabledState(IsDefaultGroupID(this->group_sel) || IsAllGroupID(this->group_sel) || _local_player != owner,
GRP_WIDGET_DELETE_GROUP, GRP_WIDGET_DELETE_GROUP,
GRP_WIDGET_RENAME_GROUP, GRP_WIDGET_RENAME_GROUP,
GRP_WIDGET_REPLACE_PROTECTION, GRP_WIDGET_REPLACE_PROTECTION,
@ -359,7 +343,7 @@ static void GroupWndProc(Window *w, WindowEvent *e)
* verify, whether you are the owner of the vehicle, * verify, whether you are the owner of the vehicle,
* so it doesn't have to be disabled * so it doesn't have to be disabled
*/ */
w->SetWidgetsDisabledState(_local_player != owner, this->SetWidgetsDisabledState(_local_player != owner,
GRP_WIDGET_CREATE_GROUP, GRP_WIDGET_CREATE_GROUP,
GRP_WIDGET_AVAILABLE_VEHICLES, GRP_WIDGET_AVAILABLE_VEHICLES,
WIDGET_LIST_END); WIDGET_LIST_END);
@ -367,66 +351,66 @@ static void GroupWndProc(Window *w, WindowEvent *e)
/* If selected_group == DEFAULT_GROUP || ALL_GROUP, draw the standard caption /* If selected_group == DEFAULT_GROUP || ALL_GROUP, draw the standard caption
We list all vehicles or ungrouped vehicles */ We list all vehicles or ungrouped vehicles */
if (IsDefaultGroupID(gv->group_sel) || IsAllGroupID(gv->group_sel)) { if (IsDefaultGroupID(this->group_sel) || IsAllGroupID(this->group_sel)) {
SetDParam(0, owner); SetDParam(0, owner);
SetDParam(1, vl->list_length); SetDParam(1, this->vehicles.list_length);
switch (gv->vehicle_type) { switch (this->vehicle_type) {
case VEH_TRAIN: case VEH_TRAIN:
w->widget[GRP_WIDGET_CAPTION].data = STR_881B_TRAINS; this->widget[GRP_WIDGET_CAPTION].data = STR_881B_TRAINS;
w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_TRAIN; this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_TRAIN;
break; break;
case VEH_ROAD: case VEH_ROAD:
w->widget[GRP_WIDGET_CAPTION].data = STR_9001_ROAD_VEHICLES; this->widget[GRP_WIDGET_CAPTION].data = STR_9001_ROAD_VEHICLES;
w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_ROADVEH; this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_ROADVEH;
break; break;
case VEH_SHIP: case VEH_SHIP:
w->widget[GRP_WIDGET_CAPTION].data = STR_9805_SHIPS; this->widget[GRP_WIDGET_CAPTION].data = STR_9805_SHIPS;
w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_SHIP; this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_SHIP;
break; break;
case VEH_AIRCRAFT: case VEH_AIRCRAFT:
w->widget[GRP_WIDGET_CAPTION].data = STR_A009_AIRCRAFT; this->widget[GRP_WIDGET_CAPTION].data = STR_A009_AIRCRAFT;
w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_AIRCRAFT; this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_AIRCRAFT;
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
} else { } else {
const Group *g = GetGroup(gv->group_sel); const Group *g = GetGroup(this->group_sel);
SetDParam(0, g->index); SetDParam(0, g->index);
SetDParam(1, g->num_vehicle); SetDParam(1, g->num_vehicle);
switch (gv->vehicle_type) { switch (this->vehicle_type) {
case VEH_TRAIN: case VEH_TRAIN:
w->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_TRAINS_CAPTION; this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_TRAINS_CAPTION;
w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_TRAIN : SPR_GROUP_REPLACE_OFF_TRAIN; this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_TRAIN : SPR_GROUP_REPLACE_OFF_TRAIN;
break; break;
case VEH_ROAD: case VEH_ROAD:
w->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_ROADVEH_CAPTION; this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_ROADVEH_CAPTION;
w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_ROADVEH : SPR_GROUP_REPLACE_OFF_ROADVEH; this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_ROADVEH : SPR_GROUP_REPLACE_OFF_ROADVEH;
break; break;
case VEH_SHIP: case VEH_SHIP:
w->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_SHIPS_CAPTION; this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_SHIPS_CAPTION;
w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_SHIP : SPR_GROUP_REPLACE_OFF_SHIP; this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_SHIP : SPR_GROUP_REPLACE_OFF_SHIP;
break; break;
case VEH_AIRCRAFT: case VEH_AIRCRAFT:
w->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_AIRCRAFTS_CAPTION; this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_AIRCRAFTS_CAPTION;
w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_AIRCRAFT : SPR_GROUP_REPLACE_OFF_AIRCRAFT; this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_AIRCRAFT : SPR_GROUP_REPLACE_OFF_AIRCRAFT;
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
} }
/* Set text of sort by dropdown */ /* Set text of sort by dropdown */
w->widget[GRP_WIDGET_SORT_BY_DROPDOWN].data = _vehicle_sort_listing[vl->sort_type]; this->widget[GRP_WIDGET_SORT_BY_DROPDOWN].data = _vehicle_sort_listing[this->vehicles.sort_type];
DrawWindowWidgets(w); DrawWindowWidgets(this);
/* Draw Matrix Group /* Draw Matrix Group
* The selected group is drawn in white */ * The selected group is drawn in white */
StringID str_all_veh, str_no_group_veh; StringID str_all_veh, str_no_group_veh;
switch (gv->vehicle_type) { switch (this->vehicle_type) {
case VEH_TRAIN: case VEH_TRAIN:
str_all_veh = STR_GROUP_ALL_TRAINS; str_all_veh = STR_GROUP_ALL_TRAINS;
str_no_group_veh = STR_GROUP_DEFAULT_TRAINS; str_no_group_veh = STR_GROUP_DEFAULT_TRAINS;
@ -445,15 +429,15 @@ static void GroupWndProc(Window *w, WindowEvent *e)
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
DrawString(10, y1, str_all_veh, IsAllGroupID(gv->group_sel) ? TC_WHITE : TC_BLACK); DrawString(10, y1, str_all_veh, IsAllGroupID(this->group_sel) ? TC_WHITE : TC_BLACK);
y1 += 13; y1 += 13;
DrawString(10, y1, str_no_group_veh, IsDefaultGroupID(gv->group_sel) ? TC_WHITE : TC_BLACK); DrawString(10, y1, str_no_group_veh, IsDefaultGroupID(this->group_sel) ? TC_WHITE : TC_BLACK);
max = min(w->vscroll.pos + w->vscroll.cap, gl->list_length); max = min(this->vscroll.pos + this->vscroll.cap, this->groups.list_length);
for (i = w->vscroll.pos ; i < max ; ++i) { for (i = this->vscroll.pos ; i < max ; ++i) {
const Group *g = gl->sort_list[i]; const Group *g = this->groups.sort_list[i];
assert(g->owner == owner); assert(g->owner == owner);
@ -461,214 +445,213 @@ static void GroupWndProc(Window *w, WindowEvent *e)
/* draw the selected group in white, else we draw it in black */ /* draw the selected group in white, else we draw it in black */
SetDParam(0, g->index); SetDParam(0, g->index);
DrawString(10, y1, STR_GROUP_NAME, (gv->group_sel == g->index) ? TC_WHITE : TC_BLACK); DrawString(10, y1, STR_GROUP_NAME, (this->group_sel == g->index) ? TC_WHITE : TC_BLACK);
/* draw the number of vehicles of the group */ /* draw the number of vehicles of the group */
SetDParam(0, g->num_vehicle); SetDParam(0, g->num_vehicle);
DrawStringRightAligned(187, y1 + 1, STR_GROUP_TINY_NUM, (gv->group_sel == g->index) ? TC_WHITE : TC_BLACK); DrawStringRightAligned(187, y1 + 1, STR_GROUP_TINY_NUM, (this->group_sel == g->index) ? TC_WHITE : TC_BLACK);
} }
DrawSortButtonState(w, GRP_WIDGET_SORT_BY_ORDER, vl->flags & VL_DESC ? SBS_DOWN : SBS_UP); DrawSortButtonState(this, GRP_WIDGET_SORT_BY_ORDER, this->vehicles.flags & VL_DESC ? SBS_DOWN : SBS_UP);
/* Draw Matrix Vehicle according to the vehicle list built before */ /* Draw Matrix Vehicle according to the vehicle list built before */
max = min(w->vscroll2.pos + w->vscroll2.cap, vl->list_length); max = min(this->vscroll2.pos + this->vscroll2.cap, this->vehicles.list_length);
for (i = w->vscroll2.pos ; i < max ; ++i) { for (i = this->vscroll2.pos ; i < max ; ++i) {
const Vehicle* v = vl->sort_list[i]; const Vehicle* v = this->vehicles.sort_list[i];
assert(v->type == gv->vehicle_type && v->owner == owner); assert(v->type == this->vehicle_type && v->owner == owner);
DrawVehicleImage(v, x + 19, y2 + 6, gv->vehicle_sel, w->hscroll.cap, 0); DrawVehicleImage(v, x + 19, y2 + 6, this->vehicle_sel, this->hscroll.cap, 0);
DrawVehicleProfitButton(v, x, y2 + 13); DrawVehicleProfitButton(v, x, y2 + 13);
SetDParam(0, v->unitnumber); SetDParam(0, v->unitnumber);
DrawString(x, y2 + 2, v->IsInDepot() ? STR_021F : (v->age > v->max_age - 366 ? STR_00E3 : STR_00E2), TC_FROMSTRING); DrawString(x, y2 + 2, v->IsInDepot() ? STR_021F : (v->age > v->max_age - 366 ? STR_00E3 : STR_00E2), TC_FROMSTRING);
if (w->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG2) DrawSmallOrderList(v, x + 138, y2); if (this->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG2) DrawSmallOrderList(v, x + 138, y2);
SetDParam(0, v->GetDisplayProfitThisYear()); SetDParam(0, v->GetDisplayProfitThisYear());
SetDParam(1, v->GetDisplayProfitLastYear()); SetDParam(1, v->GetDisplayProfitLastYear());
DrawString(x + 19, y2 + w->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING); DrawString(x + 19, y2 + this->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING);
if (IsValidGroupID(v->group_id)) { if (IsValidGroupID(v->group_id)) {
SetDParam(0, v->group_id); SetDParam(0, v->group_id);
DrawString(x + 19, y2, STR_GROUP_TINY_NAME, TC_BLACK); DrawString(x + 19, y2, STR_GROUP_TINY_NAME, TC_BLACK);
} }
y2 += w->resize.step_height; y2 += this->resize.step_height;
}
} }
break; virtual void OnClick(Point pt, int widget)
} {
if (widget != GRP_WIDGET_SORT_BY_DROPDOWN && widget != GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN) HideDropDownMenu(this);
case WE_CLICK: switch(widget) {
if (e->we.click.widget != GRP_WIDGET_SORT_BY_DROPDOWN && e->we.click.widget != GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN) HideDropDownMenu(w);
switch(e->we.click.widget) {
case GRP_WIDGET_SORT_BY_ORDER: // Flip sorting method ascending/descending case GRP_WIDGET_SORT_BY_ORDER: // Flip sorting method ascending/descending
vl->flags ^= VL_DESC; this->vehicles.flags ^= VL_DESC;
vl->flags |= VL_RESORT; this->vehicles.flags |= VL_RESORT;
gv->sorting->order = !!(vl->flags & VL_DESC); this->sorting->order = !!(this->vehicles.flags & VL_DESC);
w->SetDirty(); this->SetDirty();
break; break;
case GRP_WIDGET_SORT_BY_DROPDOWN: // Select sorting criteria dropdown menu case GRP_WIDGET_SORT_BY_DROPDOWN: // Select sorting criteria dropdown menu
ShowDropDownMenu(w, _vehicle_sort_listing, vl->sort_type, GRP_WIDGET_SORT_BY_DROPDOWN, 0, (gv->vehicle_type == VEH_TRAIN || gv->vehicle_type == VEH_ROAD) ? 0 : (1 << 10)); ShowDropDownMenu(this, _vehicle_sort_listing, this->vehicles.sort_type, GRP_WIDGET_SORT_BY_DROPDOWN, 0, (this->vehicle_type == VEH_TRAIN || this->vehicle_type == VEH_ROAD) ? 0 : (1 << 10));
return; return;
case GRP_WIDGET_ALL_VEHICLES: // All vehicles button case GRP_WIDGET_ALL_VEHICLES: // All vehicles button
if (!IsAllGroupID(gv->group_sel)) { if (!IsAllGroupID(this->group_sel)) {
gv->group_sel = ALL_GROUP; this->group_sel = ALL_GROUP;
vl->flags |= VL_REBUILD; this->vehicles.flags |= VL_REBUILD;
w->SetDirty(); this->SetDirty();
} }
break; break;
case GRP_WIDGET_DEFAULT_VEHICLES: // Ungrouped vehicles button case GRP_WIDGET_DEFAULT_VEHICLES: // Ungrouped vehicles button
if (!IsDefaultGroupID(gv->group_sel)) { if (!IsDefaultGroupID(this->group_sel)) {
gv->group_sel = DEFAULT_GROUP; this->group_sel = DEFAULT_GROUP;
vl->flags |= VL_REBUILD; this->vehicles.flags |= VL_REBUILD;
w->SetDirty(); this->SetDirty();
} }
break; break;
case GRP_WIDGET_LIST_GROUP: { // Matrix Group case GRP_WIDGET_LIST_GROUP: { // Matrix Group
uint16 id_g = (e->we.click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET - 26) / PLY_WND_PRC__SIZE_OF_ROW_TINY; uint16 id_g = (pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET - 26) / PLY_WND_PRC__SIZE_OF_ROW_TINY;
if (id_g >= w->vscroll.cap) return; if (id_g >= this->vscroll.cap) return;
id_g += w->vscroll.pos; id_g += this->vscroll.pos;
if (id_g >= gl->list_length) return; if (id_g >= this->groups.list_length) return;
gv->group_sel = gl->sort_list[id_g]->index;; this->group_sel = this->groups.sort_list[id_g]->index;;
vl->flags |= VL_REBUILD; this->vehicles.flags |= VL_REBUILD;
w->SetDirty(); this->SetDirty();
break; break;
} }
case GRP_WIDGET_LIST_VEHICLE: { // Matrix Vehicle case GRP_WIDGET_LIST_VEHICLE: { // Matrix Vehicle
uint32 id_v = (e->we.click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / (int)w->resize.step_height; uint32 id_v = (pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / (int)this->resize.step_height;
const Vehicle *v; const Vehicle *v;
if (id_v >= w->vscroll2.cap) return; // click out of bounds if (id_v >= this->vscroll2.cap) return; // click out of bounds
id_v += w->vscroll2.pos; id_v += this->vscroll2.pos;
if (id_v >= vl->list_length) return; // click out of list bound if (id_v >= this->vehicles.list_length) return; // click out of list bound
v = vl->sort_list[id_v]; v = this->vehicles.sort_list[id_v];
gv->vehicle_sel = v->index; this->vehicle_sel = v->index;
if (v->IsValid()) { if (v->IsValid()) {
SetObjectToPlaceWnd(v->GetImage(DIR_W), GetVehiclePalette(v), VHM_DRAG, w); SetObjectToPlaceWnd(v->GetImage(DIR_W), GetVehiclePalette(v), VHM_DRAG, this);
_cursor.vehchain = true; _cursor.vehchain = true;
} }
w->SetDirty(); this->SetDirty();
break; break;
} }
case GRP_WIDGET_CREATE_GROUP: // Create a new group case GRP_WIDGET_CREATE_GROUP: // Create a new group
DoCommandP(0, gv->vehicle_type, 0, NULL, CMD_CREATE_GROUP | CMD_MSG(STR_GROUP_CAN_T_CREATE)); DoCommandP(0, this->vehicle_type, 0, NULL, CMD_CREATE_GROUP | CMD_MSG(STR_GROUP_CAN_T_CREATE));
break; break;
case GRP_WIDGET_DELETE_GROUP: { // Delete the selected group case GRP_WIDGET_DELETE_GROUP: { // Delete the selected group
GroupID group = gv->group_sel; GroupID group = this->group_sel;
gv->group_sel = ALL_GROUP; this->group_sel = ALL_GROUP;
DoCommandP(0, group, 0, NULL, CMD_DELETE_GROUP | CMD_MSG(STR_GROUP_CAN_T_DELETE)); DoCommandP(0, group, 0, NULL, CMD_DELETE_GROUP | CMD_MSG(STR_GROUP_CAN_T_DELETE));
break; break;
} }
case GRP_WIDGET_RENAME_GROUP: { // Rename the selected roup case GRP_WIDGET_RENAME_GROUP: { // Rename the selected roup
assert(IsValidGroupID(gv->group_sel)); assert(IsValidGroupID(this->group_sel));
const Group *g = GetGroup(gv->group_sel); const Group *g = GetGroup(this->group_sel);
SetDParam(0, g->index); SetDParam(0, g->index);
ShowQueryString(STR_GROUP_NAME, STR_GROUP_RENAME_CAPTION, 31, 150, w, CS_ALPHANUMERAL); ShowQueryString(STR_GROUP_NAME, STR_GROUP_RENAME_CAPTION, 31, 150, this, CS_ALPHANUMERAL);
} break; } break;
case GRP_WIDGET_AVAILABLE_VEHICLES: case GRP_WIDGET_AVAILABLE_VEHICLES:
ShowBuildVehicleWindow(0, gv->vehicle_type); ShowBuildVehicleWindow(0, this->vehicle_type);
break; break;
case GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN: case GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN:
ShowGroupActionDropdown(w, gv->group_sel); ShowGroupActionDropdown(this, this->group_sel);
break; break;
case GRP_WIDGET_START_ALL: case GRP_WIDGET_START_ALL:
case GRP_WIDGET_STOP_ALL: { // Start/stop all vehicles of the list case GRP_WIDGET_STOP_ALL: { // Start/stop all vehicles of the list
DoCommandP(0, gv->group_sel, ((IsAllGroupID(gv->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK) DoCommandP(0, this->group_sel, ((IsAllGroupID(this->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK)
| (1 << 6) | (1 << 6)
| (e->we.click.widget == GRP_WIDGET_START_ALL ? (1 << 5) : 0) | (widget == GRP_WIDGET_START_ALL ? (1 << 5) : 0)
| gv->vehicle_type, NULL, CMD_MASS_START_STOP); | this->vehicle_type, NULL, CMD_MASS_START_STOP);
break; break;
} }
case GRP_WIDGET_REPLACE_PROTECTION: case GRP_WIDGET_REPLACE_PROTECTION:
if (IsValidGroupID(gv->group_sel)) { if (IsValidGroupID(this->group_sel)) {
const Group *g = GetGroup(gv->group_sel); const Group *g = GetGroup(this->group_sel);
DoCommandP(0, gv->group_sel, !g->replace_protection, NULL, CMD_SET_GROUP_REPLACE_PROTECTION); DoCommandP(0, this->group_sel, !g->replace_protection, NULL, CMD_SET_GROUP_REPLACE_PROTECTION);
} }
break; break;
} }
}
break; virtual void OnDragDrop(Point pt, int widget)
{
case WE_DRAGDROP: { switch (widget) {
switch (e->we.click.widget) {
case GRP_WIDGET_ALL_VEHICLES: // All vehicles case GRP_WIDGET_ALL_VEHICLES: // All vehicles
case GRP_WIDGET_DEFAULT_VEHICLES: // Ungrouped vehicles case GRP_WIDGET_DEFAULT_VEHICLES: // Ungrouped vehicles
DoCommandP(0, DEFAULT_GROUP, gv->vehicle_sel, NULL, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_VEHICLE)); DoCommandP(0, DEFAULT_GROUP, this->vehicle_sel, NULL, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_VEHICLE));
gv->vehicle_sel = INVALID_VEHICLE; this->vehicle_sel = INVALID_VEHICLE;
w->SetDirty(); this->SetDirty();
break; break;
case GRP_WIDGET_LIST_GROUP: { // Maxtrix group case GRP_WIDGET_LIST_GROUP: { // Maxtrix group
uint16 id_g = (e->we.click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET - 26) / PLY_WND_PRC__SIZE_OF_ROW_TINY; uint16 id_g = (pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET - 26) / PLY_WND_PRC__SIZE_OF_ROW_TINY;
const VehicleID vindex = gv->vehicle_sel; const VehicleID vindex = this->vehicle_sel;
gv->vehicle_sel = INVALID_VEHICLE; this->vehicle_sel = INVALID_VEHICLE;
w->SetDirty(); this->SetDirty();
if (id_g >= w->vscroll.cap) return; if (id_g >= this->vscroll.cap) return;
id_g += w->vscroll.pos; id_g += this->vscroll.pos;
if (id_g >= gl->list_length) return; if (id_g >= this->groups.list_length) return;
DoCommandP(0, gl->sort_list[id_g]->index, vindex, NULL, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_VEHICLE)); DoCommandP(0, this->groups.sort_list[id_g]->index, vindex, NULL, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_VEHICLE));
break; break;
} }
case GRP_WIDGET_LIST_VEHICLE: { // Maxtrix vehicle case GRP_WIDGET_LIST_VEHICLE: { // Maxtrix vehicle
uint32 id_v = (e->we.click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / (int)w->resize.step_height; uint32 id_v = (pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / (int)this->resize.step_height;
const Vehicle *v; const Vehicle *v;
const VehicleID vindex = gv->vehicle_sel; const VehicleID vindex = this->vehicle_sel;
gv->vehicle_sel = INVALID_VEHICLE; this->vehicle_sel = INVALID_VEHICLE;
w->SetDirty(); this->SetDirty();
if (id_v >= w->vscroll2.cap) return; // click out of bounds if (id_v >= this->vscroll2.cap) return; // click out of bounds
id_v += w->vscroll2.pos; id_v += this->vscroll2.pos;
if (id_v >= vl->list_length) return; // click out of list bound if (id_v >= this->vehicles.list_length) return; // click out of list bound
v = vl->sort_list[id_v]; v = this->vehicles.sort_list[id_v];
if (vindex == v->index) { if (vindex == v->index) {
ShowVehicleViewWindow(v); ShowVehicleViewWindow(v);
@ -678,62 +661,63 @@ static void GroupWndProc(Window *w, WindowEvent *e)
} }
} }
_cursor.vehchain = false; _cursor.vehchain = false;
break;
} }
case WE_ON_EDIT_TEXT: virtual void OnQueryTextFinished(char *str)
if (!StrEmpty(e->we.edittext.str)) { {
_cmd_text = e->we.edittext.str; if (!StrEmpty(str)) {
_cmd_text = str;
DoCommandP(0, gv->group_sel, 0, NULL, CMD_RENAME_GROUP | CMD_MSG(STR_GROUP_CAN_T_RENAME)); DoCommandP(0, this->group_sel, 0, NULL, CMD_RENAME_GROUP | CMD_MSG(STR_GROUP_CAN_T_RENAME));
}
} }
break;
case WE_RESIZE: virtual void OnResize(Point new_size, Point delta)
w->hscroll.cap += e->we.sizing.diff.x; {
w->vscroll.cap += e->we.sizing.diff.y / PLY_WND_PRC__SIZE_OF_ROW_TINY; this->hscroll.cap += delta.x;
w->vscroll2.cap += e->we.sizing.diff.y / (int)w->resize.step_height; this->vscroll.cap += delta.y / PLY_WND_PRC__SIZE_OF_ROW_TINY;
this->vscroll2.cap += delta.y / (int)this->resize.step_height;
w->widget[GRP_WIDGET_LIST_GROUP].data = (w->vscroll.cap << 8) + 1; this->widget[GRP_WIDGET_LIST_GROUP].data = (this->vscroll.cap << 8) + 1;
w->widget[GRP_WIDGET_LIST_VEHICLE].data = (w->vscroll2.cap << 8) + 1; this->widget[GRP_WIDGET_LIST_VEHICLE].data = (this->vscroll2.cap << 8) + 1;
break; }
virtual void OnDropdownSelect(int widget, int index)
case WE_DROPDOWN_SELECT: // we have selected a dropdown item in the list {
switch (e->we.dropdown.button) { switch (widget) {
case GRP_WIDGET_SORT_BY_DROPDOWN: case GRP_WIDGET_SORT_BY_DROPDOWN:
if (vl->sort_type != e->we.dropdown.index) { if (this->vehicles.sort_type != index) {
vl->flags |= VL_RESORT; this->vehicles.flags |= VL_RESORT;
vl->sort_type = e->we.dropdown.index; this->vehicles.sort_type = index;
gv->sorting->criteria = vl->sort_type; this->sorting->criteria = this->vehicles.sort_type;
} }
break; break;
case GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN: case GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN:
assert(vl->list_length != 0); assert(this->vehicles.list_length != 0);
switch (e->we.dropdown.index) { switch (index) {
case GALF_REPLACE: // Replace window case GALF_REPLACE: // Replace window
ShowReplaceGroupVehicleWindow(gv->group_sel, gv->vehicle_type); ShowReplaceGroupVehicleWindow(this->group_sel, this->vehicle_type);
break; break;
case GALF_SERVICE: // Send for servicing case GALF_SERVICE: // Send for servicing
DoCommandP(0, gv->group_sel, ((IsAllGroupID(gv->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK) DoCommandP(0, this->group_sel, ((IsAllGroupID(this->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK)
| DEPOT_MASS_SEND | DEPOT_MASS_SEND
| DEPOT_SERVICE, NULL, GetCmdSendToDepot(gv->vehicle_type)); | DEPOT_SERVICE, NULL, GetCmdSendToDepot(this->vehicle_type));
break; break;
case GALF_DEPOT: // Send to Depots case GALF_DEPOT: // Send to Depots
DoCommandP(0, gv->group_sel, ((IsAllGroupID(gv->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK) DoCommandP(0, this->group_sel, ((IsAllGroupID(this->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK)
| DEPOT_MASS_SEND, NULL, GetCmdSendToDepot(gv->vehicle_type)); | DEPOT_MASS_SEND, NULL, GetCmdSendToDepot(this->vehicle_type));
break; break;
case GALF_ADD_SHARED: // Add shared Vehicles case GALF_ADD_SHARED: // Add shared Vehicles
assert(IsValidGroupID(gv->group_sel)); assert(IsValidGroupID(this->group_sel));
DoCommandP(0, gv->group_sel, gv->vehicle_type, NULL, CMD_ADD_SHARED_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_SHARED_VEHICLE)); DoCommandP(0, this->group_sel, this->vehicle_type, NULL, CMD_ADD_SHARED_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_SHARED_VEHICLE));
break; break;
case GALF_REMOVE_ALL: // Remove all Vehicles from the selected group case GALF_REMOVE_ALL: // Remove all Vehicles from the selected group
assert(IsValidGroupID(gv->group_sel)); assert(IsValidGroupID(this->group_sel));
DoCommandP(0, gv->group_sel, gv->vehicle_type, NULL, CMD_REMOVE_ALL_VEHICLES_GROUP | CMD_MSG(STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES)); DoCommandP(0, this->group_sel, this->vehicle_type, NULL, CMD_REMOVE_ALL_VEHICLES_GROUP | CMD_MSG(STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES));
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
@ -742,38 +726,31 @@ static void GroupWndProc(Window *w, WindowEvent *e)
default: NOT_REACHED(); default: NOT_REACHED();
} }
w->SetDirty(); this->SetDirty();
break;
case WE_DESTROY:
free((void*)vl->sort_list);
free((void*)gl->sort_list);
break;
case WE_TICK: // resort the lists every 20 seconds orso (10 days)
if (_pause_game != 0) break;
if (--vl->resort_timer == 0) {
vl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
vl->flags |= VL_RESORT;
w->SetDirty();
} }
if (--gl->resort_timer == 0) {
gl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
gl->flags |= VL_RESORT;
w->SetDirty();
}
break;
case WE_ABORT_PLACE_OBJ: // called when new object to place is selected from keyboard virtual void OnTick()
{
if (_pause_game != 0) return;
if (--this->vehicles.resort_timer == 0) {
this->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
this->vehicles.flags |= VL_RESORT;
this->SetDirty();
}
if (--this->groups.resort_timer == 0) {
this->groups.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
this->groups.flags |= VL_RESORT;
this->SetDirty();
}
}
virtual void OnPlaceObjectAbort()
{
/* abort drag & drop */ /* abort drag & drop */
gv->vehicle_sel = INVALID_VEHICLE; this->vehicle_sel = INVALID_VEHICLE;
w->InvalidateWidget(GRP_WIDGET_LIST_VEHICLE); this->InvalidateWidget(GRP_WIDGET_LIST_VEHICLE);
break;
} }
} };
static const WindowDesc _group_desc = { static const WindowDesc _group_desc = {
@ -781,7 +758,7 @@ static const WindowDesc _group_desc = {
WC_TRAINS_LIST, WC_NONE, WC_TRAINS_LIST, WC_NONE,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_group_widgets, _group_widgets,
GroupWndProc NULL
}; };
void ShowPlayerGroup(PlayerID player, VehicleType vehicle_type) void ShowPlayerGroup(PlayerID player, VehicleType vehicle_type)
@ -800,8 +777,6 @@ void ShowPlayerGroup(PlayerID player, VehicleType vehicle_type)
WindowNumber num = (vehicle_type << 11) | VLW_GROUP_LIST | player; WindowNumber num = (vehicle_type << 11) | VLW_GROUP_LIST | player;
DeleteWindowById(wc, num); DeleteWindowById(wc, num);
Window *w = AllocateWindowDescFront<Window>(&_group_desc, num); Window *w = new VehicleGroupWindow(&_group_desc, num);
if (w == NULL) return;
w->window_class = wc; w->window_class = wc;
} }

468
src/vehicle_gui.cpp
View File

@ -116,7 +116,7 @@ static void SetVehicleListsFlag(SortListFlags sl_flag)
case WC_ROADVEH_LIST: case WC_ROADVEH_LIST:
case WC_SHIPS_LIST: case WC_SHIPS_LIST:
case WC_AIRCRAFT_LIST: case WC_AIRCRAFT_LIST:
WP(w, vehiclelist_d).vehicles.flags |= sl_flag; dynamic_cast<VehicleListBase*>(w)->vehicles.flags |= sl_flag;
w->SetDirty(); w->SetDirty();
break; break;
@ -141,7 +141,7 @@ void ResortVehicleLists()
SetVehicleListsFlag(VL_RESORT); SetVehicleListsFlag(VL_RESORT);
} }
void BuildVehicleList(vehiclelist_d *vl, PlayerID owner, uint16 index, uint16 window_type) void BuildVehicleList(VehicleListBase *vl, PlayerID owner, uint16 index, uint16 window_type)
{ {
if (!(vl->vehicles.flags & VL_REBUILD)) return; if (!(vl->vehicles.flags & VL_REBUILD)) return;
@ -157,7 +157,7 @@ void BuildVehicleList(vehiclelist_d *vl, PlayerID owner, uint16 index, uint16 wi
static const Vehicle *_last_vehicle[2] = { NULL, NULL }; static const Vehicle *_last_vehicle[2] = { NULL, NULL };
static char _last_name[2][64] = { "", "" }; static char _last_name[2][64] = { "", "" };
void SortVehicleList(vehiclelist_d *vl) void SortVehicleList(VehicleListBase *vl)
{ {
if (!(vl->vehicles.flags & VL_RESORT)) return; if (!(vl->vehicles.flags & VL_RESORT)) return;
@ -807,127 +807,6 @@ static const Widget _vehicle_list_widgets[] = {
{ WIDGETS_END}, { WIDGETS_END},
}; };
static void CreateVehicleListWindow(Window *w)
{
vehiclelist_d *vl = &WP(w, vehiclelist_d);
uint16 window_type = w->window_number & VLW_MASK;
PlayerID player = (PlayerID)GB(w->window_number, 0, 8);
vl->vehicle_type = (VehicleType)GB(w->window_number, 11, 5);
vl->vehicles.list_length = 0;
vl->vehicles.sort_list = NULL;
w->caption_color = player;
/* Hide the widgets that we will not use in this window
* Some windows contains actions only fit for the owner */
if (player == _local_player) {
w->HideWidget(VLW_WIDGET_OTHER_PLAYER_FILLER);
w->SetWidgetDisabledState(VLW_WIDGET_AVAILABLE_VEHICLES, window_type != VLW_STANDARD);
} else {
w->SetWidgetsHiddenState(true,
VLW_WIDGET_AVAILABLE_VEHICLES,
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
VLW_WIDGET_STOP_ALL,
VLW_WIDGET_START_ALL,
VLW_WIDGET_EMPTY_BOTTOM_RIGHT,
WIDGET_LIST_END);
}
/* Set up the window widgets */
switch (vl->vehicle_type) {
case VEH_TRAIN:
w->widget[VLW_WIDGET_LIST].tooltips = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR;
w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS;
break;
case VEH_ROAD:
w->widget[VLW_WIDGET_LIST].tooltips = STR_901A_ROAD_VEHICLES_CLICK_ON;
w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_ROAD_VEHICLES;
break;
case VEH_SHIP:
w->widget[VLW_WIDGET_LIST].tooltips = STR_9823_SHIPS_CLICK_ON_SHIP_FOR;
w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_SHIPS;
break;
case VEH_AIRCRAFT:
w->widget[VLW_WIDGET_LIST].tooltips = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT;
w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_AIRCRAFT;
break;
default: NOT_REACHED();
}
switch (window_type) {
case VLW_SHARED_ORDERS:
w->widget[VLW_WIDGET_CAPTION].data = STR_VEH_WITH_SHARED_ORDERS_LIST;
break;
case VLW_STANDARD: /* Company Name - standard widget setup */
switch (vl->vehicle_type) {
case VEH_TRAIN: w->widget[VLW_WIDGET_CAPTION].data = STR_881B_TRAINS; break;
case VEH_ROAD: w->widget[VLW_WIDGET_CAPTION].data = STR_9001_ROAD_VEHICLES; break;
case VEH_SHIP: w->widget[VLW_WIDGET_CAPTION].data = STR_9805_SHIPS; break;
case VEH_AIRCRAFT: w->widget[VLW_WIDGET_CAPTION].data = STR_A009_AIRCRAFT; break;
default: NOT_REACHED(); break;
}
break;
case VLW_STATION_LIST: /* Station Name */
switch (vl->vehicle_type) {
case VEH_TRAIN: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_TRAINS; break;
case VEH_ROAD: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_ROAD_VEHICLES; break;
case VEH_SHIP: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_SHIPS; break;
case VEH_AIRCRAFT: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_AIRCRAFT; break;
default: NOT_REACHED(); break;
}
break;
case VLW_DEPOT_LIST:
switch (vl->vehicle_type) {
case VEH_TRAIN: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_DEPOT; break;
case VEH_ROAD: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_ROADVEH_DEPOT; break;
case VEH_SHIP: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_SHIP_DEPOT; break;
case VEH_AIRCRAFT: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_AIRCRAFT_DEPOT; break;
default: NOT_REACHED(); break;
}
break;
default: NOT_REACHED(); break;
}
switch (vl->vehicle_type) {
case VEH_TRAIN:
w->resize.step_width = 1;
/* Fallthrough */
case VEH_ROAD:
w->vscroll.cap = 7;
w->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_SMALL;
w->resize.height = 220 - (PLY_WND_PRC__SIZE_OF_ROW_SMALL * 3); // Minimum of 4 vehicles
break;
case VEH_SHIP:
case VEH_AIRCRAFT:
w->vscroll.cap = 4;
w->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_BIG;
break;
default: NOT_REACHED();
}
w->widget[VLW_WIDGET_LIST].data = (w->vscroll.cap << 8) + 1;
/* Set up sorting. Make the window-specific _sorting variable
* point to the correct global _sorting struct so we are freed
* from having conditionals during window operation */
switch (vl->vehicle_type) {
case VEH_TRAIN: vl->sorting = &_sorting.train; break;
case VEH_ROAD: vl->sorting = &_sorting.roadveh; break;
case VEH_SHIP: vl->sorting = &_sorting.ship; break;
case VEH_AIRCRAFT: vl->sorting = &_sorting.aircraft; break;
default: NOT_REACHED(); break;
}
vl->vehicles.flags = VL_REBUILD | (vl->sorting->order ? VL_DESC : VL_NONE);
vl->vehicles.sort_type = vl->sorting->criteria;
vl->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer
}
void DrawSmallOrderList(const Vehicle *v, int x, int y) void DrawSmallOrderList(const Vehicle *v, int x, int y)
{ {
const Order *order; const Order *order;
@ -951,83 +830,221 @@ void DrawSmallOrderList(const Vehicle *v, int x, int y)
} }
} }
static void DrawVehicleListWindow(Window *w) /**
{ * Window for the (old) vehicle listing.
vehiclelist_d *vl = &WP(w, vehiclelist_d); *
* bitmask for w->window_number
* 0-7 PlayerID (owner)
* 8-10 window type (use flags in vehicle_gui.h)
* 11-15 vehicle type (using VEH_, but can be compressed to fewer bytes if needed)
* 16-31 StationID or OrderID depending on window type (bit 8-10)
*/
struct VehicleListWindow : public Window, public VehicleListBase {
VehicleListWindow(const WindowDesc *desc, void *data, WindowNumber window_number) : Window(desc, data, window_number)
{
uint16 window_type = this->window_number & VLW_MASK;
PlayerID player = (PlayerID)GB(this->window_number, 0, 8);
this->vehicle_type = (VehicleType)GB(this->window_number, 11, 5);
this->vehicles.list_length = 0;
this->vehicles.sort_list = NULL;
this->caption_color = player;
/* Hide the widgets that we will not use in this window
* Some windows contains actions only fit for the owner */
if (player == _local_player) {
this->HideWidget(VLW_WIDGET_OTHER_PLAYER_FILLER);
this->SetWidgetDisabledState(VLW_WIDGET_AVAILABLE_VEHICLES, window_type != VLW_STANDARD);
} else {
this->SetWidgetsHiddenState(true,
VLW_WIDGET_AVAILABLE_VEHICLES,
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
VLW_WIDGET_STOP_ALL,
VLW_WIDGET_START_ALL,
VLW_WIDGET_EMPTY_BOTTOM_RIGHT,
WIDGET_LIST_END);
}
/* Set up the window widgets */
switch (this->vehicle_type) {
case VEH_TRAIN:
this->widget[VLW_WIDGET_LIST].tooltips = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR;
this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS;
break;
case VEH_ROAD:
this->widget[VLW_WIDGET_LIST].tooltips = STR_901A_ROAD_VEHICLES_CLICK_ON;
this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_ROAD_VEHICLES;
break;
case VEH_SHIP:
this->widget[VLW_WIDGET_LIST].tooltips = STR_9823_SHIPS_CLICK_ON_SHIP_FOR;
this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_SHIPS;
break;
case VEH_AIRCRAFT:
this->widget[VLW_WIDGET_LIST].tooltips = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT;
this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_AIRCRAFT;
break;
default: NOT_REACHED();
}
switch (window_type) {
case VLW_SHARED_ORDERS:
this->widget[VLW_WIDGET_CAPTION].data = STR_VEH_WITH_SHARED_ORDERS_LIST;
break;
case VLW_STANDARD: /* Company Name - standard widget setup */
switch (this->vehicle_type) {
case VEH_TRAIN: this->widget[VLW_WIDGET_CAPTION].data = STR_881B_TRAINS; break;
case VEH_ROAD: this->widget[VLW_WIDGET_CAPTION].data = STR_9001_ROAD_VEHICLES; break;
case VEH_SHIP: this->widget[VLW_WIDGET_CAPTION].data = STR_9805_SHIPS; break;
case VEH_AIRCRAFT: this->widget[VLW_WIDGET_CAPTION].data = STR_A009_AIRCRAFT; break;
default: NOT_REACHED(); break;
}
break;
case VLW_STATION_LIST: /* Station Name */
switch (this->vehicle_type) {
case VEH_TRAIN: this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_TRAINS; break;
case VEH_ROAD: this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_ROAD_VEHICLES; break;
case VEH_SHIP: this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_SHIPS; break;
case VEH_AIRCRAFT: this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_AIRCRAFT; break;
default: NOT_REACHED(); break;
}
break;
case VLW_DEPOT_LIST:
switch (this->vehicle_type) {
case VEH_TRAIN: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_DEPOT; break;
case VEH_ROAD: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_ROADVEH_DEPOT; break;
case VEH_SHIP: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_SHIP_DEPOT; break;
case VEH_AIRCRAFT: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_AIRCRAFT_DEPOT; break;
default: NOT_REACHED(); break;
}
break;
default: NOT_REACHED(); break;
}
switch (this->vehicle_type) {
case VEH_TRAIN:
this->resize.step_width = 1;
/* Fallthrough */
case VEH_ROAD:
this->vscroll.cap = 7;
this->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_SMALL;
this->resize.height = 220 - (PLY_WND_PRC__SIZE_OF_ROW_SMALL * 3); // Minimum of 4 vehicles
break;
case VEH_SHIP:
case VEH_AIRCRAFT:
this->vscroll.cap = 4;
this->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_BIG;
break;
default: NOT_REACHED();
}
this->widget[VLW_WIDGET_LIST].data = (this->vscroll.cap << 8) + 1;
/* Set up sorting. Make the window-specific _sorting variable
* point to the correct global _sorting struct so we are freed
* from having conditionals during window operation */
switch (this->vehicle_type) {
case VEH_TRAIN: this->sorting = &_sorting.train; break;
case VEH_ROAD: this->sorting = &_sorting.roadveh; break;
case VEH_SHIP: this->sorting = &_sorting.ship; break;
case VEH_AIRCRAFT: this->sorting = &_sorting.aircraft; break;
default: NOT_REACHED(); break;
}
this->vehicles.flags = VL_REBUILD | (this->sorting->order ? VL_DESC : VL_NONE);
this->vehicles.sort_type = this->sorting->criteria;
this->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer
this->FindWindowPlacementAndResize(desc);
}
~VehicleListWindow()
{
free((void*)this->vehicles.sort_list);
}
virtual void OnPaint()
{
int x = 2; int x = 2;
int y = PLY_WND_PRC__OFFSET_TOP_WIDGET; int y = PLY_WND_PRC__OFFSET_TOP_WIDGET;
int max; int max;
int i; int i;
const PlayerID owner = (PlayerID)w->caption_color; const PlayerID owner = (PlayerID)this->caption_color;
const uint16 window_type = w->window_number & VLW_MASK; const uint16 window_type = this->window_number & VLW_MASK;
const uint16 index = GB(w->window_number, 16, 16); const uint16 index = GB(this->window_number, 16, 16);
BuildVehicleList(vl, owner, index, window_type); BuildVehicleList(this, owner, index, window_type);
SortVehicleList(vl); SortVehicleList(this);
SetVScrollCount(w, vl->vehicles.list_length); SetVScrollCount(this, this->vehicles.list_length);
/* draw the widgets */ /* draw the widgets */
switch (window_type) { switch (window_type) {
case VLW_SHARED_ORDERS: /* Shared Orders */ case VLW_SHARED_ORDERS: /* Shared Orders */
if (vl->vehicles.list_length == 0) { if (this->vehicles.list_length == 0) {
/* We can't open this window without vehicles using this order /* We can't open this window without vehicles using this order
* and we should close the window when deleting the order */ * and we should close the window when deleting the order */
NOT_REACHED(); NOT_REACHED();
} }
SetDParam(0, w->vscroll.count); SetDParam(0, this->vscroll.count);
break; break;
case VLW_STANDARD: /* Company Name */ case VLW_STANDARD: /* Company Name */
SetDParam(0, owner); SetDParam(0, owner);
SetDParam(1, w->vscroll.count); SetDParam(1, this->vscroll.count);
break; break;
case VLW_STATION_LIST: /* Station Name */ case VLW_STATION_LIST: /* Station Name */
SetDParam(0, index); SetDParam(0, index);
SetDParam(1, w->vscroll.count); SetDParam(1, this->vscroll.count);
break; break;
case VLW_DEPOT_LIST: case VLW_DEPOT_LIST:
switch (vl->vehicle_type) { switch (this->vehicle_type) {
case VEH_TRAIN: SetDParam(0, STR_8800_TRAIN_DEPOT); break; case VEH_TRAIN: SetDParam(0, STR_8800_TRAIN_DEPOT); break;
case VEH_ROAD: SetDParam(0, STR_9003_ROAD_VEHICLE_DEPOT); break; case VEH_ROAD: SetDParam(0, STR_9003_ROAD_VEHICLE_DEPOT); break;
case VEH_SHIP: SetDParam(0, STR_9803_SHIP_DEPOT); break; case VEH_SHIP: SetDParam(0, STR_9803_SHIP_DEPOT); break;
case VEH_AIRCRAFT: SetDParam(0, STR_A002_AIRCRAFT_HANGAR); break; case VEH_AIRCRAFT: SetDParam(0, STR_A002_AIRCRAFT_HANGAR); break;
default: NOT_REACHED(); break; default: NOT_REACHED(); break;
} }
if (vl->vehicle_type == VEH_AIRCRAFT) { if (this->vehicle_type == VEH_AIRCRAFT) {
SetDParam(1, index); // Airport name SetDParam(1, index); // Airport name
} else { } else {
SetDParam(1, GetDepot(index)->town_index); SetDParam(1, GetDepot(index)->town_index);
} }
SetDParam(2, w->vscroll.count); SetDParam(2, this->vscroll.count);
break; break;
default: NOT_REACHED(); break; default: NOT_REACHED(); break;
} }
w->SetWidgetsDisabledState(vl->vehicles.list_length == 0, this->SetWidgetsDisabledState(this->vehicles.list_length == 0,
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
VLW_WIDGET_STOP_ALL, VLW_WIDGET_STOP_ALL,
VLW_WIDGET_START_ALL, VLW_WIDGET_START_ALL,
WIDGET_LIST_END); WIDGET_LIST_END);
DrawWindowWidgets(w); DrawWindowWidgets(this);
/* draw sorting criteria string */ /* draw sorting criteria string */
DrawString(85, 15, _vehicle_sort_listing[vl->vehicles.sort_type], TC_BLACK); DrawString(85, 15, _vehicle_sort_listing[this->vehicles.sort_type], TC_BLACK);
/* draw arrow pointing up/down for ascending/descending sorting */ /* draw arrow pointing up/down for ascending/descending sorting */
DrawSortButtonState(w, VLW_WIDGET_SORT_ORDER, vl->vehicles.flags & VL_DESC ? SBS_DOWN : SBS_UP); DrawSortButtonState(this, VLW_WIDGET_SORT_ORDER, this->vehicles.flags & VL_DESC ? SBS_DOWN : SBS_UP);
max = min(w->vscroll.pos + w->vscroll.cap, vl->vehicles.list_length); max = min(this->vscroll.pos + this->vscroll.cap, this->vehicles.list_length);
for (i = w->vscroll.pos; i < max; ++i) { for (i = this->vscroll.pos; i < max; ++i) {
const Vehicle *v = vl->vehicles.sort_list[i]; const Vehicle *v = this->vehicles.sort_list[i];
StringID str; StringID str;
SetDParam(0, v->GetDisplayProfitThisYear()); SetDParam(0, v->GetDisplayProfitThisYear());
SetDParam(1, v->GetDisplayProfitLastYear()); SetDParam(1, v->GetDisplayProfitLastYear());
DrawVehicleImage(v, x + 19, y + 6, INVALID_VEHICLE, w->widget[VLW_WIDGET_LIST].right - w->widget[VLW_WIDGET_LIST].left - 20, 0); DrawVehicleImage(v, x + 19, y + 6, INVALID_VEHICLE, this->widget[VLW_WIDGET_LIST].right - this->widget[VLW_WIDGET_LIST].left - 20, 0);
DrawString(x + 19, y + w->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING); DrawString(x + 19, y + this->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING);
if (v->name != NULL) { if (v->name != NULL) {
/* The vehicle got a name so we will print it */ /* The vehicle got a name so we will print it */
@ -1035,7 +1052,7 @@ static void DrawVehicleListWindow(Window *w)
DrawString(x + 19, y, STR_01AB, TC_FROMSTRING); DrawString(x + 19, y, STR_01AB, TC_FROMSTRING);
} }
if (w->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG) DrawSmallOrderList(v, x + 138, y); if (this->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG) DrawSmallOrderList(v, x + 138, y);
if (v->IsInDepot()) { if (v->IsInDepot()) {
str = STR_021F; str = STR_021F;
@ -1048,59 +1065,40 @@ static void DrawVehicleListWindow(Window *w)
DrawVehicleProfitButton(v, x, y + 13); DrawVehicleProfitButton(v, x, y + 13);
y += w->resize.step_height; y += this->resize.step_height;
}
} }
}
/* virtual void OnClick(Point pt, int widget)
* bitmask for w->window_number {
* 0-7 PlayerID (owner) switch (widget) {
* 8-10 window type (use flags in vehicle_gui.h)
* 11-15 vehicle type (using VEH_, but can be compressed to fewer bytes if needed)
* 16-31 StationID or OrderID depending on window type (bit 8-10)
**/
void PlayerVehWndProc(Window *w, WindowEvent *e)
{
vehiclelist_d *vl = &WP(w, vehiclelist_d);
switch (e->event) {
case WE_CREATE:
CreateVehicleListWindow(w);
break;
case WE_PAINT:
DrawVehicleListWindow(w);
break;
case WE_CLICK: {
switch (e->we.click.widget) {
case VLW_WIDGET_SORT_ORDER: /* Flip sorting method ascending/descending */ case VLW_WIDGET_SORT_ORDER: /* Flip sorting method ascending/descending */
vl->vehicles.flags ^= VL_DESC; this->vehicles.flags ^= VL_DESC;
vl->vehicles.flags |= VL_RESORT; this->vehicles.flags |= VL_RESORT;
vl->sorting->order = !!(vl->vehicles.flags & VL_DESC); this->sorting->order = !!(this->vehicles.flags & VL_DESC);
w->SetDirty(); this->SetDirty();
break; break;
case VLW_WIDGET_SORT_BY_PULLDOWN:/* Select sorting criteria dropdown menu */ case VLW_WIDGET_SORT_BY_PULLDOWN:/* Select sorting criteria dropdown menu */
ShowDropDownMenu(w, _vehicle_sort_listing, vl->vehicles.sort_type, VLW_WIDGET_SORT_BY_PULLDOWN, 0, (vl->vehicle_type == VEH_TRAIN || vl->vehicle_type == VEH_ROAD) ? 0 : (1 << 10)); ShowDropDownMenu(this, _vehicle_sort_listing, this->vehicles.sort_type, VLW_WIDGET_SORT_BY_PULLDOWN, 0, (this->vehicle_type == VEH_TRAIN || this->vehicle_type == VEH_ROAD) ? 0 : (1 << 10));
return; return;
case VLW_WIDGET_LIST: { /* Matrix to show vehicles */ case VLW_WIDGET_LIST: { /* Matrix to show vehicles */
uint32 id_v = (e->we.click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / w->resize.step_height; uint32 id_v = (pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / this->resize.step_height;
const Vehicle *v; const Vehicle *v;
if (id_v >= w->vscroll.cap) return; // click out of bounds if (id_v >= this->vscroll.cap) return; // click out of bounds
id_v += w->vscroll.pos; id_v += this->vscroll.pos;
if (id_v >= vl->vehicles.list_length) return; // click out of list bound if (id_v >= this->vehicles.list_length) return; // click out of list bound
v = vl->vehicles.sort_list[id_v]; v = this->vehicles.sort_list[id_v];
ShowVehicleViewWindow(v); ShowVehicleViewWindow(v);
} break; } break;
case VLW_WIDGET_AVAILABLE_VEHICLES: case VLW_WIDGET_AVAILABLE_VEHICLES:
ShowBuildVehicleWindow(0, vl->vehicle_type); ShowBuildVehicleWindow(0, this->vehicle_type);
break; break;
case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN: { case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN: {
@ -1119,46 +1117,47 @@ void PlayerVehWndProc(Window *w, WindowEvent *e)
}; };
/* XXX - Substite string since the dropdown cannot handle dynamic strings */ /* XXX - Substite string since the dropdown cannot handle dynamic strings */
action_str[2] = depot_name[vl->vehicle_type]; action_str[2] = depot_name[this->vehicle_type];
ShowDropDownMenu(w, action_str, 0, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, 0, (w->window_number & VLW_MASK) == VLW_STANDARD ? 0 : 1); ShowDropDownMenu(this, action_str, 0, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, 0, (this->window_number & VLW_MASK) == VLW_STANDARD ? 0 : 1);
break; break;
} }
case VLW_WIDGET_STOP_ALL: case VLW_WIDGET_STOP_ALL:
case VLW_WIDGET_START_ALL: case VLW_WIDGET_START_ALL:
DoCommandP(0, GB(w->window_number, 16, 16), (w->window_number & VLW_MASK) | (1 << 6) | (e->we.click.widget == VLW_WIDGET_START_ALL ? (1 << 5) : 0) | vl->vehicle_type, NULL, CMD_MASS_START_STOP); DoCommandP(0, GB(this->window_number, 16, 16), (this->window_number & VLW_MASK) | (1 << 6) | (widget == VLW_WIDGET_START_ALL ? (1 << 5) : 0) | this->vehicle_type, NULL, CMD_MASS_START_STOP);
break; break;
} }
} break; }
case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */ virtual void OnDropdownSelect(int widget, int index)
switch (e->we.dropdown.button) { {
switch (widget) {
case VLW_WIDGET_SORT_BY_PULLDOWN: case VLW_WIDGET_SORT_BY_PULLDOWN:
if (vl->vehicles.sort_type != e->we.dropdown.index) { if (this->vehicles.sort_type != index) {
/* value has changed -> resort */ /* value has changed -> resort */
vl->vehicles.flags |= VL_RESORT; this->vehicles.flags |= VL_RESORT;
vl->vehicles.sort_type = e->we.dropdown.index; this->vehicles.sort_type = index;
vl->sorting->criteria = vl->vehicles.sort_type; this->sorting->criteria = this->vehicles.sort_type;
} }
break; break;
case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN: case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN:
assert(vl->vehicles.list_length != 0); assert(this->vehicles.list_length != 0);
switch (e->we.dropdown.index) { switch (index) {
case 0: /* Replace window */ case 0: /* Replace window */
ShowReplaceGroupVehicleWindow(DEFAULT_GROUP, vl->vehicle_type); ShowReplaceGroupVehicleWindow(DEFAULT_GROUP, this->vehicle_type);
break; break;
case 1: /* Send for servicing */ case 1: /* Send for servicing */
DoCommandP(0, GB(w->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */, DoCommandP(0, GB(this->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */,
(w->window_number & VLW_MASK) | DEPOT_MASS_SEND | DEPOT_SERVICE, (this->window_number & VLW_MASK) | DEPOT_MASS_SEND | DEPOT_SERVICE,
NULL, NULL,
GetCmdSendToDepot(vl->vehicle_type)); GetCmdSendToDepot(this->vehicle_type));
break; break;
case 2: /* Send to Depots */ case 2: /* Send to Depots */
DoCommandP(0, GB(w->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */, DoCommandP(0, GB(this->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */,
(w->window_number & VLW_MASK) | DEPOT_MASS_SEND, (this->window_number & VLW_MASK) | DEPOT_MASS_SEND,
NULL, NULL,
GetCmdSendToDepot(vl->vehicle_type)); GetCmdSendToDepot(this->vehicle_type));
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
@ -1166,39 +1165,36 @@ void PlayerVehWndProc(Window *w, WindowEvent *e)
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
w->SetDirty(); this->SetDirty();
break;
case WE_DESTROY:
free((void*)vl->vehicles.sort_list);
break;
case WE_TICK: /* resort the list every 20 seconds orso (10 days) */
if (_pause_game != 0) break;
if (--vl->vehicles.resort_timer == 0) {
StationID station = ((w->window_number & VLW_MASK) == VLW_STATION_LIST) ? GB(w->window_number, 16, 16) : INVALID_STATION;
PlayerID owner = (PlayerID)w->caption_color;
DEBUG(misc, 3, "Periodic resort %d list player %d at station %d", vl->vehicle_type, owner, station);
vl->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
vl->vehicles.flags |= VL_RESORT;
w->SetDirty();
} }
break;
case WE_RESIZE: /* Update the scroll + matrix */ virtual void OnTick()
w->vscroll.cap += e->we.sizing.diff.y / (int)w->resize.step_height; {
w->widget[VLW_WIDGET_LIST].data = (w->vscroll.cap << 8) + 1; if (_pause_game != 0) return;
break; if (--this->vehicles.resort_timer == 0) {
StationID station = ((this->window_number & VLW_MASK) == VLW_STATION_LIST) ? GB(this->window_number, 16, 16) : INVALID_STATION;
PlayerID owner = (PlayerID)this->caption_color;
DEBUG(misc, 3, "Periodic resort %d list player %d at station %d", this->vehicle_type, owner, station);
this->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
this->vehicles.flags |= VL_RESORT;
this->SetDirty();
} }
} }
virtual void OnResize(Point new_size, Point delta)
{
this->vscroll.cap += delta.y / (int)this->resize.step_height;
this->widget[VLW_WIDGET_LIST].data = (this->vscroll.cap << 8) + 1;
}
};
static const WindowDesc _player_vehicle_list_train_desc = { static const WindowDesc _player_vehicle_list_train_desc = {
WDP_AUTO, WDP_AUTO, 260, 182, 260, 182, WDP_AUTO, WDP_AUTO, 260, 182, 260, 182,
WC_TRAINS_LIST, WC_NONE, WC_TRAINS_LIST, WC_NONE,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_vehicle_list_widgets, _vehicle_list_widgets,
PlayerVehWndProc NULL
}; };
static const WindowDesc _player_vehicle_list_road_veh_desc = { static const WindowDesc _player_vehicle_list_road_veh_desc = {
@ -1206,7 +1202,7 @@ static const WindowDesc _player_vehicle_list_road_veh_desc = {
WC_ROADVEH_LIST, WC_NONE, WC_ROADVEH_LIST, WC_NONE,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_vehicle_list_widgets, _vehicle_list_widgets,
PlayerVehWndProc NULL
}; };
static const WindowDesc _player_vehicle_list_ship_desc = { static const WindowDesc _player_vehicle_list_ship_desc = {
@ -1214,7 +1210,7 @@ static const WindowDesc _player_vehicle_list_ship_desc = {
WC_SHIPS_LIST, WC_NONE, WC_SHIPS_LIST, WC_NONE,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_vehicle_list_widgets, _vehicle_list_widgets,
PlayerVehWndProc NULL
}; };
static const WindowDesc _player_vehicle_list_aircraft_desc = { static const WindowDesc _player_vehicle_list_aircraft_desc = {
@ -1222,12 +1218,12 @@ static const WindowDesc _player_vehicle_list_aircraft_desc = {
WC_AIRCRAFT_LIST, WC_NONE, WC_AIRCRAFT_LIST, WC_NONE,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
_vehicle_list_widgets, _vehicle_list_widgets,
PlayerVehWndProc NULL
}; };
static void ShowVehicleListWindowLocal(PlayerID player, uint16 VLW_flag, VehicleType vehicle_type, uint16 unique_number) static void ShowVehicleListWindowLocal(PlayerID player, uint16 VLW_flag, VehicleType vehicle_type, uint16 unique_number)
{ {
Window *w; VehicleListWindow *w;
WindowNumber num; WindowNumber num;
if (!IsValidPlayer(player)) return; if (!IsValidPlayer(player)) return;
@ -1240,18 +1236,18 @@ static void ShowVehicleListWindowLocal(PlayerID player, uint16 VLW_flag, Vehicle
switch (vehicle_type) { switch (vehicle_type) {
default: NOT_REACHED(); default: NOT_REACHED();
case VEH_TRAIN: case VEH_TRAIN:
w = AllocateWindowDescFront<Window>(&_player_vehicle_list_train_desc, num); w = AllocateWindowDescFront<VehicleListWindow>(&_player_vehicle_list_train_desc, num);
if (w != NULL) ResizeWindow(w, 65, 38); if (w != NULL) ResizeWindow(w, 65, 38);
break; break;
case VEH_ROAD: case VEH_ROAD:
w = AllocateWindowDescFront<Window>(&_player_vehicle_list_road_veh_desc, num); w = AllocateWindowDescFront<VehicleListWindow>(&_player_vehicle_list_road_veh_desc, num);
if (w != NULL) ResizeWindow(w, 0, 38); if (w != NULL) ResizeWindow(w, 0, 38);
break; break;
case VEH_SHIP: case VEH_SHIP:
w = AllocateWindowDescFront<Window>(&_player_vehicle_list_ship_desc, num); w = AllocateWindowDescFront<VehicleListWindow>(&_player_vehicle_list_ship_desc, num);
break; break;
case VEH_AIRCRAFT: case VEH_AIRCRAFT:
w = AllocateWindowDescFront<Window>(&_player_vehicle_list_aircraft_desc, num); w = AllocateWindowDescFront<VehicleListWindow>(&_player_vehicle_list_aircraft_desc, num);
break; break;
} }

8
src/vehicle_gui.h
View File

@ -63,8 +63,6 @@ static inline bool ValidVLWFlags(uint16 flags)
return (flags == VLW_STANDARD || flags == VLW_SHARED_ORDERS || flags == VLW_STATION_LIST || flags == VLW_DEPOT_LIST || flags == VLW_GROUP_LIST); return (flags == VLW_STANDARD || flags == VLW_SHARED_ORDERS || flags == VLW_STATION_LIST || flags == VLW_DEPOT_LIST || flags == VLW_GROUP_LIST);
} }
void PlayerVehWndProc(Window *w, struct WindowEvent *e);
int DrawVehiclePurchaseInfo(int x, int y, uint w, EngineID engine_number); int DrawVehiclePurchaseInfo(int x, int y, uint w, EngineID engine_number);
void DrawTrainImage(const Vehicle *v, int x, int y, VehicleID selection, int count, int skip); void DrawTrainImage(const Vehicle *v, int x, int y, VehicleID selection, int count, int skip);
@ -134,7 +132,7 @@ Vehicle *CheckClickOnVehicle(const struct ViewPort *vp, int x, int y);
typedef GUIList<const Vehicle*> GUIVehicleList; typedef GUIList<const Vehicle*> GUIVehicleList;
struct vehiclelist_d { struct VehicleListBase {
GUIVehicleList vehicles; ///< The list of vehicles GUIVehicleList vehicles; ///< The list of vehicles
Listing *sorting; ///< Pointer to the vehicle type related sorting. Listing *sorting; ///< Pointer to the vehicle type related sorting.
VehicleType vehicle_type; ///< The vehicle type that is sorted VehicleType vehicle_type; ///< The vehicle type that is sorted
@ -152,7 +150,7 @@ extern Sorting _sorting;
/* sorter stuff */ /* sorter stuff */
void RebuildVehicleLists(); void RebuildVehicleLists();
void ResortVehicleLists(); void ResortVehicleLists();
void SortVehicleList(vehiclelist_d *vl); void SortVehicleList(VehicleListBase *vl);
void BuildVehicleList(vehiclelist_d *vl, PlayerID owner, uint16 index, uint16 window_type); void BuildVehicleList(VehicleListBase *vl, PlayerID owner, uint16 index, uint16 window_type);
#endif /* VEHICLE_GUI_H */ #endif /* VEHICLE_GUI_H */