ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.169 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.246 by root, Wed May 24 22:48:19 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6# do things only needed for single-binary version (par)
7BEGIN {
8 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10
11 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1";
16 }
17 }
18
19 # TODO: pango-rc file, anybody?
20
21 unshift @INC, $ENV{PAR_TEMP};
22 }
23}
24
25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache;
28
6use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
7use Event; 31use Event;
8 32
9use Crossfire; 33use Crossfire;
10use Crossfire::Protocol; 34use Crossfire::Protocol;
11 35
13 37
14use CFClient; 38use CFClient;
15use CFClient::UI; 39use CFClient::UI;
16use CFClient::MapWidget; 40use CFClient::MapWidget;
17 41
42$Event::DIED = sub {
43 # TODO: display dialog box or so
44 CFClient::error $_[1];
45};
46
47#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
48
18our $VERSION = '0.1'; 49our $VERSION = '0.1';
19 50
20my $MAX_FPS = 60; 51my $MAX_FPS = 60;
21my $MIN_FPS = 5; # unused as of yet 52my $MIN_FPS = 5; # unused as of yet
22 53
30our $NOW; 61our $NOW;
31 62
32our $CFG; 63our $CFG;
33our $CONN; 64our $CONN;
34our $FAST; # fast, low-quality mode, possibly useful for software-rendering 65our $FAST; # fast, low-quality mode, possibly useful for software-rendering
66
67our $WANT_REFRESH;
68our $CAN_REFRESH;
35 69
36our @SDL_MODES; 70our @SDL_MODES;
37our $WIDTH; 71our $WIDTH;
38our $HEIGHT; 72our $HEIGHT;
39our $FULLSCREEN; 73our $FULLSCREEN;
41 75
42our $FONT_PROP; 76our $FONT_PROP;
43our $FONT_FIXED; 77our $FONT_FIXED;
44 78
45our $MAP; 79our $MAP;
80our $MAPMAP;
46our $MAPWIDGET; 81our $MAPWIDGET;
47our $BUTTONBAR; 82our $BUTTONBAR;
48our $LOGVIEW; 83our $LOGVIEW;
49our $CONSOLE; 84our $CONSOLE;
50our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON;
87our $QUIT_DIALOG;
51 88
89our $FLOORBOX;
52our $GAUGES; 90our $GAUGES;
53our $STATWIDS; 91our $STATWIDS;
54 92
55our $SDL_ACTIVE; 93our $SDL_ACTIVE;
56our %SDL_CB; 94our %SDL_CB;
58our $SDL_MIXER; 96our $SDL_MIXER;
59our @SOUNDS; # event => file mapping 97our @SOUNDS; # event => file mapping
60our %AUDIO_CHUNKS; # audio files 98our %AUDIO_CHUNKS; # audio files
61 99
62our $ALT_ENTER_MESSAGE; 100our $ALT_ENTER_MESSAGE;
63our $STATUS_LINE; 101our $STATUSBOX;
64our $DEBUG_STATUS; 102our $DEBUG_STATUS;
65 103
104our $INVWIN;
105our $INV;
106our $INVR;
107our $INVR_LBL;
108our $OPENCONT;
109
66sub status { 110sub status {
67 $STATUS_LINE->set_text ($_[0]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
68 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
69} 112}
70 113
71sub debug { 114sub debug {
72 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
73 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 116 my ($w, $h) = $DEBUG_STATUS->size_request;
117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
74} 118}
75 119
76sub start_game { 120sub start_game {
77 status "logging in..."; 121 status "logging in...";
78 122
79 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 123 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
80 124
81 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 125 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
82
83 $MAP = new CFClient::Map $mapsize, $mapsize; 126 $MAP = new CFClient::Map $mapsize, $mapsize;
84 127
85 my ($host, $port) = split /:/, $CFG->{host}; 128 my ($host, $port) = split /:/, $CFG->{host};
86 129
87 $CONN = new conn 130 $CONN = eval {
131 new conn
88 host => $host, 132 host => $host,
89 port => $port || 13327, 133 port => $port || 13327,
90 user => $CFG->{user}, 134 user => $CFG->{user},
91 pass => $CFG->{password}, 135 pass => $CFG->{password},
92 mapw => $mapsize, 136 mapw => $mapsize,
93 maph => $mapsize, 137 maph => $mapsize,
138 ;
94 ; 139 };
95 140
96 status "login successful"; 141 if ($CONN) {
97
98 CFClient::lowdelay fileno $CONN->{fh}; 142 CFClient::lowdelay fileno $CONN->{fh};
143
144 $LOGIN_BUTTON->set_text ("Logout");
145 status "login successful";
146
147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
150 } else {
151 status "unable to connect";
152 stop_game();
153 }
99} 154}
100 155
101sub stop_game { 156sub stop_game {
157 return unless $CONN;
158
159 status "connection closed";
160 $LOGIN_BUTTON->set_text ("Login");
161 $CONN->destroy;
162 $CONN = 0; # false, does not autovivify
163
164 $BUTTONBAR->{children}[1]->emit ("activate")
165 unless $BUTTONBAR->{children}[1]->{state};
166
167 undef $MAPCACHE;
102 undef $CONN; 168 undef $MAP;
103} 169}
104 170
105sub client_setup { 171sub client_setup {
106 my $dialog = new CFClient::UI::FancyFrame 172 my $dialog = new CFClient::UI::FancyFrame
107 title => "Client Setup", 173 title => "Client Setup",
109 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 175 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
110 176
111 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 177 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
112 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
113 179
114 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 180 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
115 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 181 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
116 182
117 $mode_slider->connect (changed => sub { 183 $mode_slider->connect (changed => sub {
118 my ($self, $value) = @_; 184 my ($self, $value) = @_;
119 185
144 } 210 }
145 ); 211 );
146 212
147 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
148 $table->add (1, $row++, new CFClient::UI::Slider 214 $table->add (1, $row++, new CFClient::UI::Slider
149 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
150 tooltip => "Enlarge or shrink the displayed map", 216 tooltip => "Enlarge or shrink the displayed map",
151 connect_changed => sub { 217 connect_changed => sub {
152 my ($self, $value) = @_; 218 my ($self, $value) = @_;
153 $CFG->{map_scale} = 0.05 * int $value / 0.05; 219 $CFG->{map_scale} = 2 ** $value;
154 } 220 }
155 ); 221 );
156 222
157 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
158 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
164 } 230 }
165 ); 231 );
166 232
167 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
168 $table->add (1, $row++, new CFClient::UI::Slider 234 $table->add (1, $row++, new CFClient::UI::Slider
169 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], 235 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
170 tooltip => "The higher the intensity, the lighter the Fog-of-War color", 236 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
171 connect_changed => sub { 237 connect_changed => sub {
172 my ($self, $value) = @_; 238 my ($self, $value) = @_;
173 $CFG->{fow_intensity} = $value; 239 $CFG->{fow_intensity} = $value;
174 } 240 }
185 } 251 }
186 ); 252 );
187 253
188 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
189 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
190 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
191 tooltip => "The font size used by most GUI elements", 257 tooltip => "The font size used by most GUI elements",
192 connect_changed => sub { 258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
193 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
194# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
195 }
196 ); 259 );
197 260
198 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
199 $table->add (1, $row++, new CFClient::UI::Slider 262 $table->add (1, $row++, new CFClient::UI::Slider
200 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 263 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
201 tooltip => "The font size used by the server log window only", 264 tooltip => "The font size used by the server log window only",
202 connect_changed => sub { 265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
203 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
204 }
205 ); 266 );
206 267
207 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
208 269
209 $table->add (1, $row++, new CFClient::UI::Slider 270 $table->add (1, $row++, new CFClient::UI::Slider
210 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
211 tooltip => "The font size used by the statistics window only", 272 tooltip => "The font size used by the statistics window only",
212 connect_changed => sub { 273 connect_changed => sub {
213 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 274 $CFG->{stat_fontsize} = $_[1];
214 &set_stats_window_fontsize; 275 &set_stats_window_fontsize;
276 }
277 );
278
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
283 connect_changed => sub {
284 $CFG->{gauge_fontsize} = $_[1];
285 &set_gauge_window_fontsize;
215 } 286 }
216 ); 287 );
217 288
218 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
219 $table->add (1, $row++, new CFClient::UI::Slider 290 $table->add (1, $row++, new CFClient::UI::Slider
220 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 291 range => [$CFG->{gauge_size}, 0.2, 0.8],
221 tooltip => "Adjust the size of the stats gauges at the bottom right", 292 tooltip => "Adjust the size of the stats gauges at the bottom right",
222 connect_changed => sub { 293 connect_changed => sub {
223 $CFG->{gauge_size} = $_[1]; 294 $CFG->{gauge_size} = $_[1];
224 my $h = int $HEIGHT * $CFG->{gauge_size}; 295 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
225 $GAUGES->{win}->set_size ($WIDTH, $h);
226 $GAUGES->{win}->move (0, $HEIGHT - $h);
227 }
228 );
229
230 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
231 $table->add (1, $row++, new CFClient::UI::Slider
232 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
233 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
234 connect_changed => sub {
235 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
236 &set_gauge_window_fontsize;
237 } 296 }
238 ); 297 );
239 298
240 $table->add (1, $row++, new CFClient::UI::Button 299 $table->add (1, $row++, new CFClient::UI::Button
241 expand => 1, align => 0, text => "Apply", 300 expand => 1, align => 0, text => "Apply",
266 connect_changed => sub { 325 connect_changed => sub {
267 $CFG->{bgm_enable} = $_[1]; 326 $CFG->{bgm_enable} = $_[1];
268 } 327 }
269 ); 328 );
270 $hbox->add (new CFClient::UI::Slider 329 $hbox->add (new CFClient::UI::Slider
271 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], 330 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
272 tooltip => "The volume of the background music", 331 tooltip => "The volume of the background music",
273 connect_changed => sub { 332 connect_changed => sub {
274 $CFG->{bgm_volume} = $_[1]; 333 $CFG->{bgm_volume} = $_[1];
275 CFClient::MixMusic::volume $_[1] * 128; 334 CFClient::MixMusic::volume $_[1] * 128;
276 } 335 }
283 audio_shutdown (); 342 audio_shutdown ();
284 audio_init (); 343 audio_init ();
285 } 344 }
286 ); 345 );
287 346
347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
349 text => $CFG->{say_command},
350 tooltip => "This is the command that will be used if you write a line in the message window entry. "
351 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
352 ."But you could also set it to 'tell <playername>' to only chat with that user.",
353 connect_changed => sub {
354 my ($self, $value) = @_;
355 $CFG->{say_command} = $value;
356 }
357 );
358
288 $dialog 359 $dialog
289} 360}
290 361
291sub set_stats_window_fontsize { 362sub set_stats_window_fontsize {
292 for (values %{$STATWIDS}) { 363 for (values %{$STATWIDS}) {
302# local $GAUGES->{win}{parent};#d# 373# local $GAUGES->{win}{parent};#d#
303# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 374# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
304} 375}
305 376
306sub make_gauge_window { 377sub make_gauge_window {
307 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 378 my $gh = int $HEIGHT * $CFG->{gauge_size};
308# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
309 379
310 my $win = new CFClient::UI::Frame ( 380 my $win = new CFClient::UI::Frame (
311 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 381 req_y => -1,
382 user_w => $WIDTH,
383 user_h => $gh,
312 ); 384 );
385
313 $win->add (my $vb = new CFClient::UI::VBox); 386 $win->add (my $hbox = new CFClient::UI::HBox
314 387 children => [
315 $vb->add (my $hbg = new CFClient::UI::HBox expand => 1); 388 (new CFClient::UI::HBox expand => 1),
389 (new CFClient::UI::VBox children => [
390 (new CFClient::UI::Empty expand => 1),
391 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
392 ]),
393 (my $vbox = new CFClient::UI::VBox),
394 ],
395 );
316 396
397 $vbox->add (new CFClient::UI::HBox
398 expand => 1,
399 children => [
317 $hbg->add (new CFClient::UI::Empty expand => 1); 400 (new CFClient::UI::Empty expand => 1),
318 $hbg->add (my $hb = new CFClient::UI::HBox); 401 (my $hb = new CFClient::UI::HBox),
402 ],
403 );
404
319 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points"); 405 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
406 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
320 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints"); 407 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
408 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
321 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace"); 409 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
410 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
322 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food"); 411 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
412 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
323 413
324 $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0"); 414 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
415 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
325 $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:"); 416 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
417 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
326 418
327 $GAUGES = { 419 $GAUGES = {
328 exp => $exp, win => $win, range => $rng, 420 exp => $exp, win => $win, range => $rng,
329 food => $fg, mana => $mg, hp => $hg, grace => $gg 421 food => $fg, mana => $mg, hp => $hg, grace => $gg
330 }; 422 };
333 425
334 $win 426 $win
335} 427}
336 428
337sub make_stats_window { 429sub make_stats_window {
338 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats"); 430 my $tgw = new CFClient::UI::FancyFrame title => "Stats";
339 431
340 $tgw->add (my $vb = new CFClient::UI::VBox); 432 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
341 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 433 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
434 can_hover => 1, can_events => 1,
435 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
342 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 436 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
437 can_hover => 1, can_events => 1,
438 tooltip => "The map you are currently on (if supported by the server).");
343 439
344 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 440 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
345
346 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 441 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
347 442
348 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 443 my $color2 = [1, 1, 0];
349 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
350 $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
351 $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
352 $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
353 $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
354 $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
355 444
356 $tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Str"); 445 for (
357 $tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dex"); 446 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
358 $tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Con"); 447 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],
359 $tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Int"); 448 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],
360 $tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wis"); 449 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],
361 $tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Pow"); 450 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
362 $tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Cha"); 451 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],
452 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
363 453
364 $tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120"); 454 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
365 $tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120"); 455 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
366 $tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120"); 456 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
367 $tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120"); 457 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."],
368 $tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54"); 458 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
369 $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9"); 459 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
460 ) {
461 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
370 462
371 $tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc"); 463 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
372 $tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac"); 464 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
373 $tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam"); 465 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
374 $tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm"); 466 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
375 $tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp"); 467 }
376 $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
377 468
378 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 469 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
379 470
380 my $row = 0; 471 my $row = 0;
381 my $col = 0; 472 my $col = 0;
382 473
383 my %resist_names = ( 474 my %resist_names = (
384 slow => "Slow", 475 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
385 holyw => "Holy Word", 476 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
386 conf => "Confusion", 477 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",
387 fire => "Fire", 478 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
388 depl => "Depletion", 479 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",
389 magic => "Magic", 480 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",
390 drain => "Draining", 481 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
391 acid => "Acid", 482 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
392 pois => "Poison", 483 pois => "<b>Poison</b> (resistance to getting poisoned)",
393 para => "Paralysation", 484 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
394 deat => "Death", 485 deat => "<b>Death</b> (resistance against death spells)",
395 phys => "Physical", 486 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
396 blind => "Blind", 487 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
397 fear => "Fear", 488 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
398 tund => "Turn undead", 489 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
399 elec => "Electricity", 490 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
400 cold => "Cold", 491 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
401 ghit => "Ghost hit", 492 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
402 ); 493 );
403 for (qw/slow holyw conf fire depl magic 494 for (qw/slow holyw conf fire depl magic
404 drain acid pois para deat phys 495 drain acid pois para deat phys
405 blind fear tund elec cold ghit/) 496 blind fear tund elec cold ghit/)
406 { 497 {
407 $tbl2->add ($col, $row, 498 $tbl2->add ($col, $row,
408 $STATWIDS->{"res_$_"} = 499 $STATWIDS->{"res_$_"} =
409 new CFClient::UI::Label 500 new CFClient::UI::Label
501 font => $FONT_FIXED,
410 template => "-100%", 502 template => "-100%",
411 align => +1, 503 align => +1,
412 valign => 0, 504 valign => 0,
505 can_events => 1,
506 can_hover => 1,
413 tooltip => $resist_names{$_} 507 tooltip => $resist_names{$_},
414 ); 508 );
415 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 509 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
510 font => $FONT_FIXED,
416 can_hover => 1, 511 can_hover => 1,
417 can_events => 1, 512 can_events => 1,
418 image => "ui/resist/resist_$_.png", 513 image => "ui/resist/resist_$_.png",
419 tooltip => $resist_names{$_} 514 tooltip => $resist_names{$_},
420 ); 515 );
421 516
422 $row++; 517 $row++;
423 if ($row % 6 == 0) { 518 if ($row % 6 == 0) {
424 $col += 2; 519 $col += 2;
503 598
504} 599}
505 600
506sub metaserver_dialog { 601sub metaserver_dialog {
507 my $dialog = new CFClient::UI::FancyFrame 602 my $dialog = new CFClient::UI::FancyFrame
508 title => "Metaserver", 603 title => "Server List",
509 child => (my $vbox = new CFClient::UI::VBox); 604 child => (my $vbox = new CFClient::UI::VBox);
510 605
511 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 606 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
512 607
513 $dialog 608 $dialog
514} 609}
610
611my $METASERVER_ATIME;
515 612
516sub update_metaserver { 613sub update_metaserver {
517 my ($HOST) = @_; 614 my ($HOST) = @_;
518 615
519 status "fetching metaserver list..."; 616 return if $METASERVER_ATIME > time;
617 $METASERVER_ATIME = time + 60;
618
619 my $table = $METASERVER->{table};
620 $table->clear;
621 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
520 622
521 my $buf; 623 my $buf;
522 624
523 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 625 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
626
627 unless ($fh) {
628 $label->set_text ("unable to contact metaserver: $!");
629 return;
630 }
524 631
525 Event->io (fd => $fh, poll => 'r', cb => sub { 632 Event->io (fd => $fh, poll => 'r', cb => sub {
526 my $res = sysread $fh, $buf, 8192, length $buf; 633 my $res = sysread $fh, $buf, 8192, length $buf;
527 634
528 if (!defined $res) { 635 if (!defined $res) {
529 $_[0]->w->cancel; 636 $_[0]->w->cancel;
530 status "metaserver: $!"; 637 $label->set_text ("error while retrieving server list: $!");
531 } elsif ($res == 0) { 638 } elsif ($res == 0) {
532 $_[0]->w->cancel; 639 $_[0]->w->cancel;
533 status "server list retrieved"; 640 status "server list retrieved";
534 641
535 my $table = $METASERVER->{table}; 642 utf8::decode $buf if utf8::valid $buf;
536 643
537 $table->clear; 644 $table->clear;
538 645
539 my @col = qw(Use #Users Host Uptime Version Description); 646 my @col = qw(Use #Users Host Uptime Version Description);
540 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 647 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
564 $m = [$users, $host, $uptime, $version, $desc]; 671 $m = [$users, $host, $uptime, $version, $desc];
565 672
566 $y++; 673 $y++;
567 674
568 $table->add (0, $y, new CFClient::UI::VBox children => [ 675 $table->add (0, $y, new CFClient::UI::VBox children => [
569 (new CFClient::UI::Button text => " ", connect_activate => sub { 676 (new CFClient::UI::Button text => "Use", connect_activate => sub {
570 $HOST->set_text ($CFG->{host} = $host); 677 $HOST->set_text ($CFG->{host} = $host);
571 }), 678 }),
572 (new CFClient::UI::Empty expand => 1), 679 (new CFClient::UI::Empty expand => 1),
573 ]); 680 ]);
574 681
575 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 682 $table->add ($_ + 1, $y, new CFClient::UI::Label
683 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
576 for 0 .. $#$m; 684 for 0 .. $#$m;
577 } 685 }
578 } 686 }
579 }); 687 });
580} 688}
603 711
604 $METASERVER = metaserver_dialog; 712 $METASERVER = metaserver_dialog;
605 713
606 $vbox->add (new CFClient::UI::Flopper 714 $vbox->add (new CFClient::UI::Flopper
607 expand => 1, 715 expand => 1,
608 text => "Metaserver", 716 text => "Server List",
609 other => $METASERVER, 717 other => $METASERVER,
610 tooltip => "Show a list of avaible crossfire servers", 718 tooltip => "Show a list of available crossfire servers",
611 connect_open => sub { 719 connect_open => sub {
612 update_metaserver $HOST; 720 update_metaserver $HOST;
613 } 721 }
614 ); 722 );
615 } 723 }
633 my ($self, $value) = @_; 741 my ($self, $value) = @_;
634 $CFG->{password} = $value; 742 $CFG->{password} = $value;
635 } 743 }
636 ); 744 );
637 745
638 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
639 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
640 text => $CFG->{say_command},
641 tooltip => "This is the command that will be used if you write a line in the message window entry. "
642 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
643 ."But you could also set it to 'tell <playername>' to only chat with that user.",
644 connect_changed => sub {
645 my ($self, $value) = @_;
646 $CFG->{say_command} = $value;
647 }
648 );
649
650 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 746 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
651 $table->add (1, 7, new CFClient::UI::Slider 747 $table->add (1, 7, new CFClient::UI::Slider
652 req_w => 100, 748 req_w => 100,
653 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 749 range => [$CFG->{mapsize}, 10, 100, 0, 1],
654 tooltip => "This is the size of the portion of the map update the server sends you. " 750 tooltip => "This is the size of the portion of the map update the server sends you. "
655 ."If you set this to a high value you will be able to see further for example.", 751 . "If you set this to a high value you will be able to see further for example.",
656 connect_changed => sub { 752 connect_changed => sub {
657 my ($self, $value) = @_; 753 my ($self, $value) = @_;
658 754
659 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 755 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
660 }, 756 },
661 ); 757 );
662 758
663 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 759 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
664 start_game; 760 $table->add (1, 8, new CFClient::UI::Entry
761 text => $CFG->{output_count},
762 tooltip => "Should be set to 1 unless you know what you are doing",
763 connect_changed => sub { $CFG->{output_count} = $_[1] },
665 }); 764 );
765
766 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
767 $table->add (1, 9, new CFClient::UI::Entry
768 text => $CFG->{output_sync},
769 tooltip => "Should be set to 1 unless you know what you are doing",
770 connect_changed => sub { $CFG->{output_sync} = $_[1] },
771 );
772
773 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
774 expand => 1,
775 align => 0,
776 text => "Login",
777 connect_activate => sub {
778 $CONN ? stop_game
779 : start_game;
780 },
781 );
666 782
667 $dialog 783 $dialog
668} 784}
669 785
670sub message_window { 786sub message_window {
671 my $window = new CFClient::UI::FancyFrame 787 my $window = new CFClient::UI::FancyFrame
672 title => "Messages", 788 title => "Messages",
673 border_bg => [1, 1, 1, 0.5], 789 border_bg => [1, 1, 1, 1],
674 bg => [0.3, 0.3, 0.3, 0.8], 790 bg => [0, 0, 0, 0.75],
675 user_w => int $::WIDTH / 3, 791 user_w => int $::WIDTH / 3,
676 user_h => int $::HEIGHT / 5, 792 user_h => int $::HEIGHT / 5,
677 child => (my $vbox = new CFClient::UI::VBox); 793 child => (my $vbox = new CFClient::UI::VBox);
678 794
679 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 795 $vbox->add ($LOGVIEW);
680 expand => 1,
681 font => $FONT_FIXED,
682 fontsize => $::CFG->{log_fontsize},
683 );
684 796
685 $vbox->add (my $input = new CFClient::UI::Entry 797 $vbox->add (my $input = new CFClient::UI::Entry
798 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
799 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
800 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
801 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
686 connect_focus_in => sub { 802 connect_focus_in => sub {
687 my ($input, $prev_focus) = @_; 803 my ($input, $prev_focus) = @_;
688 804
689 delete $input->{refocus_map}; 805 delete $input->{refocus_map};
690 806
719 }; 835 };
720 836
721 $window 837 $window
722} 838}
723 839
840sub open_quit_dialog {
841 unless ($QUIT_DIALOG) {
842
843 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
844
845 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
846
847 $vb->add (new CFClient::UI::Label
848 text => "You should find a savebed and apply it first!",
849 max_w => $WIDTH * 0.25,
850 ellipsize => 0,
851 );
852 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
853 $hb->add (new CFClient::UI::Button
854 text => "Ok",
855 expand => 1,
856 connect_activate => sub { $QUIT_DIALOG->hide },
857 );
858 $hb->add (new CFClient::UI::Button
859 text => "Quit anyway",
860 expand => 1,
861 connect_activate => sub { exit },
862 );
863
864 $QUIT_DIALOG->show_centered;
865 } else {
866 $QUIT_DIALOG->show_centered;
867 }
868}
869
870sub make_inventory_window {
871 my $invwin = new CFClient::UI::FancyFrame
872 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
873
874 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
875
876 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
877 $vb1->add (my $lbl = new CFClient::UI::Label);
878 $lbl->set_text ("Player");
879 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
880
881 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
882 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
883 $INVR_LBL->set_text ("Floor");
884 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
885
886 $invwin
887}
888
889sub make_help_window {
890 my $win = new CFClient::UI::FancyFrame
891 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
892
893 $win->add (my $vbox = new CFClient::UI::VBox);
894
895 $vbox->add (my $buttons = new CFClient::UI::HBox);
896 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
897
898 for (
899 [intro => "Introduction"],
900 [command_help => "Commands"],
901 [skill_help => "Skills"],
902 ) {
903 my ($pod, $label) = @$_;
904
905 $buttons->add (new CFClient::UI::Button
906 text => $label,
907 connect_activate => sub {
908 my $parser = new Pod::POM;
909 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
910
911 $viewer->clear;
912
913 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
914 for @{ CFClient::pod_to_pango_list $pom };
915
916 $viewer->set_offset (0);
917 },
918 );
919 }
920
921 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
922
923 $win
924}
925
724sub sdl_init { 926sub sdl_init {
725 CFClient::SDL_Init 927 CFClient::SDL_Init
726 and die "SDL::Init failed!\n"; 928 and die "SDL::Init failed!\n";
727} 929}
728 930
729sub video_init { 931sub video_init {
730 sdl_init; 932 sdl_init;
731 933
934 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
935
936 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
937
732 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 938 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
733 $FULLSCREEN = $CFG->{fullscreen}; 939 $FULLSCREEN = $CFG->{fullscreen};
734 $FAST = $CFG->{fast}; 940 $FAST = $CFG->{fast};
735 941
736 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 942 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
737 or die "SDL_SetVideoMode failed!\n"; 943 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
738 944
739 $SDL_ACTIVE = 1; 945 $SDL_ACTIVE = 1;
740
741 $LAST_REFRESH = time - 0.01; 946 $LAST_REFRESH = time - 0.01;
742 947
743 CFClient::gl_init; 948 CFClient::gl_init;
744 949
745 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 950 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
746 951
952 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
953
747 ############################################################################# 954 #############################################################################
748 955
956 if ($DEBUG_STATUS) {
957 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
958 } else {
959 # create the widgets
960
749 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 961 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
750 $DEBUG_STATUS->show; 962 $DEBUG_STATUS->show;
751 963
752 $STATUS_LINE = new CFClient::UI::Label 964 $STATUSBOX = new CFClient::UI::Statusbox;
753 padding => 0, 965 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
754 y => $HEIGHT - $FONTSIZE * 1.8;
755 $STATUS_LINE->show;
756 966
757 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 967 (new CFClient::UI::Frame
758 padding => 0, 968 bg => [0, 0, 0, 0.4],
759 fontsize => 0.8, 969 req_y => -1,
760 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 970 child => $STATUSBOX,
761 $ALT_ENTER_MESSAGE->show; 971 )->show;
762 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
763 972
764 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 973 CFClient::UI::FancyFrame->new (
765 $MAPWIDGET->focus_in; 974 border_bg => [1, 1, 1, 192/255],
975 bg => [1, 1, 1, 0],
976 child => ($MAPMAP = new CFClient::MapWidget::MapMap
977 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
978 ),
979 )->show;
980
981 $MAPWIDGET = new CFClient::MapWidget;
766 $MAPWIDGET->connect (activate_console => sub { 982 $MAPWIDGET->connect (activate_console => sub {
767 my ($mapwidget, $preset) = @_; 983 my ($mapwidget, $preset) = @_;
768 984
769 if ($CONSOLE) { 985 if ($CONSOLE) {
770 $CONSOLE->{input}->{auto_activated} = 1; 986 $CONSOLE->{input}->{auto_activated} = 1;
771 $CONSOLE->{input}->focus_in; 987 $CONSOLE->{input}->focus_in;
772 988
773 if ($preset && $CONSOLE->{input}->get_text eq '') { 989 if ($preset && $CONSOLE->{input}->get_text eq '') {
774 $CONSOLE->{input}->set_text ($preset); 990 $CONSOLE->{input}->set_text ($preset);
991 }
775 } 992 }
776 } 993 });
777 }); 994 $MAPWIDGET->show;
995 $MAPWIDGET->focus_in;
778 996
779 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 997 $LOGVIEW = new CFClient::UI::TextView
998 expand => 1,
999 font => $FONT_FIXED,
1000 fontsize => $::CFG->{log_fontsize},
1001 can_hover => 1,
1002 can_events => 1,
1003 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1004 ;
780 1005
1006 $BUTTONBAR = new CFClient::UI::HBox;
1007
781 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 1008 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1009 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
782 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 1010 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1011 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
783 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 1012 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1013 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
784 1014
785 $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1015 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1016
786 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 1017 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1018 tooltip => "Toggles the statistics window, where all your Stats and Resistances are beign displaye at all times.");
1019 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1020 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
787 1021
788 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 1022 $BUTTONBAR->add (new CFClient::UI::Button
1023 text => "Save Config",
1024 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1025 connect_activate => sub {
789 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1026 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
790 status "Configuration Saved"; 1027 status "Configuration Saved";
791 }); 1028 },
1029 );
792 1030
1031 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1032 tooltip => "View Documentation");
1033
1034 $BUTTONBAR->add (new CFClient::UI::Button
1035 text => "Quit",
1036 tooltip => "Terminates the program",
1037 connect_activate => sub {
1038 if ($CONN) {
1039 open_quit_dialog;
1040 } else {
1041 exit;
1042 }
1043 },
1044 );
1045
1046 $BUTTONBAR->show;
1047
1048 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1049
1050 # delay till geometry is constant
1051 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
793 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 1052 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1053 my $widget = $GAUGES->{win};
1054 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1055 });
1056 force_refresh ();
1057 }
794} 1058}
795 1059
796sub video_shutdown { 1060sub video_shutdown {
797 $CFClient::UI::ROOT->{children} = [];
798 undef $SDL_ACTIVE; 1061 undef $SDL_ACTIVE;
799} 1062}
800 1063
801my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1064my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
802my $bgmusic;#TODO#hack#d# 1065my $bgmusic;#TODO#hack#d#
1066
1067sub audio_channel_finished {
1068 my ($channel) = @_;
1069
1070 #warn "channel $channel finished\n";#d#
1071}
803 1072
804sub audio_music_finished { 1073sub audio_music_finished {
805 return unless $CFG->{bgm_enable}; 1074 return unless $CFG->{bgm_enable};
806 1075
807 # TODO: hack, do play loop and mood music 1076 # TODO: hack, do play loop and mood music
811 push @bgmusic, shift @bgmusic; 1080 push @bgmusic, shift @bgmusic;
812} 1081}
813 1082
814sub audio_init { 1083sub audio_init {
815 if ($CFG->{audio_enable}) { 1084 if ($CFG->{audio_enable}) {
816 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 1085 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
817 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1086 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1087
1088 unless ($SDL_MIXER) {
1089 status "Unable to open sound device: there will be no sound";
1090 return;
1091 }
1092
818 CFClient::Mix_AllocateChannels 8; 1093 CFClient::Mix_AllocateChannels 8;
819 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1094 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
820 1095
821 audio_music_finished; 1096 audio_music_finished;
822 1097
848} 1123}
849 1124
850my %animate_object; 1125my %animate_object;
851my $animate_timer; 1126my $animate_timer;
852 1127
853my $want_refresh;
854my $can_refresh;
855
856my $fps = 9; 1128my $fps = 9;
857 1129
1130my %demo;#d#
1131
858sub force_refresh { 1132sub force_refresh {
859 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1133 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
860 debug sprintf "%3.2f", $fps; 1134 debug sprintf "%3.2f", $fps;
861 1135
862 $want_refresh = 0;
863 $can_refresh = 0;
864
865 $CFClient::UI::ROOT->draw; 1136 $CFClient::UI::ROOT->draw;
866 1137
1138 $WANT_REFRESH = 0;
1139 $CAN_REFRESH = 0;
1140 $LAST_REFRESH = $NOW;
1141
11420 && do {
1143 # some weird model-drawing code, just a joke right now
1144 use CFClient::OpenGL;
1145
1146 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1147 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1148 $demo{r} ||= do {
1149 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1150 $mod->{v} = pack "f*", @{$mod->{v}};
1151 $_ = [scalar @$_, pack "S!*", @$_]
1152 for values %{$mod->{g}};
1153 $mod
1154 };
1155
1156 my $r = $demo{r} or die;
1157
1158 glDepthMask 1;
1159 glClear GL_DEPTH_BUFFER_BIT;
1160 glEnable GL_TEXTURE_2D;
1161 glEnable GL_DEPTH_TEST;
1162 glEnable GL_CULL_FACE;
1163 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1164
1165 glMatrixMode GL_PROJECTION;
1166 glLoadIdentity;
1167 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1168 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1169 glMatrixMode GL_MODELVIEW;
1170 glLoadIdentity;
1171
1172 glPushMatrix;
1173 glTranslate 0, 0, -800;
1174 glScale 1, -1, 1;
1175 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1176 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1177 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1178 glScale 50, 50, 50;
1179
1180 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1181 while (my ($k, $v) = each %{$r->{g}}) {
1182 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1183 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1184 }
1185
1186 glPopMatrix;
1187
1188 glShadeModel GL_FLAT;
1189 glDisable GL_DEPTH_TEST;
1190 glDisable GL_TEXTURE_2D;
1191 glDepthMask 0;
1192
1193 $WANT_REFRESH++;
1194};
1195
867 CFClient::SDL_GL_SwapBuffers; 1196 CFClient::SDL_GL_SwapBuffers;
868
869 $LAST_REFRESH = $NOW;
870} 1197}
871 1198
872my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1199my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
873 $NOW = time; 1200 $NOW = time;
874 1201
875 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1202 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
876 for CFClient::SDL_PollEvent; 1203 for CFClient::SDL_PollEvent;
877 1204
878 if (%animate_object) { 1205 if (%animate_object) {
879 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1206 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
880 $want_refresh++; 1207 $WANT_REFRESH++;
881 } 1208 }
882 1209
883 if ($want_refresh) { 1210 if ($WANT_REFRESH) {
884 force_refresh; 1211 force_refresh;
885 } else { 1212 } else {
886 $can_refresh = 1; 1213 $CAN_REFRESH = 1;
887 } 1214 }
888}); 1215});
889
890sub refresh {
891 $want_refresh++;
892}
893 1216
894sub animation_start { 1217sub animation_start {
895 my ($widget) = @_; 1218 my ($widget) = @_;
896 $animate_object{$widget} = $widget; 1219 $animate_object{$widget} = $widget;
897} 1220}
901 delete $animate_object{$widget}; 1224 delete $animate_object{$widget};
902} 1225}
903 1226
904@conn::ISA = Crossfire::Protocol::; 1227@conn::ISA = Crossfire::Protocol::;
905 1228
1229sub conn::new {
1230 my $class = shift;
1231
1232 my $self = $class->Crossfire::Protocol::new (@_);
1233
1234 $MAPWIDGET->clr_commands;
1235
1236 my $parser = new Pod::POM;
1237 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1238
1239 for my $head2 ($pod->head2) {
1240 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1241 or next;
1242
1243 my $cmd = $1;
1244 my @args = split /\|/, $2;
1245 @args = (".*") unless @args;
1246
1247 my $text = CFClient::pod_to_pango $head2->content;
1248
1249 for my $arg (@args) {
1250 $arg = $arg eq ".*" ? "" : " $arg";
1251
1252 $MAPWIDGET->add_command ("$cmd$arg", $text);
1253 }
1254 }
1255
1256 $self->{noface} = new_from_file CFClient::Texture
1257 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1258
1259 $self
1260}
1261
906sub conn::stats_update { 1262sub conn::stats_update {
907 my ($self, $stats) = @_; 1263 my ($self, $stats) = @_;
1264
1265 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1266 my $diff = $exp - $self->{prev_exp};
1267 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1268 if exists $self->{prev_exp} && $diff;
1269 $self->{prev_exp} = $exp;
1270 }
908 1271
909 update_stats_window ($stats); 1272 update_stats_window ($stats);
910} 1273}
911 1274
912sub conn::user_send { 1275sub conn::user_send {
967 $self->set_texture ($id => $data); 1330 $self->set_texture ($id => $data);
968 } 1331 }
969 } 1332 }
970} 1333}
971 1334
1335# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1336# (server resource,s latency, bandwidth), so this hack is warranted.
1337# the right fix is to make real tiled maps with an overview file
1338sub conn::send_mapinfo {
1339 my ($self, $data, $cb) = @_;
1340
1341 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1342 my ($wx, $wy) = ($1, $2);
1343
1344 if ($data =~ /^spatial ([1-4]+)$/) {
1345 my @dx = (0, 0, 1, 0, -1);
1346 my @dy = (0, -1, 0, 1, 0);
1347 my ($dx, $dy);
1348
1349 for (split //, $1) {
1350 $dx += $dx[$_];
1351 $dy += $dy[$_];
1352 }
1353
1354 $cb->(spatial => 15,
1355 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1356 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1357 50, 50,
1358 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1359 );
1360
1361 return;
1362 }
1363 }
1364
1365 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1366}
1367
972# this method does a "flood fill" into every tile direction 1368# this method does a "flood fill" into every tile direction
973# it assumes that tiles are arranged in a rectangular grid, 1369# it assumes that tiles are arranged in a rectangular grid,
974# i.e. a map is the same as the left of the right map etc. 1370# i.e. a map is the same as the left of the right map etc.
975# failure to comply are harmless and result in display errors 1371# failure to comply are harmless and result in display errors
976# at worst. 1372# at worst.
977sub conn::flood_fill { 1373sub conn::flood_fill {
978 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1374 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
979 1375
980 # the server does not allow map paths > 6 1376 # the server does not allow map paths > 6
981 return if 6 <= length $path; 1377 return if 7 <= length $path;
982 1378
983 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1379 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
984 1380
985 for ( 1381 for (
986 [1, 0, -1], 1382 [1, 3, 0, -1],
987 [2, 1, 0], 1383 [2, 4, 1, 0],
988 [3, 0, 1], 1384 [3, 1, 0, 1],
989 [4, -1, 0], 1385 [4, 2, -1, 0],
990 ) { 1386 ) {
991 my ($tile, $dx, $dy) = @$_; 1387 my ($tile, $tile2, $dx, $dy) = @$_;
1388
1389 next if $block & (1 << $tile);
1390 my $block = $block | (1 << $tile2);
992 1391
993 my $gx = $gx + $dx; 1392 my $gx = $gx + $dx;
994 my $gy = $gy + $dy; 1393 my $gy = $gy + $dy;
995 1394
996 next unless $flags & (1 << ($tile - 1)); 1395 next unless $flags & (1 << ($tile - 1));
998 1397
999 my $neigh = $self->{neigh_map}{$hash} ||= []; 1398 my $neigh = $self->{neigh_map}{$hash} ||= [];
1000 if (my $info = $neigh->[$tile]) { 1399 if (my $info = $neigh->[$tile]) {
1001 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1400 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1002 1401
1003 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1402 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1004 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1403 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1005 1404
1006 } else { 1405 } else {
1007 $self->send_mapinfo ("spatial $path$tile", sub { 1406 $self->send_mapinfo ("spatial $path$tile", sub {
1008 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1407 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1009 1408
1010 return if $mode ne "spatial"; 1409 return if $mode ne "spatial";
1011 1410
1012 $x += $MAP->ox; 1411 $x += $MAP->ox;
1013 $y += $MAP->oy; 1412 $y += $MAP->oy;
1014 1413
1015 $self->load_map ($hash, $x, $y) 1414 $self->load_map ($hash, $x, $y)
1016 unless $self->{neigh_map}{$hash}[5]++;#d# 1415 unless $self->{neigh_map}{$hash}[5]++;#d#
1017 1416
1018 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1417 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1019 1418
1020 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1419 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1021 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1420 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1022 }); 1421 });
1023 } 1422 }
1024 } 1423 }
1025} 1424}
1029 1428
1030 $self->flush_map; 1429 $self->flush_map;
1031 1430
1032 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1431 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1033 1432
1034 my $mapmapw = 250; 1433 my $mapmapw = $MAPMAP->{w};
1035 my $mapmaph = 250; 1434 my $mapmaph = $MAPMAP->{h};
1036 1435
1037 $self->{neigh_rect} = [ 1436 $self->{neigh_rect} = [
1038 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1437 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1039 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1438 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1040 ]; 1439 ];
1041 1440
1042 delete $self->{neigh_grid}; 1441 delete $self->{neigh_grid};
1043 $self->flood_fill (0, 0, "", $hash, $flags);
1044 1442
1045 $x += $ox; 1443 $x += $ox;
1046 $y += $oy; 1444 $y += $oy;
1047 1445
1048 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1446 $self->{map_info} = [$hash, $x, $y, $w, $h];
1049 1447
1050 my $map = $self->{map_info}[0];
1051 $map =~ s/^.*?\/([^\/]+)$/\1/; 1448 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1052 $STATWIDS->{map}->set_text ("Map: " . $map); 1449 $STATWIDS->{map}->set_text ("Map: " . $map);
1053 1450
1054 $self->load_map ($hash, $x, $y); 1451 $self->load_map ($hash, $x, $y);
1452 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1055} 1453}
1056 1454
1057sub conn::face_find { 1455sub conn::face_find {
1058 my ($self, $facenum, $face) = @_; 1456 my ($self, $facenum, $face) = @_;
1059 1457
1061 1459
1062 my $id = $FACEMAP->get ($hash); 1460 my $id = $FACEMAP->get ($hash);
1063 1461
1064 unless ($id) { 1462 unless ($id) {
1065 # create new id for face 1463 # create new id for face
1066 # i love transactions 1464 # I love transactions
1067 for (1..100) { 1465 for (1..100) {
1068 my $txn = $CFClient::DB_ENV->txn_begin; 1466 my $txn = $CFClient::DB_ENV->txn_begin;
1069 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW); 1467 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1070 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 1468 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1071 $id++; 1469 $id = ($id || 16) + 1;
1072 if ($FACEMAP->put (id => $id) == 0 1470 if ($FACEMAP->put (id => $id) == 0
1073 && $FACEMAP->put ($hash => $id) == 0) { 1471 && $FACEMAP->put ($hash => $id) == 0) {
1074 $txn->txn_commit; 1472 $txn->txn_commit;
1075 1473
1076 goto gotid; 1474 goto gotid;
1083 } 1481 }
1084 1482
1085gotid: 1483gotid:
1086 $face->{id} = $id; 1484 $face->{id} = $id;
1087 $MAP->set_face ($facenum => $id); 1485 $MAP->set_face ($facenum => $id);
1486 $self->{faceid}[$facenum] = $id;#d#
1487
1088 $TILECACHE->get ($id) 1488 $TILECACHE->get ($id) || do {
1489 my $tex = $self->{noface};
1490 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1491 undef
1492 };
1089} 1493}
1090 1494
1091sub conn::face_update { 1495sub conn::face_update {
1092 my ($self, $facenum, $face) = @_; 1496 my ($self, $facenum, $face) = @_;
1093 1497
1100 my ($self, $id, $data) = @_; 1504 my ($self, $id, $data) = @_;
1101 1505
1102 $self->{texture}[$id] ||= do { 1506 $self->{texture}[$id] ||= do {
1103 my $tex = 1507 my $tex =
1104 new_from_image CFClient::Texture 1508 new_from_image CFClient::Texture
1105 $data, minify => 1; 1509 $data, minify => 1, mipmap => 1;
1106 1510
1107 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1511 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1108 $MAPWIDGET->update; 1512 $MAPWIDGET->update;
1109 1513
1110 $tex 1514 $tex
1122 1526
1123 $chunk->play; 1527 $chunk->play;
1124# warn "sound $x,$y,$soundnum,$type\n";#d# 1528# warn "sound $x,$y,$soundnum,$type\n";#d#
1125} 1529}
1126 1530
1531my $LAST_QUERY; # server is stupid, stupid, stupid
1532
1127sub conn::query { 1533sub conn::query {
1128 my ($self, $flags, $prompt) = @_; 1534 my ($self, $flags, $prompt) = @_;
1129 1535
1130 #TODO, display dialog with relevant information 1536 $prompt = $LAST_QUERY unless length $prompt;
1131 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1537 $LAST_QUERY = $prompt;
1538
1539 my $dialog = new CFClient::UI::FancyFrame
1540 title => "Query",
1541 child => my $vbox = new CFClient::UI::VBox;
1542
1543 $vbox->add (new CFClient::UI::Label
1544 max_w => $::WIDTH * 0.4,
1545 text => $prompt);
1546
1547 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1548 $vbox->add (my $hbox = new CFClient::HBox);
1549 $hbox->add (new CFClient::Button
1550 text => "No",
1551 connect_activate => sub {
1552 $self->send ("reply n");
1553 $dialog->destroy;
1554 $MAPWIDGET->focus_in;
1555 }
1556 );
1557 $hbox->add (new CFClient::Button
1558 text => "Yes",
1559 connect_activate => sub {
1560 $self->send ("reply y");
1561 $dialog->destroy;
1562 $MAPWIDGET->focus_in;
1563 },
1564 );
1565
1566 $dialog->focus_in;
1567
1568 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1569 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1570 $vbox->add (my $entry = new CFClient::UI::Entry
1571 connect_changed => sub {
1572 $self->send ("reply $_[1]");
1573 $dialog->destroy;
1574 $MAPWIDGET->focus_in;
1575 },
1576 );
1577
1578 $entry->focus_in;
1579
1580 } else {
1581 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1582
1583 $vbox->add (my $entry = new CFClient::UI::Entry
1584 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1585 connect_activate => sub {
1586 $self->send ("reply $_[1]");
1587 $dialog->destroy;
1588 $MAPWIDGET->focus_in;
1589 },
1590 );
1591
1592 $entry->focus_in;
1593 }
1594
1595 $dialog->show_centered;
1132} 1596}
1133 1597
1134sub conn::drawinfo { 1598sub conn::drawinfo {
1135 my ($self, $color, $text) = @_; 1599 my ($self, $color, $text) = @_;
1136 1600
1148 [0.55, 0.41, 0.13], 1612 [0.55, 0.41, 0.13],
1149 [0.99, 0.77, 0.26], 1613 [0.99, 0.77, 0.26],
1150 [0.74, 0.65, 0.41], 1614 [0.74, 0.65, 0.41],
1151 ); 1615 );
1152 1616
1617 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1618
1619 $text = CFClient::UI::Label::escape $text;
1620 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1621 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1622
1153 $LOGVIEW->add_paragraph ($color[$color], $text); 1623 $LOGVIEW->add_paragraph ($color[$color],
1624 join "\n", map "$time $_", split /\n/, $text);
1625
1626 $STATUSBOX->add ($text,
1627 group => $text,
1628 fg => $color[$color],
1629 timeout => 60,
1630 tooltip_font => $::FONT_FIXED,
1631 );
1632}
1633
1634sub conn::drawextinfo {
1635 my ($self, $color, $type, $subtype, $message) = @_;
1636
1637 $self->drawinfo ($color, $message);
1154} 1638}
1155 1639
1156sub conn::spell_add { 1640sub conn::spell_add {
1157 my ($self, $spell) = @_; 1641 my ($self, $spell) = @_;
1158 1642
1643 # TODO
1644 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1159 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub { 1645 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1160 });
1161 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub { 1646 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1162 });
1163} 1647}
1164 1648
1165sub conn::spell_delete { 1649sub conn::spell_delete {
1166 my ($self, $spell) = @_; 1650 my ($self, $spell) = @_;
1167} 1651}
1168 1652
1169sub conn::addme_success { 1653sub conn::addme_success {
1170 my ($self) = @_; 1654 my ($self) = @_;
1171 1655
1656 $self->send ("command output-sync $CFG->{output_sync}");
1657 $self->send ("command output-count $CFG->{output_count}");
1658
1659 my $parser = new Pod::POM;
1660 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1661
1662 my %skill_tooltip;
1663
1664 for my $head2 ($pod->head2) {
1665 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1666 }
1667
1172 for my $skill (values %{$self->{skill_info}}) { 1668 for my $skill (values %{$self->{skill_info}}) {
1173 $MAPWIDGET->add_command ("ready_skill $skill", "", sub { 1669 $MAPWIDGET->add_command ("ready_skill $skill",
1174 }); 1670 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1671 . $skill_tooltip{$skill});
1175 $MAPWIDGET->add_command ("use_skill $skill", "", sub { 1672 $MAPWIDGET->add_command ("use_skill $skill",
1673 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1674 . $skill_tooltip{$skill});
1675 }
1676}
1677
1678sub conn::eof {
1679 $MAPWIDGET->clr_commands;
1680
1681 stop_game;
1682}
1683
1684sub update_floorbox {
1685 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1686 return unless $CONN;
1687
1688 $FLOORBOX->clear;
1689 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1690
1691 my $count = 7;
1692 for (@{ $CONN->{container}{0} }) {
1693 if (--$count) {
1694 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1695 } else {
1696 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1697 last;
1698 }
1176 }); 1699 }
1700 });
1177 } 1701
1702 $WANT_REFRESH++;
1178} 1703}
1179 1704
1180sub conn::container_add { 1705sub conn::container_add {
1181 my ($self, $id, $items) = @_; 1706 my ($self, $tag, $items) = @_;
1182 1707
1183 # 0 floor 1708 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1709
1710 if ($tag == 0) {
1711 update_floorbox;
1712 $OPENCONT = 0;
1713 $INVR_LBL->set_text ("Floor");
1714 $INVR->set_items ($self->{container}{0});
1715 } elsif ($tag == $self->{player}{tag}) {
1716 $INVR_LBL->set_text ("Player");
1717 $INV->set_items ($self->{container}{$self->{player}{tag}})
1718 } else {
1719 $OPENCONT = $tag;
1720 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1721 $INVR->set_items ($self->{container}{$tag});
1722 }
1723
1184 # $self-<{player}{tag} => player inv 1724 # $self-<{player}{tag} => player inv
1185 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1725 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1186} 1726}
1187 1727
1188sub conn::container_clear { 1728sub conn::container_clear {
1189 my ($self, $id) = @_; 1729 my ($self, $tag) = @_;
1730
1731 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1732
1733 if ($tag == 0) {
1734 update_floorbox;
1735 $OPENCONT = 0;
1736 $INVR_LBL->set_text ("Floor");
1737 $INVR->set_items ($self->{container}{0});
1738 } elsif ($tag == $self->{player}{tag}) {
1739 $INVR_LBL->set_text ("Player");
1740 $INV->set_items ($self->{container}{$tag})
1741 } else {
1742 $OPENCONT = $tag;
1743 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1744 $INVR->set_items ($self->{container}{$tag});
1745 }
1746
1190# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1747# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1748}
1749
1750sub conn::item_delete {
1751 my ($self, @items) = @_;
1752
1753 for (@items) {
1754 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1755
1756 if ($_->{container} == 0) {
1757 update_floorbox;
1758 $OPENCONT = 0;
1759 $INVR_LBL->set_text ("Floor");
1760 $INVR->set_items ($self->{container}{0});
1761 } elsif ($_->{container} == $self->{player}{tag}) {
1762 $INVR_LBL->set_text ("Player");
1763 $INV->set_items ($self->{container}{$self->{player}{tag}})
1764 } else {
1765 $OPENCONT = $_->{container};
1766 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1767 $INVR->set_items ($self->{container}{$_->{container}});
1768 }
1769 }
1770}
1771
1772sub conn::item_update {
1773 my ($self, $item) = @_;
1774
1775 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1776
1777 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1778 $OPENCONT = 0;
1779 $INVR_LBL->set_text ("Floor");
1780 $INVR->set_items ($self->{container}{0});
1781
1782 $item->{widget}->update_item
1783 if $item->{widget};
1784 } else {
1785 if ($item->{container} == 0) {
1786 update_floorbox;
1787 $OPENCONT = 0;
1788 $INVR_LBL->set_text ("Floor");
1789 $INVR->set_items ($self->{container}{0});
1790 } elsif ($item->{container} == $self->{player}{tag}) {
1791 $INV->set_items ($self->{container}{$item->{container}})
1792 }
1793 }
1191} 1794}
1192 1795
1193%SDL_CB = ( 1796%SDL_CB = (
1194 CFClient::SDL_QUIT => sub { 1797 CFClient::SDL_QUIT => sub {
1195 Event::unloop -1; 1798 Event::unloop -1;
1196 }, 1799 },
1197 CFClient::SDL_VIDEORESIZE => sub { 1800 CFClient::SDL_VIDEORESIZE => sub {
1198 }, 1801 },
1199 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1802 CFClient::SDL_VIDEOEXPOSE => sub {
1803 CFClient::UI::full_refresh;
1804 },
1200 CFClient::SDL_ACTIVEEVENT => sub { 1805 CFClient::SDL_ACTIVEEVENT => sub {
1201# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1806# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1202 }, 1807 },
1203 CFClient::SDL_KEYDOWN => sub { 1808 CFClient::SDL_KEYDOWN => sub {
1204 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1809 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1208 video_init; 1813 video_init;
1209 } else { 1814 } else {
1210 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1815 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1211 } 1816 }
1212 }, 1817 },
1213 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1818 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1214 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1819 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1215 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1820 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1216 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1821 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1217 CFClient::SDL_USEREVENT => \&audio_music_finished, 1822 CFClient::SDL_USEREVENT => sub {
1823 if ($_[0]{code} == 1) {
1824 audio_channel_finished $_[0]{data1};
1825 } elsif ($_[0]{code} == 0) {
1826 audio_music_finished;
1827 }
1828 },
1218); 1829);
1219 1830
1220############################################################################# 1831#############################################################################
1221 1832
1222$SIG{INT} = $SIG{TERM} = sub { exit }; 1833$SIG{INT} = $SIG{TERM} = sub { exit };
1223 1834
1224$TILECACHE = CFClient::db_table "tilecache";
1225$FACEMAP = CFClient::db_table "facemap";
1226
1227CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1228
1229my %DEF_CFG = (
1230 sdl_mode => 0,
1231 width => 640,
1232 height => 480,
1233 fullscreen => 0,
1234 fast => 0,
1235 map_scale => 0.5,
1236 fow_enable => 1,
1237 fow_intensity => 0.45,
1238 fow_smooth => 0,
1239 gui_fontsize => 1,
1240 log_fontsize => 1,
1241 gauge_fontsize => 1,
1242 gauge_size => 0.35,
1243 stat_fontsize => 1,
1244 mapsize => 100,
1245 host => "crossfire.schmorp.de",
1246 say_command => 'say',
1247 audio_enable => 1,
1248 bgm_enable => 1,
1249 bgm_volume => 0.25,
1250);
1251
1252while (my ($k, $v) = each %DEF_CFG) {
1253 $CFG->{$k} = $v unless exists $CFG->{$k};
1254}
1255
1256sdl_init;
1257
1258@SDL_MODES = reverse
1259 grep $_->[0] >= 640 && $_->[1] >= 480,
1260 CFClient::SDL_ListModes;
1261
1262@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1263
1264$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1265
1266{ 1835{
1836 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1837
1838 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1839
1840 $TILECACHE = CFClient::db_table "tilecache";
1841 $FACEMAP = CFClient::db_table "facemap";
1842
1843 my %DEF_CFG = (
1844 sdl_mode => 0,
1845 width => 640,
1846 height => 480,
1847 fullscreen => 0,
1848 fast => 0,
1849 map_scale => 1,
1850 fow_enable => 1,
1851 fow_intensity => 0.45,
1852 fow_smooth => 0,
1853 gui_fontsize => 1,
1854 log_fontsize => 1,
1855 gauge_fontsize=> 1,
1856 gauge_size => 0.35,
1857 stat_fontsize => 1,
1858 mapsize => 100,
1859 host => "crossfire.schmorp.de",
1860 say_command => 'say',
1861 audio_enable => 1,
1862 bgm_enable => 1,
1863 bgm_volume => 0.25,
1864 output_sync => 1,
1865 output_count => 1,
1866 );
1867
1868 while (my ($k, $v) = each %DEF_CFG) {
1869 $CFG->{$k} = $v unless exists $CFG->{$k};
1870 }
1871
1872 sdl_init;
1873
1874 @SDL_MODES = reverse
1875 grep $_->[0] >= 640 && $_->[1] >= 480,
1876 CFClient::SDL_ListModes;
1877
1878 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1879
1880 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1881
1882 {
1267 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1883 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1268 DejaVuSans.ttf 1884 DejaVuSans.ttf
1269 DejaVuSansMono.ttf 1885 DejaVuSansMono.ttf
1270 DejaVuSans-Bold.ttf 1886 DejaVuSans-Bold.ttf
1271 DejaVuSansMono-Bold.ttf 1887 DejaVuSansMono-Bold.ttf
1272 DejaVuSans-Oblique.ttf 1888 DejaVuSans-Oblique.ttf
1273 DejaVuSansMono-Oblique.ttf 1889 DejaVuSansMono-Oblique.ttf
1274 DejaVuSans-BoldOblique.ttf 1890 DejaVuSans-BoldOblique.ttf
1275 DejaVuSansMono-BoldOblique.ttf 1891 DejaVuSansMono-BoldOblique.ttf
1276 ); 1892 );
1277 1893
1278 CFClient::add_font $_ for @fonts; 1894 CFClient::add_font $_ for @fonts;
1279 1895
1896 CFClient::pango_init;
1897
1280 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1898 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1281 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1899 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1282 1900
1283 $FONT_PROP->make_default; 1901 $FONT_PROP->make_default;
1284} 1902 }
1285 1903
1904# compare mono (ft) vs. rgba (cairo)
1905# ft - 1.8s, cairo 3s, even in alpha-only mode
1906# for my $rgba (0..1) {
1907# my $t1 = Time::HiRes::time;
1908# for (1..1000) {
1909# my $layout = CFClient::Layout->new ($rgba);
1910# $layout->set_text ("hallo" x 100);
1911# $layout->render;
1912# }
1913# my $t2 = Time::HiRes::time;
1914# warn $t2-$t1;
1915# }
1916
1286video_init; 1917 video_init;
1287audio_init; 1918 audio_init;
1919}
1288 1920
1289Event::loop; 1921Event::loop;
1290 1922
1291END { CFClient::SDL_Quit } 1923END { CFClient::SDL_Quit }
1292 1924
1925=head1 NAME
1293 1926
1927pclient - A Crossfire+ and Crossfire game client
1928
1929=head1 SYNOPSIS
1930
1931Just run it - no commandline arguments are supported.
1932
1933=head1 USAGE
1934
1935Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used
1936fullscreen and interactively.
1937
1938=head1 AUTHOR
1939
1940Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1941
1942
1943

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines