author | rubidium |
Wed, 16 Jul 2008 10:07:38 +0000 | |
branch | 0.6 |
changeset 11150 | 4e3726a46a72 |
parent 11130 | 488ecb9d3296 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
3 |
/** @file gfx.cpp */ |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1829
diff
changeset
|
6 |
#include "openttd.h" |
8619
c2434269c3eb
(svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents:
8617
diff
changeset
|
7 |
#include "gfx_func.h" |
1349
07514c2cc6d1
(svn r1853) Move spritecache function declarations into a header of their own and use SpriteID as parameter type where appropriate
tron
parents:
1348
diff
changeset
|
8 |
#include "spritecache.h" |
2153
91e89aa8c299
(svn r2663) Include variables.h only in these files which need it, not globally via openttd.h
tron
parents:
2134
diff
changeset
|
9 |
#include "variables.h" |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
10 |
#include "fontcache.h" |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4171
diff
changeset
|
11 |
#include "genworld.h" |
5217
21c23507c002
(svn r7332) -Fix: segmentation fault, discovered by ln-, in the SDL video driver when one goes to fullscreen and there are no suitable resolutions.
rubidium
parents:
5156
diff
changeset
|
12 |
#include "debug.h" |
8619
c2434269c3eb
(svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents:
8617
diff
changeset
|
13 |
#include "zoom_func.h" |
7494
99eac2a2cd8b
(svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh)
truelight
parents:
7481
diff
changeset
|
14 |
#include "texteff.hpp" |
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
15 |
#include "blitter/factory.hpp" |
7666
a5fccd76176a
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7514
diff
changeset
|
16 |
#include "video/video_driver.hpp" |
8610
17cc343a23dd
(svn r11675) -Codechange: split the string types from the string functions.
rubidium
parents:
8609
diff
changeset
|
17 |
#include "strings_func.h" |
8627
448ebf3a8291
(svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'
rubidium
parents:
8619
diff
changeset
|
18 |
#include "core/math_func.hpp" |
8766
c86cfa3a7580
(svn r11834) -Codechange: only include settings_type.h if needed.
rubidium
parents:
8760
diff
changeset
|
19 |
#include "settings_type.h" |
0 | 20 |
|
8760
ce0891c412ce
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8745
diff
changeset
|
21 |
#include "table/palettes.h" |
ce0891c412ce
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8745
diff
changeset
|
22 |
#include "table/sprites.h" |
ce0891c412ce
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8745
diff
changeset
|
23 |
#include "table/control_codes.h" |
ce0891c412ce
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8745
diff
changeset
|
24 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
25 |
byte _dirkeys; ///< 1 = left, 2 = up, 4 = right, 8 = down |
5887
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
26 |
bool _fullscreen; |
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
27 |
CursorVars _cursor; |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
28 |
bool _ctrl_pressed; ///< Is Ctrl pressed? |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
29 |
bool _shift_pressed; ///< Is Shift pressed? |
5887
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
30 |
byte _fast_forward; |
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
31 |
bool _left_button_down; |
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
32 |
bool _left_button_clicked; |
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
33 |
bool _right_button_down; |
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
34 |
bool _right_button_clicked; |
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
35 |
DrawPixelInfo _screen; |
8745
0c897b4e651e
(svn r11813) -Fix [FS#1602]: Switch _screen to the output buffer and disable usage of 32bpp-anim animation buffer during giant screenshots.
frosch
parents:
8710
diff
changeset
|
36 |
bool _screen_disable_anim = false; ///< Disable palette animation (important for 32bpp-anim blitter during giant screenshot) |
5887
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
37 |
bool _exit_game; |
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
38 |
bool _networking; ///< are we in networking mode? |
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
39 |
byte _game_mode; |
9166
b37d9f4017e5
(svn r12335) -Codechange: Don't stuff signed values into a unsigned variable when the variable can just be unsigned...
peter1138
parents:
8766
diff
changeset
|
40 |
int8 _pause_game; |
5887
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
41 |
int _pal_first_dirty; |
7456
0c0636370335
(svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents:
7447
diff
changeset
|
42 |
int _pal_count_dirty; |
5887
063ca43b682c
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
KUDr
parents:
5838
diff
changeset
|
43 |
|
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
44 |
Colour _cur_palette[256]; |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
45 |
byte _stringwidth_table[FS_END][224]; |
8619
c2434269c3eb
(svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents:
8617
diff
changeset
|
46 |
DrawPixelInfo *_cur_dpi; |
c2434269c3eb
(svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents:
8617
diff
changeset
|
47 |
byte _colour_gradient[16][8]; |
c2434269c3eb
(svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents:
8617
diff
changeset
|
48 |
bool _use_dos_palette; |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
49 |
|
8177
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
50 |
static void GfxMainBlitter(const Sprite *sprite, int x, int y, BlitterMode mode, const SubSprite *sub = NULL); |
0 | 51 |
|
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
52 |
FontSize _cur_fontsize; |
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
53 |
static FontSize _last_fontsize; |
7374
54c06f06ecc8
(svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents:
7348
diff
changeset
|
54 |
static uint8 _cursor_backup[64 * 64 * 4]; |
8041
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
55 |
|
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
56 |
/** |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
57 |
* The rect for repaint. |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
58 |
* |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
59 |
* This rectangle defines the area which should be repaint by the video driver. |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
60 |
* |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
61 |
* @ingroup dirty |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
62 |
*/ |
0 | 63 |
static Rect _invalid_rect; |
1357 | 64 |
static const byte *_color_remap_ptr; |
0 | 65 |
static byte _string_colorremap[3]; |
66 |
||
2010 | 67 |
#define DIRTY_BYTES_PER_LINE (MAX_SCREEN_WIDTH / 64) |
0 | 68 |
static byte _dirty_blocks[DIRTY_BYTES_PER_LINE * MAX_SCREEN_HEIGHT / 8]; |
69 |
||
2010 | 70 |
void GfxScroll(int left, int top, int width, int height, int xo, int yo) |
71 |
{ |
|
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
72 |
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); |
0 | 73 |
|
2010 | 74 |
if (xo == 0 && yo == 0) return; |
0 | 75 |
|
2010 | 76 |
if (_cursor.visible) UndrawMouseCursor(); |
7950
3d3ed007127a
(svn r10932) -Codechange: replace "text" with "chat" for the chat related function and variables.
rubidium
parents:
7918
diff
changeset
|
77 |
UndrawChatMessage(); |
0 | 78 |
|
7447
2537a074be26
(svn r10206) -Codechange: more moving things to blitter-layer: ScrollBuffer
truelight
parents:
7444
diff
changeset
|
79 |
blitter->ScrollBuffer(_screen.dst_ptr, left, top, width, height, xo, yo); |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
80 |
/* This part of the screen is now dirty. */ |
7666
a5fccd76176a
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7514
diff
changeset
|
81 |
_video_driver->MakeDirty(left, top, width, height); |
0 | 82 |
} |
83 |
||
84 |
||
2010 | 85 |
void GfxFillRect(int left, int top, int right, int bottom, int color) |
86 |
{ |
|
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
87 |
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); |
7374
54c06f06ecc8
(svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents:
7348
diff
changeset
|
88 |
const DrawPixelInfo *dpi = _cur_dpi; |
54c06f06ecc8
(svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents:
7348
diff
changeset
|
89 |
void *dst; |
332 | 90 |
const int otop = top; |
91 |
const int oleft = left; |
|
0 | 92 |
|
7120
e31767effc16
(svn r9844) -Codechange: replace zoomlevel with an enum
truelight
parents:
7111
diff
changeset
|
93 |
if (dpi->zoom != ZOOM_LVL_NORMAL) return; |
2010 | 94 |
if (left > right || top > bottom) return; |
95 |
if (right < dpi->left || left >= dpi->left + dpi->width) return; |
|
96 |
if (bottom < dpi->top || top >= dpi->top + dpi->height) return; |
|
0 | 97 |
|
98 |
if ( (left -= dpi->left) < 0) left = 0; |
|
99 |
right = right - dpi->left + 1; |
|
2010 | 100 |
if (right > dpi->width) right = dpi->width; |
0 | 101 |
right -= left; |
102 |
assert(right > 0); |
|
103 |
||
104 |
if ( (top -= dpi->top) < 0) top = 0; |
|
105 |
bottom = bottom - dpi->top + 1; |
|
2010 | 106 |
if (bottom > dpi->height) bottom = dpi->height; |
0 | 107 |
bottom -= top; |
108 |
assert(bottom > 0); |
|
109 |
||
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
110 |
dst = blitter->MoveTo(dpi->dst_ptr, left, top); |
0 | 111 |
|
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8423
diff
changeset
|
112 |
if (!HasBit(color, PALETTE_MODIFIER_GREYOUT)) { |
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8423
diff
changeset
|
113 |
if (!HasBit(color, USE_COLORTABLE)) { |
7443
b8c8a0d029fd
(svn r10201) -Codechange: Replace Blitter::SetHorizontalLine with Blitter::DrawRect, as the former was only used by the rectangle drawing code anyway. This lets us draw rectangles in one go.
peter1138
parents:
7433
diff
changeset
|
114 |
blitter->DrawRect(dst, right, bottom, (uint8)color); |
0 | 115 |
} else { |
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
116 |
blitter->DrawColorMappingRect(dst, right, bottom, GB(color, 0, PALETTE_WIDTH)); |
0 | 117 |
} |
118 |
} else { |
|
332 | 119 |
byte bo = (oleft - left + dpi->left + otop - top + dpi->top) & 1; |
0 | 120 |
do { |
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
121 |
for (int i = (bo ^= 1); i < right; i += 2) blitter->SetPixel(dst, i, 0, (uint8)color); |
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
122 |
dst = blitter->MoveTo(dst, 0, 1); |
332 | 123 |
} while (--bottom > 0); |
0 | 124 |
} |
125 |
} |
|
126 |
||
127 |
void GfxDrawLine(int x, int y, int x2, int y2, int color) |
|
128 |
{ |
|
7444
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
129 |
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); |
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
130 |
DrawPixelInfo *dpi = _cur_dpi; |
0 | 131 |
|
7444
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
132 |
x -= dpi->left; |
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
133 |
x2 -= dpi->left; |
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
134 |
y -= dpi->top; |
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
135 |
y2 -= dpi->top; |
0 | 136 |
|
7444
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
137 |
/* Check clipping */ |
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
138 |
if (x < 0 && x2 < 0) return; |
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
139 |
if (y < 0 && y2 < 0) return; |
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
140 |
if (x > dpi->width && x2 > dpi->width) return; |
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
141 |
if (y > dpi->height && y2 > dpi->height) return; |
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
142 |
|
705a57aa0076
(svn r10203) -Codechange: more moving things to blitter-layer: DrawLine
truelight
parents:
7443
diff
changeset
|
143 |
blitter->DrawLine(dpi->dst_ptr, x, y, x2, y2, dpi->width, dpi->height, color); |
0 | 144 |
} |
145 |
||
8147
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
146 |
void GfxDrawLineUnscaled(int x, int y, int x2, int y2, int color) |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
147 |
{ |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
148 |
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
149 |
DrawPixelInfo *dpi = _cur_dpi; |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
150 |
|
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
151 |
x -= dpi->left; |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
152 |
x2 -= dpi->left; |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
153 |
y -= dpi->top; |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
154 |
y2 -= dpi->top; |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
155 |
|
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
156 |
/* Check clipping */ |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
157 |
if (x < 0 && x2 < 0) return; |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
158 |
if (y < 0 && y2 < 0) return; |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
159 |
if (x > dpi->width && x2 > dpi->width) return; |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
160 |
if (y > dpi->height && y2 > dpi->height) return; |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
161 |
|
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
162 |
blitter->DrawLine(dpi->dst_ptr, UnScaleByZoom(x, dpi->zoom), UnScaleByZoom(y, dpi->zoom), |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
163 |
UnScaleByZoom(x2, dpi->zoom), UnScaleByZoom(y2, dpi->zoom), |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
164 |
UnScaleByZoom(dpi->width, dpi->zoom), UnScaleByZoom(dpi->height, dpi->zoom), color); |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
165 |
} |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
166 |
|
8139
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
167 |
/** |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
168 |
* Draws the projection of a parallelepiped. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
169 |
* This can be used to draw boxes in world coordinates. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
170 |
* |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
171 |
* @param x Screen X-coordinate of top front corner. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
172 |
* @param y Screen Y-coordinate of top front corner. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
173 |
* @param dx1 Screen X-length of first edge. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
174 |
* @param dy1 Screen Y-length of first edge. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
175 |
* @param dx2 Screen X-length of second edge. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
176 |
* @param dy2 Screen Y-length of second edge. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
177 |
* @param dx3 Screen X-length of third edge. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
178 |
* @param dy3 Screen Y-length of third edge. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
179 |
*/ |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
180 |
void DrawBox(int x, int y, int dx1, int dy1, int dx2, int dy2, int dx3, int dy3) |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
181 |
{ |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
182 |
/* .... |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
183 |
* .. .... |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
184 |
* .. .... |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
185 |
* .. ^ |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
186 |
* <--__(dx1,dy1) /(dx2,dy2) |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
187 |
* : --__ / : |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
188 |
* : --__ / : |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
189 |
* : *(x,y) : |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
190 |
* : | : |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
191 |
* : | .. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
192 |
* .... |(dx3,dy3) |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
193 |
* .... | .. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
194 |
* ....V. |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
195 |
*/ |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
196 |
|
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
197 |
static const byte color = 255; |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
198 |
|
8147
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
199 |
GfxDrawLineUnscaled(x, y, x + dx1, y + dy1, color); |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
200 |
GfxDrawLineUnscaled(x, y, x + dx2, y + dy2, color); |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
201 |
GfxDrawLineUnscaled(x, y, x + dx3, y + dy3, color); |
8139
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
202 |
|
8147
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
203 |
GfxDrawLineUnscaled(x + dx1, y + dy1, x + dx1 + dx2, y + dy1 + dy2, color); |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
204 |
GfxDrawLineUnscaled(x + dx1, y + dy1, x + dx1 + dx3, y + dy1 + dy3, color); |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
205 |
GfxDrawLineUnscaled(x + dx2, y + dy2, x + dx2 + dx1, y + dy2 + dy1, color); |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
206 |
GfxDrawLineUnscaled(x + dx2, y + dy2, x + dx2 + dx3, y + dy2 + dy3, color); |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
207 |
GfxDrawLineUnscaled(x + dx3, y + dy3, x + dx3 + dx1, y + dy3 + dy1, color); |
93775539c977
(svn r11182) -Fix [FS#1261] (r11174): bounding boxes caused crashes when zoomed out. Patch by SmatZ.
rubidium
parents:
8139
diff
changeset
|
208 |
GfxDrawLineUnscaled(x + dx3, y + dy3, x + dx3 + dx2, y + dy3 + dy2, color); |
8139
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
209 |
} |
16ad832aa538
(svn r11174) -Codechange: add possibility to show the bounding boxes of sprites using CTRL-B so one can get a better understanding of the used bounding boxes to fix the glitches that still exist. Patch by frosch.
rubidium
parents:
8041
diff
changeset
|
210 |
|
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
211 |
|
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
212 |
/** Truncate a given string to a maximum width if neccessary. |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
213 |
* If the string is truncated, add three dots ('...') to show this. |
6977
67b989528f3d
(svn r9662) -Documentation: Doxygen corrections and @file omissions
belugas
parents:
6974
diff
changeset
|
214 |
* @param *str string that is checked and possibly truncated |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
215 |
* @param maxw maximum width in pixels of the string |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
216 |
* @return new width of (truncated) string */ |
2113
f228b399da01
(svn r2623) - CodeChange: rework DrawStringCenteredTruncated() a bit. Instead of giving center + width you give the coordinates of the bounding box (left, right) it has to fit in (ludde)
Darkvater
parents:
2107
diff
changeset
|
217 |
static int TruncateString(char *str, int maxw) |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
218 |
{ |
2113
f228b399da01
(svn r2623) - CodeChange: rework DrawStringCenteredTruncated() a bit. Instead of giving center + width you give the coordinates of the bounding box (left, right) it has to fit in (ludde)
Darkvater
parents:
2107
diff
changeset
|
219 |
int w = 0; |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
220 |
FontSize size = _cur_fontsize; |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
221 |
int ddd, ddd_w; |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
222 |
|
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
223 |
WChar c; |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
224 |
char *ddd_pos; |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
225 |
|
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
226 |
ddd_w = ddd = GetCharacterWidth(size, '.') * 3; |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
227 |
|
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
228 |
for (ddd_pos = str; (c = Utf8Consume((const char **)&str)) != '\0'; ) { |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
229 |
if (IsPrintable(c)) { |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
230 |
w += GetCharacterWidth(size, c); |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
231 |
|
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
232 |
if (w >= maxw) { |
11150 | 233 |
/* string got too big... insert dotdotdot, but make sure we do not |
234 |
* print anything beyond the string termination character. */ |
|
235 |
for (int i = 0; *ddd_pos != '\0' && i < 3; i++, ddd_pos++) *ddd_pos = '.'; |
|
236 |
*ddd_pos = '\0'; |
|
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
237 |
return ddd_w; |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
238 |
} |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
239 |
} else { |
11150 | 240 |
if (c == SCC_SETX) { |
241 |
w = *str; |
|
242 |
str++; |
|
243 |
} else if (c == SCC_SETXY) { |
|
244 |
w = *str; |
|
245 |
str += 2; |
|
246 |
} else if (c == SCC_TINYFONT) { |
|
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
247 |
size = FS_SMALL; |
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
248 |
ddd = GetCharacterWidth(size, '.') * 3; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
249 |
} else if (c == SCC_BIGFONT) { |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
250 |
size = FS_LARGE; |
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
251 |
ddd = GetCharacterWidth(size, '.') * 3; |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
252 |
} |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
253 |
} |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
254 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
255 |
/* Remember the last position where three dots fit. */ |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
256 |
if (w + ddd < maxw) { |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
257 |
ddd_w = w + ddd; |
2113
f228b399da01
(svn r2623) - CodeChange: rework DrawStringCenteredTruncated() a bit. Instead of giving center + width you give the coordinates of the bounding box (left, right) it has to fit in (ludde)
Darkvater
parents:
2107
diff
changeset
|
258 |
ddd_pos = str; |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
259 |
} |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
260 |
} |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
261 |
|
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
262 |
return w; |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
263 |
} |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
264 |
|
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4819
diff
changeset
|
265 |
static inline int TruncateStringID(StringID src, char *dest, int maxw, const char* last) |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
266 |
{ |
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4819
diff
changeset
|
267 |
GetString(dest, src, last); |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
268 |
return TruncateString(dest, maxw); |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
269 |
} |
0 | 270 |
|
271 |
/* returns right coordinate */ |
|
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
272 |
int DrawString(int x, int y, StringID str, uint16 color) |
0 | 273 |
{ |
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
274 |
char buffer[512]; |
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
275 |
|
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4819
diff
changeset
|
276 |
GetString(buffer, str, lastof(buffer)); |
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
277 |
return DoDrawString(buffer, x, y, color); |
0 | 278 |
} |
279 |
||
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
280 |
int DrawStringTruncated(int x, int y, StringID str, uint16 color, uint maxw) |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
281 |
{ |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
282 |
char buffer[512]; |
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4819
diff
changeset
|
283 |
TruncateStringID(str, buffer, maxw, lastof(buffer)); |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
284 |
return DoDrawString(buffer, x, y, color); |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
285 |
} |
0 | 286 |
|
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
287 |
|
4314
c7ded7546e7f
(svn r5967) -Change: use right alignment for the year in the player's balance window instead of centering (about) 'string width' / 2 from the right edge
rubidium
parents:
4300
diff
changeset
|
288 |
int DrawStringRightAligned(int x, int y, StringID str, uint16 color) |
0 | 289 |
{ |
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
290 |
char buffer[512]; |
4314
c7ded7546e7f
(svn r5967) -Change: use right alignment for the year in the player's balance window instead of centering (about) 'string width' / 2 from the right edge
rubidium
parents:
4300
diff
changeset
|
291 |
int w; |
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
292 |
|
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4819
diff
changeset
|
293 |
GetString(buffer, str, lastof(buffer)); |
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
294 |
w = GetStringBoundingBox(buffer).width; |
4314
c7ded7546e7f
(svn r5967) -Change: use right alignment for the year in the player's balance window instead of centering (about) 'string width' / 2 from the right edge
rubidium
parents:
4300
diff
changeset
|
295 |
DoDrawString(buffer, x - w, y, color); |
c7ded7546e7f
(svn r5967) -Change: use right alignment for the year in the player's balance window instead of centering (about) 'string width' / 2 from the right edge
rubidium
parents:
4300
diff
changeset
|
296 |
|
c7ded7546e7f
(svn r5967) -Change: use right alignment for the year in the player's balance window instead of centering (about) 'string width' / 2 from the right edge
rubidium
parents:
4300
diff
changeset
|
297 |
return w; |
0 | 298 |
} |
299 |
||
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
300 |
void DrawStringRightAlignedTruncated(int x, int y, StringID str, uint16 color, uint maxw) |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
301 |
{ |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
302 |
char buffer[512]; |
0 | 303 |
|
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4819
diff
changeset
|
304 |
TruncateStringID(str, buffer, maxw, lastof(buffer)); |
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
305 |
DoDrawString(buffer, x - GetStringBoundingBox(buffer).width, y, color); |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
306 |
} |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
307 |
|
4314
c7ded7546e7f
(svn r5967) -Change: use right alignment for the year in the player's balance window instead of centering (about) 'string width' / 2 from the right edge
rubidium
parents:
4300
diff
changeset
|
308 |
void DrawStringRightAlignedUnderline(int x, int y, StringID str, uint16 color) |
c7ded7546e7f
(svn r5967) -Change: use right alignment for the year in the player's balance window instead of centering (about) 'string width' / 2 from the right edge
rubidium
parents:
4300
diff
changeset
|
309 |
{ |
c7ded7546e7f
(svn r5967) -Change: use right alignment for the year in the player's balance window instead of centering (about) 'string width' / 2 from the right edge
rubidium
parents:
4300
diff
changeset
|
310 |
int w = DrawStringRightAligned(x, y, str, color); |
c7ded7546e7f
(svn r5967) -Change: use right alignment for the year in the player's balance window instead of centering (about) 'string width' / 2 from the right edge
rubidium
parents:
4300
diff
changeset
|
311 |
GfxFillRect(x - w, y + 10, x, y + 10, _string_colorremap[1]); |
c7ded7546e7f
(svn r5967) -Change: use right alignment for the year in the player's balance window instead of centering (about) 'string width' / 2 from the right edge
rubidium
parents:
4300
diff
changeset
|
312 |
} |
c7ded7546e7f
(svn r5967) -Change: use right alignment for the year in the player's balance window instead of centering (about) 'string width' / 2 from the right edge
rubidium
parents:
4300
diff
changeset
|
313 |
|
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
314 |
|
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
315 |
int DrawStringCentered(int x, int y, StringID str, uint16 color) |
0 | 316 |
{ |
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
317 |
char buffer[512]; |
0 | 318 |
int w; |
319 |
||
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4819
diff
changeset
|
320 |
GetString(buffer, str, lastof(buffer)); |
0 | 321 |
|
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
322 |
w = GetStringBoundingBox(buffer).width; |
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
323 |
DoDrawString(buffer, x - w / 2, y, color); |
0 | 324 |
|
325 |
return w; |
|
326 |
} |
|
327 |
||
2113
f228b399da01
(svn r2623) - CodeChange: rework DrawStringCenteredTruncated() a bit. Instead of giving center + width you give the coordinates of the bounding box (left, right) it has to fit in (ludde)
Darkvater
parents:
2107
diff
changeset
|
328 |
int DrawStringCenteredTruncated(int xl, int xr, int y, StringID str, uint16 color) |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
329 |
{ |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
330 |
char buffer[512]; |
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4819
diff
changeset
|
331 |
int w = TruncateStringID(str, buffer, xr - xl, lastof(buffer)); |
2113
f228b399da01
(svn r2623) - CodeChange: rework DrawStringCenteredTruncated() a bit. Instead of giving center + width you give the coordinates of the bounding box (left, right) it has to fit in (ludde)
Darkvater
parents:
2107
diff
changeset
|
332 |
return DoDrawString(buffer, (xl + xr - w) / 2, y, color); |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
333 |
} |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
334 |
|
2134 | 335 |
int DoDrawStringCentered(int x, int y, const char *str, uint16 color) |
336 |
{ |
|
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
337 |
int w = GetStringBoundingBox(str).width; |
2134 | 338 |
DoDrawString(str, x - w / 2, y, color); |
339 |
return w; |
|
340 |
} |
|
341 |
||
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
342 |
void DrawStringCenterUnderline(int x, int y, StringID str, uint16 color) |
0 | 343 |
{ |
344 |
int w = DrawStringCentered(x, y, str, color); |
|
2010 | 345 |
GfxFillRect(x - (w >> 1), y + 10, x - (w >> 1) + w, y + 10, _string_colorremap[1]); |
0 | 346 |
} |
347 |
||
2113
f228b399da01
(svn r2623) - CodeChange: rework DrawStringCenteredTruncated() a bit. Instead of giving center + width you give the coordinates of the bounding box (left, right) it has to fit in (ludde)
Darkvater
parents:
2107
diff
changeset
|
348 |
void DrawStringCenterUnderlineTruncated(int xl, int xr, int y, StringID str, uint16 color) |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
349 |
{ |
2113
f228b399da01
(svn r2623) - CodeChange: rework DrawStringCenteredTruncated() a bit. Instead of giving center + width you give the coordinates of the bounding box (left, right) it has to fit in (ludde)
Darkvater
parents:
2107
diff
changeset
|
350 |
int w = DrawStringCenteredTruncated(xl, xr, y, str, color); |
f228b399da01
(svn r2623) - CodeChange: rework DrawStringCenteredTruncated() a bit. Instead of giving center + width you give the coordinates of the bounding box (left, right) it has to fit in (ludde)
Darkvater
parents:
2107
diff
changeset
|
351 |
GfxFillRect((xl + xr - w) / 2, y + 10, (xl + xr + w) / 2, y + 10, _string_colorremap[1]); |
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
352 |
} |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
353 |
|
8041
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
354 |
/** |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
355 |
* 'Correct' a string to a maximum length. Longer strings will be cut into |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
356 |
* additional lines at whitespace characters if possible. The string parameter |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
357 |
* is modified with terminating characters mid-string which are the |
6977
67b989528f3d
(svn r9662) -Documentation: Doxygen corrections and @file omissions
belugas
parents:
6974
diff
changeset
|
358 |
* placeholders for the newlines. |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
359 |
* The string WILL be truncated if there was no whitespace for the current |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
360 |
* line's maximum width. |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
361 |
* |
6977
67b989528f3d
(svn r9662) -Documentation: Doxygen corrections and @file omissions
belugas
parents:
6974
diff
changeset
|
362 |
* @note To know if the terminating '\0' is the string end or just a |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
363 |
* newline, the returned 'num' value should be consulted. The num'th '\0', |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
364 |
* starting with index 0 is the real string end. |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
365 |
* |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
366 |
* @param str string to check and correct for length restrictions |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
367 |
* @param maxw the maximum width the string can have on one line |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
368 |
* @return return a 32bit wide number consisting of 2 packed values: |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
369 |
* 0 - 15 the number of lines ADDED to the string |
8041
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
370 |
* 16 - 31 the fontsize in which the length calculation was done at |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
371 |
*/ |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
372 |
uint32 FormatStringLinebreaks(char *str, int maxw) |
1095 | 373 |
{ |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
374 |
FontSize size = _cur_fontsize; |
0 | 375 |
int num = 0; |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
376 |
|
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
377 |
assert(maxw > 0); |
0 | 378 |
|
2952 | 379 |
for (;;) { |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
380 |
char *last_space = NULL; |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
381 |
int w = 0; |
0 | 382 |
|
2952 | 383 |
for (;;) { |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
384 |
WChar c = Utf8Consume((const char **)&str); |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
385 |
/* whitespace is where we will insert the line-break */ |
6541
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
386 |
if (IsWhitespace(c)) last_space = str; |
0 | 387 |
|
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
388 |
if (IsPrintable(c)) { |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
389 |
w += GetCharacterWidth(size, c); |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
390 |
/* string is longer than maximum width so we need to decide what to |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
391 |
* do. We can do two things: |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
392 |
* 1. If no whitespace was found at all up until now (on this line) then |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
393 |
* we will truncate the string and bail out. |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
394 |
* 2. In all other cases force a linebreak at the last seen whitespace */ |
0 | 395 |
if (w > maxw) { |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
396 |
if (last_space == NULL) { |
6541
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
397 |
*Utf8PrevChar(str) = '\0'; |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
398 |
return num + (size << 16); |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
399 |
} |
0 | 400 |
str = last_space; |
401 |
break; |
|
402 |
} |
|
403 |
} else { |
|
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
404 |
switch (c) { |
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
405 |
case '\0': return num + (size << 16); break; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
406 |
case SCC_SETX: str++; break; |
6987
b0f13039bda2
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6977
diff
changeset
|
407 |
case SCC_SETXY: str += 2; break; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
408 |
case SCC_TINYFONT: size = FS_SMALL; break; |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
409 |
case SCC_BIGFONT: size = FS_LARGE; break; |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
410 |
case '\n': goto end_of_inner_loop; |
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
411 |
} |
0 | 412 |
} |
413 |
} |
|
4954
d773d01b35f5
(svn r6953) -Codechange: Change FormatStringLinebreaks in such a way that if no whitespace was seen
Darkvater
parents:
4949
diff
changeset
|
414 |
end_of_inner_loop: |
6541
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
415 |
/* String didn't fit on line (or a '\n' was encountered), so 'dummy' terminate |
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
416 |
* and increase linecount. We use Utf8PrevChar() as also non 1 char long |
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
417 |
* whitespace seperators are supported */ |
0 | 418 |
num++; |
6541
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
419 |
char *s = Utf8PrevChar(str); |
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
420 |
*s++ = '\0'; |
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
421 |
|
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
422 |
/* In which case (see above) we will shift remainder to left and close the gap */ |
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
423 |
if (str - s >= 1) { |
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
424 |
for (; str[-1] != '\0';) *s++ = *str++; |
ff575414f0d2
(svn r9012) -Fix/Feature (UTF8): When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'.
Darkvater
parents:
6505
diff
changeset
|
425 |
} |
0 | 426 |
} |
427 |
} |
|
428 |
||
5579
be371346efae
(svn r7580) -Fix (r7182): UTF8-merge changed the string handling a bit, now the str pointer for
Darkvater
parents:
5568
diff
changeset
|
429 |
/** Draw a given string with the centre around the given x coordinates |
be371346efae
(svn r7580) -Fix (r7182): UTF8-merge changed the string handling a bit, now the str pointer for
Darkvater
parents:
5568
diff
changeset
|
430 |
* @param x Centre the string around this pixel width |
be371346efae
(svn r7580) -Fix (r7182): UTF8-merge changed the string handling a bit, now the str pointer for
Darkvater
parents:
5568
diff
changeset
|
431 |
* @param y Draw the string at this pixel height (first line's bottom) |
be371346efae
(svn r7580) -Fix (r7182): UTF8-merge changed the string handling a bit, now the str pointer for
Darkvater
parents:
5568
diff
changeset
|
432 |
* @param str String to draw |
6977
67b989528f3d
(svn r9662) -Documentation: Doxygen corrections and @file omissions
belugas
parents:
6974
diff
changeset
|
433 |
* @param maxw Maximum width the string can have before it is wrapped */ |
2634
16334e1a4862
(svn r3176) Use proper types, not some variants of int
tron
parents:
2631
diff
changeset
|
434 |
void DrawStringMultiCenter(int x, int y, StringID str, int maxw) |
0 | 435 |
{ |
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
436 |
char buffer[512]; |
0 | 437 |
uint32 tmp; |
2631
13daba67f217
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2548
diff
changeset
|
438 |
int num, w, mt; |
1323
41397685320a
(svn r1827) Next iteration of the byte -> char transition: some string drawing functions and buffers
tron
parents:
1309
diff
changeset
|
439 |
const char *src; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
440 |
WChar c; |
0 | 441 |
|
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4819
diff
changeset
|
442 |
GetString(buffer, str, lastof(buffer)); |
0 | 443 |
|
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
444 |
tmp = FormatStringLinebreaks(buffer, maxw); |
2635 | 445 |
num = GB(tmp, 0, 16); |
0 | 446 |
|
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
447 |
mt = GetCharacterHeight((FontSize)GB(tmp, 16, 16)); |
0 | 448 |
|
449 |
y -= (mt >> 1) * num; |
|
450 |
||
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
451 |
src = buffer; |
0 | 452 |
|
2952 | 453 |
for (;;) { |
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
454 |
w = GetStringBoundingBox(src).width; |
6987
b0f13039bda2
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6977
diff
changeset
|
455 |
DoDrawString(src, x - (w >> 1), y, 0xFE); |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
456 |
_cur_fontsize = _last_fontsize; |
0 | 457 |
|
2952 | 458 |
for (;;) { |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
459 |
c = Utf8Consume(&src); |
0 | 460 |
if (c == 0) { |
461 |
y += mt; |
|
462 |
if (--num < 0) { |
|
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
463 |
_cur_fontsize = FS_NORMAL; |
0 | 464 |
return; |
465 |
} |
|
466 |
break; |
|
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
467 |
} else if (c == SCC_SETX) { |
0 | 468 |
src++; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
469 |
} else if (c == SCC_SETXY) { |
6987
b0f13039bda2
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6977
diff
changeset
|
470 |
src += 2; |
0 | 471 |
} |
472 |
} |
|
473 |
} |
|
474 |
} |
|
475 |
||
4928
4cdb51b5db7b
(svn r6908) - Codechange: Modify DrawStringMultiLine() to return the number of pixel lines used, and use it for drawing NewGRF additional text (mart3p)
peter1138
parents:
4912
diff
changeset
|
476 |
|
6703
9ddfcb1849e4
(svn r9449) -Fix: Truncate the newgrf information text in the newgrf gui if it's too long.
maedhros
parents:
6683
diff
changeset
|
477 |
uint DrawStringMultiLine(int x, int y, StringID str, int maxw, int maxh) |
2010 | 478 |
{ |
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
479 |
char buffer[512]; |
0 | 480 |
uint32 tmp; |
2753 | 481 |
int num, mt; |
4928
4cdb51b5db7b
(svn r6908) - Codechange: Modify DrawStringMultiLine() to return the number of pixel lines used, and use it for drawing NewGRF additional text (mart3p)
peter1138
parents:
4912
diff
changeset
|
482 |
uint total_height; |
1323
41397685320a
(svn r1827) Next iteration of the byte -> char transition: some string drawing functions and buffers
tron
parents:
1309
diff
changeset
|
483 |
const char *src; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
484 |
WChar c; |
0 | 485 |
|
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4819
diff
changeset
|
486 |
GetString(buffer, str, lastof(buffer)); |
0 | 487 |
|
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
488 |
tmp = FormatStringLinebreaks(buffer, maxw); |
2635 | 489 |
num = GB(tmp, 0, 16); |
2631
13daba67f217
(svn r3173) Use the trinary operator and switch to improve readability
tron
parents:
2548
diff
changeset
|
490 |
|
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
491 |
mt = GetCharacterHeight((FontSize)GB(tmp, 16, 16)); |
4928
4cdb51b5db7b
(svn r6908) - Codechange: Modify DrawStringMultiLine() to return the number of pixel lines used, and use it for drawing NewGRF additional text (mart3p)
peter1138
parents:
4912
diff
changeset
|
492 |
total_height = (num + 1) * mt; |
0 | 493 |
|
6708
77b9506be3c3
(svn r9472) -Fix (r9449): num is the number of newlines in the string, not the number of lines. Also allow for maxh being negative.
maedhros
parents:
6703
diff
changeset
|
494 |
if (maxh != -1 && (int)total_height > maxh) { |
77b9506be3c3
(svn r9472) -Fix (r9449): num is the number of newlines in the string, not the number of lines. Also allow for maxh being negative.
maedhros
parents:
6703
diff
changeset
|
495 |
/* Check there's room enough for at least one line. */ |
77b9506be3c3
(svn r9472) -Fix (r9449): num is the number of newlines in the string, not the number of lines. Also allow for maxh being negative.
maedhros
parents:
6703
diff
changeset
|
496 |
if (maxh < mt) return 0; |
77b9506be3c3
(svn r9472) -Fix (r9449): num is the number of newlines in the string, not the number of lines. Also allow for maxh being negative.
maedhros
parents:
6703
diff
changeset
|
497 |
|
6703
9ddfcb1849e4
(svn r9449) -Fix: Truncate the newgrf information text in the newgrf gui if it's too long.
maedhros
parents:
6683
diff
changeset
|
498 |
num = maxh / mt - 1; |
9ddfcb1849e4
(svn r9449) -Fix: Truncate the newgrf information text in the newgrf gui if it's too long.
maedhros
parents:
6683
diff
changeset
|
499 |
total_height = (num + 1) * mt; |
9ddfcb1849e4
(svn r9449) -Fix: Truncate the newgrf information text in the newgrf gui if it's too long.
maedhros
parents:
6683
diff
changeset
|
500 |
} |
9ddfcb1849e4
(svn r9449) -Fix: Truncate the newgrf information text in the newgrf gui if it's too long.
maedhros
parents:
6683
diff
changeset
|
501 |
|
1336
c9e6b766bf21
(svn r1840) Repel str_buffr and use local buffers where possible
tron
parents:
1323
diff
changeset
|
502 |
src = buffer; |
0 | 503 |
|
2952 | 504 |
for (;;) { |
0 | 505 |
DoDrawString(src, x, y, 0xFE); |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
506 |
_cur_fontsize = _last_fontsize; |
0 | 507 |
|
2952 | 508 |
for (;;) { |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
509 |
c = Utf8Consume(&src); |
0 | 510 |
if (c == 0) { |
511 |
y += mt; |
|
512 |
if (--num < 0) { |
|
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
513 |
_cur_fontsize = FS_NORMAL; |
4928
4cdb51b5db7b
(svn r6908) - Codechange: Modify DrawStringMultiLine() to return the number of pixel lines used, and use it for drawing NewGRF additional text (mart3p)
peter1138
parents:
4912
diff
changeset
|
514 |
return total_height; |
0 | 515 |
} |
516 |
break; |
|
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
517 |
} else if (c == SCC_SETX) { |
0 | 518 |
src++; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
519 |
} else if (c == SCC_SETXY) { |
6987
b0f13039bda2
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6977
diff
changeset
|
520 |
src += 2; |
0 | 521 |
} |
522 |
} |
|
523 |
} |
|
524 |
} |
|
525 |
||
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
526 |
/** Return the string dimension in pixels. The height and width are returned |
8617
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
8610
diff
changeset
|
527 |
* in a single Dimension value. TINYFONT, BIGFONT modifiers are only |
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
528 |
* supported as the first character of the string. The returned dimensions |
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
529 |
* are therefore a rough estimation correct for all the current strings |
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
530 |
* but not every possible combination |
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
531 |
* @param str string to calculate pixel-width |
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
532 |
* @return string width and height in pixels */ |
8617
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
8610
diff
changeset
|
533 |
Dimension GetStringBoundingBox(const char *str) |
1323
41397685320a
(svn r1827) Next iteration of the byte -> char transition: some string drawing functions and buffers
tron
parents:
1309
diff
changeset
|
534 |
{ |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
535 |
FontSize size = _cur_fontsize; |
8617
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
8610
diff
changeset
|
536 |
Dimension br; |
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
537 |
int max_width; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
538 |
WChar c; |
4557
112872feb6fd
(svn r6404) -Fix: GetStringWidth failed to calculate correct string width if the string
Darkvater
parents:
4525
diff
changeset
|
539 |
|
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
540 |
br.width = br.height = max_width = 0; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
541 |
for (;;) { |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
542 |
c = Utf8Consume(&str); |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
543 |
if (c == 0) break; |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
544 |
if (IsPrintable(c)) { |
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
545 |
br.width += GetCharacterWidth(size, c); |
0 | 546 |
} else { |
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
547 |
switch (c) { |
5579
be371346efae
(svn r7580) -Fix (r7182): UTF8-merge changed the string handling a bit, now the str pointer for
Darkvater
parents:
5568
diff
changeset
|
548 |
case SCC_SETX: br.width += (byte)*str++; break; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
549 |
case SCC_SETXY: |
5579
be371346efae
(svn r7580) -Fix (r7182): UTF8-merge changed the string handling a bit, now the str pointer for
Darkvater
parents:
5568
diff
changeset
|
550 |
br.width += (byte)*str++; |
be371346efae
(svn r7580) -Fix (r7182): UTF8-merge changed the string handling a bit, now the str pointer for
Darkvater
parents:
5568
diff
changeset
|
551 |
br.height += (byte)*str++; |
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
552 |
break; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
553 |
case SCC_TINYFONT: size = FS_SMALL; break; |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
554 |
case SCC_BIGFONT: size = FS_LARGE; break; |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
555 |
case '\n': |
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
556 |
br.height += GetCharacterHeight(size); |
4610
45ac1d25fd62
(svn r6463) -Fix (r6462): Reset the string width to zero on every new line of course...
Darkvater
parents:
4609
diff
changeset
|
557 |
if (br.width > max_width) max_width = br.width; |
45ac1d25fd62
(svn r6463) -Fix (r6462): Reset the string width to zero on every new line of course...
Darkvater
parents:
4609
diff
changeset
|
558 |
br.width = 0; |
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
559 |
break; |
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
560 |
} |
0 | 561 |
} |
562 |
} |
|
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
563 |
br.height += GetCharacterHeight(size); |
4557
112872feb6fd
(svn r6404) -Fix: GetStringWidth failed to calculate correct string width if the string
Darkvater
parents:
4525
diff
changeset
|
564 |
|
4609
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
565 |
br.width = max(br.width, max_width); |
6c337b3fbf4b
(svn r6462) -Codechange: Have GetStringWidth() return width as well as the height bounding
Darkvater
parents:
4557
diff
changeset
|
566 |
return br; |
0 | 567 |
} |
568 |
||
4949
fa564e9c2aea
(svn r6938) -Codechange: Comments, typo, variable naming, whitespace, strecpy and simplification
Darkvater
parents:
4928
diff
changeset
|
569 |
/** Draw a string at the given coordinates with the given colour |
fa564e9c2aea
(svn r6938) -Codechange: Comments, typo, variable naming, whitespace, strecpy and simplification
Darkvater
parents:
4928
diff
changeset
|
570 |
* @param string the string to draw |
fa564e9c2aea
(svn r6938) -Codechange: Comments, typo, variable naming, whitespace, strecpy and simplification
Darkvater
parents:
4928
diff
changeset
|
571 |
* @param x offset from left side of the screen, if negative offset from the right side |
6977
67b989528f3d
(svn r9662) -Documentation: Doxygen corrections and @file omissions
belugas
parents:
6974
diff
changeset
|
572 |
* @param y offset from top side of the screen, if negative offset from the bottom |
4949
fa564e9c2aea
(svn r6938) -Codechange: Comments, typo, variable naming, whitespace, strecpy and simplification
Darkvater
parents:
4928
diff
changeset
|
573 |
* @param real_color colour of the string, see _string_colormap in |
8619
c2434269c3eb
(svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents:
8617
diff
changeset
|
574 |
* table/palettes.h or docs/ottd-colourtext-palette.png or the enum TextColour in gfx_type.h |
4949
fa564e9c2aea
(svn r6938) -Codechange: Comments, typo, variable naming, whitespace, strecpy and simplification
Darkvater
parents:
4928
diff
changeset
|
575 |
* @return the x-coordinates where the drawing has finished. If nothing is drawn |
fa564e9c2aea
(svn r6938) -Codechange: Comments, typo, variable naming, whitespace, strecpy and simplification
Darkvater
parents:
4928
diff
changeset
|
576 |
* the originally passed x-coordinate is returned */ |
1323
41397685320a
(svn r1827) Next iteration of the byte -> char transition: some string drawing functions and buffers
tron
parents:
1309
diff
changeset
|
577 |
int DoDrawString(const char *string, int x, int y, uint16 real_color) |
41397685320a
(svn r1827) Next iteration of the byte -> char transition: some string drawing functions and buffers
tron
parents:
1309
diff
changeset
|
578 |
{ |
4522 | 579 |
DrawPixelInfo *dpi = _cur_dpi; |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
580 |
FontSize size = _cur_fontsize; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
581 |
WChar c; |
0 | 582 |
int xo = x, yo = y; |
583 |
||
7918
3b2e2a49a093
(svn r10820) -Codechange: make negative currencies red and restore the colour from before the currency was printed; this removes the need to make two strings for printing currencies (one for positive currencies and one for negative currencies).
rubidium
parents:
7904
diff
changeset
|
584 |
byte color = real_color & 0xFF; |
3b2e2a49a093
(svn r10820) -Codechange: make negative currencies red and restore the colour from before the currency was printed; this removes the need to make two strings for printing currencies (one for positive currencies and one for negative currencies).
rubidium
parents:
7904
diff
changeset
|
585 |
byte previous_color = color; |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
510
diff
changeset
|
586 |
|
0 | 587 |
if (color != 0xFE) { |
588 |
if (x >= dpi->left + dpi->width || |
|
6987
b0f13039bda2
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6977
diff
changeset
|
589 |
x + _screen.width * 2 <= dpi->left || |
0 | 590 |
y >= dpi->top + dpi->height || |
591 |
y + _screen.height <= dpi->top) |
|
592 |
return x; |
|
593 |
||
594 |
if (color != 0xFF) { |
|
595 |
switch_color:; |
|
657
40a9032b454b
(svn r1091) Fix: Finally station names use 100% the correct color in transparent mode
dominik
parents:
619
diff
changeset
|
596 |
if (real_color & IS_PALETTE_COLOR) { |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
510
diff
changeset
|
597 |
_string_colorremap[1] = color; |
6974
24490c839582
(svn r9654) -Fix: Add string colours for the DOS palette and use them when playing with the DOS data files.
maedhros
parents:
6708
diff
changeset
|
598 |
_string_colorremap[2] = _use_dos_palette ? 1 : 215; |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
510
diff
changeset
|
599 |
} else { |
6974
24490c839582
(svn r9654) -Fix: Add string colours for the DOS palette and use them when playing with the DOS data files.
maedhros
parents:
6708
diff
changeset
|
600 |
uint palette = _use_dos_palette ? 1 : 0; |
24490c839582
(svn r9654) -Fix: Add string colours for the DOS palette and use them when playing with the DOS data files.
maedhros
parents:
6708
diff
changeset
|
601 |
_string_colorremap[1] = _string_colormap[palette][color].text; |
24490c839582
(svn r9654) -Fix: Add string colours for the DOS palette and use them when playing with the DOS data files.
maedhros
parents:
6708
diff
changeset
|
602 |
_string_colorremap[2] = _string_colormap[palette][color].shadow; |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
510
diff
changeset
|
603 |
} |
0 | 604 |
_color_remap_ptr = _string_colorremap; |
605 |
} |
|
606 |
} |
|
607 |
||
608 |
check_bounds: |
|
609 |
if (y + 19 <= dpi->top || dpi->top + dpi->height <= y) { |
|
610 |
skip_char:; |
|
2952 | 611 |
for (;;) { |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
612 |
c = Utf8Consume(&string); |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
613 |
if (!IsPrintable(c)) goto skip_cont; |
0 | 614 |
} |
615 |
} |
|
616 |
||
2952 | 617 |
for (;;) { |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
618 |
c = Utf8Consume(&string); |
0 | 619 |
skip_cont:; |
620 |
if (c == 0) { |
|
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
621 |
_last_fontsize = size; |
0 | 622 |
return x; |
623 |
} |
|
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
624 |
if (IsPrintable(c)) { |
0 | 625 |
if (x >= dpi->left + dpi->width) goto skip_char; |
626 |
if (x + 26 >= dpi->left) { |
|
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
627 |
GfxMainBlitter(GetGlyph(size, c), x, y, BM_COLOUR_REMAP); |
0 | 628 |
} |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
629 |
x += GetCharacterWidth(size, c); |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
630 |
} else if (c == '\n') { // newline = {} |
0 | 631 |
x = xo; |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
632 |
y += GetCharacterHeight(size); |
0 | 633 |
goto check_bounds; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
634 |
} else if (c >= SCC_BLUE && c <= SCC_BLACK) { // change color? |
7918
3b2e2a49a093
(svn r10820) -Codechange: make negative currencies red and restore the colour from before the currency was printed; this removes the need to make two strings for printing currencies (one for positive currencies and one for negative currencies).
rubidium
parents:
7904
diff
changeset
|
635 |
previous_color = color; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
636 |
color = (byte)(c - SCC_BLUE); |
0 | 637 |
goto switch_color; |
7918
3b2e2a49a093
(svn r10820) -Codechange: make negative currencies red and restore the colour from before the currency was printed; this removes the need to make two strings for printing currencies (one for positive currencies and one for negative currencies).
rubidium
parents:
7904
diff
changeset
|
638 |
} else if (c == SCC_PREVIOUS_COLOUR) { // revert to the previous color |
3b2e2a49a093
(svn r10820) -Codechange: make negative currencies red and restore the colour from before the currency was printed; this removes the need to make two strings for printing currencies (one for positive currencies and one for negative currencies).
rubidium
parents:
7904
diff
changeset
|
639 |
Swap(color, previous_color); |
3b2e2a49a093
(svn r10820) -Codechange: make negative currencies red and restore the colour from before the currency was printed; this removes the need to make two strings for printing currencies (one for positive currencies and one for negative currencies).
rubidium
parents:
7904
diff
changeset
|
640 |
goto switch_color; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
641 |
} else if (c == SCC_SETX) { // {SETX} |
1323
41397685320a
(svn r1827) Next iteration of the byte -> char transition: some string drawing functions and buffers
tron
parents:
1309
diff
changeset
|
642 |
x = xo + (byte)*string++; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
643 |
} else if (c == SCC_SETXY) {// {SETXY} |
1323
41397685320a
(svn r1827) Next iteration of the byte -> char transition: some string drawing functions and buffers
tron
parents:
1309
diff
changeset
|
644 |
x = xo + (byte)*string++; |
41397685320a
(svn r1827) Next iteration of the byte -> char transition: some string drawing functions and buffers
tron
parents:
1309
diff
changeset
|
645 |
y = yo + (byte)*string++; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
646 |
} else if (c == SCC_TINYFONT) { // {TINYFONT} |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
647 |
size = FS_SMALL; |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
648 |
} else if (c == SCC_BIGFONT) { // {BIGFONT} |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
649 |
size = FS_LARGE; |
0 | 650 |
} else { |
5579
be371346efae
(svn r7580) -Fix (r7182): UTF8-merge changed the string handling a bit, now the str pointer for
Darkvater
parents:
5568
diff
changeset
|
651 |
DEBUG(misc, 0, "[utf8] unknown string command character %d", c); |
0 | 652 |
} |
653 |
} |
|
654 |
} |
|
655 |
||
2097
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
656 |
int DoDrawStringTruncated(const char *str, int x, int y, uint16 color, uint maxw) |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
657 |
{ |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
658 |
char buffer[512]; |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
659 |
ttd_strlcpy(buffer, str, sizeof(buffer)); |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
660 |
TruncateString(buffer, maxw); |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
661 |
return DoDrawString(buffer, x, y, color); |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
662 |
} |
82b1e11883fd
(svn r2607) - Feature: add support for truncating strings to a given (pixel) length. Function courtesy of Ludde.
Darkvater
parents:
2062
diff
changeset
|
663 |
|
8177
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
664 |
void DrawSprite(SpriteID img, SpriteID pal, int x, int y, const SubSprite *sub) |
2010 | 665 |
{ |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8423
diff
changeset
|
666 |
if (HasBit(img, PALETTE_MODIFIER_TRANSPARENT)) { |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5887
diff
changeset
|
667 |
_color_remap_ptr = GetNonSprite(GB(pal, 0, PALETTE_WIDTH)) + 1; |
8177
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
668 |
GfxMainBlitter(GetSprite(GB(img, 0, SPRITE_WIDTH)), x, y, BM_TRANSPARENT, sub); |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5887
diff
changeset
|
669 |
} else if (pal != PAL_NONE) { |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5887
diff
changeset
|
670 |
_color_remap_ptr = GetNonSprite(GB(pal, 0, PALETTE_WIDTH)) + 1; |
8177
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
671 |
GfxMainBlitter(GetSprite(GB(img, 0, SPRITE_WIDTH)), x, y, BM_COLOUR_REMAP, sub); |
0 | 672 |
} else { |
8177
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
673 |
GfxMainBlitter(GetSprite(GB(img, 0, SPRITE_WIDTH)), x, y, BM_NORMAL, sub); |
0 | 674 |
} |
675 |
} |
|
676 |
||
11130 | 677 |
static void GfxMainBlitter(const Sprite *sprite, int x, int y, BlitterMode mode, const SubSprite *sub) |
0 | 678 |
{ |
4171 | 679 |
const DrawPixelInfo *dpi = _cur_dpi; |
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
680 |
Blitter::BlitterParams bp; |
0 | 681 |
|
8177
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
682 |
/* Amount of pixels to clip from the source sprite */ |
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
683 |
int clip_left = (sub != NULL ? max(0, -sprite->x_offs + sub->left ) : 0); |
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
684 |
int clip_top = (sub != NULL ? max(0, -sprite->y_offs + sub->top ) : 0); |
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
685 |
int clip_right = (sub != NULL ? max(0, sprite->width - (-sprite->x_offs + sub->right + 1)) : 0); |
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
686 |
int clip_bottom = (sub != NULL ? max(0, sprite->height - (-sprite->y_offs + sub->bottom + 1)) : 0); |
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
687 |
|
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
688 |
if (clip_left + clip_right >= sprite->width) return; |
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
689 |
if (clip_top + clip_bottom >= sprite->height) return; |
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
690 |
|
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
691 |
/* Move to the correct offset */ |
1351
3e7aa0d35f8f
(svn r1855) Handle endianness of sprite headers when loading a sprite, not everytime when accessing it
tron
parents:
1350
diff
changeset
|
692 |
x += sprite->x_offs; |
3e7aa0d35f8f
(svn r1855) Handle endianness of sprite headers when loading a sprite, not everytime when accessing it
tron
parents:
1350
diff
changeset
|
693 |
y += sprite->y_offs; |
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
694 |
|
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
695 |
/* Copy the main data directly from the sprite */ |
4518 | 696 |
bp.sprite = sprite->data; |
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
697 |
bp.sprite_width = sprite->width; |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
698 |
bp.sprite_height = sprite->height; |
8177
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
699 |
bp.width = UnScaleByZoom(sprite->width - clip_left - clip_right, dpi->zoom); |
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
700 |
bp.height = UnScaleByZoom(sprite->height - clip_top - clip_bottom, dpi->zoom); |
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
701 |
bp.top = 0; |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
702 |
bp.left = 0; |
11130 | 703 |
bp.skip_left = UnScaleByZoomLower(clip_left, dpi->zoom); |
704 |
bp.skip_top = UnScaleByZoomLower(clip_top, dpi->zoom); |
|
8177
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
705 |
|
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
706 |
x += ScaleByZoom(bp.skip_left, dpi->zoom); |
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
707 |
y += ScaleByZoom(bp.skip_top, dpi->zoom); |
f0bcc8e149f3
(svn r11212) -Codechange: add support for drawing parts of sprites. Patch by frosch.
rubidium
parents:
8147
diff
changeset
|
708 |
|
0 | 709 |
bp.dst = dpi->dst_ptr; |
710 |
bp.pitch = dpi->pitch; |
|
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
711 |
bp.remap = _color_remap_ptr; |
0 | 712 |
|
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
713 |
assert(sprite->width > 0); |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
714 |
assert(sprite->height > 0); |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
715 |
|
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
716 |
if (bp.width <= 0) return; |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
717 |
if (bp.height <= 0) return; |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
718 |
|
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
719 |
y -= dpi->top; |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
720 |
/* Check for top overflow */ |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
721 |
if (y < 0) { |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
722 |
bp.height -= -UnScaleByZoom(y, dpi->zoom); |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
723 |
if (bp.height <= 0) return; |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
724 |
bp.skip_top += -UnScaleByZoom(y, dpi->zoom); |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
725 |
y = 0; |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
726 |
} else { |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
727 |
bp.top = UnScaleByZoom(y, dpi->zoom); |
7300
6c3d987e8e6d
(svn r10043) -Change: make templates of the blitters, based on zoom and mode, which makes the optimizing better, and therefor a higher blitter speed (tnx boekabart)
truelight
parents:
7149
diff
changeset
|
728 |
} |
0 | 729 |
|
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
730 |
/* Check for bottom overflow */ |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
731 |
y += ScaleByZoom(bp.height, dpi->zoom) - dpi->height; |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
732 |
if (y > 0) { |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
733 |
bp.height -= UnScaleByZoom(y, dpi->zoom); |
7300
6c3d987e8e6d
(svn r10043) -Change: make templates of the blitters, based on zoom and mode, which makes the optimizing better, and therefor a higher blitter speed (tnx boekabart)
truelight
parents:
7149
diff
changeset
|
734 |
if (bp.height <= 0) return; |
6c3d987e8e6d
(svn r10043) -Change: make templates of the blitters, based on zoom and mode, which makes the optimizing better, and therefor a higher blitter speed (tnx boekabart)
truelight
parents:
7149
diff
changeset
|
735 |
} |
6c3d987e8e6d
(svn r10043) -Change: make templates of the blitters, based on zoom and mode, which makes the optimizing better, and therefor a higher blitter speed (tnx boekabart)
truelight
parents:
7149
diff
changeset
|
736 |
|
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
737 |
x -= dpi->left; |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
738 |
/* Check for left overflow */ |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
739 |
if (x < 0) { |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
740 |
bp.width -= -UnScaleByZoom(x, dpi->zoom); |
7300
6c3d987e8e6d
(svn r10043) -Change: make templates of the blitters, based on zoom and mode, which makes the optimizing better, and therefor a higher blitter speed (tnx boekabart)
truelight
parents:
7149
diff
changeset
|
741 |
if (bp.width <= 0) return; |
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
742 |
bp.skip_left += -UnScaleByZoom(x, dpi->zoom); |
7300
6c3d987e8e6d
(svn r10043) -Change: make templates of the blitters, based on zoom and mode, which makes the optimizing better, and therefor a higher blitter speed (tnx boekabart)
truelight
parents:
7149
diff
changeset
|
743 |
x = 0; |
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
744 |
} else { |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
745 |
bp.left = UnScaleByZoom(x, dpi->zoom); |
7300
6c3d987e8e6d
(svn r10043) -Change: make templates of the blitters, based on zoom and mode, which makes the optimizing better, and therefor a higher blitter speed (tnx boekabart)
truelight
parents:
7149
diff
changeset
|
746 |
} |
6c3d987e8e6d
(svn r10043) -Change: make templates of the blitters, based on zoom and mode, which makes the optimizing better, and therefor a higher blitter speed (tnx boekabart)
truelight
parents:
7149
diff
changeset
|
747 |
|
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
748 |
/* Check for right overflow */ |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
749 |
x += ScaleByZoom(bp.width, dpi->zoom) - dpi->width; |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
750 |
if (x > 0) { |
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
751 |
bp.width -= UnScaleByZoom(x, dpi->zoom); |
7300
6c3d987e8e6d
(svn r10043) -Change: make templates of the blitters, based on zoom and mode, which makes the optimizing better, and therefor a higher blitter speed (tnx boekabart)
truelight
parents:
7149
diff
changeset
|
752 |
if (bp.width <= 0) return; |
6c3d987e8e6d
(svn r10043) -Change: make templates of the blitters, based on zoom and mode, which makes the optimizing better, and therefor a higher blitter speed (tnx boekabart)
truelight
parents:
7149
diff
changeset
|
753 |
} |
6c3d987e8e6d
(svn r10043) -Change: make templates of the blitters, based on zoom and mode, which makes the optimizing better, and therefor a higher blitter speed (tnx boekabart)
truelight
parents:
7149
diff
changeset
|
754 |
|
11130 | 755 |
assert(bp.skip_left + bp.width <= UnScaleByZoom(sprite->width, dpi->zoom)); |
756 |
assert(bp.skip_top + bp.height <= UnScaleByZoom(sprite->height, dpi->zoom)); |
|
757 |
||
7348
becce3f57dc7
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
7327
diff
changeset
|
758 |
BlitterFactoryBase::GetCurrentBlitter()->Draw(&bp, mode, dpi->zoom); |
0 | 759 |
} |
760 |
||
6573 | 761 |
void DoPaletteAnimations(); |
614
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
543
diff
changeset
|
762 |
|
6573 | 763 |
void GfxInitPalettes() |
0 | 764 |
{ |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
765 |
memcpy(_cur_palette, _palettes[_use_dos_palette ? 1 : 0], sizeof(_cur_palette)); |
614
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
543
diff
changeset
|
766 |
|
7460
46c24d1287cf
(svn r10220) -Fix r10216: even more fuck-ups for non-SDL video backends
truelight
parents:
7456
diff
changeset
|
767 |
DoPaletteAnimations(); |
0 | 768 |
_pal_first_dirty = 0; |
7888
d26883560502
(svn r10761) -Fix (FS#1101, r10216): _pal_last_dirty changed to _pal_count_dirty without updating, so it was of by one
glx
parents:
7858
diff
changeset
|
769 |
_pal_count_dirty = 256; |
0 | 770 |
} |
771 |
||
7514
98a024616010
(svn r10276) -Codechange: made a counter based on milliseconds and independent of the game-state to base double-click and TGP Generation Process on
truelight
parents:
7495
diff
changeset
|
772 |
#define EXTR(p, q) (((uint16)(_palette_animation_counter * (p)) * (q)) >> 16) |
98a024616010
(svn r10276) -Codechange: made a counter based on milliseconds and independent of the game-state to base double-click and TGP Generation Process on
truelight
parents:
7495
diff
changeset
|
773 |
#define EXTR2(p, q) (((uint16)(~_palette_animation_counter * (p)) * (q)) >> 16) |
0 | 774 |
|
6573 | 775 |
void DoPaletteAnimations() |
0 | 776 |
{ |
7456
0c0636370335
(svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents:
7447
diff
changeset
|
777 |
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); |
4171 | 778 |
const Colour *s; |
779 |
Colour *d; |
|
614
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
543
diff
changeset
|
780 |
/* Amount of colors to be rotated. |
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
543
diff
changeset
|
781 |
* A few more for the DOS palette, because the water colors are |
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
543
diff
changeset
|
782 |
* 245-254 for DOS and 217-226 for Windows. */ |
0 | 783 |
const ExtraPaletteValues *ev = &_extra_palette_values; |
2005 | 784 |
int c = _use_dos_palette ? 38 : 28; |
7456
0c0636370335
(svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents:
7447
diff
changeset
|
785 |
Colour old_val[38]; |
2005 | 786 |
uint i; |
787 |
uint j; |
|
7514
98a024616010
(svn r10276) -Codechange: made a counter based on milliseconds and independent of the game-state to base double-click and TGP Generation Process on
truelight
parents:
7495
diff
changeset
|
788 |
uint old_tc = _palette_animation_counter; |
7374
54c06f06ecc8
(svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents:
7348
diff
changeset
|
789 |
|
7456
0c0636370335
(svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents:
7447
diff
changeset
|
790 |
if (blitter != NULL && blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_NONE) { |
7514
98a024616010
(svn r10276) -Codechange: made a counter based on milliseconds and independent of the game-state to base double-click and TGP Generation Process on
truelight
parents:
7495
diff
changeset
|
791 |
_palette_animation_counter = 0; |
7374
54c06f06ecc8
(svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents:
7348
diff
changeset
|
792 |
} |
0 | 793 |
|
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
794 |
d = &_cur_palette[217]; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
795 |
memcpy(old_val, d, c * sizeof(*old_val)); |
0 | 796 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
797 |
/* Dark blue water */ |
6683
7ec558346172
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6574
diff
changeset
|
798 |
s = (_opt.landscape == LT_TOYLAND) ? ev->ac : ev->a; |
2005 | 799 |
j = EXTR(320, 5); |
800 |
for (i = 0; i != 5; i++) { |
|
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
801 |
*d++ = s[j]; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
802 |
j++; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
803 |
if (j == 5) j = 0; |
0 | 804 |
} |
805 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
806 |
/* Glittery water */ |
6683
7ec558346172
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6574
diff
changeset
|
807 |
s = (_opt.landscape == LT_TOYLAND) ? ev->bc : ev->b; |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
808 |
j = EXTR(128, 15); |
2005 | 809 |
for (i = 0; i != 5; i++) { |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
810 |
*d++ = s[j]; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
811 |
j += 3; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
812 |
if (j >= 15) j -= 15; |
0 | 813 |
} |
814 |
||
815 |
s = ev->e; |
|
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
816 |
j = EXTR2(512, 5); |
2005 | 817 |
for (i = 0; i != 5; i++) { |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
818 |
*d++ = s[j]; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
819 |
j++; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
820 |
if (j == 5) j = 0; |
0 | 821 |
} |
822 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
823 |
/* Oil refinery fire animation */ |
0 | 824 |
s = ev->oil_ref; |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
825 |
j = EXTR2(512, 7); |
2005 | 826 |
for (i = 0; i != 7; i++) { |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
827 |
*d++ = s[j]; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
828 |
j++; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
829 |
if (j == 7) j = 0; |
0 | 830 |
} |
831 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
832 |
/* Radio tower blinking */ |
0 | 833 |
{ |
7514
98a024616010
(svn r10276) -Codechange: made a counter based on milliseconds and independent of the game-state to base double-click and TGP Generation Process on
truelight
parents:
7495
diff
changeset
|
834 |
byte i = (_palette_animation_counter >> 1) & 0x7F; |
2005 | 835 |
byte v; |
836 |
||
0 | 837 |
(v = 255, i < 0x3f) || |
838 |
(v = 128, i < 0x4A || i >= 0x75) || |
|
839 |
(v = 20); |
|
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
840 |
d->r = v; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
841 |
d->g = 0; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
842 |
d->b = 0; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
843 |
d++; |
0 | 844 |
|
845 |
i ^= 0x40; |
|
846 |
(v = 255, i < 0x3f) || |
|
847 |
(v = 128, i < 0x4A || i >= 0x75) || |
|
848 |
(v = 20); |
|
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
849 |
d->r = v; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
850 |
d->g = 0; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
851 |
d->b = 0; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
852 |
d++; |
0 | 853 |
} |
854 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
855 |
/* Handle lighthouse and stadium animation */ |
0 | 856 |
s = ev->lighthouse; |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
857 |
j = EXTR(256, 4); |
2005 | 858 |
for (i = 0; i != 4; i++) { |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
859 |
*d++ = s[j]; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
860 |
j++; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
861 |
if (j == 4) j = 0; |
0 | 862 |
} |
863 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
864 |
/* Animate water for old DOS graphics */ |
2005 | 865 |
if (_use_dos_palette) { |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
866 |
/* Dark blue water DOS */ |
6683
7ec558346172
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6574
diff
changeset
|
867 |
s = (_opt.landscape == LT_TOYLAND) ? ev->ac : ev->a; |
2005 | 868 |
j = EXTR(320, 5); |
869 |
for (i = 0; i != 5; i++) { |
|
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
870 |
*d++ = s[j]; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
871 |
j++; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
872 |
if (j == 5) j = 0; |
614
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
543
diff
changeset
|
873 |
} |
915 | 874 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
875 |
/* Glittery water DOS */ |
6683
7ec558346172
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6574
diff
changeset
|
876 |
s = (_opt.landscape == LT_TOYLAND) ? ev->bc : ev->b; |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
877 |
j = EXTR(128, 15); |
2005 | 878 |
for (i = 0; i != 5; i++) { |
1991
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
879 |
*d++ = s[j]; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
880 |
j += 3; |
f3d5e35731a2
(svn r2497) Use a struct array for palette entries instead of a flat byte array
tron
parents:
1914
diff
changeset
|
881 |
if (j >= 15) j -= 15; |
614
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
543
diff
changeset
|
882 |
} |
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
543
diff
changeset
|
883 |
} |
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
543
diff
changeset
|
884 |
|
7456
0c0636370335
(svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents:
7447
diff
changeset
|
885 |
if (blitter != NULL && blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_NONE) { |
7514
98a024616010
(svn r10276) -Codechange: made a counter based on milliseconds and independent of the game-state to base double-click and TGP Generation Process on
truelight
parents:
7495
diff
changeset
|
886 |
_palette_animation_counter = old_tc; |
7456
0c0636370335
(svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents:
7447
diff
changeset
|
887 |
} else { |
0c0636370335
(svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents:
7447
diff
changeset
|
888 |
if (memcmp(old_val, &_cur_palette[217], c * sizeof(*old_val)) != 0) { |
0c0636370335
(svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents:
7447
diff
changeset
|
889 |
_pal_first_dirty = 217; |
0c0636370335
(svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents:
7447
diff
changeset
|
890 |
_pal_count_dirty = c; |
0c0636370335
(svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents:
7447
diff
changeset
|
891 |
} |
0 | 892 |
} |
893 |
} |
|
894 |
||
895 |
||
6573 | 896 |
void LoadStringWidthTable() |
0 | 897 |
{ |
2005 | 898 |
uint i; |
0 | 899 |
|
3797
86749951a1bf
(svn r4793) - Replace list of magic numbers (characters that don't exist) with a call to SpriteExists(), when building the character width cache.
peter1138
parents:
3312
diff
changeset
|
900 |
/* Normal font */ |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
901 |
for (i = 0; i != 224; i++) { |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
902 |
_stringwidth_table[FS_NORMAL][i] = GetGlyphWidth(FS_NORMAL, i + 32); |
0 | 903 |
} |
904 |
||
3797
86749951a1bf
(svn r4793) - Replace list of magic numbers (characters that don't exist) with a call to SpriteExists(), when building the character width cache.
peter1138
parents:
3312
diff
changeset
|
905 |
/* Small font */ |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
906 |
for (i = 0; i != 224; i++) { |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
907 |
_stringwidth_table[FS_SMALL][i] = GetGlyphWidth(FS_SMALL, i + 32); |
0 | 908 |
} |
909 |
||
3797
86749951a1bf
(svn r4793) - Replace list of magic numbers (characters that don't exist) with a call to SpriteExists(), when building the character width cache.
peter1138
parents:
3312
diff
changeset
|
910 |
/* Large font */ |
3798
37a2090eac94
(svn r4802) - Codechange: replace _stringwidth_base and associated magic numbers with a FontSize enum, using the numbers (which are SpriteIDs) in only the places needed.
peter1138
parents:
3797
diff
changeset
|
911 |
for (i = 0; i != 224; i++) { |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
912 |
_stringwidth_table[FS_LARGE][i] = GetGlyphWidth(FS_LARGE, i + 32); |
0 | 913 |
} |
914 |
} |
|
915 |
||
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
916 |
|
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
917 |
byte GetCharacterWidth(FontSize size, WChar key) |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
918 |
{ |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
919 |
if (key >= 32 && key < 256) return _stringwidth_table[size][key - 32]; |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
920 |
|
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
921 |
return GetGlyphWidth(size, key); |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
922 |
} |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
923 |
|
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
4958
diff
changeset
|
924 |
|
6573 | 925 |
void ScreenSizeChanged() |
0 | 926 |
{ |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
927 |
/* check the dirty rect */ |
0 | 928 |
if (_invalid_rect.right >= _screen.width) _invalid_rect.right = _screen.width; |
929 |
if (_invalid_rect.bottom >= _screen.height) _invalid_rect.bottom = _screen.height; |
|
930 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
931 |
/* screen size changed and the old bitmap is invalid now, so we don't want to undraw it */ |
0 | 932 |
_cursor.visible = false; |
933 |
} |
|
934 |
||
6573 | 935 |
void UndrawMouseCursor() |
0 | 936 |
{ |
937 |
if (_cursor.visible) { |
|
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
938 |
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); |
0 | 939 |
_cursor.visible = false; |
7481
699607d457a0
(svn r10241) -Codechange: CopyToBuffer now produces a buffer that is unreadable from outside the blitter, so the blitter can store anything he likes
truelight
parents:
7460
diff
changeset
|
940 |
blitter->CopyFromBuffer(blitter->MoveTo(_screen.dst_ptr, _cursor.draw_pos.x, _cursor.draw_pos.y), _cursor_backup, _cursor.draw_size.x, _cursor.draw_size.y); |
7666
a5fccd76176a
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7514
diff
changeset
|
941 |
_video_driver->MakeDirty(_cursor.draw_pos.x, _cursor.draw_pos.y, _cursor.draw_size.x, _cursor.draw_size.y); |
0 | 942 |
} |
943 |
} |
|
944 |
||
6573 | 945 |
void DrawMouseCursor() |
0 | 946 |
{ |
7904
238db1373ca3
(svn r10781) -Fix: ported more pieces to WinCE, so it compiles a bit more
truelight
parents:
7888
diff
changeset
|
947 |
#if defined(WINCE) |
238db1373ca3
(svn r10781) -Fix: ported more pieces to WinCE, so it compiles a bit more
truelight
parents:
7888
diff
changeset
|
948 |
/* Don't ever draw the mouse for WinCE, as we work with a stylus */ |
238db1373ca3
(svn r10781) -Fix: ported more pieces to WinCE, so it compiles a bit more
truelight
parents:
7888
diff
changeset
|
949 |
return; |
238db1373ca3
(svn r10781) -Fix: ported more pieces to WinCE, so it compiles a bit more
truelight
parents:
7888
diff
changeset
|
950 |
#endif |
238db1373ca3
(svn r10781) -Fix: ported more pieces to WinCE, so it compiles a bit more
truelight
parents:
7888
diff
changeset
|
951 |
|
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
952 |
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); |
2010 | 953 |
int x; |
954 |
int y; |
|
955 |
int w; |
|
956 |
int h; |
|
0 | 957 |
|
3312
593789444b01
(svn r4075) - Feature: Undraw the mouse when it leaves the window and Draw it again when it enters. Added both for WIN32 and SDL. Since Win95 has troubles with TrackMouseEvent(), this function was just simply rewritten which was the easiest. Based on a patch by DmitryKo.
Darkvater
parents:
3252
diff
changeset
|
958 |
/* Redraw mouse cursor but only when it's inside the window */ |
593789444b01
(svn r4075) - Feature: Undraw the mouse when it leaves the window and Draw it again when it enters. Added both for WIN32 and SDL. Since Win95 has troubles with TrackMouseEvent(), this function was just simply rewritten which was the easiest. Based on a patch by DmitryKo.
Darkvater
parents:
3252
diff
changeset
|
959 |
if (!_cursor.in_window) return; |
593789444b01
(svn r4075) - Feature: Undraw the mouse when it leaves the window and Draw it again when it enters. Added both for WIN32 and SDL. Since Win95 has troubles with TrackMouseEvent(), this function was just simply rewritten which was the easiest. Based on a patch by DmitryKo.
Darkvater
parents:
3252
diff
changeset
|
960 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
961 |
/* Don't draw the mouse cursor if it's already drawn */ |
0 | 962 |
if (_cursor.visible) { |
2010 | 963 |
if (!_cursor.dirty) return; |
0 | 964 |
UndrawMouseCursor(); |
965 |
} |
|
966 |
||
967 |
w = _cursor.size.x; |
|
968 |
x = _cursor.pos.x + _cursor.offs.x; |
|
2010 | 969 |
if (x < 0) { |
970 |
w += x; |
|
971 |
x = 0; |
|
972 |
} |
|
973 |
if (w > _screen.width - x) w = _screen.width - x; |
|
0 | 974 |
if (w <= 0) return; |
975 |
_cursor.draw_pos.x = x; |
|
976 |
_cursor.draw_size.x = w; |
|
977 |
||
978 |
h = _cursor.size.y; |
|
979 |
y = _cursor.pos.y + _cursor.offs.y; |
|
2010 | 980 |
if (y < 0) { |
981 |
h += y; |
|
982 |
y = 0; |
|
983 |
} |
|
984 |
if (h > _screen.height - y) h = _screen.height - y; |
|
0 | 985 |
if (h <= 0) return; |
986 |
_cursor.draw_pos.y = y; |
|
987 |
_cursor.draw_size.y = h; |
|
988 |
||
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
989 |
assert(blitter->BufferSize(w, h) < (int)sizeof(_cursor_backup)); |
0 | 990 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
991 |
/* Make backup of stuff below cursor */ |
7481
699607d457a0
(svn r10241) -Codechange: CopyToBuffer now produces a buffer that is unreadable from outside the blitter, so the blitter can store anything he likes
truelight
parents:
7460
diff
changeset
|
992 |
blitter->CopyToBuffer(blitter->MoveTo(_screen.dst_ptr, _cursor.draw_pos.x, _cursor.draw_pos.y), _cursor_backup, _cursor.draw_size.x, _cursor.draw_size.y); |
0 | 993 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
994 |
/* Draw cursor on screen */ |
0 | 995 |
_cur_dpi = &_screen; |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5887
diff
changeset
|
996 |
DrawSprite(_cursor.sprite, _cursor.pal, _cursor.pos.x, _cursor.pos.y); |
0 | 997 |
|
7666
a5fccd76176a
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7514
diff
changeset
|
998 |
_video_driver->MakeDirty(_cursor.draw_pos.x, _cursor.draw_pos.y, _cursor.draw_size.x, _cursor.draw_size.y); |
0 | 999 |
|
1000 |
_cursor.visible = true; |
|
1001 |
_cursor.dirty = false; |
|
1002 |
} |
|
1003 |
||
1004 |
void RedrawScreenRect(int left, int top, int right, int bottom) |
|
1005 |
{ |
|
1006 |
assert(right <= _screen.width && bottom <= _screen.height); |
|
1007 |
if (_cursor.visible) { |
|
1008 |
if (right > _cursor.draw_pos.x && |
|
1009 |
left < _cursor.draw_pos.x + _cursor.draw_size.x && |
|
1010 |
bottom > _cursor.draw_pos.y && |
|
1011 |
top < _cursor.draw_pos.y + _cursor.draw_size.y) { |
|
1012 |
UndrawMouseCursor(); |
|
1013 |
} |
|
1014 |
} |
|
7950
3d3ed007127a
(svn r10932) -Codechange: replace "text" with "chat" for the chat related function and variables.
rubidium
parents:
7918
diff
changeset
|
1015 |
UndrawChatMessage(); |
0 | 1016 |
|
7495
3bed6c98b8f3
(svn r10255) -Codechange: remove some old debug code nobody was using anymore
truelight
parents:
7494
diff
changeset
|
1017 |
DrawOverlappedWindowForAll(left, top, right, bottom); |
0 | 1018 |
|
7666
a5fccd76176a
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7514
diff
changeset
|
1019 |
_video_driver->MakeDirty(left, top, right - left, bottom - top); |
0 | 1020 |
} |
1021 |
||
8041
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1022 |
/*! |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1023 |
* Repaints the rectangle blocks which are marked as 'dirty'. |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1024 |
* |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1025 |
* @see SetDirtyBlocks |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1026 |
*/ |
6573 | 1027 |
void DrawDirtyBlocks() |
0 | 1028 |
{ |
1029 |
byte *b = _dirty_blocks; |
|
8423
8453e9a0f0b5
(svn r11480) -Codechange: Rename the function ALIGN fitting to the naming style
skidd13
parents:
8320
diff
changeset
|
1030 |
const int w = Align(_screen.width, 64); |
8453e9a0f0b5
(svn r11480) -Codechange: Rename the function ALIGN fitting to the naming style
skidd13
parents:
8320
diff
changeset
|
1031 |
const int h = Align(_screen.height, 8); |
2025 | 1032 |
int x; |
1033 |
int y; |
|
0 | 1034 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4171
diff
changeset
|
1035 |
if (IsGeneratingWorld() && !IsGeneratingWorldReadyForPaint()) return; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4171
diff
changeset
|
1036 |
|
2025 | 1037 |
y = 0; |
0 | 1038 |
do { |
2025 | 1039 |
x = 0; |
1040 |
do { |
|
1041 |
if (*b != 0) { |
|
1042 |
int left; |
|
1043 |
int top; |
|
1044 |
int right = x + 64; |
|
1045 |
int bottom = y; |
|
1046 |
byte *p = b; |
|
1047 |
int h2; |
|
0 | 1048 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
1049 |
/* First try coalescing downwards */ |
0 | 1050 |
do { |
2025 | 1051 |
*p = 0; |
1052 |
p += DIRTY_BYTES_PER_LINE; |
|
1053 |
bottom += 8; |
|
1054 |
} while (bottom != h && *p != 0); |
|
0 | 1055 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
1056 |
/* Try coalescing to the right too. */ |
2025 | 1057 |
h2 = (bottom - y) >> 3; |
1058 |
assert(h2 > 0); |
|
1059 |
p = b; |
|
0 | 1060 |
|
2025 | 1061 |
while (right != w) { |
1062 |
byte *p2 = ++p; |
|
1063 |
int h = h2; |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
1064 |
/* Check if a full line of dirty flags is set. */ |
2025 | 1065 |
do { |
1066 |
if (!*p2) goto no_more_coalesc; |
|
1067 |
p2 += DIRTY_BYTES_PER_LINE; |
|
1068 |
} while (--h != 0); |
|
1069 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
1070 |
/* Wohoo, can combine it one step to the right! |
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
1071 |
* Do that, and clear the bits. */ |
2025 | 1072 |
right += 64; |
1073 |
||
1074 |
h = h2; |
|
1075 |
p2 = p; |
|
1076 |
do { |
|
1077 |
*p2 = 0; |
|
1078 |
p2 += DIRTY_BYTES_PER_LINE; |
|
1079 |
} while (--h != 0); |
|
1080 |
} |
|
1081 |
no_more_coalesc: |
|
1082 |
||
1083 |
left = x; |
|
1084 |
top = y; |
|
1085 |
||
1086 |
if (left < _invalid_rect.left ) left = _invalid_rect.left; |
|
1087 |
if (top < _invalid_rect.top ) top = _invalid_rect.top; |
|
1088 |
if (right > _invalid_rect.right ) right = _invalid_rect.right; |
|
1089 |
if (bottom > _invalid_rect.bottom) bottom = _invalid_rect.bottom; |
|
1090 |
||
1091 |
if (left < right && top < bottom) { |
|
1092 |
RedrawScreenRect(left, top, right, bottom); |
|
1093 |
} |
|
1094 |
||
0 | 1095 |
} |
2025 | 1096 |
} while (b++, (x += 64) != w); |
1097 |
} while (b += -(w >> 6) + DIRTY_BYTES_PER_LINE, (y += 8) != h); |
|
0 | 1098 |
|
1099 |
_invalid_rect.left = w; |
|
1100 |
_invalid_rect.top = h; |
|
1101 |
_invalid_rect.right = 0; |
|
1102 |
_invalid_rect.bottom = 0; |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4171
diff
changeset
|
1103 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4171
diff
changeset
|
1104 |
/* If we are generating a world, and waiting for a paint run, mark it here |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4171
diff
changeset
|
1105 |
* as done painting, so we can continue generating. */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4171
diff
changeset
|
1106 |
if (IsGeneratingWorld() && IsGeneratingWorldReadyForPaint()) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4171
diff
changeset
|
1107 |
SetGeneratingWorldPaintStatus(false); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4171
diff
changeset
|
1108 |
} |
0 | 1109 |
} |
1110 |
||
8041
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1111 |
/*! |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1112 |
* This function extends the internal _invalid_rect rectangle as it |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1113 |
* now contains the rectangle defined by the given parameters. Note |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1114 |
* the point (0,0) is top left. |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1115 |
* |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1116 |
* @param left The left edge of the rectangle |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1117 |
* @param top The top edge of the rectangle |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1118 |
* @param right The right edge of the rectangle |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1119 |
* @param bottom The bottm edge of the rectangle |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1120 |
* @see DrawDirtyBlocks |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1121 |
* |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1122 |
* @todo The name of the function should be called like @c AddDirtyBlock as |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1123 |
* it neither set a dirty rect nor add several dirty rects although |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1124 |
* the function name is in plural. (Progman) |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1125 |
*/ |
0 | 1126 |
void SetDirtyBlocks(int left, int top, int right, int bottom) |
1127 |
{ |
|
1128 |
byte *b; |
|
2010 | 1129 |
int width; |
1130 |
int height; |
|
0 | 1131 |
|
1132 |
if (left < 0) left = 0; |
|
1133 |
if (top < 0) top = 0; |
|
1134 |
if (right > _screen.width) right = _screen.width; |
|
1135 |
if (bottom > _screen.height) bottom = _screen.height; |
|
1136 |
||
2010 | 1137 |
if (left >= right || top >= bottom) return; |
0 | 1138 |
|
2010 | 1139 |
if (left < _invalid_rect.left ) _invalid_rect.left = left; |
1140 |
if (top < _invalid_rect.top ) _invalid_rect.top = top; |
|
1141 |
if (right > _invalid_rect.right ) _invalid_rect.right = right; |
|
1142 |
if (bottom > _invalid_rect.bottom) _invalid_rect.bottom = bottom; |
|
0 | 1143 |
|
1144 |
left >>= 6; |
|
2010 | 1145 |
top >>= 3; |
0 | 1146 |
|
1147 |
b = _dirty_blocks + top * DIRTY_BYTES_PER_LINE + left; |
|
1148 |
||
2010 | 1149 |
width = ((right - 1) >> 6) - left + 1; |
1150 |
height = ((bottom - 1) >> 3) - top + 1; |
|
0 | 1151 |
|
1152 |
assert(width > 0 && height > 0); |
|
1153 |
||
1154 |
do { |
|
2010 | 1155 |
int i = width; |
1156 |
||
0 | 1157 |
do b[--i] = 0xFF; while (i); |
1158 |
||
1159 |
b += DIRTY_BYTES_PER_LINE; |
|
2010 | 1160 |
} while (--height != 0); |
0 | 1161 |
} |
1162 |
||
8041
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1163 |
/*! |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1164 |
* This function mark the whole screen as dirty. This results in repainting |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1165 |
* the whole screen. Use this with care as this function will break the |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1166 |
* idea about marking only parts of the screen as 'dirty'. |
63e760418a15
(svn r11065) -Documentation [FS#1186]: of the dirty marking/repainting subsystem. Patch by Progman.
rubidium
parents:
7950
diff
changeset
|
1167 |
*/ |
6573 | 1168 |
void MarkWholeScreenDirty() |
0 | 1169 |
{ |
1170 |
SetDirtyBlocks(0, 0, _screen.width, _screen.height); |
|
1171 |
} |
|
1172 |
||
4958 | 1173 |
/** Set up a clipping area for only drawing into a certain area. To do this, |
1174 |
* Fill a DrawPixelInfo object with the supplied relative rectangle, backup |
|
1175 |
* the original (calling) _cur_dpi and assign the just returned DrawPixelInfo |
|
1176 |
* _cur_dpi. When you are done, give restore _cur_dpi's original value |
|
1177 |
* @param *n the DrawPixelInfo that will be the clipping rectangle box allowed |
|
1178 |
* for drawing |
|
1179 |
* @param left,top,width,height the relative coordinates of the clipping |
|
1180 |
* rectangle relative to the current _cur_dpi. This will most likely be the |
|
1181 |
* offset from the calling window coordinates |
|
1182 |
* @return return false if the requested rectangle is not possible with the |
|
1183 |
* current dpi pointer. Only continue of the return value is true, or you'll |
|
1184 |
* get some nasty results */ |
|
4429
1bb01569940c
(svn r6184) Remove the unused (because it was NULL in all callers) second parameter of FillDrawPixelInfo() and simplify some expressions
tron
parents:
4428
diff
changeset
|
1185 |
bool FillDrawPixelInfo(DrawPixelInfo *n, int left, int top, int width, int height) |
0 | 1186 |
{ |
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
1187 |
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); |
4429
1bb01569940c
(svn r6184) Remove the unused (because it was NULL in all callers) second parameter of FillDrawPixelInfo() and simplify some expressions
tron
parents:
4428
diff
changeset
|
1188 |
const DrawPixelInfo *o = _cur_dpi; |
0 | 1189 |
|
7120
e31767effc16
(svn r9844) -Codechange: replace zoomlevel with an enum
truelight
parents:
7111
diff
changeset
|
1190 |
n->zoom = ZOOM_LVL_NORMAL; |
0 | 1191 |
|
1192 |
assert(width > 0); |
|
1193 |
assert(height > 0); |
|
1194 |
||
1195 |
if ((left -= o->left) < 0) { |
|
2010 | 1196 |
width += left; |
4525
fa3aabcd12bc
(svn r6351) -Fix: Due to some off-by-one errors the width or height of a clipping rectangle could become 0, which isn't sensible. This should fix a very rare and hard to trigger assertion in GfxFillRect()
tron
parents:
4522
diff
changeset
|
1197 |
if (width <= 0) return false; |
0 | 1198 |
n->left = -left; |
1199 |
left = 0; |
|
4429
1bb01569940c
(svn r6184) Remove the unused (because it was NULL in all callers) second parameter of FillDrawPixelInfo() and simplify some expressions
tron
parents:
4428
diff
changeset
|
1200 |
} else { |
1bb01569940c
(svn r6184) Remove the unused (because it was NULL in all callers) second parameter of FillDrawPixelInfo() and simplify some expressions
tron
parents:
4428
diff
changeset
|
1201 |
n->left = 0; |
0 | 1202 |
} |
1203 |
||
4429
1bb01569940c
(svn r6184) Remove the unused (because it was NULL in all callers) second parameter of FillDrawPixelInfo() and simplify some expressions
tron
parents:
4428
diff
changeset
|
1204 |
if (width > o->width - left) { |
1bb01569940c
(svn r6184) Remove the unused (because it was NULL in all callers) second parameter of FillDrawPixelInfo() and simplify some expressions
tron
parents:
4428
diff
changeset
|
1205 |
width = o->width - left; |
4525
fa3aabcd12bc
(svn r6351) -Fix: Due to some off-by-one errors the width or height of a clipping rectangle could become 0, which isn't sensible. This should fix a very rare and hard to trigger assertion in GfxFillRect()
tron
parents:
4522
diff
changeset
|
1206 |
if (width <= 0) return false; |
0 | 1207 |
} |
1208 |
n->width = width; |
|
1209 |
||
1210 |
if ((top -= o->top) < 0) { |
|
2010 | 1211 |
height += top; |
4525
fa3aabcd12bc
(svn r6351) -Fix: Due to some off-by-one errors the width or height of a clipping rectangle could become 0, which isn't sensible. This should fix a very rare and hard to trigger assertion in GfxFillRect()
tron
parents:
4522
diff
changeset
|
1212 |
if (height <= 0) return false; |
0 | 1213 |
n->top = -top; |
1214 |
top = 0; |
|
4429
1bb01569940c
(svn r6184) Remove the unused (because it was NULL in all callers) second parameter of FillDrawPixelInfo() and simplify some expressions
tron
parents:
4428
diff
changeset
|
1215 |
} else { |
1bb01569940c
(svn r6184) Remove the unused (because it was NULL in all callers) second parameter of FillDrawPixelInfo() and simplify some expressions
tron
parents:
4428
diff
changeset
|
1216 |
n->top = 0; |
0 | 1217 |
} |
1218 |
||
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7385
diff
changeset
|
1219 |
n->dst_ptr = blitter->MoveTo(o->dst_ptr, left, top); |
7374
54c06f06ecc8
(svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents:
7348
diff
changeset
|
1220 |
n->pitch = o->pitch; |
0 | 1221 |
|
4429
1bb01569940c
(svn r6184) Remove the unused (because it was NULL in all callers) second parameter of FillDrawPixelInfo() and simplify some expressions
tron
parents:
4428
diff
changeset
|
1222 |
if (height > o->height - top) { |
1bb01569940c
(svn r6184) Remove the unused (because it was NULL in all callers) second parameter of FillDrawPixelInfo() and simplify some expressions
tron
parents:
4428
diff
changeset
|
1223 |
height = o->height - top; |
4525
fa3aabcd12bc
(svn r6351) -Fix: Due to some off-by-one errors the width or height of a clipping rectangle could become 0, which isn't sensible. This should fix a very rare and hard to trigger assertion in GfxFillRect()
tron
parents:
4522
diff
changeset
|
1224 |
if (height <= 0) return false; |
0 | 1225 |
} |
1226 |
n->height = height; |
|
1227 |
||
1228 |
return true; |
|
1229 |
} |
|
1230 |
||
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5887
diff
changeset
|
1231 |
static void SetCursorSprite(SpriteID cursor, SpriteID pal) |
0 | 1232 |
{ |
1233 |
CursorVars *cv = &_cursor; |
|
1348 | 1234 |
const Sprite *p; |
0 | 1235 |
|
2010 | 1236 |
if (cv->sprite == cursor) return; |
0 | 1237 |
|
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5887
diff
changeset
|
1238 |
p = GetSprite(GB(cursor, 0, SPRITE_WIDTH)); |
0 | 1239 |
cv->sprite = cursor; |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5887
diff
changeset
|
1240 |
cv->pal = pal; |
1348 | 1241 |
cv->size.y = p->height; |
1351
3e7aa0d35f8f
(svn r1855) Handle endianness of sprite headers when loading a sprite, not everytime when accessing it
tron
parents:
1350
diff
changeset
|
1242 |
cv->size.x = p->width; |
3e7aa0d35f8f
(svn r1855) Handle endianness of sprite headers when loading a sprite, not everytime when accessing it
tron
parents:
1350
diff
changeset
|
1243 |
cv->offs.x = p->x_offs; |
3e7aa0d35f8f
(svn r1855) Handle endianness of sprite headers when loading a sprite, not everytime when accessing it
tron
parents:
1350
diff
changeset
|
1244 |
cv->offs.y = p->y_offs; |
0 | 1245 |
|
1246 |
cv->dirty = true; |
|
1247 |
} |
|
1248 |
||
6573 | 1249 |
static void SwitchAnimatedCursor() |
0 | 1250 |
{ |
6464
1c3515433409
(svn r8880) -Codechange: make anim cursors an array of structs.
rubidium
parents:
5919
diff
changeset
|
1251 |
const AnimCursor *cur = _cursor.animate_cur; |
0 | 1252 |
|
6464
1c3515433409
(svn r8880) -Codechange: make anim cursors an array of structs.
rubidium
parents:
5919
diff
changeset
|
1253 |
if (cur == NULL || cur->sprite == AnimCursor::LAST) cur = _cursor.animate_list; |
1914
5ede46fd496f
(svn r2420) - Codechange: magic number elminitation of cursorsprites.
Darkvater
parents:
1891
diff
changeset
|
1254 |
|
6464
1c3515433409
(svn r8880) -Codechange: make anim cursors an array of structs.
rubidium
parents:
5919
diff
changeset
|
1255 |
SetCursorSprite(cur->sprite, _cursor.pal); |
0 | 1256 |
|
6464
1c3515433409
(svn r8880) -Codechange: make anim cursors an array of structs.
rubidium
parents:
5919
diff
changeset
|
1257 |
_cursor.animate_timeout = cur->display_time; |
1c3515433409
(svn r8880) -Codechange: make anim cursors an array of structs.
rubidium
parents:
5919
diff
changeset
|
1258 |
_cursor.animate_cur = cur + 1; |
0 | 1259 |
} |
1260 |
||
6573 | 1261 |
void CursorTick() |
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1056
diff
changeset
|
1262 |
{ |
2010 | 1263 |
if (_cursor.animate_timeout != 0 && --_cursor.animate_timeout == 0) |
0 | 1264 |
SwitchAnimatedCursor(); |
1265 |
} |
|
1266 |
||
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5887
diff
changeset
|
1267 |
void SetMouseCursor(SpriteID sprite, SpriteID pal) |
0 | 1268 |
{ |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
1269 |
/* Turn off animation */ |
0 | 1270 |
_cursor.animate_timeout = 0; |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6464
diff
changeset
|
1271 |
/* Set cursor */ |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5887
diff
changeset
|
1272 |
SetCursorSprite(sprite, pal); |
0 | 1273 |
} |
1274 |
||
6464
1c3515433409
(svn r8880) -Codechange: make anim cursors an array of structs.
rubidium
parents:
5919
diff
changeset
|
1275 |
void SetAnimatedMouseCursor(const AnimCursor *table) |
0 | 1276 |
{ |
1277 |
_cursor.animate_list = table; |
|
1278 |
_cursor.animate_cur = NULL; |
|
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5887
diff
changeset
|
1279 |
_cursor.pal = PAL_NONE; |
0 | 1280 |
SwitchAnimatedCursor(); |
1281 |
} |
|
1282 |
||
7856
121ae75a45a0
(svn r10723) -Codechange: dynamically sized (width) main toolbars and status bar for when the window becomes less than 640 pixels in width.
rubidium
parents:
7666
diff
changeset
|
1283 |
bool ChangeResInGame(int width, int height) |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
126
diff
changeset
|
1284 |
{ |
7858
eece91cb3472
(svn r10725) -Codechange: move some window related code out of gfx.cpp to windows.cpp
rubidium
parents:
7857
diff
changeset
|
1285 |
return (_screen.width == width && _screen.height == height) || _video_driver->ChangeResolution(width, height); |
0 | 1286 |
} |
298
b3e83b94be19
(svn r304) -Fix: [967096] fullscreen. New button 'Fullscreen' in 'Game Options' menu which lets you set fullscreen ingame.
darkvater
parents:
193
diff
changeset
|
1287 |
|
8667
c916a5375166
(svn r11734) -Change: Allow ToggleFullScreen to return the result of the operation' attempt. Previously, only visual clues were available.
belugas
parents:
8627
diff
changeset
|
1288 |
bool ToggleFullScreen(bool fs) |
5217
21c23507c002
(svn r7332) -Fix: segmentation fault, discovered by ln-, in the SDL video driver when one goes to fullscreen and there are no suitable resolutions.
rubidium
parents:
5156
diff
changeset
|
1289 |
{ |
8667
c916a5375166
(svn r11734) -Change: Allow ToggleFullScreen to return the result of the operation' attempt. Previously, only visual clues were available.
belugas
parents:
8627
diff
changeset
|
1290 |
bool result = _video_driver->ToggleFullscreen(fs); |
5217
21c23507c002
(svn r7332) -Fix: segmentation fault, discovered by ln-, in the SDL video driver when one goes to fullscreen and there are no suitable resolutions.
rubidium
parents:
5156
diff
changeset
|
1291 |
if (_fullscreen != fs && _num_resolutions == 0) { |
5568
75f13d7bfaed
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5217
diff
changeset
|
1292 |
DEBUG(driver, 0, "Could not find a suitable fullscreen resolution"); |
5217
21c23507c002
(svn r7332) -Fix: segmentation fault, discovered by ln-, in the SDL video driver when one goes to fullscreen and there are no suitable resolutions.
rubidium
parents:
5156
diff
changeset
|
1293 |
} |
8667
c916a5375166
(svn r11734) -Change: Allow ToggleFullScreen to return the result of the operation' attempt. Previously, only visual clues were available.
belugas
parents:
8627
diff
changeset
|
1294 |
return result; |
5217
21c23507c002
(svn r7332) -Fix: segmentation fault, discovered by ln-, in the SDL video driver when one goes to fullscreen and there are no suitable resolutions.
rubidium
parents:
5156
diff
changeset
|
1295 |
} |
1829
0b6de3b4458a
(svn r2334) - Fix (regression): moved togglefullscreen into the video-driver, now windows works, dedicated works and sdl works. Also reverted the change to the makefile.
Darkvater
parents:
1806
diff
changeset
|
1296 |
|
1806
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1390
diff
changeset
|
1297 |
static int CDECL compare_res(const void *pa, const void *pb) |
298
b3e83b94be19
(svn r304) -Fix: [967096] fullscreen. New button 'Fullscreen' in 'Game Options' menu which lets you set fullscreen ingame.
darkvater
parents:
193
diff
changeset
|
1298 |
{ |
1806
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1390
diff
changeset
|
1299 |
int x = ((const uint16*)pa)[0] - ((const uint16*)pb)[0]; |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1390
diff
changeset
|
1300 |
if (x != 0) return x; |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1390
diff
changeset
|
1301 |
return ((const uint16*)pa)[1] - ((const uint16*)pb)[1]; |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1390
diff
changeset
|
1302 |
} |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1390
diff
changeset
|
1303 |
|
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1390
diff
changeset
|
1304 |
void SortResolutions(int count) |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1390
diff
changeset
|
1305 |
{ |
75dc9c737892
(svn r2310) - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid. Big thanks to DaleStan for track down the crashing bug.
Darkvater
parents:
1390
diff
changeset
|
1306 |
qsort(_resolutions, count, sizeof(_resolutions[0]), compare_res); |
298
b3e83b94be19
(svn r304) -Fix: [967096] fullscreen. New button 'Fullscreen' in 'Game Options' menu which lets you set fullscreen ingame.
darkvater
parents:
193
diff
changeset
|
1307 |
} |