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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.28 by root, Mon May 29 21:10:47 2006 UTC vs.
Revision 1.187 by elmex, Fri Jul 27 18:04:43 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 54
21 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
22 } 67 }
23} 68}
24 69
25# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 72 if %PAR::LibCache;
28 73
29use Time::HiRes 'time'; 74use Time::HiRes 'time';
30use Pod::POM;
31use Event; 75use Event;
32 76
33use Crossfire; 77use Crossfire;
34use Crossfire::Protocol::Constants; 78use Crossfire::Protocol::Constants;
35 79
36use Compress::LZF; 80use Compress::LZF;
37 81
38use CFClient; 82use CFPlus;
39use CFClient::OpenGL (); 83use CFPlus::OpenGL ();
40use CFClient::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
41use CFClient::UI; 86use CFPlus::UI;
87use CFPlus::UI::Canvas;
88use CFPlus::UI::Inventory;
89use CFPlus::UI::SpellList;
90use CFPlus::UI::MessageWindow;
91use CFPlus::Pod;
42use CFClient::MapWidget; 92use CFPlus::MapWidget;
93use CFPlus::Macro;
43 94
95$SIG{QUIT} = sub { Carp::cluck "QUIT" };
96$SIG{PIPE} = 'IGNORE';
97
98$Event::Eval = 1;
44$Event::DIED = sub { 99$Event::DIED = sub {
45 # TODO: display dialog box or so 100 CFPlus::fatal Carp::longmess $_[1]
46 CFClient::error $_[1];
47}; 101};
48
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50
51our $VERSION = '0.1';
52 102
53my $MAX_FPS = 60; 103my $MAX_FPS = 60;
54my $MIN_FPS = 5; # unused as of yet 104my $MIN_FPS = 5; # unused as of yet
55 105
56our $META_SERVER = "crossfire.real-time.com:13326"; 106our $META_SERVER = "http://metaserver.schmorp.de/current.json";
57 107
58our $LAST_REFRESH; 108our $LAST_REFRESH;
59our $NOW; 109our $NOW;
60 110
61our $CFG; 111our $CFG;
62our $CONN; 112our $CONN;
113our $PROFILE; # current profile
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 114our $FAST; # fast, low-quality mode, possibly useful for software-rendering
64 115
65our $WANT_REFRESH; 116our $WANT_REFRESH;
66our $CAN_REFRESH; 117our $CAN_REFRESH;
67 118
… …
76 127
77our $MAP; 128our $MAP;
78our $MAPMAP; 129our $MAPMAP;
79our $MAPWIDGET; 130our $MAPWIDGET;
80our $BUTTONBAR; 131our $BUTTONBAR;
81our $LOGVIEW;
82our $CONSOLE;
83our $METASERVER; 132our $METASERVER;
84our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 134our $QUIT_DIALOG;
86our $SERVER_SETUP; 135our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE;
137our $PICKUP_ENABLE;
138our $SERVER_INFO;
87 139
140our $SETUP_DIALOG;
141our $SETUP_NOTEBOOK;
142our $SETUP_SERVER;
143our $SETUP_KEYBOARD;
144
145our $PL_NOTEBOOK;
146our $PL_WINDOW;
147
148our $INVENTORY_PAGE;
149our $STATS_PAGE;
150our $SKILL_PAGE;
151our $SPELL_PAGE;
152our $SPELL_LIST;
153
154our $HELP_WINDOW;
155our $MESSAGE_WINDOW;
88our $FLOORBOX; 156our $FLOORBOX;
89our $GAUGES; 157our $GAUGES;
90our $STATWIDS; 158our $STATWIDS;
91 159
92our $SDL_ACTIVE; 160our $SDL_ACTIVE;
93our %SDL_CB; 161our %SDL_CB;
94 162
95our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
96our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
97our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
98 172
99our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
100our $STATUSBOX; 174our $STATUSBOX;
101our $DEBUG_STATUS; 175our $DEBUG_STATUS;
102 176
103our $INV_WINDOW;
104our $INV; 177our $INV;
105our $INVR; 178our $INVR;
106our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
107 180
108our $BIND_WINDOW; 181our $PICKUP_CFG;
109 182
110sub status { 183sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 184 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 185}
113 186
114sub debug { 187sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 188 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request; 189}
117 $DEBUG_STATUS->move ($WIDTH - $w, 0); 190
191sub message {
192 my ($para) = @_;
193 $MESSAGE_WINDOW->message ($para);
194}
195
196sub destroy_query_dialog {
197 (delete $_[0]{query_dialog})->destroy
198 if $_[0]{query_dialog};
199}
200
201# FIXME: a very ugly hack to wait for stat update look below! #d#
202our $QUERY_TIMER; #d#
203
204# server query dialog
205sub server_query {
206 my ($conn, $flags, $prompt) = @_;
207
208 # FIXME: a very ugly hack to wait for stat update #d#
209 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
210 unless ($QUERY_TIMER) {
211 $QUERY_TIMER =
212 Event->timer (
213 after => 1,
214 cb => sub {
215 server_query ($conn, $flags, $prompt, 1);
216 $QUERY_TIMER = undef
217 }
218 );
219 return;
220 }
221 }
222
223 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
224 x => "center",
225 y => "center",
226 title => "Server Query",
227 child => my $vbox = new CFPlus::UI::VBox,
228 ;
229
230 my @dialog = my $label = new CFPlus::UI::Label
231 max_w => $::WIDTH * 0.8,
232 ellipsise => 0,
233 text => $prompt;
234
235 if ($flags & CS_QUERY_YESNO) {
236 push @dialog, my $hbox = new CFPlus::UI::HBox;
237
238 $hbox->add (new CFPlus::UI::Button
239 text => "No",
240 on_activate => sub {
241 $conn->send ("reply n");
242 $dialog->destroy;
243 0
244 }
245 );
246 $hbox->add (new CFPlus::UI::Button
247 text => "Yes",
248 on_activate => sub {
249 $conn->send ("reply y");
250 destroy_query_dialog $conn;
251 0
252 },
253 );
254
255 $dialog->grab_focus;
256
257 } elsif ($flags & CS_QUERY_SINGLECHAR) {
258 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
259 $dialog->{tooltip} = "#charcreation_focus";
260
261 unshift @dialog, new CFPlus::UI::Label
262 max_w => $::WIDTH * 0.8,
263 ellipsise => 0,
264 markup => "\nOr use your keyboard and the text entry below:\n";
265
266 unshift @dialog, my $table = new CFPlus::UI::Table;
267
268 $table->add_at (0, 0, new CFPlus::UI::Button
269 text => "Next Race",
270 on_activate => sub {
271 $conn->send ("reply n");
272 destroy_query_dialog $conn;
273 0
274 },
275 );
276 $table->add_at (2, 0, new CFPlus::UI::Button
277 text => "Accept",
278 on_activate => sub {
279 $conn->send ("reply d");
280 destroy_query_dialog $conn;
281 0
282 },
283 );
284
285 if ($conn->{chargen_race_description}) {
286 unshift @dialog, new CFPlus::UI::Label
287 max_w => $::WIDTH * 0.8,
288 ellipsise => 0,
289 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
290 ;
291 }
292
293 unshift @dialog, new CFPlus::UI::Face
294 face => $conn->{player}{face},
295 bg => [.2, .2, .2, 1],
296 min_w => 64,
297 min_h => 64,
298 ;
299
300 if ($conn->{chargen_race_title}) {
301 unshift @dialog, new CFPlus::UI::Label
302 allign => 1,
303 ellipsise => 0,
304 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
305 ;
306 }
307
308 unshift @dialog, new CFPlus::UI::Label
309 max_w => $::WIDTH * 0.4,
310 ellipsise => 0,
311 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
312 ;
313
314 } elsif ($prompt =~ /roll new stats/) {
315 if (my $stat = delete $conn->{stat_change_with}) {
316 $conn->send ("reply $stat");
317 destroy_query_dialog $conn;
318 return;
319 }
320
321 unshift @dialog, new CFPlus::UI::Label
322 max_w => $::WIDTH * 0.4,
323 ellipsise => 0,
324 markup => "\nOr use your keyboard and the text entry below:\n";
325
326 unshift @dialog, my $table = new CFPlus::UI::Table;
327
328 # left: re-roll
329 $table->add_at (0, 0, new CFPlus::UI::Button
330 text => "Roll Again",
331 on_activate => sub {
332 $conn->send ("reply y");
333 destroy_query_dialog $conn;
334 0
335 },
336 );
337
338 # center: swap stats
339 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
340 expand => 1,
341 value => $_,
342 options => [
343 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
344 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
345 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
346 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
347 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
348 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
349 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
350 ],
351 ), 1 .. 2;
352
353 $table->add_at (2, 0, new CFPlus::UI::Button
354 text => "Swap Stats",
355 on_activate => sub {
356 $conn->{stat_change_with} = $sw2->{value};
357 $conn->send ("reply $sw1->{value}");
358 destroy_query_dialog $conn;
359 0
360 },
361 );
362 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
363
364 # right: accept
365 $table->add_at (4, 0, new CFPlus::UI::Button
366 text => "Accept",
367 on_activate => sub {
368 $conn->send ("reply n");
369 $STATS_PAGE->hide;
370 destroy_query_dialog $conn;
371 0
372 },
373 );
374
375 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
376 for (
377 [Str => CS_STAT_STR],
378 [Dex => CS_STAT_DEX],
379 [Con => CS_STAT_CON],
380 [Int => CS_STAT_INT],
381 [Wis => CS_STAT_WIS],
382 [Pow => CS_STAT_POW],
383 [Cha => CS_STAT_CHA],
384 ) {
385 my ($name, $id) = @$_;
386 $hbox->add (new CFPlus::UI::Label
387 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
388 align => 0,
389 expand => 1,
390 can_events => 1,
391 can_hover => 1,
392 tooltip => "#stat_$name",
393 );
394 }
395
396 unshift @dialog, new CFPlus::UI::Label
397 max_w => $::WIDTH * 0.4,
398 ellipsise => 0,
399 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
400 ;
401 }
402
403 push @dialog, my $entry = new CFPlus::UI::Entry
404 on_changed => sub {
405 $conn->send ("reply $_[1]");
406 destroy_query_dialog $conn;
407 0
408 },
409 ;
410
411 $entry->grab_focus;
412
413 } else {
414 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
415
416 push @dialog, my $entry = new CFPlus::UI::Entry
417 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
418 on_activate => sub {
419 $conn->send ("reply $_[1]");
420 destroy_query_dialog $conn;
421 0
422 },
423 ;
424
425 $entry->grab_focus;
426 }
427
428 $vbox->add (@dialog);
429 $dialog->show;
118} 430}
119 431
120sub start_game { 432sub start_game {
121 status "logging in..."; 433 status "logging in...";
122 434
123 $LOGIN_BUTTON->set_text ("Logout"); 435 $LOGIN_BUTTON->set_text ("Logout");
124 $SERVER_SETUP->hide; 436 $SETUP_DIALOG->hide;
125 437
126 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 438 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
127 439
128 my ($host, $port) = split /:/, $CFG->{host}; 440 my ($host, $port) = split /:/, $PROFILE->{host};
129 441
130 $MAP = new CFClient::Map $mapsize, $mapsize; 442 $MAP = new CFPlus::Map;
131 443
132 $CONN = eval { 444 $CONN = eval {
133 new CFClient::Protocol 445 new CFPlus::Protocol
134 host => $host, 446 host => $host,
135 port => $port || 13327, 447 port => $port || 13327,
136 user => $CFG->{user}, 448 user => $PROFILE->{user},
137 pass => $CFG->{password}, 449 pass => $PROFILE->{password},
138 mapw => $mapsize, 450 mapw => $mapsize,
139 maph => $mapsize, 451 maph => $mapsize,
140 452
453 client => "cfplus $CFPlus::VERSION $] $^O",
454
141 map_widget => $MAPWIDGET, 455 map_widget => $MAPWIDGET,
142 logview => $LOGVIEW,
143 statusbox => $STATUSBOX, 456 statusbox => $STATUSBOX,
144 map => $MAP, 457 map => $MAP,
145 mapmap => $MAPMAP, 458 mapmap => $MAPMAP,
459 query => \&server_query,
460
461 setup_req => {
462 smoothing => $CFG->{map_smoothing}*1,
463 },
146 464
147 sound_play => sub { 465 sound_play => sub {
148 my ($x, $y, $soundnum, $type) = @_; 466 my ($x, $y, $soundnum, $type) = @_;
149 467
150 $SDL_MIXER 468 $SDL_MIXER
… …
156 $chunk->play; 474 $chunk->play;
157 }, 475 },
158 }; 476 };
159 477
160 if ($CONN) { 478 if ($CONN) {
161 CFClient::lowdelay fileno $CONN->{fh}; 479 CFPlus::lowdelay fileno $CONN->{fh};
162 480
163 status "login successful"; 481 status "login successful";
164 } else { 482 } else {
165 status "unable to connect"; 483 status "unable to connect";
166 stop_game(); 484 stop_game();
167 } 485 }
168} 486}
169 487
170sub stop_game { 488sub stop_game {
171 $LOGIN_BUTTON->set_text ("Login"); 489 $LOGIN_BUTTON->set_text ("Login");
172 $SERVER_SETUP->show; 490 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
491 $SETUP_DIALOG->show;
173 $INV_WINDOW->hide; 492 $PL_WINDOW->hide;
174 $LOGVIEW->hide; 493 $SPELL_LIST->clear_spells;
494 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
495
496 &audio_music_set ([]);
175 497
176 return unless $CONN; 498 return unless $CONN;
177 499
178 status "connection closed"; 500 status "connection closed";
179 501
502 destroy_query_dialog $CONN;
180 $CONN->destroy; 503 $CONN->destroy;
181 $CONN = 0; # false, does not autovivify 504 $CONN = 0; # false, does not autovivify
182}
183 505
184sub client_setup { 506 undef $MAP;
185 my $dialog = new CFClient::UI::FancyFrame 507}
186 req_x => 1, 508
187 req_y => $HEIGHT * (1/8), 509sub graphics_setup {
188 name => "client_setup", 510 my $vbox = new CFPlus::UI::VBox;
189 title => "Client Setup", 511
190 child => (my $vbox = new CFClient::UI::VBox);
191 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 512 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
192 513
514 my $row = 0;
515
516 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
517 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
518 can_events => 1,
519 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
520
521 my $vidmode_tooltip =
522 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
523 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
524
193 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 525 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 526 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
195 527
196 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 528 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
197 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 529 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
530 tooltip => $vidmode_tooltip);
531 $hbox->add (my $mode_label = new CFPlus::UI::Label
532 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
533 can_events => 1, tooltip => $vidmode_tooltip);
198 534
199 $mode_slider->connect (changed => sub { 535 $mode_slider->connect (changed => sub {
200 my ($self, $value) = @_; 536 my ($self, $value) = @_;
201 537
202 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 538 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
203 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 539 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
204 }); 540 });
205 $mode_slider->emit (changed => $mode_slider->{range}[0]); 541 $mode_slider->emit (changed => $mode_slider->{range}[0]);
206 542
207 my $row = 1;
208
209 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 543 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
210 $table->add (1, $row++, new CFClient::UI::CheckBox 544 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
211 state => $CFG->{fullscreen}, 545 state => $CFG->{fullscreen},
212 tooltip => "Bring the client into fullscreen mode.", 546 tooltip => "Bring the client into fullscreen mode.",
213 on_changed => sub { 547 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
214 my ($self, $value) = @_;
215 $CFG->{fullscreen} = $value;
216 }
217 ); 548 );
218 549
219 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 550 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
220 $table->add (1, $row++, new CFClient::UI::CheckBox 551 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
221 state => $CFG->{fast}, 552 state => $CFG->{fast},
222 tooltip => "Lower the visual quality considerably to speed up rendering.", 553 tooltip => "Lower the visual quality considerably to speed up rendering.",
554 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
555 );
556
557 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
558 $table->add_at (1, $row++, new CFPlus::UI::Slider
559 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
560 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
561 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
562 );
563
564 $table->add_at (1, $row++, new CFPlus::UI::Button
565 expand => 1, align => 0, text => "Apply",
566 tooltip => "Apply the video settings above.",
223 on_changed => sub { 567 on_activate => sub {
224 my ($self, $value) = @_; 568 video_shutdown ();
225 $CFG->{fast} = $value; 569 video_init ();
570 0
226 } 571 }
227 ); 572 );
228 573
229 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 574 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
230 $table->add (1, $row++, new CFClient::UI::Slider 575 $table->add_at (1, $row++, new CFPlus::UI::Slider
231 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 576 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
232 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 577 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
233 on_changed => sub { 578 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
234 my ($self, $value) = @_;
235 $CFG->{map_scale} = 2 ** $value;
236 }
237 ); 579 );
238 580
581 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
582 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
583 state => $CFG->{map_smoothing},
584 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
585 . "This increases load on the graphics subsystem and works only with 2.x servers. "
586 . "Changes take effect at next connection only.",
587 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
588 );
589
239 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 590 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
240 $table->add (1, $row++, new CFClient::UI::CheckBox 591 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
241 state => $CFG->{fow_enable}, 592 state => $CFG->{fow_enable},
242 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 593 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
243 on_changed => sub { 594 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
244 my ($self, $value) = @_;
245 $CFG->{fow_enable} = $value;
246 }
247 ); 595 );
248 596
249 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 597 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
250 $table->add (1, $row++, new CFClient::UI::Slider 598 $table->add_at (1, $row++, new CFPlus::UI::Slider
251 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 599 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
252 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 600 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
253 on_changed => sub { 601 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
254 my ($self, $value) = @_;
255 $CFG->{fow_intensity} = $value;
256 }
257 ); 602 );
258 603
259 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
260 $table->add (1, $row++, new CFClient::UI::CheckBox
261 state => $CFG->{fow_smooth},
262 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
263 on_changed => sub {
264 my ($self, $value) = @_;
265 $CFG->{fow_smooth} = $value;
266 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
267 }
268 );
269
270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
271 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
273 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
274 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
275 );
276
277 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 604 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
278 $table->add (1, $row++, new CFClient::UI::Slider 605 $table->add_at (1, $row++, new CFPlus::UI::Slider
279 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 606 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
280 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 607 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
281 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 608 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
282 ); 609 );
283 610
284 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
285
286 $table->add (1, $row++, new CFClient::UI::Slider
287 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
288 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
289 on_changed => sub {
290 $CFG->{stat_fontsize} = $_[1];
291 &set_stats_window_fontsize;
292 }
293 );
294
295 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 611 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
296 $table->add (1, $row++, new CFClient::UI::Slider 612 $table->add_at (1, $row++, new CFPlus::UI::Slider
297 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 613 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
298 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 614 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
299 on_changed => sub { 615 on_changed => sub {
300 $CFG->{gauge_fontsize} = $_[1]; 616 $CFG->{gauge_fontsize} = $_[1];
301 &set_gauge_window_fontsize; 617 &set_gauge_window_fontsize;
618 0
302 } 619 }
303 ); 620 );
304 621
305 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 622 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
306 $table->add (1, $row++, new CFClient::UI::Slider 623 $table->add_at (1, $row++, new CFPlus::UI::Slider
307 range => [$CFG->{gauge_size}, 0.2, 0.8], 624 range => [$CFG->{gauge_size}, 0.2, 0.8],
308 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 625 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
309 on_changed => sub { 626 on_changed => sub {
310 $CFG->{gauge_size} = $_[1]; 627 $CFG->{gauge_size} = $_[1];
311 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 628 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
629 0
312 } 630 }
313 ); 631 );
314 632
315 $table->add (1, $row++, new CFClient::UI::Button 633 $vbox
316 expand => 1, align => 0, text => "Apply", 634}
317 tooltip => "Apply the video settings",
318 on_activate => sub {
319 video_shutdown ();
320 video_init ();
321 }
322 );
323 635
636sub audio_setup {
637 my $vbox = new CFPlus::UI::VBox;
638
639 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
640
641 my $row = 0;
642
324 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 643 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
325 $table->add (1, $row++, new CFClient::UI::CheckBox 644 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
326 state => $CFG->{audio_enable}, 645 state => $CFG->{audio_enable},
327 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 646 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
328 on_changed => sub { 647 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
329 $CFG->{audio_enable} = $_[1];
330 }
331 ); 648 );
332# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 649# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
333# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 650# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
334# $CFG->{effects_volume} = $_[1]; 651# $CFG->{effects_volume} = $_[1];
335# }); 652# });
336 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 653 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
337 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 654 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
338 $hbox->add (new CFClient::UI::CheckBox 655 $hbox->add (new CFPlus::UI::CheckBox
339 expand => 1, state => $CFG->{bgm_enable}, 656 expand => 1, state => $CFG->{bgm_enable},
340 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 657 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
341 on_changed => sub { 658 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
342 $CFG->{bgm_enable} = $_[1];
343 }
344 ); 659 );
345 $hbox->add (new CFClient::UI::Slider 660 $hbox->add (new CFPlus::UI::Slider
346 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 661 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
347 tooltip => "The volume of the background music. Changes are instant.", 662 tooltip => "The volume of the background music. Changes are instant.",
348 on_changed => sub { 663 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
349 $CFG->{bgm_volume} = $_[1];
350 CFClient::MixMusic::volume $_[1] * 128;
351 }
352 ); 664 );
353 665
354 $table->add (1, $row++, new CFClient::UI::Button 666 $table->add_at (1, $row++, new CFPlus::UI::Button
355 expand => 1, align => 0, text => "Apply", 667 expand => 1, align => 0, text => "Apply",
356 tooltip => "Apply the audio settings", 668 tooltip => "Apply the audio settings",
357 on_activate => sub { 669 on_activate => sub {
358 audio_shutdown (); 670 audio_shutdown ();
359 audio_init (); 671 audio_init ();
672 0
360 } 673 }
361 ); 674 );
362 675
363 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 676 $vbox
364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
365 text => $CFG->{say_command},
366 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
367 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
368 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
369 on_changed => sub {
370 my ($self, $value) = @_;
371 $CFG->{say_command} = $value;
372 }
373 );
374
375 $dialog
376}
377
378sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize});
381 }
382} 677}
383 678
384sub set_gauge_window_fontsize { 679sub set_gauge_window_fontsize {
385 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 680 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
386 $_->set_fontsize ($::CFG->{gauge_fontsize}); 681 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
388} 683}
389 684
390sub make_gauge_window { 685sub make_gauge_window {
391 my $gh = int $HEIGHT * $CFG->{gauge_size}; 686 my $gh = int $HEIGHT * $CFG->{gauge_size};
392 687
393 my $win = new CFClient::UI::Frame ( 688 my $win = new CFPlus::UI::Frame (
394 req_x => 0, 689 force_x => 0,
395 req_y => -1, 690 force_y => "max",
396 def_w => $WIDTH, 691 force_w => $WIDTH,
397 def_h => $gh, 692 force_h => $gh,
398 ); 693 );
399 694
400 $win->add (my $hbox = new CFClient::UI::HBox 695 $win->add (my $hbox = new CFPlus::UI::HBox
401 children => [ 696 children => [
402 (new CFClient::UI::HBox expand => 1), 697 (new CFPlus::UI::HBox expand => 1),
403 (new CFClient::UI::VBox children => [ 698 (new CFPlus::UI::VBox children => [
404 (new CFClient::UI::Empty expand => 1), 699 (new CFPlus::UI::Empty expand => 1),
405 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 700 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
406 ]), 701 ]),
407 (my $vbox = new CFClient::UI::VBox), 702 (my $vbox = new CFPlus::UI::VBox),
408 ], 703 ],
409 ); 704 );
410 705
411 $vbox->add (new CFClient::UI::HBox 706 $vbox->add (new CFPlus::UI::HBox
412 expand => 1, 707 expand => 1,
413 children => [ 708 children => [
414 (new CFClient::UI::Empty expand => 1), 709 (new CFPlus::UI::Empty expand => 1),
415 (my $hb = new CFClient::UI::HBox), 710 (my $hb = new CFPlus::UI::HBox),
416 ], 711 ],
417 ); 712 );
418 713
419 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 714 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
420 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.");
421 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 715 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
422 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.");
423 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 716 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
424 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.");
425 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 717 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
426 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.");
427 718
428 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 719 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
429 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.");
430 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 720 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
431 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
432 721
433 $GAUGES = { 722 $GAUGES = {
434 exp => $exp, win => $win, range => $rng, 723 exp => $exp, win => $win, range => $rng,
435 food => $fg, mana => $mg, hp => $hg, grace => $gg 724 food => $fg, mana => $mg, hp => $hg, grace => $gg
436 }; 725 };
… …
438 &set_gauge_window_fontsize; 727 &set_gauge_window_fontsize;
439 728
440 $win 729 $win
441} 730}
442 731
732sub debug_setup {
733 my $table = new CFPlus::UI::Table;
443 734
735 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
736 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
737 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
738 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
739 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
740 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
741 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
742 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
743 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
744
745 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
746
747 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
748 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
749 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
750 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
751 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
752 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
753
754 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
755
756 $c->add_items ({
757 type => "line_loop",
758 color => [0, 1, 0],
759 width => 9,
760 coord_mode => "abs",
761 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
762 });
763
764 $c->add_items ({
765 type => "lines",
766 color => [1, 1, 0],
767 width => 2,
768 coord_mode => "rel",
769 coord => [[0,0], [1,1], [1,0], [0,1]],
770 });
771
772 $c->add_items ({
773 type => "polygon",
774 color => [0, 0.43, 0],
775 width => 2,
776 coord_mode => "rel",
777 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
778 });
779
780 $table
781}
782
444sub make_stats_window { 783sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 784 my $r = new CFPlus::UI::ScrolledWindow (
446 req_y => $HEIGHT * (2/8),
447 req_x => -1, 785 expand => 1,
448 title => "Stats", 786 scroll_y => 1
449 name => "stats_window"; 787 );
788 $r->add (my $vb = new CFPlus::UI::VBox);
450 789
451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 790 $vb->add (new CFPlus::UI::FancyFrame
791 label => "Player",
792 child => (my $pi = new CFPlus::UI::VBox),
793 );
794
452 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 795 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453 can_hover => 1, can_events => 1, 796 can_hover => 1, can_events => 1,
454 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 797 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
455 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 798 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
456 can_hover => 1, can_events => 1, 799 can_hover => 1, can_events => 1,
457 tooltip => "The map you are currently on (if supported by the server)."); 800 tooltip => "The map you are currently on (if supported by the server).");
458 801
459 $vb->add (my $hb0 = new CFClient::UI::HBox); 802 $pi->add (my $hb0 = new CFPlus::UI::HBox);
460 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 803 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
461 can_hover => 1, can_events => 1, 804 can_hover => 1, can_events => 1,
462 tooltip => "The weight of the player including all inventory items."); 805 tooltip => "The weight of the player including all inventory items.");
463 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 806 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
464 can_hover => 1, can_events => 1, 807 can_hover => 1, can_events => 1,
465 tooltip => "The weight limit: you cannot carry more than this."); 808 tooltip => "The weight limit: you cannot carry more than this.");
466 809
467 810 $vb->add (new CFPlus::UI::FancyFrame
811 label => "Primary/Secondary Statistics",
468 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 812 child => (my $hb = new CFPlus::UI::HBox expand => 1),
813 );
469 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 814 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
470 815
471 my $color2 = [1, 1, 0]; 816 my $color2 = [1, 1, 0];
472 817
473 for ( 818 for (
474 [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"], 819 [0, 0, st_str => "Str", 30],
475 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 820 [0, 1, st_dex => "Dex", 30],
476 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 821 [0, 2, st_con => "Con", 30],
477 [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"], 822 [0, 3, st_int => "Int", 30],
478 [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"], 823 [0, 4, st_wis => "Wis", 30],
479 [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"], 824 [0, 5, st_pow => "Pow", 30],
480 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 825 [0, 6, st_cha => "Cha", 30],
481 826
482 [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."], 827 [2, 0, st_wc => "Wc", -120],
483 [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."], 828 [2, 1, st_ac => "Ac", -120],
484 [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."], 829 [2, 2, st_dam => "Dam", 120],
485 [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."], 830 [2, 3, st_arm => "Arm", 120],
486 [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."], 831 [2, 4, st_spd => "Spd", 10.54],
487 [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."], 832 [2, 5, st_wspd => "WSp", 10.54],
488 ) { 833 ) {
489 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 834 my ($col, $row, $id, $label, $template) = @$_;
490 835
491 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 836 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
492 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 837 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
838 align => +1, template => $template, tooltip => "#stat_$label");
493 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 839 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
494 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 840 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
841 align => -1, text => $label, tooltip => "#stat_$label");
495 } 842 }
496 843
844 $vb->add (new CFPlus::UI::FancyFrame
845 label => "Resistancies",
497 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 846 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
847 );
498 848
499 my $row = 0; 849 my $row = 0;
500 my $col = 0; 850 my $col = 0;
501 851
502 my %resist_names = ( 852 my %resist_names = (
853 slow => ["Slow",
503 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.)", 854 "<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.)"],
855 holyw => ["Holy Word",
504 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.)", 856 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
857 conf => ["Confusion",
505 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 858 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
859 fire => ["Fire",
506 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 860 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
861 depl => ["Depletion",
507 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 862 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
863 magic => ["Magic",
508 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 864 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
865 drain => ["Draining",
509 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 866 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
867 acid => ["Acid",
510 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 868 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
869 pois => ["Poison",
511 pois => "<b>Poison</b> (resistance to getting poisoned)", 870 "<b>Poison</b> (resistance to getting poisoned)"],
871 para => ["Paralysation",
512 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 872 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
873 deat => ["Death",
513 deat => "<b>Death</b> (resistance against death spells)", 874 "<b>Death</b> (resistance against death spells)"],
514 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 875 phys => ["Physical",
876 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
877 blind => ["Blind",
515 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 878 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
879 fear => ["Fear",
516 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)", 880 "<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)"],
881 tund => ["Turn undead",
517 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 882 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
883 elec => ["Electricity",
518 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 884 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
885 cold => ["Cold",
519 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 886 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
887 ghit => ["Ghost hit",
520 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 888 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
521 ); 889 );
890
522 for (qw/slow holyw conf fire depl magic 891 for (qw/slow holyw conf fire depl magic
523 drain acid pois para deat phys 892 drain acid pois para deat phys
524 blind fear tund elec cold ghit/) 893 blind fear tund elec cold ghit/)
525 { 894 {
526 $tbl2->add ($col, $row, 895 $tbl2->add_at ($col, $row,
527 $STATWIDS->{"res_$_"} = 896 $STATWIDS->{"res_$_"} =
528 new CFClient::UI::Label 897 new CFPlus::UI::Label
529 font => $FONT_FIXED, 898 font => $FONT_FIXED,
530 template => "-100%", 899 template => "-100%",
531 align => +1, 900 align => +1,
532 valign => 0, 901 valign => 0,
533 can_events => 1, 902 can_events => 1,
534 can_hover => 1, 903 can_hover => 1,
535 tooltip => $resist_names{$_}, 904 tooltip => $resist_names{$_}->[1],
536 ); 905 );
537 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 906 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
538 font => $FONT_FIXED, 907 font => $FONT_FIXED,
539 can_hover => 1, 908 can_hover => 1,
540 can_events => 1, 909 can_events => 1,
541 image => "ui/resist/resist_$_.png", 910 path => "ui/resist/resist_$_.png",
542 tooltip => $resist_names{$_}, 911 tooltip => $resist_names{$_}->[1],
912 );
913 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
914 text => $resist_names{$_}->[0],
915 font => $FONT_FIXED,
916 can_hover => 1,
917 can_events => 1,
918 tooltip => $resist_names{$_}->[1],
543 ); 919 );
544 920
545 $row++; 921 $row++;
546 if ($row % 6 == 0) { 922 if ($row % 6 == 0) {
547 $col += 2; 923 $col += 3;
548 $row = 0; 924 $row = 0;
549 } 925 }
550 } 926 }
551 927
552 &set_stats_window_fontsize;
553 update_stats_window ({}); 928 #update_stats_window ({});
554 929
930 $r
931}
932
933sub skill_window {
934 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
935 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
555 $tgw 936 $sw
556} 937}
557 938
558sub formsep { 939sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 940 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560}
561
562sub update_stats_window {
563 my ($stats) = @_;
564
565 # I love text protocols...
566
567 my $hp = $stats->{+CS_STAT_HP} * 1;
568 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
569 my $sp = $stats->{+CS_STAT_SP} * 1;
570 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
571 my $fo = $stats->{+CS_STAT_FOOD} * 1;
572 my $fo_m = 999;
573 my $gr = $stats->{+CS_STAT_GRACE} * 1;
574 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
575
576 $GAUGES->{hp} ->set_value ($hp, $hp_m);
577 $GAUGES->{mana} ->set_value ($sp, $sp_m);
578 $GAUGES->{food} ->set_value ($fo, $fo_m);
579 $GAUGES->{grace} ->set_value ($gr, $gr_m);
580 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
581 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
582 my $rng = $stats->{+CS_STAT_RANGE};
583 $rng =~ s/^Range: //; # thank you so much dear server
584 $GAUGES->{range} ->set_text ("Rng: " . $rng);
585 my $title = $stats->{+CS_STAT_TITLE};
586 $title =~ s/^Player: //;
587 $STATWIDS->{title} ->set_text ("Title: " . $title);
588
589 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
590 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
591 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
592 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
593 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
594 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
595 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
596 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
597 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
598 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
599 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
600 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
601 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
602
603 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
604
605 # TODO: replace by CS_STAT_RES_xxx constants
606 my %tbl = (
607 phys => 100,
608 magic => 101,
609 fire => 102,
610 elec => 103,
611 cold => 104,
612 conf => 105,
613 acid => 106,
614 drain => 107,
615 ghit => 108,
616 pois => 109,
617 slow => 110,
618 para => 111,
619 tund => 112,
620 fear => 113,
621 depl => 113,
622 deat => 115,
623 holyw => 116,
624 blind => 117,
625 );
626
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl;
629}
630
631sub metaserver_dialog {
632 my $dialog = new CFClient::UI::FancyFrame
633 title => "Server List",
634 child => (my $vbox = new CFClient::UI::VBox);
635
636 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638 $dialog
639} 941}
640 942
641my $METASERVER_ATIME; 943my $METASERVER_ATIME;
642 944
643sub update_metaserver { 945sub update_metaserver {
644 my ($HOST) = @_; 946 my ($metaserver_dialog) = @_;
947
948 $METASERVER = $metaserver_dialog
949 if defined $metaserver_dialog;
645 950
646 return if $METASERVER_ATIME > time; 951 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 952 $METASERVER_ATIME = time + 60;
648 953
649 my $table = $METASERVER->{table}; 954 my $table = $METASERVER->{table};
650 $table->clear; 955 $table->clear;
651 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 956 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
652 957
653 my $buf; 958 my $ok = 0;
654 959
655 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 960 CFPlus::background {
961 my $ua = CFPlus::lwp_useragent;
656 962
657 unless ($fh) { 963 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
658 $label->set_text ("unable to contact metaserver: $!"); 964 } sub {
659 return; 965 my ($msg) = @_;
660 } 966 if ($msg) {
661
662 Event->io (fd => $fh, poll => 'r', cb => sub {
663 my $res = sysread $fh, $buf, 8192, length $buf;
664
665 if (!defined $res) {
666 $_[0]->w->cancel;
667 $label->set_text ("error while retrieving server list: $!");
668 } elsif ($res == 0) {
669 $_[0]->w->cancel;
670 status "server list retrieved";
671
672 utf8::decode $buf if utf8::valid $buf;
673
674 $table->clear; 967 $table->clear;
675 968
969 my @tip = (
970 "The current number of users logged in on the server.",
971 "The hostname of the server.",
972 "The time this server has been running without being restarted.",
973 "The server software version - a '+' indicates a Crossfire+ server.",
974 "Short information about this server provided by its admins.",
975 );
676 my @col = qw(Use #Users Host Uptime Version Description); 976 my @col = qw(#Users Host Uptime Version Description);
677 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 977 $table->add_at ($_, 0, new CFPlus::UI::Label
978 can_hover => 1, can_events => 1,
979 align => 0, fg => [1, 1, 0],
980 text => $col[$_], tooltip => $tip[$_])
678 for 0 .. $#col; 981 for 0 .. $#col;
679 982
680 my @align = qw(1 0 1 1 -1); 983 my @align = qw(1 0 1 1 -1);
681 984
682 my $y = 0; 985 my $y = 0;
683 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 986 for my $m (@{ $msg->{servers} }) {
684 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 987 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
988 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
685 989
686 for ($desc) { 990 for ($desc) {
687 s/<br>/\n/gi; 991 s/<br>/\n/gi;
688 s/<li>/\n· /gi; 992 s/<li>/\n· /gi;
689 s/<.*?>//sgi; 993 s/<.*?>//sgi;
690 s/&/&amp;/g; 994 s/&amp;/&/g;
691 s/</&lt;/g; 995 s/&lt;/</g;
692 s/>/&gt;/g; 996 s/&gt;/>/g;
693 } 997 }
694 998
695 $uptime = sprintf "%dd %02d:%02d:%02d", 999 $uptime = sprintf "%dd %02d:%02d:%02d",
696 (int $m->[8] / 86400), 1000 (int $uptime / 86400),
697 (int $m->[8] / 3600) % 24, 1001 (int $uptime / 3600) % 24,
698 (int $m->[8] / 60) % 60, 1002 (int $uptime / 60) % 60,
699 $m->[8] % 60; 1003 $uptime % 60;
700 1004
701 $m = [$users, $host, $uptime, $version, $desc]; 1005 $m = [$users, $host, $uptime, $version, $desc];
702 1006
703 $y++; 1007 $y++;
704 1008
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 1009 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
706 (new CFClient::UI::Button text => "Use", on_activate => sub { 1010 (new CFPlus::UI::Button
1011 text => "Use",
1012 tooltip => "Put this server into the <b>Host:Port</b> field",
1013 on_activate => sub {
707 $HOST->set_text ($CFG->{host} = $host); 1014 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1015 $METASERVER->hide;
1016 0
1017 },
708 }), 1018 ),
709 (new CFClient::UI::Empty expand => 1), 1019 (new CFPlus::UI::Empty expand => 1),
710 ]); 1020 ]);
711 1021
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 1022 $table->add_at ($_, $y, new CFPlus::UI::Label
713 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 1023 max_w => $::WIDTH * 0.4,
1024 ellipsise => 0,
1025 align => $align[$_],
1026 text => $m->[$_],
1027 tooltip => $tip[$_],
1028 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
1029 can_hover => 1,
1030 can_events => 1,
1031 fontsize => 0.8)
714 for 0 .. $#$m; 1032 for 0 .. $#$m;
715 } 1033 }
1034 } else {
1035 $ok or $label->set_text ("error while contacting metaserver");
716 } 1036 }
717 }); 1037 };
718}
719 1038
720sub server_setup { 1039}
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame 1040
722 x => $WIDTH * (1/3), 1041sub metaserver_dialog {
723 y => $HEIGHT * (1/8), 1042 my $vbox = new CFPlus::UI::VBox;
724 name => "server_setup", 1043 my $table = new CFPlus::UI::Table;
725 title => "Server Setup", 1044 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
726 child => (my $vbox = new CFClient::UI::VBox), 1045
1046 my $dialog = new CFPlus::UI::Toplevel
1047 title => "Server List",
1048 name => 'metaserver_dialog',
1049 x => 'center',
1050 y => 'center',
1051 z => 3,
1052 force_w => $::WIDTH * 0.9,
1053 force_h => $::HEIGHT * 0.7,
1054 child => $vbox,
1055 has_close_button => 1,
1056 table => $table,
727 on_visibility_change => sub { 1057 on_visibility_change => sub {
728 my ($self, $visible) = @_; 1058 update_metaserver ($_[0]) if $_[1];
729 $self->center if $visible; 1059 0
730 }, 1060 },
731 ; 1061 ;
732 1062
1063 $dialog
1064}
1065
1066sub server_setup {
1067 my $vbox = new CFPlus::UI::VBox;
1068
1069 $vbox->add (new CFPlus::UI::FancyFrame
1070 label => "Connection Settings",
733 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1071 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1072 );
734 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 1073 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
735 1074
736 { 1075 {
737 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1076 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
738 1077
739 $vbox->add ( 1078 $vbox->add (
740 my $HOST = new CFClient::UI::Entry 1079 $HOST_ENTRY = new CFPlus::UI::Entry
741 expand => 1, 1080 expand => 1,
742 text => $CFG->{host}, 1081 text => $CFG->{profile}{default}{host},
743 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1082 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
744 on_changed => sub { 1083 on_changed => sub {
745 my ($self, $value) = @_; 1084 my ($self, $value) = @_;
746 $CFG->{host} = $value; 1085 $CFG->{profile}{default}{host} = $value;
1086 0
747 } 1087 }
748 ); 1088 );
749 1089
750 $METASERVER = metaserver_dialog;
751
752 $vbox->add (new CFClient::UI::Flopper 1090 $vbox->add (new CFPlus::UI::Button
753 expand => 1, 1091 expand => 1,
754 text => "Server List", 1092 text => "Server List",
755 other => $METASERVER, 1093 other => $METASERVER,
756 tooltip => "Show a list of available crossfire servers", 1094 tooltip => "Show a list of available crossfire servers",
757 on_open => sub { 1095 on_activate => sub { $METASERVER->toggle_visibility; 0 },
758 update_metaserver $HOST; 1096 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
759 }
760 ); 1097 );
761 } 1098 }
762 1099
763 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1100 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
764 $table->add (1, 4, new CFClient::UI::Entry 1101 $table->add_at (1, 4, new CFPlus::UI::Entry
765 text => $CFG->{user}, 1102 text => $CFG->{profile}{default}{user},
766 tooltip => "The name of your character on the server", 1103 tooltip => "The name of your character on the server",
767 on_changed => sub { 1104 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
768 my ($self, $value) = @_;
769 $CFG->{user} = $value;
770 }
771 ); 1105 );
772 1106
773 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1107 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
774 $table->add (1, 5, new CFClient::UI::Entry 1108 $table->add_at (1, 5, new CFPlus::UI::Entry
775 text => $CFG->{password}, 1109 text => $CFG->{profile}{default}{password},
776 hidden => 1, 1110 hidden => 1,
777 tooltip => "The password for your character", 1111 tooltip => "The password for your character",
778 on_changed => sub { 1112 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
779 my ($self, $value) = @_;
780 $CFG->{password} = $value;
781 }
782 ); 1113 );
783 1114
784 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1115 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
785 $table->add (1, 7, new CFClient::UI::Slider 1116 $table->add_at (1, 7, new CFPlus::UI::Slider
786 req_w => 100, 1117 force_w => 100,
787 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1118 range => [$CFG->{mapsize}, 10, 100, 0, 1],
788 tooltip => "This is the size of the portion of the map update the server sends you. " 1119 tooltip => "This is the size of the portion of the map update the server sends you. "
789 . "If you set this to a high value you will be able to see further, " 1120 . "If you set this to a high value you will be able to see further, "
790 . "but you also increase bandwidth requirements and latency. " 1121 . "but you also increase bandwidth requirements and latency. "
791 . "This option is only used once at log-in.", 1122 . "This option is only used once at log-in.",
792 on_changed => sub { 1123 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
793 my ($self, $value) = @_;
794
795 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
796 },
797 ); 1124 );
798 1125
799 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1126 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
800 $table->add (1, 8, new CFClient::UI::CheckBox 1127 $table->add_at (1, 8, new CFPlus::UI::CheckBox
801 state => $CFG->{face_prefetch}, 1128 state => $CFG->{face_prefetch},
802 tooltip => "<b>Background Image Prefetch</b>\n\n" 1129 tooltip => "<b>Background Image Prefetch</b>\n\n"
803 . "If enabled, the client automatically pre-fetches images from the server. " 1130 . "If enabled, the client automatically pre-fetches images from the server. "
804 . "This might increase or create lag, but increases the chances " 1131 . "This might increase or create lag, but increases the chances "
805 . "of faces being ready for display when you encounter them. " 1132 . "of faces being ready for display when you encounter them. "
806 . "It also uses up server bandwidth on every connect, " 1133 . "It also uses up server bandwidth on every connect, "
807 . "so only set it if you really need to prefetch images. " 1134 . "so only set it if you really need to prefetch images. "
808 . "This option can be set and unset any time.", 1135 . "This option can be set and unset any time.",
809 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1136 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
810 ); 1137 );
811 1138
1139 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1140 $table->add_at (1, 9, new CFPlus::UI::Entry
1141 text => $CFG->{output_rate},
1142 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1143 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1144 . "default will be used, which is usually around 100kb/s.",
1145 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1146 );
1147
812 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1148 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
813 $table->add (1, 9, new CFClient::UI::Entry 1149 $table->add_at (1, 10, new CFPlus::UI::Entry
814 text => $CFG->{output_count}, 1150 text => $CFG->{output_count},
815 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1151 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
816 on_changed => sub { $CFG->{output_count} = $_[1] }, 1152 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
817 ); 1153 );
818 1154
819 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1155 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
820 $table->add (1, 10, new CFClient::UI::Entry 1156 $table->add_at (1, 11, new CFPlus::UI::Entry
821 text => $CFG->{output_sync}, 1157 text => $CFG->{output_sync},
822 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1158 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
823 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1159 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
824 ); 1160 );
825 1161
826 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1162 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
827 expand => 1, 1163 expand => 1,
828 align => 0, 1164 align => 0,
829 text => "Login", 1165 text => "Login",
830 on_activate => sub { 1166 on_activate => sub {
831 $CONN ? stop_game 1167 $CONN ? stop_game
832 : start_game; 1168 : start_game;
1169 0
833 }, 1170 },
834 ); 1171 );
835 1172
836 $dialog 1173 $vbox->add (new CFPlus::UI::FancyFrame
837} 1174 label => "Server Info",
1175 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1176 );
838 1177
839sub message_window { 1178 $vbox
840 my $window = new CFClient::UI::FancyFrame 1179}
841 name => "message_window",
842 title => "Messages",
843 border_bg => [1, 1, 1, 1],
844 bg => [0, 0, 0, 0.75],
845 req_x => -1,
846 req_y => 0,
847 def_w => int $::WIDTH / 3,
848 def_h => int $::HEIGHT / 5,
849 child => (my $vbox = new CFClient::UI::VBox);
850 1180
851 $vbox->add ($LOGVIEW); 1181sub client_setup {
1182 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
852 1183
853 $vbox->add (my $input = new CFClient::UI::Entry 1184 my $row = 0;
854 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1185
855 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1186 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
856 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1187 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
857 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1188 state => $CFG->{show_tips},
1189 tooltip => "Show the <b>Tip of the day</b> window at startup?",
858 on_focus_in => sub { 1190 on_changed => sub {
859 my ($input, $prev_focus) = @_; 1191 my ($self, $value) = @_;
860 1192 $CFG->{show_tips} = $value;
861 delete $input->{refocus_map};
862
863 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
864 $input->{refocus_map} = 1;
865 } 1193 0
866 delete $input->{auto_activated}; 1194 }
1195 );
1196
1197 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1198 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1199 text => $CFG->{logview_max_par},
1200 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1201 . "sends more messages than this number, older messages get removed to save memory and "
1202 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1203 on_changed => sub {
1204 my ($self, $value) = @_;
1205 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1206 0
867 }, 1207 },
1208 );
1209
1210 $table
1211}
1212
1213sub autopickup_setup {
1214 my $r = new CFPlus::UI::ScrolledWindow (
1215 expand => 1,
1216 scroll_y => 1
1217 );
1218 $r->add (my $table = new CFPlus::UI::Table
1219 row_expand => [0],
1220 col_expand => [0, 1, 0, 1],
1221 );
1222
1223 for (
1224 ["General", 0, 0,
1225 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1226 ["Inhibit autopickup" => PICKUP_INHIBIT],
1227 ["Stop before pickup" => PICKUP_STOP],
1228 ["Debug autopickup" => PICKUP_DEBUG],
1229 ],
1230 ["Weapons", 0, 6,
1231 ["All weapons" => PICKUP_ALLWEAPON],
1232 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1233 ["Bows" => PICKUP_BOW],
1234 ["Arrows" => PICKUP_ARROW],
1235 ],
1236 ["Armour", 0, 12,
1237 ["Helmets" => PICKUP_HELMET],
1238 ["Shields" => PICKUP_SHIELD],
1239 ["Body Armour" => PICKUP_ARMOUR],
1240 ["Boots" => PICKUP_BOOTS],
1241 ["Gloves" => PICKUP_GLOVES],
1242 ["Cloaks" => PICKUP_CLOAK],
1243 ],
1244
1245 ["Readables", 2, 0,
1246 ["Spellbooks" => PICKUP_SPELLBOOK],
1247 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1248 ["Normal Books/Scrolls" => PICKUP_READABLES],
1249 ],
1250 ["Misc", 2, 5,
1251 ["Food" => PICKUP_FOOD],
1252 ["Drinks" => PICKUP_DRINK],
1253 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1254 ["Keys" => PICKUP_KEY],
1255 ["Magical Items" => PICKUP_MAGICAL],
1256 ["Potions" => PICKUP_POTION],
1257 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1258 ["Ignore cursed" => PICKUP_NOT_CURSED],
1259 ["Jewelery" => PICKUP_JEWELS],
1260 ["Flesh" => PICKUP_FLESH],
1261 ],
1262 ["Weight/Value ratio", 2, 17]
1263 )
1264 {
1265 my ($title, $x, $y, @bits) = @$_;
1266 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1267
1268 for (@bits) {
1269 ++$y;
1270
1271 my $mask = $_->[1];
1272 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1273 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1274 state => $::CFG->{pickup} & $mask,
1275 on_changed => sub {
1276 my ($box, $value) = @_;
1277
1278 if ($value) {
1279 $::CFG->{pickup} |= $mask;
1280 } else {
1281 $::CFG->{pickup} &= ~$mask;
1282 }
1283
1284 $::CONN->send_command ("pickup $::CFG->{pickup}")
1285 if defined $::CONN;
1286
1287 0
1288 });
1289
1290 ${$_->[2]} = $checkbox if $_->[2];
1291 }
1292 }
1293
1294 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1295 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1296 template => ">= 99",
1297 to_value => sub { ">= " . 5 * $_[0] },
1298 on_changed => sub {
1299 my ($slider, $value) = @_;
1300
1301 $::CFG->{pickup} &= ~0xF;
1302 $::CFG->{pickup} |= int $value
1303 if $value;
1304 1;
1305 });
1306
1307 $table->add_at (3, 18, new CFPlus::UI::Button
1308 text => "set",
868 on_activate => sub { 1309 on_activate => sub {
869 my ($input, $text) = @_; 1310 $::CONN->send_command ("pickup $::CFG->{pickup}")
870 $input->set_text (''); 1311 if defined $::CONN;
871
872 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]);
874 } elsif ($text =~ /^\/(.*)/) {
875 $::CONN->user_send ($1);
876 } else {
877 my $say_cmd = $::CFG->{say_command} || 'say';
878 $::CONN->user_send ("$say_cmd $text");
879 } 1312 0
880 if ($input->{refocus_map}) { 1313 });
881 delete $input->{refocus_map}; 1314
882 $MAPWIDGET->focus_in 1315 $r
1316}
1317
1318my %SORT_ORDER = (
1319 type => undef,
1320 mtime => sub {
1321 my $NOW = time;
1322 sort {
1323 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1324 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1325
1326 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1327 or $btime <=> $atime
1328 or $a->{type} <=> $b->{type}
1329 } @_
883 } 1330 },
1331 weight => sub { sort {
1332 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1333 or $a->{type} <=> $b->{type}
1334 } @_ },
1335);
1336
1337sub inventory_widget {
1338 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1339
1340 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1341 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1342
1343 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1344
1345 use sort 'stable';
1346
1347 $hb1->add (new CFPlus::UI::Selector
1348 value => $::CFG->{inv_sort},
1349 options => [
1350 [type => "Type/Name"],
1351 [mtime => "Recent/Normal/Locked"],
1352 [weight => "Weight/Type"],
1353 ],
1354 on_changed => sub {
1355 $::CFG->{inv_sort} = $_[1];
1356 $INV->set_sort_order ($SORT_ORDER{$_[1]});
884 }, 1357 },
885 on_escape => sub { 1358 );
886 $MAPWIDGET->focus_in 1359 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1360 #TODO# update to weigh/maxweight
1361 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1362
1363 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1364 $sw1->add ($INV = new CFPlus::UI::Inventory);
1365 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1366
1367 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1368
1369 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1370
1371 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1372 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1373
1374 # XXX: Call after $INVR = ... because set_opencont sets the items
1375 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1376
1377 $hb
1378}
1379
1380sub toggle_player_page {
1381 my ($widget) = @_;
1382
1383 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1384 $PL_WINDOW->hide;
1385 } else {
1386 $PL_NOTEBOOK->set_current_page ($widget);
1387 $PL_WINDOW->show;
1388 }
1389}
1390
1391sub player_window {
1392 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1393 x => "center",
1394 y => "center",
1395 force_w => $WIDTH * 9/10,
1396 force_h => $HEIGHT * 9/10,
1397 title => "Player",
1398 name => "playerbook",
1399 has_close_button => 1
1400 ;
1401
1402 my $ntb =
1403 $PL_NOTEBOOK =
1404 new CFPlus::UI::Notebook expand => 1;
1405
1406 $ntb->add_tab (
1407 "Statistics (F2)" => $STATS_PAGE = stats_window,
1408 "Shows statistics, where all your Stats and Resistances are shown."
1409 );
1410 $ntb->add_tab (
1411 "Skills (F3)" => $SKILL_PAGE = skill_window,
1412 "Shows all your Skills."
1413 );
1414
1415 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1416 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1417 $ntb->add_tab (
1418 "Spellbook (F4)" => $spellsw,
1419 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1420 );
1421 $ntb->add_tab (
1422 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1423 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1424 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1425 );
1426 $ntb->add_tab (Pickup => autopickup_setup,
1427 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1428
1429 $ntb->set_current_page ($INVENTORY_PAGE);
1430
1431 $plwin->add ($ntb);
1432 $plwin
1433}
1434
1435sub keyboard_setup {
1436 CFPlus::Macro::keyboard_setup
1437}
1438
1439sub help_window {
1440 my $win = new CFPlus::UI::Toplevel
1441 x => 'center',
1442 y => 'center',
1443 z => 4,
1444 name => 'doc_browser',
1445 force_w => int $WIDTH * 7/8,
1446 force_h => int $HEIGHT * 7/8,
1447 title => "Help Browser",
1448 has_close_button => 1;
1449
1450 $win->add (my $vbox = new CFPlus::UI::VBox);
1451
1452 $vbox->add (new CFPlus::UI::FancyFrame
1453 label => "Navigation",
1454 child => (my $buttons = new CFPlus::UI::HBox),
1455 );
1456 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1457 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1458
1459 my @history;
1460 my @future;
1461 my $curnode;
1462
1463 my $load_node; $load_node = sub {
1464 my ($node, $para) = @_;
1465
1466 $buttons->clear;
1467
1468 $buttons->add (new CFPlus::UI::Button
1469 text => "⇤",
1470 tooltip => "back to the starting page",
1471 on_activate => sub {
1472 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1473 unshift @future, @history;
1474 @history = ();
1475 $load_node->(@{shift @future});
1476 },
1477 );
1478
1479 if (@history) {
1480 $buttons->add (new CFPlus::UI::Button
1481 text => "⋘",
1482 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1483 on_activate => sub {
1484 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1485 $load_node->(@{pop @history});
1486 },
1487 );
887 }, 1488 }
888 );
889 1489
890 $CONSOLE = { 1490 if (@future) {
891 window => $window, 1491 $buttons->add (new CFPlus::UI::Button
892 input => $input 1492 text => "⋙",
1493 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1494 on_activate => sub {
1495 push @history, [$curnode, $viewer->current_paragraph];
1496 $load_node->(@{shift @future});
1497 },
1498 );
1499 }
1500
1501 $buttons->add (new CFPlus::UI::Label text => " ");
1502
1503 my @path = CFPlus::Pod::full_path_of $node;
1504 pop @path; # drop current node
1505
1506 for my $node (@path) {
1507 $buttons->add (new CFPlus::UI::Button
1508 text => $node->{kw}[0],
1509 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1510 on_activate => sub {
1511 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1512 $load_node->($node);
1513 },
1514 );
1515 $buttons->add (new CFPlus::UI::Label text => "/");
1516 }
1517
1518 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1519
1520 $curnode = $node;
1521
1522 $viewer->clear;
1523 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1524 $viewer->scroll_to ($para);
893 }; 1525 };
894 1526
1527 $load_node->(CFPlus::Pod::find pod => "mainpage");
1528
1529 $CFPlus::Pod::goto_document = sub {
1530 my (@path) = @_;
1531
1532 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1533
1534 $load_node->((CFPlus::Pod::find @path)[0]);
1535 $win->show;
1536 };
1537
895 $window 1538 $win
1539}
1540
1541sub open_string_query {
1542 my ($title, $cb, $txt, $tooltip) = @_;
1543 my $dialog = new CFPlus::UI::Toplevel
1544 x => "center",
1545 y => "center",
1546 z => 50,
1547 force_w => $WIDTH * 4/5,
1548 title => $title;
1549
1550 $dialog->add (
1551 my $e = new CFPlus::UI::Entry
1552 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1553 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1554 tooltip => $tooltip
1555 );
1556
1557 $e->grab_focus;
1558 $e->set_text ($txt) if $txt;
1559 $dialog->show;
896} 1560}
897 1561
898sub open_quit_dialog { 1562sub open_quit_dialog {
899 unless ($QUIT_DIALOG) { 1563 unless ($QUIT_DIALOG) {
900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1564 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1565 x => "center",
1566 y => "center",
1567 z => 50,
1568 title => "Really Quit?",
1569 on_key_down => sub {
1570 my ($dialog, $ev) = @_;
1571 $ev->{sym} == 27 and $dialog->hide;
1572 }
1573 ;
901 1574
902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1575 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
903 1576
904 $vb->add (new CFClient::UI::Label 1577 $vb->add (new CFPlus::UI::Label
905 text => "You should find a savebed and apply it first!", 1578 text => "You should find a savebed and apply it first!",
906 max_w => $WIDTH * 0.25, 1579 max_w => $WIDTH * 0.25,
907 ellipsize => 0, 1580 ellipsize => 0,
908 ); 1581 );
909 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1582 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
910 $hb->add (new CFClient::UI::Button 1583 $hb->add (new CFPlus::UI::Button
911 text => "Ok", 1584 text => "Ok",
912 expand => 1, 1585 expand => 1,
913 on_activate => sub { $QUIT_DIALOG->hide }, 1586 on_activate => sub { $QUIT_DIALOG->hide; 0 },
914 ); 1587 );
915 $hb->add (new CFClient::UI::Button 1588 $hb->add (new CFPlus::UI::Button
916 text => "Quit anyway", 1589 text => "Quit anyway",
917 expand => 1, 1590 expand => 1,
918 on_activate => sub { exit }, 1591 on_activate => sub { exit },
919 ); 1592 );
920 } 1593 }
921 1594
922 $QUIT_DIALOG->show; 1595 $QUIT_DIALOG->show;
923 $QUIT_DIALOG->center; 1596 $QUIT_DIALOG->grab_focus;
924} 1597}
925 1598
926sub make_inventory_window { 1599sub show_tip_of_the_day {
927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1600 # find all tips
928 def_w => $WIDTH * 7/8, 1601 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
929 def_h => $HEIGHT * 7/8,
930 title => "Inventory",
931 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ;
937 1602
938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1603 CFPlus::DB::get state => "tip_of_the_day", sub {
1604 my ($todindex) = @_;
1605 $todindex = 0 if $todindex >= @tod;
1606 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
939 1607
940 $hb->add (my $vb1 = new CFClient::UI::VBox); 1608 # create dialog
941 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1609 my $dialog;
942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
943 1610
944 $hb->add (my $vb2 = new CFClient::UI::VBox); 1611 my $close = sub {
945 1612 $dialog->destroy;
946 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
947
948 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
949
950 # XXX: Call after $INVR = ... because set_opencont sets the items
951 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
952
953 $invwin
954}
955
956sub make_binding_window {
957 my $binding_list = new CFClient::UI::VBox;
958
959 my $refresh = sub {
960 $binding_list->clear ();
961
962 for my $mod (keys %{$::CFG->{bindings}}) {
963 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
964 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
965 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
966
967 my $lbl = join "; ", @$cmds;
968 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);
969 $binding_list->add (my $hb = new CFClient::UI::HBox);
970 $hb->add (new CFClient::UI::Button
971 text => "delete",
972 on_activate => sub {
973 $binding_list->remove ($hb);
974 delete $::CFG->{bindings}->{$mod}->{$sym};
975 });
976 $hb->add (new CFClient::UI::Label text => "($nam)");
977 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
978 }
979 }
980 };
981
982 $BIND_WINDOW = new CFClient::UI::FancyFrame
983 title => "Bindings",
984 def_w => int $WIDTH * 7/8,
985 def_h => int $HEIGHT * 7/8,
986 on_visibility_change => sub {
987 my ($self, $visible) = @_;
988 if ($visible) {
989 $self->center;
990 $refresh->()
991 }
992 }; 1613 };
993 1614
994 $BIND_WINDOW->add ($binding_list); 1615 $dialog = new CFPlus::UI::Toplevel
995 $refresh->(); 1616 x => "center",
996 $BIND_WINDOW 1617 y => "center",
997} 1618 z => 3,
998 1619 name => 'tip_of_the_day',
999sub make_help_window {
1000 my $win = new CFClient::UI::FancyFrame
1001 def_w => int $WIDTH * 7/8, 1620 force_w => int $WIDTH * 4/9,
1002 def_h => int $HEIGHT * 7/8, 1621 force_h => int $WIDTH * 2/9,
1003 title => "Documentation"; 1622 title => "Tip of the day #" . (1 + $todindex),
1623 child => my $vbox = new CFPlus::UI::VBox,
1624 has_close_button => 1,
1625 on_delete => $close,
1626 ;
1004 1627
1005 $win->add (my $vbox = new CFClient::UI::VBox); 1628 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1629 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1630 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1006 1631
1007 $vbox->add (my $buttons = new CFClient::UI::HBox); 1632 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1008 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
1009 1633
1010 for ( 1634 $table->add_at (0, 0, new CFPlus::UI::Button
1011 [intro => "Introduction"],
1012 [manual => "Manual"],
1013 [command_help => "Commands"],
1014 [skill_help => "Skills"],
1015 ) {
1016 my ($pod, $label) = @$_;
1017
1018 $buttons->add (new CFClient::UI::Button
1019 text => $label, 1635 text => "Close",
1636 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1637 on_activate => $close,
1638 );
1639
1640 $table->add_at (2, 0, new CFPlus::UI::Button
1641 text => "Next",
1642 tooltip => "Show the next <b>Tip of the day</b>.",
1020 on_activate => sub { 1643 on_activate => sub {
1021 my $parser = new Pod::POM; 1644 $close->();
1022 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1645 &show_tip_of_the_day;
1023
1024 $viewer->clear;
1025
1026 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1027 for @{ CFClient::pod_to_pango_list $pom };
1028
1029 $viewer->set_offset (0);
1030 }, 1646 },
1031 ); 1647 );
1648
1649 $dialog->show;
1032 } 1650 };
1033
1034 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1035
1036 $win
1037} 1651}
1038 1652
1039sub sdl_init { 1653sub sdl_init {
1040 CFClient::SDL_Init 1654 CFPlus::SDL_Init
1041 and die "SDL::Init failed!\n"; 1655 and die "SDL::Init failed!\n";
1042} 1656}
1043 1657
1044sub video_init { 1658sub video_init {
1045 sdl_init;
1046
1047 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1659 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1048 1660
1049 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1661 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1050 1662
1051 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1663 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1052 $FULLSCREEN = $CFG->{fullscreen}; 1664 $FULLSCREEN = $CFG->{fullscreen};
1053 $FAST = $CFG->{fast}; 1665 $FAST = $CFG->{fast};
1054 1666
1055 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1667 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1056 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1668 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1057 1669
1058 $SDL_ACTIVE = 1; 1670 $SDL_ACTIVE = 1;
1059 $LAST_REFRESH = time - 0.01; 1671 $LAST_REFRESH = time - 0.01;
1060 1672
1061 CFClient::OpenGL::init; 1673 CFPlus::OpenGL::init;
1062 1674
1063 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1675 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1064 1676
1065 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1677 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1066 1678
1067 ############################################################################# 1679 #############################################################################
1068 1680
1069 if ($DEBUG_STATUS) { 1681 if ($DEBUG_STATUS) {
1070 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1682 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1071 } else { 1683 } else {
1072 # create the widgets 1684 # create the widgets
1073 1685
1074 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1686 $DEBUG_STATUS = new CFPlus::UI::Label
1687 padding => 0,
1688 z => 100,
1689 force_x => "max",
1690 force_y => 0;
1075 $DEBUG_STATUS->show; 1691 $DEBUG_STATUS->show;
1076 1692
1077 $STATUSBOX = new CFClient::UI::Statusbox; 1693 $STATUSBOX = new CFPlus::UI::Statusbox;
1078 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1694 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1079 1695
1080 (new CFClient::UI::Frame 1696 (new CFPlus::UI::Frame
1081 bg => [0, 0, 0, 0.4], 1697 bg => [0, 0, 0, 0.4],
1082 req_y => -1, 1698 force_x => 0,
1699 force_y => "max",
1083 child => $STATUSBOX, 1700 child => $STATUSBOX,
1084 )->show; 1701 )->show;
1085 1702
1086 CFClient::UI::FancyFrame->new ( 1703 CFPlus::UI::Toplevel->new (
1704 title => "Map",
1705 name => "mapmap",
1706 x => 0,
1707 y => $FONTSIZE + 8,
1087 border_bg => [1, 1, 1, 192/255], 1708 border_bg => [1, 1, 1, 192/255],
1088 bg => [1, 1, 1, 0], 1709 bg => [1, 1, 1, 0],
1089 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1710 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1090 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1711 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1091 ), 1712 ),
1092 )->show; 1713 )->show;
1093 1714
1094 $MAPWIDGET = new CFClient::MapWidget; 1715 $MAPWIDGET = new CFPlus::MapWidget;
1095 $MAPWIDGET->connect (activate_console => sub { 1716 $MAPWIDGET->connect (activate_console => sub {
1096 my ($mapwidget, $preset) = @_; 1717 my ($mapwidget, $preset) = @_;
1097 1718
1098 if ($CONSOLE) { 1719 $MESSAGE_WINDOW->activate_console ($preset)
1099 $CONSOLE->{input}->{auto_activated} = 1; 1720 if $MESSAGE_WINDOW;
1100 $CONSOLE->{input}->focus_in;
1101
1102 if ($preset && $CONSOLE->{input}->get_text eq '') {
1103 $CONSOLE->{input}->set_text ($preset);
1104 }
1105 }
1106 }); 1721 });
1107 $MAPWIDGET->show; 1722 $MAPWIDGET->show;
1108 $MAPWIDGET->focus_in; 1723 $MAPWIDGET->grab_focus;
1109 1724
1110 $LOGVIEW = new CFClient::UI::TextView 1725 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1726 title => "Setup",
1727 name => "setup_dialog",
1728 x => 'center',
1729 y => 'center',
1111 expand => 1, 1730 z => 2,
1112 font => $FONT_FIXED, 1731 force_w => $::WIDTH * 0.6,
1113 fontsize => $::CFG->{log_fontsize}, 1732 force_h => $::HEIGHT * 0.6,
1114 can_hover => 1, 1733 has_close_button => 1,
1115 can_events => 1,
1116 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1117 ; 1734 ;
1118 1735
1119 $BUTTONBAR = new CFClient::UI::HBox; 1736 $METASERVER = metaserver_dialog;
1737 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1120 1738
1121 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1739 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1122 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1740 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1123 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1741
1742 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1124 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1743 "Configure the server to play on, your username, password and other server-related options.");
1744 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1745 "Configure various client-specific settings.");
1746 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1747 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1748 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1749 "Configure the use of audio, sound effects and background music.");
1750 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1751 "Lets you define, edit and delete key bindings."
1752 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1753 . "with nothing set and the recording started. After doing the actions you "
1754 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1755 . "After pressing the combo the binding will be saved automatically and the "
1756 . "binding editor closes");
1757 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1758 "Some debuggin' options. Do not ask.");
1759
1760 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1761
1762 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1763 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1764
1125 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1765 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1126 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1766 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1127 1767
1128 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 1768 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
1129 1769
1130 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1131 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1132 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1770 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1133 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1771 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1134 1772
1135 $BUTTONBAR->add (new CFClient::UI::Button 1773 $BUTTONBAR->add (new CFPlus::UI::Button
1136 text => "Save Config", 1774 text => "Save Config",
1137 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1775 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1138 on_activate => sub { 1776 on_activate => sub {
1139 $::CFG->{layout} = CFClient::UI::get_layout; 1777 $::CFG->{layout} = CFPlus::UI::get_layout;
1140 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1778 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1141 status "Configuration Saved"; 1779 status "Configuration Saved";
1780 0
1142 }, 1781 },
1143 ); 1782 );
1144 1783
1145 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1784 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1146 tooltip => "View Documentation"); 1785 tooltip => "View Documentation");
1147 1786
1148 $BUTTONBAR->add (new CFClient::UI::Flopper
1149 text => "Bindings",
1150 other => make_binding_window,
1151 tooltip => "Lets you delete bindings you have made with the recorder"
1152 );
1153 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1154 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1155 1787
1156 $BUTTONBAR->add (new CFClient::UI::Button 1788 $BUTTONBAR->add (new CFPlus::UI::Button
1157 text => "Quit", 1789 text => "Quit",
1158 tooltip => "Terminates the program", 1790 tooltip => "Terminates the program",
1159 on_activate => sub { 1791 on_activate => sub {
1160 if ($CONN) { 1792 if ($CONN) {
1161 open_quit_dialog; 1793 open_quit_dialog;
1162 } else { 1794 } else {
1163 exit; 1795 exit;
1164 } 1796 }
1797 0
1165 }, 1798 },
1166 ); 1799 );
1167 1800
1168 $BUTTONBAR->show; 1801 $BUTTONBAR->show;
1169 1802 $SETUP_DIALOG->show;
1170 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1171
1172 $SERVER_SETUP->show;
1173 } 1803 }
1804
1805 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1174} 1806}
1175 1807
1176sub video_shutdown { 1808sub video_shutdown {
1809 CFPlus::OpenGL::shutdown;
1810
1177 undef $SDL_ACTIVE; 1811 undef $SDL_ACTIVE;
1178} 1812}
1179
1180my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1181my $bgmusic;#TODO#hack#d#
1182 1813
1183sub audio_channel_finished { 1814sub audio_channel_finished {
1184 my ($channel) = @_; 1815 my ($channel) = @_;
1185 1816
1186 #warn "channel $channel finished\n";#d# 1817 #warn "channel $channel finished\n";#d#
1187} 1818}
1188 1819
1820sub audio_music_set {
1821 my ($songs) = @_;
1822
1823 my @want =
1824 grep $_,
1825 map $CONN->{music_meta}{$_},
1826 @$songs;
1827
1828 if (@want) {
1829 @MUSIC_WANT = @want;
1830 &audio_music_changed ();
1831 }
1832}
1833
1834sub audio_music_start {
1835 my $path = $MUSIC_PLAYING->{path}
1836 or return;
1837
1838 CFPlus::DB::prefetch_file $path, 1024_000, sub {
1839 return unless $SDL_MIXER;
1840
1841 # music might have changed...
1842 $path eq $MUSIC_PLAYING->{path}
1843 or return &audio_music_start ();
1844
1845 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
1846
1847 my $NOW = time;
1848
1849 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1850 my $pos = $MUSIC_PLAYING->{stop_pos};
1851 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1852 $MUSIC_START = time - $pos;
1853 } else {
1854 $MUSIC_PLAYER->play (0);
1855 $MUSIC_START = time;
1856 }
1857
1858 delete $MUSIC_PLAYING->{stop_time};
1859 delete $MUSIC_PLAYING->{stop_pos};
1860 }
1861}
1862
1863sub audio_music_changed {
1864 return unless $CFG->{bgm_enable};
1865 return unless $SDL_MIXER;
1866
1867 # default MUSIC_WANT == MUSIC_DEFAULT
1868 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1869
1870 # if the currently playing song is acceptable, let it continue
1871 return if $MUSIC_PLAYING
1872 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
1873
1874 my $NOW = time;
1875
1876 if ($MUSIC_PLAYING) {
1877 $MUSIC_PLAYING->{stop_time} = $NOW;
1878 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
1879 CFPlus::MixMusic::fade_out 1000;
1880 } else {
1881 # sort by stop time, oldest first
1882 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1883
1884 # if the most recently-played piece played very recently,
1885 # resume it, else choose the oldest piece for rotation.
1886 $MUSIC_PLAYING =
1887 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1888 ? $MUSIC_WANT[-1]
1889 : $MUSIC_WANT[0];
1890
1891 audio_music_start;
1892 }
1893}
1894
1189sub audio_music_finished { 1895sub audio_music_finished {
1190 return unless $CFG->{bgm_enable}; 1896 $MUSIC_PLAYING = undef;
1897 undef $MUSIC_PLAYER;
1191 1898
1192 # TODO: hack, do play loop and mood music 1899 audio_music_changed;
1193 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1194 $bgmusic->play (0);
1195
1196 push @bgmusic, shift @bgmusic;
1197} 1900}
1198 1901
1199sub audio_init { 1902sub audio_init {
1200 if ($CFG->{audio_enable}) { 1903 if ($CFG->{audio_enable}) {
1201 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1904 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1202 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1905 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1203 1906
1204 unless ($SDL_MIXER) { 1907 unless ($SDL_MIXER) {
1205 status "Unable to open sound device: there will be no sound"; 1908 status "Unable to open sound device: there will be no sound";
1206 return; 1909 return;
1207 } 1910 }
1208 1911
1209 CFClient::Mix_AllocateChannels 8; 1912 CFPlus::Mix_AllocateChannels 8;
1210 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1913 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1211 1914
1212 audio_music_finished; 1915 audio_music_finished;
1213 1916
1917 local $_;
1214 while (<$fh>) { 1918 while (<$fh>) {
1215 next if /^\s*#/; 1919 next if /^\s*#/;
1216 next if /^\s*$/; 1920 next if /^\s*$/;
1217 1921
1218 my ($file, $volume, $event) = split /\s+/, $_, 3; 1922 my ($file, $volume, $event) = split /\s+/, $_, 3;
1219 1923
1220 push @SOUNDS, "$volume,$file"; 1924 push @SOUNDS, "$volume,$file";
1221 1925
1222 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1926 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1223 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 1927 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1224 $chunk->volume ($volume * 128 / 100); 1928 $chunk->volume ($volume * 128 / 100);
1225 $chunk 1929 $chunk
1226 }; 1930 };
1227 } 1931 }
1228 } else { 1932 } else {
1229 status "unable to open sound config: $!"; 1933 status "unable to open sound config: $!";
1230 } 1934 }
1935 } else {
1936 undef $SDL_MIXER;
1231 } 1937 }
1232} 1938}
1233 1939
1234sub audio_shutdown { 1940sub audio_shutdown {
1235 CFClient::Mix_CloseAudio if $SDL_MIXER; 1941 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1236 undef $SDL_MIXER; 1942 undef $SDL_MIXER;
1237 @SOUNDS = (); 1943 @SOUNDS = ();
1238 %AUDIO_CHUNKS = (); 1944 %AUDIO_CHUNKS = ();
1239} 1945}
1240 1946
… …
1245 1951
1246my %demo;#d# 1952my %demo;#d#
1247 1953
1248sub force_refresh { 1954sub force_refresh {
1249 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1955 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1250 debug sprintf "%3.2f", $fps; 1956 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1251 1957
1252 $CFClient::UI::ROOT->draw; 1958 $CFPlus::UI::ROOT->draw;
1253 1959
1254 $WANT_REFRESH = 0; 1960 $WANT_REFRESH = 0;
1255 $CAN_REFRESH = 0; 1961 $CAN_REFRESH = 0;
1256 $LAST_REFRESH = $NOW; 1962 $LAST_REFRESH = $NOW;
1257 1963
12580 && do {
1259 # some weird model-drawing code, just a joke right now
1260 use CFClient::OpenGL;
1261
1262 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1263 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1264 $demo{r} ||= do {
1265 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1266 $mod->{v} = pack "f*", @{$mod->{v}};
1267 $_ = [scalar @$_, pack "S!*", @$_]
1268 for values %{$mod->{g}};
1269 $mod
1270 };
1271
1272 my $r = $demo{r} or die;
1273
1274 glDepthMask 1;
1275 glClear GL_DEPTH_BUFFER_BIT;
1276 glEnable GL_TEXTURE_2D;
1277 glEnable GL_DEPTH_TEST;
1278 glEnable GL_CULL_FACE;
1279 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1280
1281 glMatrixMode GL_PROJECTION;
1282 glLoadIdentity;
1283 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1284 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1285 glMatrixMode GL_MODELVIEW;
1286 glLoadIdentity;
1287
1288 glPushMatrix;
1289 glTranslate 0, 0, -800;
1290 glScale 1, -1, 1;
1291 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1292 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1293 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1294 glScale 50, 50, 50;
1295
1296 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1297 while (my ($k, $v) = each %{$r->{g}}) {
1298 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1299 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1300 }
1301
1302 glPopMatrix;
1303
1304 glShadeModel GL_FLAT;
1305 glDisable GL_DEPTH_TEST;
1306 glDisable GL_TEXTURE_2D;
1307 glDepthMask 0;
1308
1309 $WANT_REFRESH++;
1310};
1311
1312 CFClient::SDL_GL_SwapBuffers; 1964 CFPlus::SDL_GL_SwapBuffers;
1313} 1965}
1314 1966
1315my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1967my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1316 $NOW = time; 1968 $NOW = time;
1317 1969
1318 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1970 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1319 for CFClient::SDL_PollEvent; 1971 for CFPlus::poll_events;
1320 1972
1321 if (%animate_object) { 1973 if (%animate_object) {
1322 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1974 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1323 $WANT_REFRESH++; 1975 ++$WANT_REFRESH;
1324 } 1976 }
1325 1977
1326 if ($WANT_REFRESH) { 1978 if ($WANT_REFRESH) {
1327 force_refresh; 1979 force_refresh;
1328 } else { 1980 } else {
… …
1348 $CONN->face_prefetch 2000 $CONN->face_prefetch
1349 if $CONN; 2001 if $CONN;
1350}); 2002});
1351 2003
1352%SDL_CB = ( 2004%SDL_CB = (
1353 CFClient::SDL_QUIT => sub { 2005 CFPlus::SDL_QUIT => sub {
1354 Event::unloop -1; 2006 exit;
1355 }, 2007 },
1356 CFClient::SDL_VIDEORESIZE => sub { 2008 CFPlus::SDL_VIDEORESIZE => sub {
1357 }, 2009 },
1358 CFClient::SDL_VIDEOEXPOSE => sub { 2010 CFPlus::SDL_VIDEOEXPOSE => sub {
1359 CFClient::UI::full_refresh; 2011 CFPlus::UI::full_refresh;
1360 }, 2012 },
1361 CFClient::SDL_ACTIVEEVENT => sub { 2013 CFPlus::SDL_ACTIVEEVENT => sub {
1362# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2014# not useful, as APPACTIVE include sonly iconified state, not unmapped
2015# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2016# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2017# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2018# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2019# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1363 }, 2020 },
1364 CFClient::SDL_KEYDOWN => sub { 2021 CFPlus::SDL_KEYDOWN => sub {
1365 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2022 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1366 # alt-enter 2023 # alt-enter
2024 $FULLSCREEN_ENABLE->toggle;
1367 video_shutdown; 2025 video_shutdown;
1368 $CFG->{fullscreen} = !$CFG->{fullscreen};
1369 video_init; 2026 video_init;
1370 } else { 2027 } else {
1371 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2028 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1372 } 2029 }
1373 }, 2030 },
1374 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2031 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1375 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2032 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1376 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2033 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1377 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2034 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1378 CFClient::SDL_USEREVENT => sub { 2035 CFPlus::SDL_USEREVENT => sub {
1379 if ($_[0]{code} == 1) { 2036 if ($_[0]{code} == 1) {
1380 audio_channel_finished $_[0]{data1}; 2037 audio_channel_finished $_[0]{data1};
1381 } elsif ($_[0]{code} == 0) { 2038 } elsif ($_[0]{code} == 0) {
1382 audio_music_finished; 2039 audio_music_finished;
1383 } 2040 }
… …
1387############################################################################# 2044#############################################################################
1388 2045
1389$SIG{INT} = $SIG{TERM} = sub { exit }; 2046$SIG{INT} = $SIG{TERM} = sub { exit };
1390 2047
1391{ 2048{
1392 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1393
1394 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2049 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2050 CFPlus::DB::Server::run;
2051
1395 CFClient::UI::set_layout ($::CFG->{layout}); 2052 CFPlus::UI::set_layout ($::CFG->{layout});
1396 2053
1397 my %DEF_CFG = ( 2054 my %DEF_CFG = (
1398 sdl_mode => 0, 2055 sdl_mode => 0,
1399 width => 640, 2056 width => 640,
1400 height => 480, 2057 height => 480,
1401 fullscreen => 0, 2058 fullscreen => 0,
1402 fast => 0, 2059 fast => 0,
1403 map_scale => 1, 2060 map_scale => 1,
1404 fow_enable => 1, 2061 fow_enable => 1,
1405 fow_intensity => 0.45, 2062 fow_intensity => 0,
1406 fow_smooth => 0, 2063 map_smoothing => 1,
1407 gui_fontsize => 1, 2064 gui_fontsize => 1,
1408 log_fontsize => 1, 2065 log_fontsize => 0.7,
1409 gauge_fontsize=> 1, 2066 gauge_fontsize => 1,
1410 gauge_size => 0.35, 2067 gauge_size => 0.35,
1411 stat_fontsize => 1, 2068 stat_fontsize => 0.7,
1412 mapsize => 100, 2069 mapsize => 100,
1413 host => "crossfire.schmorp.de",
1414 say_command => 'say',
1415 audio_enable => 1, 2070 audio_enable => 1,
1416 bgm_enable => 1, 2071 bgm_enable => 1,
1417 bgm_volume => 0.25, 2072 bgm_volume => 0.25,
1418 face_prefetch => 0, 2073 face_prefetch => 0,
1419 output_sync => 1, 2074 output_sync => 1,
1420 output_count => 1, 2075 output_count => 1,
2076 output_rate => "",
2077 pickup => 0,
2078 inv_sort => "mtime",
2079 default => "profile", # default profile
2080 show_tips => 1,
2081 logview_max_par => 1000,
2082 );
1421 ); 2083
1422
1423 while (my ($k, $v) = each %DEF_CFG) { 2084 while (my ($k, $v) = each %DEF_CFG) {
1424 $CFG->{$k} = $v unless exists $CFG->{$k}; 2085 $CFG->{$k} = $v unless exists $CFG->{$k};
1425 } 2086 }
1426 2087
2088 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2089 $PROFILE = $CFG->{profile}{default};
2090
2091 # convert old bindings (only default profile matters)
2092 if (my $bindings = delete $PROFILE->{bindings}) {
2093 while (my ($mod, $syms) = each %$bindings) {
2094 while (my ($sym, $cmds) = each %$syms) {
2095 push @{ $PROFILE->{macro} }, {
2096 accelkey => [$mod*1, $sym*1],
2097 action => $cmds,
2098 };
2099 }
2100 }
2101 }
2102
1427 sdl_init; 2103 sdl_init;
1428 2104
1429 @SDL_MODES = reverse 2105 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1430 grep $_->[0] >= 640 && $_->[1] >= 480, 2106 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1431 CFClient::SDL_ListModes;
1432
1433 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2107 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2108
2109 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1434 2110
1435 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2111 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1436 2112
1437 { 2113 {
1438 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2114 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1439 DejaVuSans.ttf 2115 DejaVuSans.ttf
1440 DejaVuSansMono.ttf 2116 DejaVuSansMono.ttf
1441 DejaVuSans-Bold.ttf 2117 DejaVuSans-Bold.ttf
1442 DejaVuSansMono-Bold.ttf 2118 DejaVuSansMono-Bold.ttf
1443 DejaVuSans-Oblique.ttf 2119 DejaVuSans-Oblique.ttf
1444 DejaVuSansMono-Oblique.ttf 2120 DejaVuSansMono-Oblique.ttf
1445 DejaVuSans-BoldOblique.ttf 2121 DejaVuSans-BoldOblique.ttf
1446 DejaVuSansMono-BoldOblique.ttf 2122 DejaVuSansMono-BoldOblique.ttf
1447 ); 2123 );
1448 2124
1449 CFClient::add_font $_ for @fonts; 2125 CFPlus::add_font $_ for @fonts;
1450 2126
1451 CFClient::pango_init; 2127 CFPlus::pango_init;
1452 2128
1453 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2129 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1454 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2130 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1455 2131
1456 $FONT_PROP->make_default; 2132 $FONT_PROP->make_default;
1457 } 2133 }
1458 2134
1459# compare mono (ft) vs. rgba (cairo) 2135# compare mono (ft) vs. rgba (cairo)
1460# ft - 1.8s, cairo 3s, even in alpha-only mode 2136# ft - 1.8s, cairo 3s, even in alpha-only mode
1461# for my $rgba (0..1) { 2137# for my $rgba (0..1) {
1462# my $t1 = Time::HiRes::time; 2138# my $t1 = Time::HiRes::time;
1463# for (1..1000) { 2139# for (1..1000) {
1464# my $layout = CFClient::Layout->new ($rgba); 2140# my $layout = CFPlus::Layout->new ($rgba);
1465# $layout->set_text ("hallo" x 100); 2141# $layout->set_text ("hallo" x 100);
1466# $layout->render; 2142# $layout->render;
1467# } 2143# }
1468# my $t2 = Time::HiRes::time; 2144# my $t2 = Time::HiRes::time;
1469# warn $t2-$t1; 2145# warn $t2-$t1;
1470# } 2146# }
1471 2147
2148 $startup_done->();
2149
1472 video_init; 2150 video_init;
1473 audio_init; 2151 audio_init;
1474} 2152}
1475 2153
2154show_tip_of_the_day if $CFG->{show_tips};
2155
1476Event::loop; 2156Event::loop;
2157#CFPlus::SDL_Quit;
2158#CFPlus::_exit 0;
1477 2159
1478END { CFClient::SDL_Quit } 2160END {
2161 CFPlus::SDL_Quit;
2162 CFPlus::DB::Server::stop;
2163}
1479 2164
1480=head1 NAME 2165=head1 NAME
1481 2166
1482cfplus - A Crossfire+ and Crossfire game client 2167cfplus - A Crossfire+ and Crossfire game client
1483 2168
… …
1488=head1 USAGE 2173=head1 USAGE
1489 2174
1490cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2175cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1491fullscreen and interactively. 2176fullscreen and interactively.
1492 2177
2178=head1 DEBUGGING
2179
2180
2181CFPLUS_DEBUG - environment variable
2182
2183 1 draw borders around widgets
2184 2 add low-level widget info to tooltips
2185 4 show fps
2186 8 suppress tooltips
2187
1493=head1 AUTHOR 2188=head1 AUTHOR
1494 2189
1495Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2190Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1496 2191
1497 2192

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines