mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13119) -Codechange: make a class of the timetable window.

release/0.7
rubidium 2008-05-16 13:39:25 +00:00
parent feba3ac1e7
commit e1cce4dd3c
1 changed files with 205 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
src/timetable_gui.cpp
View File

@ -36,27 +36,6 @@ enum TimetableViewWindowWidgets {
TTV_RESIZE, TTV_RESIZE,
}; };
struct timetable_d {
int sel;
};
assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(timetable_d));
static int GetOrderFromTimetableWndPt(Window *w, int y, const Vehicle *v)
{
/*
* Calculation description:
* 15 = 14 (w->widget[TTV_ORDER_VIEW].top) + 1 (frame-line)
* 10 = order text hight
*/
int sel = (y - 15) / 10;
if ((uint)sel >= w->vscroll.cap) return INVALID_ORDER;
sel += w->vscroll.pos;
return (sel <= v->num_orders * 2 && sel >= 0) ? sel : INVALID_ORDER;
}
void SetTimetableParams(int param1, int param2, uint32 time) void SetTimetableParams(int param1, int param2, uint32 time)
{ {
if (_patches.timetable_in_ticks) { if (_patches.timetable_in_ticks) {
@ -68,44 +47,71 @@ void SetTimetableParams(int param1, int param2, uint32 time)
} }
} }
static void DrawTimetableWindow(Window *w) struct TimetableWindow : Window {
{ int sel_index;
const Vehicle *v = GetVehicle(w->window_number);
int selected = WP(w, timetable_d).sel;
SetVScrollCount(w, v->num_orders * 2); TimetableWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
{
this->caption_color = GetVehicle(window_number)->owner;
this->vscroll.cap = 8;
this->resize.step_height = 10;
this->sel_index = -1;
}
int GetOrderFromTimetableWndPt(int y, const Vehicle *v)
{
/*
* Calculation description:
* 15 = 14 (this->widget[TTV_ORDER_VIEW].top) + 1 (frame-line)
* 10 = order text hight
*/
int sel = (y - 15) / 10;
if ((uint)sel >= this->vscroll.cap) return INVALID_ORDER;
sel += this->vscroll.pos;
return (sel <= v->num_orders * 2 && sel >= 0) ? sel : INVALID_ORDER;
}
void OnPaint()
{
const Vehicle *v = GetVehicle(this->window_number);
int selected = this->sel_index;
SetVScrollCount(this, v->num_orders * 2);
if (v->owner == _local_player) { if (v->owner == _local_player) {
if (selected == -1) { if (selected == -1) {
w->DisableWidget(TTV_CHANGE_TIME); this->DisableWidget(TTV_CHANGE_TIME);
w->DisableWidget(TTV_CLEAR_TIME); this->DisableWidget(TTV_CLEAR_TIME);
} else if (selected % 2 == 1) { } else if (selected % 2 == 1) {
w->EnableWidget(TTV_CHANGE_TIME); this->EnableWidget(TTV_CHANGE_TIME);
w->EnableWidget(TTV_CLEAR_TIME); this->EnableWidget(TTV_CLEAR_TIME);
} else { } else {
const Order *order = GetVehicleOrder(v, (selected + 1) / 2); const Order *order = GetVehicleOrder(v, (selected + 1) / 2);
bool disable = order == NULL || !order->IsType(OT_GOTO_STATION) || (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION); bool disable = order == NULL || !order->IsType(OT_GOTO_STATION) || (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION);
w->SetWidgetDisabledState(TTV_CHANGE_TIME, disable); this->SetWidgetDisabledState(TTV_CHANGE_TIME, disable);
w->SetWidgetDisabledState(TTV_CLEAR_TIME, disable); this->SetWidgetDisabledState(TTV_CLEAR_TIME, disable);
} }
w->EnableWidget(TTV_RESET_LATENESS); this->EnableWidget(TTV_RESET_LATENESS);
w->EnableWidget(TTV_AUTOFILL); this->EnableWidget(TTV_AUTOFILL);
} else { } else {
w->DisableWidget(TTV_CHANGE_TIME); this->DisableWidget(TTV_CHANGE_TIME);
w->DisableWidget(TTV_CLEAR_TIME); this->DisableWidget(TTV_CLEAR_TIME);
w->DisableWidget(TTV_RESET_LATENESS); this->DisableWidget(TTV_RESET_LATENESS);
w->DisableWidget(TTV_AUTOFILL); this->DisableWidget(TTV_AUTOFILL);
} }
w->SetWidgetLoweredState(TTV_AUTOFILL, HasBit(v->vehicle_flags, VF_AUTOFILL_TIMETABLE)); this->SetWidgetLoweredState(TTV_AUTOFILL, HasBit(v->vehicle_flags, VF_AUTOFILL_TIMETABLE));
SetDParam(0, v->index); SetDParam(0, v->index);
DrawWindowWidgets(w); DrawWindowWidgets(this);
int y = 15; int y = 15;
int i = w->vscroll.pos; int i = this->vscroll.pos;
VehicleOrderID order_id = (i + 1) / 2; VehicleOrderID order_id = (i + 1) / 2;
bool final_order = false; bool final_order = false;
@ -113,7 +119,7 @@ static void DrawTimetableWindow(Window *w)
while (order != NULL) { while (order != NULL) {
/* Don't draw anything if it extends past the end of the window. */ /* Don't draw anything if it extends past the end of the window. */
if (i - w->vscroll.pos >= w->vscroll.cap) break; if (i - this->vscroll.pos >= this->vscroll.cap) break;
if (i % 2 == 0) { if (i % 2 == 0) {
DrawOrderString(v, order, order_id, y, i == selected, true); DrawOrderString(v, order, order_id, y, i == selected, true);
@ -145,7 +151,7 @@ static void DrawTimetableWindow(Window *w)
y += 10; y += 10;
} }
y = w->widget[TTV_SUMMARY_PANEL].top + 1; y = this->widget[TTV_SUMMARY_PANEL].top + 1;
{ {
uint total_time = 0; uint total_time = 0;
@ -170,47 +176,41 @@ static void DrawTimetableWindow(Window *w)
SetTimetableParams(0, 1, abs(v->lateness_counter)); SetTimetableParams(0, 1, abs(v->lateness_counter));
DrawString(2, y, v->lateness_counter < 0 ? STR_TIMETABLE_STATUS_EARLY : STR_TIMETABLE_STATUS_LATE, TC_BLACK); DrawString(2, y, v->lateness_counter < 0 ? STR_TIMETABLE_STATUS_EARLY : STR_TIMETABLE_STATUS_LATE, TC_BLACK);
} }
} }
static inline uint32 PackTimetableArgs(const Vehicle *v, uint selected) static inline uint32 PackTimetableArgs(const Vehicle *v, uint selected)
{ {
uint order_number = (selected + 1) / 2; uint order_number = (selected + 1) / 2;
uint is_journey = (selected % 2 == 1) ? 1 : 0; uint is_journey = (selected % 2 == 1) ? 1 : 0;
if (order_number >= v->num_orders) order_number = 0; if (order_number >= v->num_orders) order_number = 0;
return v->index | (order_number << 16) | (is_journey << 24); return v->index | (order_number << 16) | (is_journey << 24);
} }
static void TimetableWndProc(Window *w, WindowEvent *we) virtual void OnClick(Point pt, int widget)
{ {
switch (we->event) { const Vehicle *v = GetVehicle(this->window_number);
case WE_PAINT:
DrawTimetableWindow(w);
break;
case WE_CLICK: { switch (widget) {
const Vehicle *v = GetVehicle(w->window_number);
switch (we->we.click.widget) {
case TTV_ORDER_VIEW: /* Order view button */ case TTV_ORDER_VIEW: /* Order view button */
ShowOrdersWindow(v); ShowOrdersWindow(v);
break; break;
case TTV_TIMETABLE_PANEL: { /* Main panel. */ case TTV_TIMETABLE_PANEL: { /* Main panel. */
int selected = GetOrderFromTimetableWndPt(w, we->we.click.pt.y, v); int selected = GetOrderFromTimetableWndPt(pt.y, v);
if (selected == INVALID_ORDER || selected == WP(w, timetable_d).sel) { if (selected == INVALID_ORDER || selected == this->sel_index) {
/* Deselect clicked order */ /* Deselect clicked order */
WP(w, timetable_d).sel = -1; this->sel_index = -1;
} else { } else {
/* Select clicked order */ /* Select clicked order */
WP(w, timetable_d).sel = selected; this->sel_index = selected;
} }
} break; } break;
case TTV_CHANGE_TIME: { /* "Wait For" button. */ case TTV_CHANGE_TIME: { /* "Wait For" button. */
int selected = WP(w, timetable_d).sel; int selected = this->sel_index;
VehicleOrderID real = (selected + 1) / 2; VehicleOrderID real = (selected + 1) / 2;
if (real >= v->num_orders) real = 0; if (real >= v->num_orders) real = 0;
@ -228,11 +228,11 @@ static void TimetableWndProc(Window *w, WindowEvent *we)
} }
} }
ShowQueryString(current, STR_TIMETABLE_CHANGE_TIME, 31, 150, w, CS_NUMERAL); ShowQueryString(current, STR_TIMETABLE_CHANGE_TIME, 31, 150, this, CS_NUMERAL);
} break; } break;
case TTV_CLEAR_TIME: { /* Clear waiting time button. */ case TTV_CLEAR_TIME: { /* Clear waiting time button. */
uint32 p1 = PackTimetableArgs(v, WP(w, timetable_d).sel); uint32 p1 = PackTimetableArgs(v, this->sel_index);
DoCommandP(0, p1, 0, NULL, CMD_CHANGE_TIMETABLE | CMD_MSG(STR_CAN_T_TIMETABLE_VEHICLE)); DoCommandP(0, p1, 0, NULL, CMD_CHANGE_TIMETABLE | CMD_MSG(STR_CAN_T_TIMETABLE_VEHICLE));
} break; } break;
@ -245,31 +245,31 @@ static void TimetableWndProc(Window *w, WindowEvent *we)
break; break;
} }
w->SetDirty(); this->SetDirty();
} break; }
case WE_ON_EDIT_TEXT: { virtual void OnQueryTextFinished(char *str)
if (we->we.edittext.str == NULL) break; {
if (str == NULL) return;
const Vehicle *v = GetVehicle(w->window_number); const Vehicle *v = GetVehicle(this->window_number);
uint32 p1 = PackTimetableArgs(v, WP(w, timetable_d).sel); uint32 p1 = PackTimetableArgs(v, this->sel_index);
uint64 time = StrEmpty(we->we.edittext.str) ? 0 : strtoul(we->we.edittext.str, NULL, 10); uint64 time = StrEmpty(str) ? 0 : strtoul(str, NULL, 10);
if (!_patches.timetable_in_ticks) time *= DAY_TICKS; if (!_patches.timetable_in_ticks) time *= DAY_TICKS;
uint32 p2 = minu(time, MAX_UVALUE(uint16)); uint32 p2 = minu(time, MAX_UVALUE(uint16));
DoCommandP(0, p1, p2, NULL, CMD_CHANGE_TIMETABLE | CMD_MSG(STR_CAN_T_TIMETABLE_VEHICLE)); DoCommandP(0, p1, p2, NULL, CMD_CHANGE_TIMETABLE | CMD_MSG(STR_CAN_T_TIMETABLE_VEHICLE));
} break;
case WE_RESIZE:
/* Update the scroll + matrix */
w->vscroll.cap = (w->widget[TTV_TIMETABLE_PANEL].bottom - w->widget[TTV_TIMETABLE_PANEL].top) / 10;
break;
} }
}
virtual void OnResize(Point new_size, Point delta)
{
/* Update the scroll + matrix */
this->vscroll.cap = (this->widget[TTV_TIMETABLE_PANEL].bottom - this->widget[TTV_TIMETABLE_PANEL].top) / 10;
}
};
static const Widget _timetable_widgets[] = { static const Widget _timetable_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // TTV_WIDGET_CLOSEBOX { WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // TTV_WIDGET_CLOSEBOX
@ -298,17 +298,10 @@ static const WindowDesc _timetable_desc = {
WC_VEHICLE_TIMETABLE, WC_VEHICLE_VIEW, WC_VEHICLE_TIMETABLE, WC_VEHICLE_VIEW,
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,
_timetable_widgets, _timetable_widgets,
TimetableWndProc NULL
}; };
void ShowTimetableWindow(const Vehicle *v) void ShowTimetableWindow(const Vehicle *v)
{ {
Window *w = AllocateWindowDescFront<Window>(&_timetable_desc, v->index); AllocateWindowDescFront<TimetableWindow>(&_timetable_desc, v->index);
if (w != NULL) {
w->caption_color = v->owner;
w->vscroll.cap = 8;
w->resize.step_height = 10;
WP(w, timetable_d).sel = -1;
}
} }