gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-01-20 14:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r12768) -Codechange: move the statusbar GUI to it's own file.

Browse Source
This commit is contained in:
rubidium 2008-04-18 15:13:45 +00:00
parent dc16b4f2b4
commit 8c2c7c27ea
7 changed files with 204 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
projects/openttd_vs80.vcproj
View File

@ -727,6 +727,10 @@
RelativePath=".\..\src\station.cpp"
>
</File>
<File
RelativePath=".\..\src\statusbar_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\string.cpp"
>
@ -1195,6 +1199,10 @@
RelativePath=".\..\src\news_func.h"
>
</File>
<File
RelativePath=".\..\src\news_gui.h"
>
</File>
<File
RelativePath=".\..\src\news_type.h"
>

8
projects/openttd_vs90.vcproj
View File

@ -724,6 +724,10 @@
RelativePath=".\..\src\station.cpp"
>
</File>
<File
RelativePath=".\..\src\statusbar_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\string.cpp"
>
@ -1192,6 +1196,10 @@
RelativePath=".\..\src\news_func.h"
>
</File>
<File
RelativePath=".\..\src\news_gui.h"
>
</File>
<File
RelativePath=".\..\src\news_type.h"
>

2
source.list
View File

@ -75,6 +75,7 @@ signs.cpp
sound.cpp
spritecache.cpp
station.cpp
statusbar_gui.cpp
string.cpp
strings.cpp
texteff.cpp
@ -220,6 +221,7 @@ newgrf_text.h
newgrf_town.h
newgrf_townname.h
news_func.h
news_gui.h
news_type.h
npf.h
music/null_m.h

5
src/gui.h
View File

@ -34,11 +34,6 @@ void ShowCargoPaymentRates();
void ShowCompanyLeagueTable();
void ShowPerformanceRatingDetail();
/* news_gui.cpp */
void ShowLastNewsMessage();
void ShowMessageOptions();
void ShowMessageHistory();
/* train_gui.cpp */
void ShowOrdersWindow(const Vehicle *v);

157
src/main_gui.cpp
View File

@ -12,7 +12,7 @@
#include "textbuf_gui.h"
#include "viewport_func.h"
#include "command_func.h"
#include "news_func.h"
#include "news_gui.h"
#include "console.h"
#include "waypoint.h"
#include "genworld.h"
@ -214,153 +214,6 @@ void ZoomInOrOutToCursorWindow(bool in, Window *w)
}
}
extern GetNewsStringCallbackProc * const _get_news_string_callback[];
static bool DrawScrollingStatusText(const NewsItem *ni, int pos, int width)
{
char buf[512];
StringID str;
const char *s, *last;
char *d;
DrawPixelInfo tmp_dpi, *old_dpi;
int x;
char buffer[256];
if (ni->display_mode == NM_CALLBACK) {
str = _get_news_string_callback[ni->callback](ni);
} else {
CopyInDParam(0, ni->params, lengthof(ni->params));
str = ni->string_id;
}
GetString(buf, str, lastof(buf));
s = buf;
d = buffer;
last = lastof(buffer);
for (;;) {
WChar c = Utf8Consume(&s);
if (c == 0) {
break;
} else if (c == 0x0D) {
if (d + 4 >= last) break;
d[0] = d[1] = d[2] = d[3] = ' ';
d += 4;
} else if (IsPrintable(c)) {
if (d + Utf8CharLen(c) >= last) break;
d += Utf8Encode(d, c);
}
}
*d = '\0';
if (!FillDrawPixelInfo(&tmp_dpi, 141, 1, width, 11)) return true;
old_dpi = _cur_dpi;
_cur_dpi = &tmp_dpi;
x = DoDrawString(buffer, pos, 0, TC_LIGHT_BLUE);
_cur_dpi = old_dpi;
return x > 0;
}
static void StatusBarWndProc(Window *w, WindowEvent *e)
{
switch (e->event) {
case WE_PAINT: {
const Player *p = (_local_player == PLAYER_SPECTATOR) ? NULL : GetPlayer(_local_player);
DrawWindowWidgets(w);
SetDParam(0, _date);
DrawStringCentered(
70, 1, (_pause_game || _patches.status_long_date) ? STR_00AF : STR_00AE, TC_FROMSTRING
);
if (p != NULL) {
/* Draw player money */
SetDParam(0, p->player_money);
DrawStringCentered(w->widget[2].left + 70, 1, STR_0004, TC_FROMSTRING);
}
/* Draw status bar */
if (w->message.msg) { // true when saving is active
DrawStringCenteredTruncated(w->widget[1].left + 1, w->widget[1].right - 1, 1, STR_SAVING_GAME, TC_FROMSTRING);
} else if (_do_autosave) {
DrawStringCenteredTruncated(w->widget[1].left + 1, w->widget[1].right - 1, 1, STR_032F_AUTOSAVE, TC_FROMSTRING);
} else if (_pause_game) {
DrawStringCenteredTruncated(w->widget[1].left + 1, w->widget[1].right - 1, 1, STR_0319_PAUSED, TC_FROMSTRING);
} else if (WP(w, def_d).data_1 > -1280 && FindWindowById(WC_NEWS_WINDOW,0) == NULL && _statusbar_news_item.string_id != 0) {
/* Draw the scrolling news text */
if (!DrawScrollingStatusText(&_statusbar_news_item, WP(w, def_d).data_1, w->widget[1].right - w->widget[1].left - 2)) {
WP(w, def_d).data_1 = -1280;
if (p != NULL) {
/* This is the default text */
SetDParam(0, p->index);
DrawStringCenteredTruncated(w->widget[1].left + 1, w->widget[1].right - 1, 1, STR_02BA, TC_FROMSTRING);
}
}
} else {
if (p != NULL) {
/* This is the default text */
SetDParam(0, p->index);
DrawStringCenteredTruncated(w->widget[1].left + 1, w->widget[1].right - 1, 1, STR_02BA, TC_FROMSTRING);
}
}
if (WP(w, def_d).data_2 > 0) DrawSprite(SPR_BLOT, PALETTE_TO_RED, w->widget[1].right - 11, 2);
} break;
case WE_MESSAGE:
w->message.msg = e->we.message.msg;
SetWindowDirty(w);
break;
case WE_CLICK:
switch (e->we.click.widget) {
case 1: ShowLastNewsMessage(); break;
case 2: if (_local_player != PLAYER_SPECTATOR) ShowPlayerFinances(_local_player); break;
default: ResetObjectToPlace();
}
break;
case WE_TICK: {
if (_pause_game) return;
if (WP(w, def_d).data_1 > -1280) { // Scrolling text
WP(w, def_d).data_1 -= 2;
w->InvalidateWidget(1);
}
if (WP(w, def_d).data_2 > 0) { // Red blot to show there are new unread newsmessages
WP(w, def_d).data_2 -= 2;
} else if (WP(w, def_d).data_2 < 0) {
WP(w, def_d).data_2 = 0;
w->InvalidateWidget(1);
}
break;
}
}
}
static const Widget _main_status_widgets[] = {
{ WWT_PANEL, RESIZE_NONE, 14, 0, 139, 0, 11, 0x0, STR_NULL},
{ WWT_PUSHBTN, RESIZE_RIGHT, 14, 140, 179, 0, 11, 0x0, STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS},
{ WWT_PUSHBTN, RESIZE_LR, 14, 180, 319, 0, 11, 0x0, STR_NULL},
{ WIDGETS_END},
};
static WindowDesc _main_status_desc = {
WDP_CENTER, 0, 320, 12, 640, 12,
WC_STATUS_BAR, WC_NONE,
WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_main_status_widgets,
StatusBarWndProc
};
extern void UpdateAllStationVirtCoord();
static void MainWindowWndProc(Window *w, WindowEvent *e)
@ -601,6 +454,8 @@ void SetupColorsAndInitialWindow()
}
}
extern void ShowStatusBar();
void ShowVitalWindows()
{
Window *w = AllocateToolbar();
@ -609,11 +464,7 @@ void ShowVitalWindows()
/* Status bad only for normal games */
if (_game_mode == GM_EDITOR) return;
_main_status_desc.top = _screen.height - 12;
w = AllocateWindowDesc(&_main_status_desc);
CLRBITS(w->flags4, WF_WHITE_BORDER_MASK);
WP(w, def_d).data_1 = -1280;
ShowStatusBar();
}
/**

12
src/news_gui.h Normal file
View File

@ -0,0 +1,12 @@
/* $Id$ */
/** @file news_gui.h GUI functions related to the news. */
#ifndef NEWS_GUI_H
#define NEWS_GUI_H
void ShowLastNewsMessage();
void ShowMessageOptions();
void ShowMessageHistory();
#endif /* NEWS_GUI_H */

170
src/statusbar_gui.cpp Normal file
View File

@ -0,0 +1,170 @@
/* $Id$ */
/** @file main_gui.cpp */
#include "stdafx.h"
#include "openttd.h"
#include "settings_type.h"
#include "date_func.h"
#include "gfx_func.h"
#include "news_func.h"
#include "player_func.h"
#include "string_func.h"
#include "strings_func.h"
#include "player_base.h"
#include "viewport_func.h"
#include "news_gui.h"
#include "player_gui.h"
#include "window_gui.h"
#include "variables.h"
#include "table/strings.h"
#include "table/sprites.h"
extern GetNewsStringCallbackProc * const _get_news_string_callback[];
static bool DrawScrollingStatusText(const NewsItem *ni, int pos, int width)
{
StringID str;
if (ni->display_mode == NM_CALLBACK) {
str = _get_news_string_callback[ni->callback](ni);
} else {
CopyInDParam(0, ni->params, lengthof(ni->params));
str = ni->string_id;
}
char buf[512];
GetString(buf, str, lastof(buf));
const char *s = buf;
char buffer[256];
char *d = buffer;
const char *last = lastof(buffer);
for (;;) {
WChar c = Utf8Consume(&s);
if (c == 0) {
break;
} else if (c == 0x0D) {
if (d + 4 >= last) break;
d[0] = d[1] = d[2] = d[3] = ' ';
d += 4;
} else if (IsPrintable(c)) {
if (d + Utf8CharLen(c) >= last) break;
d += Utf8Encode(d, c);
}
}
*d = '\0';
DrawPixelInfo tmp_dpi;
if (!FillDrawPixelInfo(&tmp_dpi, 141, 1, width, 11)) return true;
DrawPixelInfo *old_dpi = _cur_dpi;
_cur_dpi = &tmp_dpi;
int x = DoDrawString(buffer, pos, 0, TC_LIGHT_BLUE);
_cur_dpi = old_dpi;
return x > 0;
}
static void StatusBarWndProc(Window *w, WindowEvent *e)
{
switch (e->event) {
case WE_PAINT: {
const Player *p = (_local_player == PLAYER_SPECTATOR) ? NULL : GetPlayer(_local_player);
DrawWindowWidgets(w);
SetDParam(0, _date);
DrawStringCentered(70, 1, (_pause_game || _patches.status_long_date) ? STR_00AF : STR_00AE, TC_FROMSTRING);
if (p != NULL) {
/* Draw player money */
SetDParam(0, p->player_money);
DrawStringCentered(w->widget[2].left + 70, 1, STR_0004, TC_FROMSTRING);
}
/* Draw status bar */
if (w->message.msg) { // true when saving is active
DrawStringCenteredTruncated(w->widget[1].left + 1, w->widget[1].right - 1, 1, STR_SAVING_GAME, TC_FROMSTRING);
} else if (_do_autosave) {
DrawStringCenteredTruncated(w->widget[1].left + 1, w->widget[1].right - 1, 1, STR_032F_AUTOSAVE, TC_FROMSTRING);
} else if (_pause_game) {
DrawStringCenteredTruncated(w->widget[1].left + 1, w->widget[1].right - 1, 1, STR_0319_PAUSED, TC_FROMSTRING);
} else if (WP(w, def_d).data_1 > -1280 && FindWindowById(WC_NEWS_WINDOW,0) == NULL && _statusbar_news_item.string_id != 0) {
/* Draw the scrolling news text */
if (!DrawScrollingStatusText(&_statusbar_news_item, WP(w, def_d).data_1, w->widget[1].right - w->widget[1].left - 2)) {
WP(w, def_d).data_1 = -1280;
if (p != NULL) {
/* This is the default text */
SetDParam(0, p->index);
DrawStringCenteredTruncated(w->widget[1].left + 1, w->widget[1].right - 1, 1, STR_02BA, TC_FROMSTRING);
}
}
} else {
if (p != NULL) {
/* This is the default text */
SetDParam(0, p->index);
DrawStringCenteredTruncated(w->widget[1].left + 1, w->widget[1].right - 1, 1, STR_02BA, TC_FROMSTRING);
}
}
if (WP(w, def_d).data_2 > 0) DrawSprite(SPR_BLOT, PALETTE_TO_RED, w->widget[1].right - 11, 2);
} break;
case WE_MESSAGE:
w->message.msg = e->we.message.msg;
SetWindowDirty(w);
break;
case WE_CLICK:
switch (e->we.click.widget) {
case 1: ShowLastNewsMessage(); break;
case 2: if (_local_player != PLAYER_SPECTATOR) ShowPlayerFinances(_local_player); break;
default: ResetObjectToPlace();
}
break;
case WE_TICK: {
if (_pause_game) return;
if (WP(w, def_d).data_1 > -1280) { // Scrolling text
WP(w, def_d).data_1 -= 2;
w->InvalidateWidget(1);
}
if (WP(w, def_d).data_2 > 0) { // Red blot to show there are new unread newsmessages
WP(w, def_d).data_2 -= 2;
} else if (WP(w, def_d).data_2 < 0) {
WP(w, def_d).data_2 = 0;
w->InvalidateWidget(1);
}
} break;
}
}
static const Widget _main_status_widgets[] = {
{ WWT_PANEL, RESIZE_NONE, 14, 0, 139, 0, 11, 0x0, STR_NULL},
{ WWT_PUSHBTN, RESIZE_RIGHT, 14, 140, 179, 0, 11, 0x0, STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS},
{ WWT_PUSHBTN, RESIZE_LR, 14, 180, 319, 0, 11, 0x0, STR_NULL},
{ WIDGETS_END},
};
static WindowDesc _main_status_desc = {
WDP_CENTER, 0, 320, 12, 640, 12,
WC_STATUS_BAR, WC_NONE,
WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_main_status_widgets,
StatusBarWndProc
};
void ShowStatusBar()
{
_main_status_desc.top = _screen.height - 12;
Window *w = AllocateWindowDesc(&_main_status_desc);
if (w != NULL) {
CLRBITS(w->flags4, WF_WHITE_BORDER_MASK);
WP(w, def_d).data_1 = -1280;
}
}