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

Diff Legend

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