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

Diff Legend

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