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

Diff Legend

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