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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.17 by root, Wed Dec 26 20:46:39 2007 UTC vs.
Revision 1.45 by root, Mon May 26 03:35:42 2008 UTC

… …
78} 78}
79 79
80# prepend private library directory 80# prepend private library directory
81BEGIN { 81BEGIN {
82 for (grep !ref, @INC) { 82 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private/dc"; 83 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 84 if (-d $path) {
85 unshift @INC, $path; 85 unshift @INC, $path;
86 last; 86 last;
87 } 87 }
88 } 88 }
… …
99use Deliantra; 99use Deliantra;
100use Deliantra::Protocol::Constants; 100use Deliantra::Protocol::Constants;
101 101
102use Compress::LZF; 102use Compress::LZF;
103 103
104use dc; 104use DC;
105BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
105use dc::OpenGL (); 106use DC::OpenGL ();
106use dc::Protocol; 107use DC::Protocol;
107use dc::DB; 108use DC::DB;
108use dc::UI; 109use DC::UI;
109use dc::UI::Canvas; 110use DC::UI::Canvas;
110use dc::UI::Inventory; 111use DC::UI::Inventory;
111use dc::UI::SpellList; 112use DC::UI::SpellList;
112use dc::UI::Dockable; 113use DC::UI::Dockable;
114use DC::UI::Dockbar;
113use dc::UI::MessageWindow; 115use DC::UI::MessageWindow;
114use dc::UI::ChatView; 116use DC::UI::ChatView;
117use DC::MessageDistributor;
115use dc::Pod; 118use DC::Pod;
116use dc::MapWidget; 119use DC::MapWidget;
117use dc::Macro; 120use DC::Macro;
118 121
119$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 122$SIG{QUIT} = sub { Carp::cluck "QUIT" };
120$SIG{PIPE} = 'IGNORE'; 123$SIG{PIPE} = 'IGNORE';
121 124
122$EV::DIED = sub { 125$EV::DIED = sub {
123 dc::fatal Carp::longmess $@; 126 DC::fatal Carp::longmess $@;
124}; 127};
125 128
126my $MAX_FPS = 60; 129my $MAX_FPS = 60;
127my $MIN_FPS = 5; # unused as of yet
128 130
129our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 131our $META_SERVER = "http://metaserver.schmorp.de/current.json";
130 132
131our $LAST_REFRESH; 133our $LAST_REFRESH;
132our $NOW; 134our $NOW;
… …
179our $SPELL_PAGE; 181our $SPELL_PAGE;
180our $SPELL_LIST; 182our $SPELL_LIST;
181 183
182our $HELP_WINDOW; 184our $HELP_WINDOW;
183our $MESSAGE_WINDOW; 185our $MESSAGE_WINDOW;
186our $MESSAGE_DIST;
184our $FLOORBOX; 187our $FLOORBOX;
185our $GAUGES; 188our $GAUGES;
186our $STATWIDS; 189our $STATWIDS;
187 190
188our $SDL_ACTIVE; 191our $SDL_ACTIVE;
189our %SDL_CB; 192our %SDL_CB;
190 193
191our $ALT_ENTER_MESSAGE; 194our $ALT_ENTER_MESSAGE;
192our $STATUSBOX; 195our $STATUSBOX;
196our $MODBOX;
193our $DEBUG_STATUS; 197our $DEBUG_STATUS;
194 198
195our $INV; 199our $INV;
196our $INVR; 200our $INVR;
197our $INVR_HB; 201our $INVR_HB;
198 202
199############################################################################# 203#############################################################################
200 204
201sub status { 205sub status {
202 $STATUSBOX->add (dc::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 206 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
203} 207}
204 208
205sub debug { 209sub debug {
206 $DEBUG_STATUS->set_text ($_[0]); 210 $DEBUG_STATUS->set_text ($_[0]);
207} 211}
208 212
209sub message { 213sub message {
210 $MESSAGE_WINDOW->message (@_); 214 $MESSAGE_DIST->message (@_);
215}
216
217sub update_modbox {
218 my $mod = DC::SDL_GetModState;
219
220 my $markup;
221
222 $markup .= $mod & DC::KMOD_CTRL
223 ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[<span foreground='#888'>REPEAT</span>]")
224 : "[<span foreground='#888'> once </span>]";
225
226 $markup .= $mod & DC::KMOD_SHIFT
227 ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[<span foreground='#888'>FIRE</span>]")
228 : "[<span foreground='#888'>move</span>]";
229
230 $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
231 ? "[ALT]"
232 : "[<span foreground='#888'>alt</span>]";
233
234 $markup .= $mod & DC::KMOD_NUM
235 ? "[NUM]"
236 : "[<span foreground='#888'>num</span>]";
237
238 # <tt> around next statement works around some bug that keeps the
239 # "font =>" from being used on windows
240 $MODBOX->set_markup ("<tt>$markup</tt>");
211} 241}
212 242
213############################################################################# 243#############################################################################
214#TODO: maybe move into own audio module... 244#TODO: maybe move into own audio module...
215 245
… …
245 275
246 if (my $chunk = $AUDIO_CHUNK{$face}) { 276 if (my $chunk = $AUDIO_CHUNK{$face}) {
247 for (grep $_->[0] >= EV::now, @{(delete $AUDIO_PLAY{$face}) || []}) { 277 for (grep $_->[0] >= EV::now, @{(delete $AUDIO_PLAY{$face}) || []}) {
248 my (undef, $dx, $dy, $vol) = @$_; 278 my (undef, $dx, $dy, $vol) = @$_;
249 279
250 my $channel = dc::Channel::find; 280 my $channel = DC::Channel::find;
251 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255); 281 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
252 $channel->set_position_r ($dx, $dy, 20); 282 $channel->set_position_r ($dx, $dy, 20);
253 $chunk->play ($channel); 283 $chunk->play ($channel);
254 } 284 }
255 } else { 285 } else {
… …
266 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 296 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
267 &audio_music_push ($face); 297 &audio_music_push ($face);
268 } 298 }
269 } else { 299 } else {
270 # fetch from database 300 # fetch from database
271 dc::DB::get res_data => $meta->{name}, sub { 301 DC::DB::get res_data => $meta->{name}, sub {
272 my $rwops = new dc::RW $_[0]; 302 my $rwops = new DC::RW $_[0];
273 my $chunk = new dc::MixChunk $rwops 303 my $chunk = new DC::MixChunk $rwops
274 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . dc::Mix_GetError; 304 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError;
275 $chunk->volume (($meta->{data}{volume} || 1) * 128); 305 $chunk->volume (($meta->{data}{volume} || 1) * 128);
276 $AUDIO_CHUNK{$face} = $chunk; 306 $AUDIO_CHUNK{$face} = $chunk;
277 307
278 audio_sound_push ($face); 308 audio_sound_push ($face);
279 }; 309 };
… …
298sub audio_music_set_meta { 328sub audio_music_set_meta {
299 my ($meta) = @_; 329 my ($meta) = @_;
300 330
301 $MUSIC_PLAYING_META = $meta; 331 $MUSIC_PLAYING_META = $meta;
302 $MUSIC_PLAYING_WIDGET->set_markup ( 332 $MUSIC_PLAYING_WIDGET->set_markup (
303 "<b>Name</b>: " . (dc::asxml $meta->{data}{name}) . "\n" 333 "<b>Name</b>: " . (DC::asxml $meta->{data}{name}) . "\n"
304 . "<b>Author</b>: " . (dc::asxml $meta->{data}{author}) . "\n" 334 . "<b>Author</b>: " . (DC::asxml $meta->{data}{author}) . "\n"
305 . "<b>Source</b>: " . (dc::asxml $meta->{data}{source}) . "\n" 335 . "<b>Source</b>: " . (DC::asxml $meta->{data}{source}) . "\n"
306 . "<b>License</b>: " . (dc::asxml $meta->{data}{license}) 336 . "<b>License</b>: " . (DC::asxml $meta->{data}{license})
307 ); 337 );
308} 338}
309 339
310sub audio_music_update_volume { 340sub audio_music_update_volume {
311 return unless $MUSIC_PLAYING_META; 341 return unless $MUSIC_PLAYING_META;
312 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1; 342 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
313 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume}; 343 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
314 dc::MixMusic::volume $base * $volume * 128; 344 DC::MixMusic::volume $base * $volume * 128;
315} 345}
316 346
317sub audio_music_start { 347sub audio_music_start {
318 my $meta = $MUSIC_PLAYING_META; 348 my $meta = $MUSIC_PLAYING_META;
319 349
320 dc::DB::get res_data => $meta->{name}, sub { 350 DC::DB::get res_data => $meta->{name}, sub {
321 return unless $SDL_MIXER; 351 return unless $SDL_MIXER;
322 352
323 # music might have changed... 353 # music might have changed...
324 $meta eq $MUSIC_PLAYING_META 354 $meta eq $MUSIC_PLAYING_META
325 or return &audio_music_start (); 355 or return &audio_music_start ();
… …
327 audio_music_update_volume; 357 audio_music_update_volume;
328 358
329 $MUSIC_PLAYING_DATA = \$_[0]; 359 $MUSIC_PLAYING_DATA = \$_[0];
330 360
331 my $rwops = $meta->{path} 361 my $rwops = $meta->{path}
332 ? new_from_file dc::RW $meta->{path} 362 ? new_from_file DC::RW $meta->{path}
333 : new dc::RW $$MUSIC_PLAYING_DATA; 363 : new DC::RW $$MUSIC_PLAYING_DATA;
334 364
335 $MUSIC_PLAYER = new dc::MixMusic $rwops 365 $MUSIC_PLAYER = new DC::MixMusic $rwops
336 or Carp::confess "music face $meta->{face} unloadable: " . dc::Mix_GetError; 366 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError;
337 367
338 my $NOW = time; 368 my $NOW = time;
339 369
340 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 370 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
341 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 371 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
372 402
373 # randomize music a bit so that the order is not always the same 403 # randomize music a bit so that the order is not always the same
374 $_->{stop_time} ||= rand for @MUSIC_HAVE; 404 $_->{stop_time} ||= rand for @MUSIC_HAVE;
375 405
376 # default MUSIC_HAVE == MUSIC_DEFAULT 406 # default MUSIC_HAVE == MUSIC_DEFAULT
377 @MUSIC_HAVE = { path => dc::find_rcfile "music/$MUSIC_DEFAULT" } 407 @MUSIC_HAVE = { path => DC::find_rcfile "music/$MUSIC_DEFAULT" }
378 unless @MUSIC_HAVE; 408 unless @MUSIC_HAVE;
379 } 409 }
380 410
381 # if the currently playing song is acceptable, let it continue 411 # if the currently playing song is acceptable, let it continue
382 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 412 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
… …
384 my $NOW = time; 414 my $NOW = time;
385 415
386 if ($MUSIC_PLAYING_META) { 416 if ($MUSIC_PLAYING_META) {
387 $MUSIC_PLAYING_META->{stop_time} = $NOW; 417 $MUSIC_PLAYING_META->{stop_time} = $NOW;
388 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START; 418 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
389 dc::MixMusic::fade_out $fade_out; 419 DC::MixMusic::fade_out $fade_out;
390 } else { 420 } else {
391 # sort by stop time, oldest first 421 # sort by stop time, oldest first
392 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 422 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
393 423
394 # if the most recently-played piece played very recently, 424 # if the most recently-played piece played very recently,
… …
428} 458}
429 459
430sub audio_init { 460sub audio_init {
431 if ($CFG->{audio_enable}) { 461 if ($CFG->{audio_enable}) {
432 $ENV{MIX_EFFECTSMAXSPEED} = 1; 462 $ENV{MIX_EFFECTSMAXSPEED} = 1;
433 $SDL_MIXER = !dc::Mix_OpenAudio 463 $SDL_MIXER = !DC::Mix_OpenAudio
434 $CFG->{audio_hw_frequency}, 464 $CFG->{audio_hw_frequency},
435 dc::MIX_DEFAULT_FORMAT, 465 DC::MIX_DEFAULT_FORMAT,
436 $CFG->{audio_hw_channels}, 466 $CFG->{audio_hw_channels},
437 $CFG->{audio_hw_chunksize}; 467 $CFG->{audio_hw_chunksize};
438 468
439 if ($SDL_MIXER) { 469 if ($SDL_MIXER) {
440 dc::Mix_AllocateChannels $CFG->{audio_mix_channels}; 470 DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
441 471
442 audio_music_finished; 472 audio_music_finished;
443 } else { 473 } else {
444 status "Unable to open sound device: there will be no sound"; 474 status "Unable to open sound device: there will be no sound";
445 } 475 }
… …
459 $MUSIC_WANT = []; 489 $MUSIC_WANT = [];
460 @MUSIC_JINGLE = (); 490 @MUSIC_JINGLE = ();
461 %AUDIO_PLAY = (); 491 %AUDIO_PLAY = ();
462 %AUDIO_CHUNK = (); 492 %AUDIO_CHUNK = ();
463 493
464 dc::Mix_CloseAudio if $SDL_MIXER; 494 DC::Mix_CloseAudio if $SDL_MIXER;
465 undef $SDL_MIXER; 495 undef $SDL_MIXER;
466} 496}
467 497
468############################################################################# 498#############################################################################
469 499
… …
489 519
490 return; 520 return;
491 } 521 }
492 } 522 }
493 523
494 $conn->{query_dialog} = my $dialog = new dc::UI::Toplevel 524 $conn->{query_dialog} = my $dialog = new DC::UI::Toplevel
495 x => "center", 525 x => "center",
496 y => "center", 526 y => "center",
497 title => "Server Query", 527 title => "Server Query",
498 child => my $vbox = new dc::UI::VBox, 528 child => my $vbox = new DC::UI::VBox,
499 ; 529 ;
500 530
501 my @dialog = my $label = new dc::UI::Label 531 my @dialog = my $label = new DC::UI::Label
502 max_w => $::WIDTH * 0.8, 532 max_w => $::WIDTH * 0.8,
503 ellipsise => 0, 533 ellipsise => 0,
504 text => $prompt; 534 text => $prompt;
505 535
506 if ($flags & CS_QUERY_YESNO) { 536 if ($flags & CS_QUERY_YESNO) {
507 push @dialog, my $hbox = new dc::UI::HBox; 537 push @dialog, my $hbox = new DC::UI::HBox;
508 538
509 $hbox->add (new dc::UI::Button 539 $hbox->add (new DC::UI::Button
510 text => "No", 540 text => "No",
511 on_activate => sub { 541 on_activate => sub {
512 $conn->send ("reply n"); 542 $conn->send ("reply n");
513 $dialog->destroy; 543 $dialog->destroy;
514 0 544 0
515 } 545 }
516 ); 546 );
517 $hbox->add (new dc::UI::Button 547 $hbox->add (new DC::UI::Button
518 text => "Yes", 548 text => "Yes",
519 on_activate => sub { 549 on_activate => sub {
520 $conn->send ("reply y"); 550 $conn->send ("reply y");
521 destroy_query_dialog $conn; 551 destroy_query_dialog $conn;
522 0 552 0
… …
527 557
528 } elsif ($flags & CS_QUERY_SINGLECHAR) { 558 } elsif ($flags & CS_QUERY_SINGLECHAR) {
529 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 559 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
530 $dialog->{tooltip} = "#charcreation_focus"; 560 $dialog->{tooltip} = "#charcreation_focus";
531 561
532 unshift @dialog, new dc::UI::Label 562 unshift @dialog, new DC::UI::Label
533 max_w => $::WIDTH * 0.8, 563 max_w => $::WIDTH * 0.8,
534 ellipsise => 0, 564 ellipsise => 0,
535 markup => "\nOr use your keyboard and the text entry below:\n"; 565 markup => "\nOr use your keyboard and the text entry below:\n";
536 566
537 unshift @dialog, my $table = new dc::UI::Table; 567 unshift @dialog, my $table = new DC::UI::Table;
538 568
539 $table->add_at (0, 0, new dc::UI::Button 569 $table->add_at (0, 0, new DC::UI::Button
540 text => "Next Race", 570 text => "Next Race",
541 on_activate => sub { 571 on_activate => sub {
542 $conn->send ("reply n"); 572 $conn->send ("reply n");
543 destroy_query_dialog $conn; 573 destroy_query_dialog $conn;
544 0 574 0
545 }, 575 },
546 ); 576 );
547 $table->add_at (2, 0, new dc::UI::Button 577 $table->add_at (2, 0, new DC::UI::Button
548 text => "Accept", 578 text => "Accept",
549 on_activate => sub { 579 on_activate => sub {
550 $conn->send ("reply d"); 580 $conn->send ("reply d");
551 destroy_query_dialog $conn; 581 destroy_query_dialog $conn;
552 0 582 0
553 }, 583 },
554 ); 584 );
555 585
556 if ($conn->{chargen_race_description}) { 586 if ($conn->{chargen_race_description}) {
557 unshift @dialog, new dc::UI::Label 587 unshift @dialog, new DC::UI::Label
558 max_w => $::WIDTH * 0.8, 588 max_w => $::WIDTH * 0.8,
559 ellipsise => 0, 589 ellipsise => 0,
560 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>", 590 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
561 ; 591 ;
562 } 592 }
563 593
564 unshift @dialog, new dc::UI::Face 594 unshift @dialog, new DC::UI::Face
565 face => $conn->{player}{face}, 595 face => $conn->{player}{face},
566 bg => [.2, .2, .2, 1], 596 bg => [.2, .2, .2, 1],
567 min_w => 64, 597 min_w => 64,
568 min_h => 64, 598 min_h => 64,
569 ; 599 ;
570 600
571 if ($conn->{chargen_race_title}) { 601 if ($conn->{chargen_race_title}) {
572 unshift @dialog, new dc::UI::Label 602 unshift @dialog, new DC::UI::Label
573 allign => 1, 603 allign => 1,
574 ellipsise => 0, 604 ellipsise => 0,
575 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>", 605 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
576 ; 606 ;
577 } 607 }
578 608
579 unshift @dialog, new dc::UI::Label 609 unshift @dialog, new DC::UI::Label
580 max_w => $::WIDTH * 0.4, 610 max_w => $::WIDTH * 0.4,
581 ellipsise => 0, 611 ellipsise => 0,
582 markup => (dc::Pod::section_label ui => "chargen_race"), 612 markup => (DC::Pod::section_label ui => "chargen_race"),
583 ; 613 ;
584 614
585 } elsif ($prompt =~ /roll new stats/) { 615 } elsif ($prompt =~ /roll new stats/) {
586 if (my $stat = delete $conn->{stat_change_with}) { 616 if (my $stat = delete $conn->{stat_change_with}) {
587 $conn->send ("reply $stat"); 617 $conn->send ("reply $stat");
588 destroy_query_dialog $conn; 618 destroy_query_dialog $conn;
589 return; 619 return;
590 } 620 }
591 621
592 unshift @dialog, new dc::UI::Label 622 unshift @dialog, new DC::UI::Label
593 max_w => $::WIDTH * 0.4, 623 max_w => $::WIDTH * 0.4,
594 ellipsise => 0, 624 ellipsise => 0,
595 markup => "\nOr use your keyboard and the text entry below:\n"; 625 markup => "\nOr use your keyboard and the text entry below:\n";
596 626
597 unshift @dialog, my $table = new dc::UI::Table; 627 unshift @dialog, my $table = new DC::UI::Table;
598 628
599 # left: re-roll 629 # left: re-roll
600 $table->add_at (0, 0, new dc::UI::Button 630 $table->add_at (0, 0, new DC::UI::Button
601 text => "Roll Again", 631 text => "Roll Again",
602 on_activate => sub { 632 on_activate => sub {
603 $conn->send ("reply y"); 633 $conn->send ("reply y");
604 destroy_query_dialog $conn; 634 destroy_query_dialog $conn;
605 0 635 0
606 }, 636 },
607 ); 637 );
608 638
609 # center: swap stats 639 # center: swap stats
610 my ($sw1, $sw2) = map +(new dc::UI::Selector 640 my ($sw1, $sw2) = map +(new DC::UI::Selector
611 expand => 1, 641 expand => 1,
612 value => $_, 642 value => $_,
613 options => [ 643 options => [
614 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 644 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
615 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 645 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
… …
619 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 649 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
620 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 650 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
621 ], 651 ],
622 ), 1 .. 2; 652 ), 1 .. 2;
623 653
624 $table->add_at (2, 0, new dc::UI::Button 654 $table->add_at (2, 0, new DC::UI::Button
625 text => "Swap Stats", 655 text => "Swap Stats",
626 on_activate => sub { 656 on_activate => sub {
627 $conn->{stat_change_with} = $sw2->{value}; 657 $conn->{stat_change_with} = $sw2->{value};
628 $conn->send ("reply $sw1->{value}"); 658 $conn->send ("reply $sw1->{value}");
629 destroy_query_dialog $conn; 659 destroy_query_dialog $conn;
630 0 660 0
631 }, 661 },
632 ); 662 );
633 $table->add_at (2, 1, new dc::UI::HBox children => [$sw1, $sw2]); 663 $table->add_at (2, 1, new DC::UI::HBox children => [$sw1, $sw2]);
634 664
635 # right: accept 665 # right: accept
636 $table->add_at (4, 0, new dc::UI::Button 666 $table->add_at (4, 0, new DC::UI::Button
637 text => "Accept", 667 text => "Accept",
638 on_activate => sub { 668 on_activate => sub {
639 $conn->send ("reply n"); 669 $conn->send ("reply n");
640 $STATS_PAGE->hide;
641 destroy_query_dialog $conn; 670 destroy_query_dialog $conn;
642 0 671 0
643 }, 672 },
644 ); 673 );
645 674
646 unshift @dialog, my $hbox = new dc::UI::HBox; 675 unshift @dialog, my $hbox = new DC::UI::HBox;
647 for ( 676 for (
648 [Str => CS_STAT_STR], 677 [Str => CS_STAT_STR],
649 [Dex => CS_STAT_DEX], 678 [Dex => CS_STAT_DEX],
650 [Con => CS_STAT_CON], 679 [Con => CS_STAT_CON],
651 [Int => CS_STAT_INT], 680 [Int => CS_STAT_INT],
652 [Wis => CS_STAT_WIS], 681 [Wis => CS_STAT_WIS],
653 [Pow => CS_STAT_POW], 682 [Pow => CS_STAT_POW],
654 [Cha => CS_STAT_CHA], 683 [Cha => CS_STAT_CHA],
655 ) { 684 ) {
656 my ($name, $id) = @$_; 685 my ($name, $id) = @$_;
657 $hbox->add (new dc::UI::Label 686 $hbox->add (new DC::UI::Label
658 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 687 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
659 align => 0,
660 expand => 1, 688 expand => 1,
661 can_events => 1, 689 can_events => 1,
662 can_hover => 1, 690 can_hover => 1,
663 tooltip => "#stat_$name", 691 tooltip => "#stat_$name",
664 ); 692 );
665 } 693 }
666 694
667 unshift @dialog, new dc::UI::Label 695 unshift @dialog, new DC::UI::Label
668 max_w => $::WIDTH * 0.4, 696 max_w => $::WIDTH * 0.4,
669 ellipsise => 0, 697 ellipsise => 0,
670 markup => (dc::Pod::section_label ui => "chargen_stats"), 698 markup => (DC::Pod::section_label ui => "chargen_stats"),
671 ; 699 ;
672 } 700 }
673 701
674 push @dialog, my $entry = new dc::UI::Entry 702 push @dialog, my $entry = new DC::UI::Entry
675 on_changed => sub { 703 on_changed => sub {
676 $conn->send ("reply $_[1]"); 704 $conn->send ("reply $_[1]");
677 destroy_query_dialog $conn; 705 destroy_query_dialog $conn;
678 0 706 0
679 }, 707 },
… …
682 $entry->grab_focus; 710 $entry->grab_focus;
683 711
684 } else { 712 } else {
685 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 713 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
686 714
687 push @dialog, my $entry = new dc::UI::Entry 715 push @dialog, my $entry = new DC::UI::Entry
688 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 716 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
689 on_activate => sub { 717 on_activate => sub {
690 $conn->send ("reply $_[1]"); 718 $conn->send ("reply $_[1]");
691 destroy_query_dialog $conn; 719 destroy_query_dialog $conn;
692 0 720 0
… …
708 736
709 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 737 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
710 738
711 my ($host, $port) = split /:/, $PROFILE->{host}; 739 my ($host, $port) = split /:/, $PROFILE->{host};
712 740
713 $MAP = new dc::Map; 741 $MAP = new DC::Map;
714 742
715 $CONN = eval { 743 $CONN =
716 new dc::Protocol 744 new DC::Protocol
717 host => $host, 745 host => $host,
718 port => $port || 13327, 746 port => $port || 13327,
719 user => $PROFILE->{user}, 747 user => $PROFILE->{user},
720 pass => $PROFILE->{password}, 748 pass => $PROFILE->{password},
721 mapw => $mapsize, 749 mapw => $mapsize,
722 maph => $mapsize, 750 maph => $mapsize,
723 751
724 client => "cfplus $dc::VERSION $] $^O", 752 client => "$DC::VERSION $] $^O",
725 753
726 map_widget => $MAPWIDGET, 754 map_widget => $MAPWIDGET,
727 statusbox => $STATUSBOX, 755 statusbox => $STATUSBOX,
728 map => $MAP, 756 map => $MAP,
729 mapmap => $MAPMAP, 757 mapmap => $MAPMAP,
730 query => \&server_query, 758 query => \&server_query,
731 759
732 setup_req => { 760 setup_req => {
733 smoothing => $CFG->{map_smoothing}*1, 761 smoothing => $CFG->{map_smoothing}*1,
734 }, 762 },
763
764 on_connect => sub {
765 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh};
767
768 status "login successful";
769 } else {
770 undef $CONN;
771 status "unable to connect: $!";
772 stop_game();
773 }
774 },
735 }; 775 ;
736
737 if ($CONN) {
738 dc::lowdelay fileno $CONN->{fh};
739
740 status "login successful";
741 } else {
742 status "unable to connect";
743 stop_game();
744 }
745} 776}
746 777
747sub stop_game { 778sub stop_game {
748 $LOGIN_BUTTON->set_text ("Login / Register"); 779 $LOGIN_BUTTON->set_text ("Login / Register");
749 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 780 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
750 $SETUP_DIALOG->show; 781 $SETUP_DIALOG->show;
751 $PL_WINDOW->hide; 782 $PL_WINDOW->hide;
752 $SPELL_LIST->clear_spells; 783 $SPELL_LIST->clear_spells;
753 $dc::UI::ROOT->emit (stop_game => ! ! $CONN); 784 $DC::UI::ROOT->emit (stop_game => ! ! $CONN);
754 785
755 &audio_music_set_ambient ([]); 786 &audio_music_set_ambient ([]);
756 787
757 return unless $CONN; 788 return unless $CONN;
758 789
… …
764 795
765 undef $MAP; 796 undef $MAP;
766} 797}
767 798
768sub graphics_setup { 799sub graphics_setup {
769 my $vbox = new dc::UI::VBox; 800 my $vbox = new DC::UI::VBox;
770 801
771 $vbox->add (my $table = new dc::UI::Table expand => 1, col_expand => [0, 1]); 802 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
772 803
773 my $row = 0; 804 my $row = 0;
774 805
775 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 806 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
776 $table->add_at (1, $row++, new dc::UI::Label valign => 0, fontsize => 0.8, text => dc::OpenGL::gl_vendor . ", " . dc::OpenGL::gl_version, 807 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
777 can_events => 1, 808 can_events => 1,
778 tooltip => "<tt><span size='8192'>" . (dc::OpenGL::gl_extensions) . "</span></tt>"); 809 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
779 810
780 my $vidmode_tooltip = 811 my $vidmode_tooltip =
781 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 812 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
782 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 813 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
783 814
784 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Video Mode"); 815 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
785 $table->add_at (1, $row++, my $hbox = new dc::UI::HBox); 816 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
786 817
787 $hbox->add (my $mode_slider = new dc::UI::Slider 818 $hbox->add (my $mode_slider = new DC::UI::Slider
788 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 819 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
789 tooltip => $vidmode_tooltip); 820 tooltip => $vidmode_tooltip);
790 $hbox->add (my $mode_label = new dc::UI::Label 821 $hbox->add (my $mode_label = new DC::UI::Label
791 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 822 height => 0.8, template => "9999x9999@9+9",
792 can_events => 1, tooltip => $vidmode_tooltip); 823 can_events => 1, tooltip => $vidmode_tooltip);
793 824
794 $mode_slider->connect (changed => sub { 825 $mode_slider->connect (changed => sub {
795 my ($self, $value) = @_; 826 my ($self, $value) = @_;
796 827
797 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 828 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
798 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 829 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
799 }); 830 });
800 $mode_slider->emit (changed => $mode_slider->{range}[0]); 831 $mode_slider->emit (changed => $mode_slider->{range}[0]);
801 832
802 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Fullscreen"); 833 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
803 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new dc::UI::CheckBox 834 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
804 state => $CFG->{fullscreen}, 835 state => $CFG->{fullscreen},
805 tooltip => "Bring the client into fullscreen mode.", 836 tooltip => "Bring the client into fullscreen mode.",
806 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 837 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
807 ); 838 );
808 839
809 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 840 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
810 $table->add_at (1, $row++, new dc::UI::CheckBox 841 $table->add_at (1, $row++, new DC::UI::CheckBox
811 state => $CFG->{force_opengl11}, 842 state => $CFG->{force_opengl11},
812 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 843 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
813 . "higher memory usage and slower performance. It will, however, help tremendously on " 844 . "higher memory usage and slower performance. It will, however, help tremendously on "
814 . "cards that claim to support a feature but fall back to software rendering. " 845 . "cards that claim to support a feature but fall back to software rendering. "
815 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 846 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
816 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 847 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
817 . "experience extremely low framerates and your card should do better, try this option.</b>", 848 . "experience extremely low framerates and your card should do better, try this option.</b>",
818 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 849 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
819 ); 850 );
820 851
821 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Compress Textures"); 852 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
822 $table->add_at (1, $row++, new dc::UI::CheckBox 853 $table->add_at (1, $row++, new DC::UI::CheckBox
823 state => $CFG->{texture_compression}, 854 state => $CFG->{texture_compression},
824 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 855 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
825 . "will save a lot of memory and increase performance. The compression algorithm " 856 . "will save a lot of memory and increase performance. The compression algorithm "
826 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 857 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
827 . "forced OpenGL 1.1 mode.", 858 . "forced OpenGL 1.1 mode.",
828 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 859 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
829 ); 860 );
830 861
831 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 862 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
832 $table->add_at (1, $row++, new dc::UI::CheckBox 863 $table->add_at (1, $row++, new DC::UI::CheckBox
833 state => $CFG->{fast}, 864 state => $CFG->{fast},
834 tooltip => "Lower the visual quality considerably to speed up rendering.", 865 tooltip => "Lower the visual quality considerably to speed up rendering.",
835 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 866 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
836 ); 867 );
837 868
838 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 869 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
839 $table->add_at (1, $row++, new dc::UI::Slider 870 $table->add_at (1, $row++, new DC::UI::Slider
840 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 871 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
841 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 872 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
842 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 873 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
843 ); 874 );
844 875
845 $table->add_at (1, $row++, new dc::UI::Button 876 $table->add_at (1, $row++, new DC::UI::Button
846 expand => 1, align => 0, text => "Apply", 877 expand => 1, text => "Apply",
847 tooltip => "Apply the video settings above.", 878 tooltip => "Apply the video settings above.",
848 on_activate => sub { 879 on_activate => sub {
849 video_shutdown (); 880 video_shutdown ();
850 video_init (); 881 video_init ();
851 0 882 0
852 } 883 }
853 ); 884 );
854 885
855 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Map Scale"); 886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
856 $table->add_at (1, $row++, new dc::UI::Slider 887 $table->add_at (1, $row++, new DC::UI::Slider
857 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 888 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
858 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 889 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
859 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 890 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
860 ); 891 );
861 892
862 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 893 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
863 $table->add_at (1, $row++, new dc::UI::CheckBox 894 $table->add_at (1, $row++, new DC::UI::CheckBox
864 state => $CFG->{map_smoothing}, 895 state => $CFG->{map_smoothing},
865 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 896 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
866 . "This increases load on the graphics subsystem and works only with TRT servers. " 897 . "This increases load on the graphics subsystem and works only with TRT servers. "
867 . "Changes take effect at next login only.", 898 . "Changes take effect at next login only.",
868 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 899 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
869 ); 900 );
870 901
871 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Fog of War"); 902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
872 $table->add_at (1, $row++, new dc::UI::CheckBox 903 $table->add_at (1, $row++, new DC::UI::CheckBox
873 state => $CFG->{fow_enable}, 904 state => $CFG->{fow_enable},
874 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 905 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
875 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 906 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
876 ); 907 );
877 908
878 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 909 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
879 $table->add_at (1, $row++, new dc::UI::Slider 910 $table->add_at (1, $row++, new DC::UI::Slider
880 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 911 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
881 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 912 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
882 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 913 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
883 ); 914 );
884 915
885 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 916 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
886 $table->add_at (1, $row++, new dc::UI::Slider 917 $table->add_at (1, $row++, new DC::UI::Slider
887 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 918 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
888 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 919 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
889 . "but you still need to press apply to correctly re-layout the widget.", 920 . "but you still need to press apply to correctly re-layout the widget.",
890 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 921 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
891 ); 922 );
892 923
893 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 924 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
894 $table->add_at (1, $row++, new dc::UI::Slider 925 $table->add_at (1, $row++, new DC::UI::Slider
895 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 926 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
896 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 927 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
897 on_changed => sub { 928 on_changed => sub {
898 $CFG->{gauge_fontsize} = $_[1]; 929 $CFG->{gauge_fontsize} = $_[1];
899 &set_gauge_window_fontsize; 930 &set_gauge_window_fontsize;
900 0 931 0
901 } 932 }
902 ); 933 );
903 934
904 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Gauge size"); 935 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
905 $table->add_at (1, $row++, new dc::UI::Slider 936 $table->add_at (1, $row++, new DC::UI::Slider
906 range => [$CFG->{gauge_size}, 0.2, 0.8], 937 range => [$CFG->{gauge_size}, 0.2, 0.8],
907 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 938 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
908 on_changed => sub { 939 on_changed => sub {
909 $CFG->{gauge_size} = $_[1]; 940 $CFG->{gauge_size} = $_[1];
910 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 941 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
917 948
918our $AUDIO_HW_CHUNKSIZE; 949our $AUDIO_HW_CHUNKSIZE;
919our $AUDIO_INFO; 950our $AUDIO_INFO;
920 951
921sub audio_tab_update { 952sub audio_tab_update {
922 my ($freq, $format, $chans) = dc::Mix_QuerySpec; 953 my ($freq, $format, $chans) = DC::Mix_QuerySpec;
923 954
924 $AUDIO_HW_CHUNKSIZE->set_options ([ 955 $AUDIO_HW_CHUNKSIZE->set_options ([
925 [0, "default", "Use System Default"], 956 [0, "default", "Use System Default"],
926 map { 957 map {
927 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050); 958 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
… …
937 968
938 $AUDIO_INFO->set_text ($text); 969 $AUDIO_INFO->set_text ($text);
939} 970}
940 971
941sub audio_setup { 972sub audio_setup {
942 my $vbox = new dc::UI::VBox; 973 my $vbox = new DC::UI::VBox;
943 974
944 $vbox->add (my $table = new dc::UI::Table expand => 1, col_expand => [0, 0, 1]); 975 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
945 976
946 my $row = 0; 977 my $row = 0;
947 978
948 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Audio Enable"); 979 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
949 $table->add_at (1, $row++, new dc::UI::CheckBox 980 $table->add_at (1, $row++, new DC::UI::CheckBox
950 state => $CFG->{audio_enable}, 981 state => $CFG->{audio_enable},
951 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.", 982 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.",
952 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 } 983 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
953 ); 984 );
954 985
955 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Sound Effects"); 986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
956 $table->add_at (1, $row, new dc::UI::CheckBox 987 $table->add_at (1, $row, new DC::UI::CheckBox
957 expand => 1, state => $CFG->{effects_enable}, 988 expand => 1, state => $CFG->{effects_enable},
958 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 989 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
959 on_changed => sub { 990 on_changed => sub {
960 $CFG->{effects_enable} = $_[1]; 991 $CFG->{effects_enable} = $_[1];
961 $CONN->update_fx_want if $CONN; 992 $CONN->update_fx_want if $CONN;
962 1 993 1
963 } 994 }
964 ); 995 );
965 $table->add_at (2, $row++, new dc::UI::Slider 996 $table->add_at (2, $row++, new DC::UI::Slider
966 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 997 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
967 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 998 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
968 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 999 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
969 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1000 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
970 ); 1001 );
971 1002
972 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Background Music"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
973 $table->add_at (1, $row, new dc::UI::CheckBox 1004 $table->add_at (1, $row, new DC::UI::CheckBox
974 expand => 1, state => $CFG->{bgm_enable}, 1005 expand => 1, state => $CFG->{bgm_enable},
975 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1006 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
976 on_changed => sub { 1007 on_changed => sub {
977 $CFG->{bgm_enable} = $_[1]; 1008 $CFG->{bgm_enable} = $_[1];
978 $CONN->update_fx_want if $CONN; 1009 $CONN->update_fx_want if $CONN;
979 audio_music_push; 1010 audio_music_push;
980 1 1011 1
981 } 1012 }
982 ); 1013 );
983 $table->add_at (2, $row++, new dc::UI::Slider 1014 $table->add_at (2, $row++, new DC::UI::Slider
984 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1015 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
985 tooltip => "The volume of the background music. Changes are instant.", 1016 tooltip => "The volume of the background music. Changes are instant.",
986 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1017 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
987 ); 1018 );
988 1019
989 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Frequency"); 1020 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
990 $table->add_at (1, $row++, new dc::UI::Selector 1021 $table->add_at (1, $row++, new DC::UI::Selector
991 c_colspan => 2, expand => 1, 1022 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_frequency}, 1023 value => $CFG->{audio_hw_frequency},
993 options => [ 1024 options => [
994 [ 0, "default" , "Use System Default"], 1025 [ 0, "default" , "Use System Default"],
995 [11025, "11 kHz" , "11kHz (low quality)"], 1026 [11025, "11 kHz" , "11kHz (low quality)"],
… …
1003 audio_tab_update; 1034 audio_tab_update;
1004 1 1035 1
1005 } 1036 }
1006 ); 1037 );
1007 1038
1008 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Channels"); 1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
1009 $table->add_at (1, $row++, new dc::UI::Selector 1040 $table->add_at (1, $row++, new DC::UI::Selector
1010 c_colspan => 2, expand => 1, 1041 c_colspan => 2, expand => 1,
1011 value => $CFG->{audio_hw_channels}, 1042 value => $CFG->{audio_hw_channels},
1012 options => [ 1043 options => [
1013 [0, "default" , "Use System Default"], 1044 [0, "default" , "Use System Default"],
1014 [1, "Mono" , "Mono (single channel, low quality)"], 1045 [1, "Mono" , "Mono (single channel, low quality)"],
… …
1022 audio_tab_update; 1053 audio_tab_update;
1023 1 1054 1
1024 } 1055 }
1025 ); 1056 );
1026 1057
1027 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Latency"); 1058 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
1028 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new dc::UI::Selector 1059 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1029 c_colspan => 2, expand => 1, 1060 c_colspan => 2, expand => 1,
1030 value => $CFG->{audio_hw_chunksize}, 1061 value => $CFG->{audio_hw_chunksize},
1031 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback " 1062 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1032 . "is stuttering, increase this value. Values of 50-100ms are optimal.", 1063 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1033 on_changed => sub { 1064 on_changed => sub {
… …
1036 1 1067 1
1037 } 1068 }
1038 ); 1069 );
1039 1070
1040 # should really be a slider 1071 # should really be a slider
1041 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1072 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1042 $table->add_at (1, $row++, new dc::UI::ValSlider 1073 $table->add_at (1, $row++, new DC::UI::ValSlider
1043 c_colspan => 2, expand => 1, 1074 c_colspan => 2, expand => 1,
1044 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.", 1075 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1045 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1], 1076 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1046 template => ">= 99", 1077 template => ">= 99",
1047 on_changed => sub { 1078 on_changed => sub {
… …
1051 if $value; 1082 if $value;
1052 1; 1083 1;
1053 } 1084 }
1054 ); 1085 );
1055 1086
1056 $table->add_at (1, $row++, new dc::UI::Button 1087 $table->add_at (1, $row++, new DC::UI::Button
1057 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1088 c_colspan => 2, expand => 1, text => "Apply",
1058 tooltip => "Apply the audio settings", 1089 tooltip => "Apply the audio settings",
1059 on_activate => sub { 1090 on_activate => sub {
1060 audio_shutdown (); 1091 audio_shutdown ();
1061 audio_init (); 1092 audio_init ();
1062 0 1093 0
1063 } 1094 }
1064 ); 1095 );
1065 1096
1066 $vbox->add (new dc::UI::FancyFrame 1097 $vbox->add (new DC::UI::FancyFrame
1067 expand => 1, 1098 expand => 1,
1068 label => "Audio Info", 1099 label => "Audio Info",
1069 child => ($AUDIO_INFO = new dc::UI::Label ellipsise => 0), 1100 child => ($AUDIO_INFO = new DC::UI::Label ellipsise => 0),
1070 ); 1101 );
1071 1102
1072 audio_tab_update; 1103 audio_tab_update;
1073 1104
1074 $vbox 1105 $vbox
… …
1081} 1112}
1082 1113
1083sub make_gauge_window { 1114sub make_gauge_window {
1084 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1115 my $gh = int $HEIGHT * $CFG->{gauge_size};
1085 1116
1086 my $win = new dc::UI::Frame ( 1117 my $win = new DC::UI::Frame (
1087 force_x => 0, 1118 force_x => 0,
1088 force_y => "max", 1119 force_y => "max",
1089 force_w => $WIDTH, 1120 force_w => $WIDTH,
1090 force_h => $gh, 1121 force_h => $gh,
1091 ); 1122 );
1092 1123
1093 $win->add (my $hbox = new dc::UI::HBox 1124 $win->add (my $hbox = new DC::UI::HBox
1094 children => [ 1125 children => [
1095 (new dc::UI::HBox expand => 1), 1126 (new DC::UI::HBox expand => 1),
1096 (new dc::UI::VBox children => [ 1127 (new DC::UI::VBox children => [
1097 (new dc::UI::Empty expand => 1), 1128 (new DC::UI::Empty expand => 1),
1098 (new dc::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new dc::UI::Table)), 1129 (new DC::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new DC::UI::Table)),
1099 ]), 1130 ]),
1100 (my $vbox = new dc::UI::VBox), 1131 (my $vbox = new DC::UI::VBox),
1101 ], 1132 ],
1102 ); 1133 );
1103 1134
1104 $vbox->add (new dc::UI::HBox 1135 $vbox->add (new DC::UI::HBox
1105 expand => 1, 1136 expand => 1,
1106 children => [ 1137 children => [
1107 (new dc::UI::Empty expand => 1), 1138 (new DC::UI::Empty expand => 1),
1108 (my $hb = new dc::UI::HBox), 1139 (my $hb = new DC::UI::HBox),
1109 ], 1140 ],
1110 ); 1141 );
1111 1142
1112 $hb->add (my $hg = new dc::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1143 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1113 $hb->add (my $mg = new dc::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1144 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1114 $hb->add (my $gg = new dc::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1145 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1115 $hb->add (my $fg = new dc::UI::Gauge type => 'food', tooltip => "#stat_food"); 1146 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1116 1147
1117 $vbox->add (my $exp = new dc::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1148 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1118 $vbox->add (my $prg = new dc::UI::ExperienceProgress); 1149 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1119 $vbox->add (my $sklprg = new dc::UI::ExperienceProgress); 1150 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1120 $vbox->add (my $rng = new dc::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1151 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1121 1152
1122 $GAUGES = { 1153 $GAUGES = {
1123 exp => $exp, prg => $prg, sklprg => $sklprg, 1154 exp => $exp, prg => $prg, sklprg => $sklprg,
1124 win => $win, range => $rng, 1155 win => $win, range => $rng,
1125 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1156 hp => $hg, mana => $mg, grace => $gg, food => $fg,
… …
1129 1160
1130 $win 1161 $win
1131} 1162}
1132 1163
1133sub debug_setup { 1164sub debug_setup {
1134 my $table = new dc::UI::Table; 1165 my $table = new DC::UI::Table;
1135 1166
1136 $table->add_at (0, 0, new dc::UI::Label text => "Widget Borders"); 1167 $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
1137 $table->add_at (1, 0, new dc::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1168 $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
1138 $table->add_at (0, 1, new dc::UI::Label text => "Tooltip Widget Info"); 1169 $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
1139 $table->add_at (1, 1, new dc::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1170 $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
1140 $table->add_at (0, 2, new dc::UI::Label text => "Show FPS"); 1171 $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
1141 $table->add_at (1, 2, new dc::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1172 $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
1142 $table->add_at (0, 3, new dc::UI::Label text => "Suppress Tooltips"); 1173 $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
1143 $table->add_at (1, 3, new dc::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1174 $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1144 $table->add_at (0, 4, new dc::UI::Button text => "die on click(tm)", on_activate => sub { &dc::debug() } ); 1175 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1145 1176
1146 $table->add_at (0, 5, new dc::UI::TextEdit text => "line1\0152\0153");#d# 1177 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1147 1178
1148 $table->add_at (7,7, my $t = new dc::UI::Table expand => 0); 1179 $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
1149 $t->add_at (0,0, new dc::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2); 1180 $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
1150 $t->add_at (2,0, new dc::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1); 1181 $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1151 $t->add_at (1,2, new dc::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2); 1182 $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
1152 $t->add_at (0,1, new dc::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1); 1183 $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
1153 $t->add_at (1,1, new dc::UI::Label text => "e"); 1184 $t->add_at (1,1, new DC::UI::Label text => "e");
1154 1185
1155 $table->add_at (7, 6, my $c = new dc::UI::Canvas); 1186 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1156 1187
1157 $c->add_items ({ 1188 $c->add_items ({
1158 type => "line_loop", 1189 type => "line_loop",
1159 color => [0, 1, 0], 1190 color => [0, 1, 0],
1160 width => 9, 1191 width => 9,
… …
1180 1211
1181 $table 1212 $table
1182} 1213}
1183 1214
1184sub stats_window { 1215sub stats_window {
1185 my $r = new dc::UI::ScrolledWindow ( 1216 my $r = new DC::UI::ScrolledWindow (
1186 expand => 1, 1217 expand => 1,
1187 scroll_y => 1 1218 scroll_y => 1
1188 ); 1219 );
1189 $r->add (my $vb = new dc::UI::VBox); 1220 $r->add (my $vb = new DC::UI::VBox);
1190 1221
1191 $vb->add (new dc::UI::FancyFrame 1222 $vb->add (new DC::UI::FancyFrame
1192 label => "Player", 1223 label => "Player",
1193 child => (my $pi = new dc::UI::VBox), 1224 child => (my $pi = new DC::UI::VBox),
1194 ); 1225 );
1195 1226
1196 $pi->add ($STATWIDS->{title} = new dc::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1227 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1197 can_hover => 1, can_events => 1, 1228 can_hover => 1, can_events => 1,
1198 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1229 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
1199 $pi->add ($STATWIDS->{map} = new dc::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1230 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1200 can_hover => 1, can_events => 1, 1231 can_hover => 1, can_events => 1,
1201 tooltip => "The map you are currently on (if supported by the server)."); 1232 tooltip => "The map you are currently on (if supported by the server).");
1202 1233
1203 $pi->add (my $hb0 = new dc::UI::HBox); 1234 $pi->add (my $hb0 = new DC::UI::HBox);
1204 $hb0->add ($STATWIDS->{weight} = new dc::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1235 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1205 can_hover => 1, can_events => 1, 1236 can_hover => 1, can_events => 1,
1206 tooltip => "The weight of the player including all inventory items."); 1237 tooltip => "The weight of the player including all inventory items.");
1207 $hb0->add ($STATWIDS->{m_weight} = new dc::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1238 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1208 can_hover => 1, can_events => 1, 1239 can_hover => 1, can_events => 1,
1209 tooltip => "The weight limit: you cannot carry more than this."); 1240 tooltip => "The weight limit: you cannot carry more than this.");
1210 1241
1211 $vb->add (new dc::UI::FancyFrame 1242 $vb->add (new DC::UI::FancyFrame
1212 label => "Primary/Secondary Statistics", 1243 label => "Primary/Secondary Statistics",
1213 child => (my $hb = new dc::UI::HBox expand => 1), 1244 child => (my $hb = new DC::UI::HBox expand => 1),
1214 ); 1245 );
1215 $hb->add (my $tbl = new dc::UI::Table expand => 1); 1246 $hb->add (my $tbl = new DC::UI::Table expand => 1);
1216 1247
1217 my $color2 = [1, 1, 0]; 1248 my $color2 = [1, 1, 0];
1218 1249
1219 for ( 1250 for (
1220 [0, 0, st_str => "Str", 30], 1251 [0, 0, st_str => "Str", 30],
… …
1232 [2, 4, st_spd => "Spd", 10.54], 1263 [2, 4, st_spd => "Spd", 10.54],
1233 [2, 5, st_wspd => "WSp", 10.54], 1264 [2, 5, st_wspd => "WSp", 10.54],
1234 ) { 1265 ) {
1235 my ($col, $row, $id, $label, $template) = @$_; 1266 my ($col, $row, $id, $label, $template) = @$_;
1236 1267
1237 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new dc::UI::Label 1268 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1238 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1269 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1239 align => +1, template => $template, tooltip => "#stat_$label"); 1270 align => 1, template => $template, tooltip => "#stat_$label");
1240 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new dc::UI::Label 1271 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
1241 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1272 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1242 align => -1, text => $label, tooltip => "#stat_$label"); 1273 align => 0, text => $label, tooltip => "#stat_$label");
1243 } 1274 }
1244 1275
1245 $vb->add (new dc::UI::FancyFrame 1276 $vb->add (new DC::UI::FancyFrame
1246 label => "Resistancies", 1277 label => "Resistancies",
1247 child => (my $tbl2 = new dc::UI::Table expand => 1), 1278 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1248 ); 1279 );
1249 1280
1250 my $row = 0; 1281 my $row = 0;
1251 my $col = 0; 1282 my $col = 0;
1252 1283
… …
1291 1322
1292 for (qw/slow holyw conf fire depl magic 1323 for (qw/slow holyw conf fire depl magic
1293 drain acid pois para deat phys 1324 drain acid pois para deat phys
1294 blind fear tund elec cold ghit/) 1325 blind fear tund elec cold ghit/)
1295 { 1326 {
1296 $tbl2->add_at ($col, $row, 1327 $tbl2->add_at ($col + 2, $row,
1297 $STATWIDS->{"res_$_"} = 1328 $STATWIDS->{"res_$_"} =
1298 new dc::UI::Label 1329 new DC::UI::Label
1299 font => $FONT_FIXED, 1330 font => $FONT_FIXED,
1300 template => "-100%", 1331 template => "-100%",
1301 align => +1, 1332 align => 1,
1302 valign => 0,
1303 can_events => 1, 1333 can_events => 1,
1304 can_hover => 1, 1334 can_hover => 1,
1305 tooltip => $resist_names{$_}->[1], 1335 tooltip => $resist_names{$_}->[1],
1306 ); 1336 );
1307 $tbl2->add_at ($col + 1, $row, new dc::UI::Image 1337 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1308 font => $FONT_FIXED, 1338 font => $FONT_FIXED,
1309 can_hover => 1, 1339 can_hover => 1,
1310 can_events => 1, 1340 can_events => 1,
1311 path => "ui/resist/resist_$_.png", 1341 path => "ui/resist/resist_$_.png",
1312 tooltip => $resist_names{$_}->[1], 1342 tooltip => $resist_names{$_}->[1],
1313 ); 1343 );
1314 $tbl2->add_at ($col + 2, $row, new dc::UI::Label 1344 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1315 text => $resist_names{$_}->[0], 1345 text => $resist_names{$_}->[0],
1316 font => $FONT_FIXED, 1346 font => $FONT_FIXED,
1347 align => 1,
1317 can_hover => 1, 1348 can_hover => 1,
1318 can_events => 1, 1349 can_events => 1,
1319 tooltip => $resist_names{$_}->[1], 1350 tooltip => $resist_names{$_}->[1],
1320 ); 1351 );
1321 1352
1322 $row++; 1353 $row++;
1323 if ($row % 6 == 0) { 1354 if ($row % 6 == 0) {
1324 $col += 3; 1355 $col += 4;
1325 $row = 0; 1356 $row = 0;
1326 } 1357 }
1327 } 1358 }
1328 1359
1329 #update_stats_window ({}); 1360 #update_stats_window ({});
1330 1361
1331 $r 1362 $r
1332} 1363}
1333 1364
1334sub skill_window { 1365sub skill_window {
1335 my $sw = new dc::UI::ScrolledWindow (expand => 1); 1366 my $sw = new DC::UI::ScrolledWindow (expand => 1);
1336 1367
1337 $sw->add ($STATWIDS->{skill_tbl} = new dc::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]); 1368 $sw->add ($STATWIDS->{skill_tbl} = new DC::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1338 1369
1339 $sw 1370 $sw
1340} 1371}
1341 1372
1342sub formsep($) { 1373sub formsep($) {
… …
1354 return if $METASERVER_ATIME > time; 1385 return if $METASERVER_ATIME > time;
1355 $METASERVER_ATIME = time + 60; 1386 $METASERVER_ATIME = time + 60;
1356 1387
1357 my $table = $METASERVER->{table}; 1388 my $table = $METASERVER->{table};
1358 $table->clear; 1389 $table->clear;
1359 $table->add_at (0, 0, my $label = new dc::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1390 $table->add_at (0, 0, my $label = new DC::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
1360 1391
1361 my $ok = 0; 1392 my $ok = 0;
1362 1393
1363 dc::background { 1394 DC::background {
1364 my $ua = dc::lwp_useragent; 1395 my $ua = DC::lwp_useragent;
1365 1396
1366 dc::background_msg dc::decode_json +(dc::lwp_check $ua->get ($META_SERVER))->decoded_content; 1397 DC::background_msg DC::decode_json +(DC::lwp_check $ua->get ($META_SERVER))->decoded_content;
1367 } sub { 1398 } sub {
1368 my ($msg) = @_; 1399 my ($msg) = @_;
1369 if ($msg) { 1400 if ($msg) {
1370 $table->clear; 1401 $table->clear;
1371 1402
… …
1374 "The hostname of the server.", 1405 "The hostname of the server.",
1375 "The time this server has been running without being restarted.", 1406 "The time this server has been running without being restarted.",
1376 "Short information about this server provided by its admins.", 1407 "Short information about this server provided by its admins.",
1377 ); 1408 );
1378 my @col = qw(#Users Host Uptime Version Description); 1409 my @col = qw(#Users Host Uptime Version Description);
1379 $table->add_at ($_, 0, new dc::UI::Label 1410 $table->add_at ($_, 0, new DC::UI::Label
1380 can_hover => 1, can_events => 1, 1411 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1381 align => 0, fg => [1, 1, 0],
1382 text => $col[$_], tooltip => $tip[$_]) 1412 text => $col[$_], tooltip => $tip[$_])
1383 for 0 .. $#col; 1413 for 0 .. $#col;
1384 1414
1385 my @align = qw(1 0 1 1 -1); 1415 my @align = qw(1 0.5 1 1 0);
1386 1416
1387 my $y = 0; 1417 my $y = 0;
1388 for my $m (@{ $msg->{servers} }) { 1418 for my $m (@{ $msg->{servers} }) {
1389 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1419 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1390 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1420 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
… …
1406 1436
1407 $m = [$users, $host, $uptime, $version, $desc]; 1437 $m = [$users, $host, $uptime, $version, $desc];
1408 1438
1409 $y++; 1439 $y++;
1410 1440
1411 $table->add_at (scalar @$m, $y, new dc::UI::VBox children => [ 1441 $table->add_at (scalar @$m, $y, new DC::UI::VBox children => [
1412 (new dc::UI::Button 1442 (new DC::UI::Button
1413 text => "Use", 1443 text => "Use",
1414 tooltip => "Put this server into the <b>Host:Port</b> field", 1444 tooltip => "Put this server into the <b>Host:Port</b> field",
1415 on_activate => sub { 1445 on_activate => sub {
1416 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1446 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1417 $METASERVER->hide; 1447 $METASERVER->hide;
1418 0 1448 0
1419 }, 1449 },
1420 ), 1450 ),
1421 (new dc::UI::Empty expand => 1), 1451 (new DC::UI::Empty expand => 1),
1422 ]); 1452 ]);
1423 1453
1424 $table->add_at ($_, $y, new dc::UI::Label 1454 $table->add_at ($_, $y, new DC::UI::Label
1425 max_w => $::WIDTH * 0.4, 1455 max_w => $::WIDTH * 0.4,
1426 ellipsise => 0, 1456 ellipsise => 0,
1427 align => $align[$_], 1457 align => $align[$_],
1428 text => $m->[$_], 1458 text => $m->[$_],
1429 tooltip => $tip[$_], 1459 tooltip => $tip[$_],
… …
1439 }; 1469 };
1440 1470
1441} 1471}
1442 1472
1443sub metaserver_dialog { 1473sub metaserver_dialog {
1444 my $vbox = new dc::UI::VBox; 1474 my $vbox = new DC::UI::VBox;
1445 my $table = new dc::UI::Table; 1475 my $table = new DC::UI::Table;
1446 $vbox->add (new dc::UI::ScrolledWindow expand => 1, child => $table); 1476 $vbox->add (new DC::UI::ScrolledWindow expand => 1, child => $table);
1447 1477
1448 my $dialog = new dc::UI::Toplevel 1478 my $dialog = new DC::UI::Toplevel
1449 title => "Server List", 1479 title => "Server List",
1450 name => 'metaserver_dialog', 1480 name => 'metaserver_dialog',
1451 x => 'center', 1481 x => 'center',
1452 y => 'center', 1482 y => 'center',
1453 z => 3, 1483 z => 3,
… …
1464 1494
1465 $dialog 1495 $dialog
1466} 1496}
1467 1497
1468sub login_setup { 1498sub login_setup {
1469 my $vbox = new dc::UI::VBox; 1499 my $vbox = new DC::UI::VBox;
1470 1500
1471 $vbox->add (new dc::UI::FancyFrame 1501 $vbox->add (new DC::UI::FancyFrame
1472 label => "Login Settings", 1502 label => "Login Settings",
1473 child => (my $table = new dc::UI::Table expand => 1, col_expand => [0, 1]), 1503 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1474 ); 1504 );
1475 1505
1476 $table->add_at (0, 4, new dc::UI::Label valign => 0, align => 1, text => "Username"); 1506 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1477 $table->add_at (1, 4, new dc::UI::Entry 1507 $table->add_at (1, 4, new DC::UI::Entry
1478 text => $CFG->{profile}{default}{user}, 1508 text => $CFG->{profile}{default}{user},
1479 tooltip => "The name of your character on the server.", 1509 tooltip => "The name of your character on the server.",
1480 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1510 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1481 ); 1511 );
1482 1512
1483 $table->add_at (0, 5, new dc::UI::Label valign => 0, align => 1, text => "Password"); 1513 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1484 $table->add_at (1, 5, new dc::UI::Entry 1514 $table->add_at (1, 5, new DC::UI::Entry
1485 text => $CFG->{profile}{default}{password}, 1515 text => $CFG->{profile}{default}{password},
1486 hidden => 1, 1516 hidden => 1,
1487 tooltip => "The password for your character.", 1517 tooltip => "The password for your character.",
1488 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1518 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1489 ); 1519 );
1490 1520
1491 $table->add_at (1, 11, $LOGIN_BUTTON = new dc::UI::Button 1521 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1492 expand => 1, 1522 expand => 1,
1493 align => 0,
1494 text => "Login / Register", 1523 text => "Login / Register",
1495 tooltip => "This button will either login to the account configured above or register a new account.", 1524 tooltip => "This button will either login to the account configured above or register a new account.",
1496 on_activate => sub { 1525 on_activate => sub {
1497 $CONN ? stop_game 1526 $CONN ? stop_game
1498 : start_game; 1527 : start_game;
1499 1 1528 1
1500 }, 1529 },
1501 ); 1530 );
1502 1531
1503 $vbox->add (new dc::UI::FancyFrame 1532 $vbox->add (new DC::UI::FancyFrame
1504 label => "Registering", 1533 label => "Registering",
1505 min_h => 200, 1534 min_h => 200,
1506 child => (new dc::UI::Label valign => -1, ellipsise => 0, 1535 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1507 markup => 1536 markup =>
1508 "To register a new account, choose a username that hasn't been taken yet and " 1537 "To register a new account, choose a username that hasn't been taken yet and "
1509 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1538 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1510 ), 1539 ),
1511 ); 1540 );
1512 1541
1513 $vbox 1542 $vbox
1514} 1543}
1515 1544
1516sub server_setup { 1545sub server_setup {
1517 my $vbox = new dc::UI::VBox; 1546 my $vbox = new DC::UI::VBox;
1518 1547
1519 $vbox->add (new dc::UI::FancyFrame 1548 $vbox->add (new DC::UI::FancyFrame
1520 label => "Connection Settings", 1549 label => "Connection Settings",
1521 child => (my $table = new dc::UI::Table expand => 1, col_expand => [0, 1]), 1550 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1522 ); 1551 );
1523 1552
1524 my $row = 0; 1553 my $row = 0;
1525 1554
1526 $table->add_at (0, ++$row, new dc::UI::Label valign => 0, align => 1, text => "Host:Port"); 1555 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1527 { 1556 {
1528 $table->add_at (1, $row, my $vbox = new dc::UI::VBox); 1557 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1529 1558
1530 $vbox->add ( 1559 $vbox->add (
1531 $HOST_ENTRY = new dc::UI::Entry 1560 $HOST_ENTRY = new DC::UI::Entry
1532 expand => 1, 1561 expand => 1,
1533 text => $CFG->{profile}{default}{host}, 1562 text => $CFG->{profile}{default}{host},
1534 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1563 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1535 on_changed => sub { 1564 on_changed => sub {
1536 my ($self, $value) = @_; 1565 my ($self, $value) = @_;
1537 $CFG->{profile}{default}{host} = $value; 1566 $CFG->{profile}{default}{host} = $value;
1538 1 1567 1
1539 } 1568 }
1540 ); 1569 );
1541 1570
1542 if (0) { #d# disabled 1571 if (0) { #d# disabled
1543 $vbox->add (new dc::UI::Button 1572 $vbox->add (new DC::UI::Button
1544 expand => 1, 1573 expand => 1,
1545 text => "Server List", 1574 text => "Server List",
1546 other => $METASERVER, 1575 other => $METASERVER,
1547 tooltip => "Show a list of available crossfire servers", 1576 tooltip => "Show a list of available Deliantra servers",
1548 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1577 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1549 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1578 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1550 ); 1579 );
1551 }#d# 1580 }#d#
1552 } 1581 }
1553 1582
1554 $table->add_at (0, ++$row, new dc::UI::Label valign => 0, align => 1, text => "Map Size"); 1583 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1555 $table->add_at (1, $row, new dc::UI::Slider 1584 $table->add_at (1, $row, new DC::UI::Slider
1556 force_w => 100, 1585 force_w => 100,
1557 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1586 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1558 tooltip => "This is the size of the portion of the map update the server sends you. " 1587 tooltip => "This is the size of the portion of the map update the server sends you. "
1559 . "If you set this to a high value you will be able to see further, " 1588 . "If you set this to a high value you will be able to see further, "
1560 . "but you also increase bandwidth requirements and latency. " 1589 . "but you also increase bandwidth requirements and latency. "
1561 . "This option is only used once at log-in.", 1590 . "This option is only used once at log-in.",
1562 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, 1591 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1563 ); 1592 );
1564 1593
1565 $table->add_at (0, ++$row, new dc::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1594 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1566 $table->add_at (1, $row, new dc::UI::Entry 1595 $table->add_at (1, $row, new DC::UI::Entry
1567 text => $CFG->{output_rate}, 1596 text => $CFG->{output_rate},
1568 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1597 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1569 . "when sending data. When 0 or unset, the server " 1598 . "when sending data. When 0 or unset, the server "
1570 . "default will be used, which is usually around 100kb/s. Most servers will " 1599 . "default will be used, which is usually around 100kb/s. Most servers will "
1571 . "dynamically find an optimal rate, so adjust this only when necessary.", 1600 . "dynamically find an optimal rate, so adjust this only when necessary.",
1572 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 }, 1601 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1573 ); 1602 );
1574 1603
1575 $vbox->add (new dc::UI::FancyFrame 1604 $vbox->add (new DC::UI::FancyFrame
1576 label => "Server Info", 1605 label => "Server Info",
1577 child => ($SERVER_INFO = new dc::UI::Label ellipsise => 0), 1606 child => ($SERVER_INFO = new DC::UI::Label ellipsise => 0),
1578 ); 1607 );
1579 1608
1580 $vbox 1609 $vbox
1581} 1610}
1582 1611
1583sub client_setup { 1612sub client_setup {
1584 my $table = new dc::UI::Table expand => 1, col_expand => [0, 1]; 1613 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1585 1614
1586 my $row = 0; 1615 my $row = 0;
1587 1616
1588 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1617 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1589 $table->add_at (1, $row++, new dc::UI::CheckBox 1618 $table->add_at (1, $row++, new DC::UI::CheckBox
1590 state => $CFG->{show_tips}, 1619 state => $CFG->{show_tips},
1591 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1620 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1592 on_changed => sub { 1621 on_changed => sub {
1593 my ($self, $value) = @_; 1622 my ($self, $value) = @_;
1594 $CFG->{show_tips} = $value; 1623 $CFG->{show_tips} = $value;
1595 0 1624 0
1596 } 1625 }
1597 ); 1626 );
1598 1627
1599 $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1628 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1600 $table->add_at (1, $row++, my $saycmd = new dc::UI::Entry 1629 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1601 text => $CFG->{logview_max_par}, 1630 text => $CFG->{logview_max_par},
1602 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1631 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1603 . "sends more messages than this number, older messages get removed to save memory and " 1632 . "sends more messages than this number, older messages get removed to save memory and "
1604 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1633 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1605 on_changed => sub { 1634 on_changed => sub {
1606 my ($self, $value) = @_; 1635 my ($self, $value) = @_;
1607 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1636 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1608 0 1637 0
1609 }, 1638 },
1610 ); 1639 );
1611 1640
1612 $table 1641 $table
1613} 1642}
1614 1643
1615sub autopickup_setup { 1644sub autopickup_setup {
1616 my $r = new dc::UI::ScrolledWindow ( 1645 my $r = new DC::UI::ScrolledWindow (
1617 expand => 1, 1646 expand => 1,
1618 scroll_y => 1 1647 scroll_y => 1
1619 ); 1648 );
1620 $r->add (my $table = new dc::UI::Table 1649 $r->add (my $table = new DC::UI::Table
1621 row_expand => [0], 1650 row_expand => [0],
1622 col_expand => [0, 1, 0, 1], 1651 col_expand => [0, 1, 0, 1],
1623 ); 1652 );
1624 1653
1625 for ( 1654 for (
… …
1663 ], 1692 ],
1664 ["Weight/Value ratio", 2, 17] 1693 ["Weight/Value ratio", 2, 17]
1665 ) 1694 )
1666 { 1695 {
1667 my ($title, $x, $y, @bits) = @$_; 1696 my ($title, $x, $y, @bits) = @$_;
1668 $table->add_at ($x, $y, new dc::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1697 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1669 1698
1670 for (@bits) { 1699 for (@bits) {
1671 ++$y; 1700 ++$y;
1672 1701
1673 my $mask = $_->[1]; 1702 my $mask = $_->[1];
1674 $table->add_at ($x , $y, new dc::UI::Label text => $_->[0], align => 1, expand => 1); 1703 $table->add_at ($x , $y, new DC::UI::Label text => $_->[0], align => 1, expand => 1);
1675 $table->add_at ($x+1, $y, my $checkbox = new dc::UI::CheckBox 1704 $table->add_at ($x+1, $y, my $checkbox = new DC::UI::CheckBox
1676 state => $::CFG->{pickup} & $mask, 1705 state => $::CFG->{pickup} & $mask,
1677 on_changed => sub { 1706 on_changed => sub {
1678 my ($box, $value) = @_; 1707 my ($box, $value) = @_;
1679 1708
1680 if ($value) { 1709 if ($value) {
… …
1691 1720
1692 ${$_->[2]} = $checkbox if $_->[2]; 1721 ${$_->[2]} = $checkbox if $_->[2];
1693 } 1722 }
1694 } 1723 }
1695 1724
1696 $table->add_at (2, 18, new dc::UI::ValSlider 1725 $table->add_at (2, 18, new DC::UI::ValSlider
1697 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1726 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1698 template => ">= 99", 1727 template => ">= 99",
1699 to_value => sub { ">= " . 5 * $_[0] }, 1728 to_value => sub { ">= " . 5 * $_[0] },
1700 on_changed => sub { 1729 on_changed => sub {
1701 my ($slider, $value) = @_; 1730 my ($slider, $value) = @_;
… …
1704 $::CFG->{pickup} |= int $value 1733 $::CFG->{pickup} |= int $value
1705 if $value; 1734 if $value;
1706 1; 1735 1;
1707 }); 1736 });
1708 1737
1709 $table->add_at (3, 18, new dc::UI::Button 1738 $table->add_at (3, 18, new DC::UI::Button
1710 text => "set", 1739 text => "set",
1711 on_activate => sub { 1740 on_activate => sub {
1712 $::CONN->send_command ("pickup $::CFG->{pickup}") 1741 $::CONN->send_command ("pickup $::CFG->{pickup}")
1713 if defined $::CONN; 1742 if defined $::CONN;
1714 0 1743 0
… …
1716 1745
1717 $r 1746 $r
1718} 1747}
1719 1748
1720my %SORT_ORDER = ( 1749my %SORT_ORDER = (
1721 type => undef, 1750 type => sub {
1751 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1752 },
1722 mtime => sub { 1753 mtime => sub {
1723 my $NOW = time; 1754 my $NOW = time;
1724 sort { 1755 sort {
1725 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1756 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1726 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1757 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1735 or $a->{type} <=> $b->{type} 1766 or $a->{type} <=> $b->{type}
1736 } @_ }, 1767 } @_ },
1737); 1768);
1738 1769
1739sub inventory_widget { 1770sub inventory_widget {
1740 my $hb = new dc::UI::HBox homogeneous => 1; 1771 my $hb = new DC::UI::HBox homogeneous => 1;
1741 1772
1742 $hb->add (my $vb1 = new dc::UI::VBox); 1773 $hb->add (my $vb1 = new DC::UI::VBox);
1743 $vb1->add (new dc::UI::Label align => 0, text => "Player"); 1774 $vb1->add (new DC::UI::Label text => "Player");
1744 1775
1745 $vb1->add (my $hb1 = new dc::UI::HBox); 1776 $vb1->add (my $hb1 = new DC::UI::HBox);
1746 1777
1747 use sort 'stable'; 1778 use sort 'stable';
1748 1779
1749 $hb1->add (new dc::UI::Selector 1780 $hb1->add (new DC::UI::Selector
1750 value => $::CFG->{inv_sort}, 1781 value => $::CFG->{inv_sort},
1751 options => [ 1782 options => [
1752 [type => "Type/Name"], 1783 [type => "Type/Name"],
1753 [mtime => "Recent/Normal/Locked"], 1784 [mtime => "Recent/Normal/Locked"],
1754 [weight => "Weight/Type"], 1785 [weight => "Weight/Type"],
… …
1756 on_changed => sub { 1787 on_changed => sub {
1757 $::CFG->{inv_sort} = $_[1]; 1788 $::CFG->{inv_sort} = $_[1];
1758 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1789 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1759 }, 1790 },
1760 ); 1791 );
1761 $hb1->add (new dc::UI::Label text => "Weight: ", align => 1, expand => 1); 1792 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1762 #TODO# update to weigh/maxweight 1793 #TODO# update to weigh/maxweight
1763 $hb1->add ($STATWIDS->{i_weight} = new dc::UI::Label align => -1); 1794 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1764 1795
1765 $vb1->add (my $sw1 = new dc::UI::ScrolledWindow expand => 1, scroll_y => 1); 1796 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1766 $sw1->add ($INV = new dc::UI::Inventory); 1797 $sw1->add ($INV = new DC::UI::Inventory);
1767 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1798 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1768 1799
1769 $hb->add (my $vb2 = new dc::UI::VBox); 1800 $hb->add (my $vb2 = new DC::UI::VBox);
1770 1801
1771 $vb2->add ($INVR_HB = new dc::UI::HBox); 1802 $vb2->add ($INVR_HB = new DC::UI::HBox);
1772 1803
1773 $vb2->add (my $sw2 = new dc::UI::ScrolledWindow expand => 1, scroll_y => 1); 1804 $vb2->add (my $sw2 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1774 $sw2->add ($INVR = new dc::UI::Inventory); 1805 $sw2->add ($INVR = new DC::UI::Inventory);
1775 1806
1776 # XXX: Call after $INVR = ... because set_opencont sets the items 1807 # XXX: Call after $INVR = ... because set_opencont sets the items
1777 dc::Protocol::set_opencont ($::CONN, 0, "Floor"); 1808 DC::Protocol::set_opencont ($::CONN, 0, "Floor");
1778 1809
1779 $hb 1810 $hb
1780} 1811}
1781 1812
1782sub media_window { 1813sub media_window {
1783 my $vb = new dc::UI::VBox; 1814 my $vb = new DC::UI::VBox;
1784 1815
1785 $vb->add (new dc::UI::FancyFrame 1816 $vb->add (new DC::UI::FancyFrame
1786 label => "Currently playing music", 1817 label => "Currently playing music",
1787 child => new dc::UI::ScrolledWindow scroll_x => 1, scroll_y => 0, 1818 child => new DC::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1788 child => ($MUSIC_PLAYING_WIDGET = new dc::UI::Label ellipsise => 0, fontsize => 0.8), 1819 child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
1789 ); 1820 );
1790 1821
1791 $vb->add (new dc::UI::FancyFrame 1822 $vb->add (new DC::UI::FancyFrame
1792 label => "Other media used in this session", 1823 label => "Other media used in this session",
1793 expand => 1, 1824 expand => 1,
1794 child => ($LICENSE_WIDGET = new dc::UI::TextScroller 1825 child => ($LICENSE_WIDGET = new DC::UI::TextScroller
1795 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4), 1826 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1796 ); 1827 );
1797 1828
1798 $vb 1829 $vb
1799} 1830}
… …
1808 or return; 1839 or return;
1809 1840
1810 $LICENSE_WIDGET->add_paragraph ({ 1841 $LICENSE_WIDGET->add_paragraph ({
1811 fg => [1, 1, 1, 1], 1842 fg => [1, 1, 1, 1],
1812 markup => "<small>" 1843 markup => "<small>"
1813 . "<b>Name:</b> " . (dc::asxml $meta->{name}) . "\n" 1844 . "<b>Name:</b> " . (DC::asxml $meta->{name}) . "\n"
1814 . "<b>Author:</b> " . (dc::asxml $meta->{author}) . "\n" 1845 . "<b>Author:</b> " . (DC::asxml $meta->{author}) . "\n"
1815 . "<b>Source:</b> " . (dc::asxml $meta->{source}) . "\n" 1846 . "<b>Source:</b> " . (DC::asxml $meta->{source}) . "\n"
1816 . "<b>License:</b> " . (dc::asxml $meta->{license}) . "\n" 1847 . "<b>License:</b> " . (DC::asxml $meta->{license}) . "\n"
1817 . "</small>", 1848 . "</small>",
1818 }); 1849 });
1819 $LICENSE_WIDGET->scroll_to_bottom; 1850 $LICENSE_WIDGET->scroll_to_bottom;
1820} 1851}
1821 1852
… …
1829 $PL_WINDOW->show; 1860 $PL_WINDOW->show;
1830 } 1861 }
1831} 1862}
1832 1863
1833sub player_window { 1864sub player_window {
1834 my $plwin = $PL_WINDOW = new dc::UI::Toplevel 1865 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1835 x => "center", 1866 x => "center",
1836 y => "center", 1867 y => "center",
1837 force_w => $WIDTH * 9/10, 1868 force_w => $WIDTH * 9/10,
1838 force_h => $HEIGHT * 9/10, 1869 force_h => $HEIGHT * 9/10,
1839 title => "Player", 1870 title => "Player",
… …
1841 has_close_button => 1 1872 has_close_button => 1
1842 ; 1873 ;
1843 1874
1844 my $ntb = 1875 my $ntb =
1845 $PL_NOTEBOOK = 1876 $PL_NOTEBOOK =
1846 new dc::UI::Notebook expand => 1; 1877 new DC::UI::Notebook expand => 1;
1847 1878
1848 $ntb->add_tab ( 1879 $ntb->add_tab (
1849 "Statistics (F2)" => $STATS_PAGE = stats_window, 1880 "Statistics (F2)" => $STATS_PAGE = stats_window,
1850 "Shows statistics, where all your Stats and Resistances are shown." 1881 "Shows statistics, where all your Stats and Resistances are shown."
1851 ); 1882 );
1852 $ntb->add_tab ( 1883 $ntb->add_tab (
1853 "Skills (F3)" => $SKILL_PAGE = skill_window, 1884 "Skills (F3)" => $SKILL_PAGE = skill_window,
1854 "Shows all your Skills." 1885 "Shows all your Skills."
1855 ); 1886 );
1856 1887
1857 my $spellsw = $SPELL_PAGE = new dc::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1888 my $spellsw = $SPELL_PAGE = new DC::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1858 $spellsw->add ($SPELL_LIST = new dc::UI::SpellList); 1889 $spellsw->add ($SPELL_LIST = new DC::UI::SpellList);
1859 $ntb->add_tab ( 1890 $ntb->add_tab (
1860 "Spellbook (F4)" => $spellsw, 1891 "Spellbook (F4)" => $spellsw,
1861 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1892 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1862 ); 1893 );
1863 $ntb->add_tab ( 1894 $ntb->add_tab (
… …
1876 $plwin->add ($ntb); 1907 $plwin->add ($ntb);
1877 $plwin 1908 $plwin
1878} 1909}
1879 1910
1880sub keyboard_setup { 1911sub keyboard_setup {
1881 dc::Macro::keyboard_setup 1912 DC::Macro::keyboard_setup
1882} 1913}
1883 1914
1884sub help_window { 1915sub help_window {
1885 my $win = new dc::UI::Toplevel 1916 my $win = new DC::UI::Toplevel
1886 x => 'center', 1917 x => 'center',
1887 y => 'center', 1918 y => 'center',
1888 z => 4, 1919 z => 4,
1889 name => 'doc_browser', 1920 name => 'doc_browser',
1890 force_w => int $WIDTH * 7/8, 1921 force_w => int $WIDTH * 7/8,
1891 force_h => int $HEIGHT * 7/8, 1922 force_h => int $HEIGHT * 7/8,
1892 title => "Help Browser", 1923 title => "Help Browser",
1893 has_close_button => 1; 1924 has_close_button => 1;
1894 1925
1895 $win->add (my $vbox = new dc::UI::VBox); 1926 $win->add (my $vbox = new DC::UI::VBox);
1896 1927
1897 $vbox->add (new dc::UI::FancyFrame 1928 $vbox->add (new DC::UI::FancyFrame
1898 label => "Navigation", 1929 label => "Navigation",
1899 child => (my $buttons = new dc::UI::HBox), 1930 child => (my $buttons = new DC::UI::HBox),
1900 ); 1931 );
1901 $vbox->add (my $viewer = new dc::UI::TextScroller 1932 $vbox->add (my $viewer = new DC::UI::TextScroller
1902 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1933 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1903 1934
1904 my @history; 1935 my @history;
1905 my @future; 1936 my @future;
1906 my $curnode; 1937 my $curnode;
… …
1908 my $load_node; $load_node = sub { 1939 my $load_node; $load_node = sub {
1909 my ($node, $para) = @_; 1940 my ($node, $para) = @_;
1910 1941
1911 $buttons->clear; 1942 $buttons->clear;
1912 1943
1913 $buttons->add (new dc::UI::Button 1944 $buttons->add (new DC::UI::Button
1914 text => "⇤", 1945 text => "⇤",
1915 tooltip => "back to the starting page", 1946 tooltip => "back to the starting page",
1916 on_activate => sub { 1947 on_activate => sub {
1917 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 1948 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1918 unshift @future, @history; 1949 unshift @future, @history;
… …
1920 $load_node->(@{shift @future}); 1951 $load_node->(@{shift @future});
1921 }, 1952 },
1922 ); 1953 );
1923 1954
1924 if (@history) { 1955 if (@history) {
1925 $buttons->add (new dc::UI::Button 1956 $buttons->add (new DC::UI::Button
1926 text => "⋘", 1957 text => "⋘",
1927 tooltip => "back to <i>" . (dc::asxml dc::Pod::full_path $history[-1][0]) . "</i>", 1958 tooltip => "back to <i>" . (DC::asxml DC::Pod::full_path $history[-1][0]) . "</i>",
1928 on_activate => sub { 1959 on_activate => sub {
1929 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 1960 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1930 $load_node->(@{pop @history}); 1961 $load_node->(@{pop @history});
1931 }, 1962 },
1932 ); 1963 );
1933 } 1964 }
1934 1965
1935 if (@future) { 1966 if (@future) {
1936 $buttons->add (new dc::UI::Button 1967 $buttons->add (new DC::UI::Button
1937 text => "⋙", 1968 text => "⋙",
1938 tooltip => "forward to <i>" . (dc::asxml dc::Pod::full_path $future[0][0]) . "</i>", 1969 tooltip => "forward to <i>" . (DC::asxml DC::Pod::full_path $future[0][0]) . "</i>",
1939 on_activate => sub { 1970 on_activate => sub {
1940 push @history, [$curnode, $viewer->current_paragraph]; 1971 push @history, [$curnode, $viewer->current_paragraph];
1941 $load_node->(@{shift @future}); 1972 $load_node->(@{shift @future});
1942 }, 1973 },
1943 ); 1974 );
1944 } 1975 }
1945 1976
1946 $buttons->add (new dc::UI::Label text => " "); 1977 $buttons->add (new DC::UI::Label text => " ");
1947 1978
1948 my @path = dc::Pod::full_path_of $node; 1979 my @path = DC::Pod::full_path_of $node;
1949 pop @path; # drop current node 1980 pop @path; # drop current node
1950 1981
1951 for my $node (@path) { 1982 for my $node (@path) {
1952 $buttons->add (new dc::UI::Button 1983 $buttons->add (new DC::UI::Button
1953 text => $node->{kw}[0], 1984 text => $node->[DC::Pod::N_KW][0],
1954 tooltip => "go to <i>" . (dc::asxml dc::Pod::full_path $node) . "</i>", 1985 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1955 on_activate => sub { 1986 on_activate => sub {
1956 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1987 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1957 $load_node->($node); 1988 $load_node->($node);
1958 }, 1989 },
1959 ); 1990 );
1960 $buttons->add (new dc::UI::Label text => "/"); 1991 $buttons->add (new DC::UI::Label text => "/");
1961 } 1992 }
1962 1993
1963 $buttons->add (new dc::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 1994 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1964 1995
1965 $curnode = $node; 1996 $curnode = $node;
1966 1997
1967 $viewer->clear; 1998 $viewer->clear;
1968 $viewer->add_paragraph (dc::Pod::as_paragraphs dc::Pod::section_of $curnode); 1999 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
1969 $viewer->scroll_to ($para); 2000 $viewer->scroll_to ($para);
1970 }; 2001 };
1971 2002
1972 $load_node->(dc::Pod::find pod => "mainpage"); 2003 $load_node->(DC::Pod::find pod => "mainpage");
1973 2004
1974 $dc::Pod::goto_document = sub { 2005 $DC::Pod::goto_document = sub {
1975 my (@path) = @_; 2006 my (@path) = @_;
1976 2007
1977 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2008 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1978 2009
1979 $load_node->((dc::Pod::find @path)[0]); 2010 $load_node->((DC::Pod::find @path)[0]);
1980 $win->show; 2011 $win->show;
1981 }; 2012 };
1982 2013
1983 $win 2014 $win
1984} 2015}
1985 2016
1986sub open_string_query { 2017sub open_string_query {
1987 my ($title, $cb, $txt, $tooltip) = @_; 2018 my ($title, $cb, $txt, $tooltip) = @_;
1988 my $dialog = new dc::UI::Toplevel 2019 my $dialog = new DC::UI::Toplevel
1989 x => "center", 2020 x => "center",
1990 y => "center", 2021 y => "center",
1991 z => 50, 2022 z => 50,
1992 force_w => $WIDTH * 4/5, 2023 force_w => $WIDTH * 4/5,
1993 title => $title; 2024 title => $title;
1994 2025
1995 $dialog->add ( 2026 $dialog->add (
1996 my $e = new dc::UI::Entry 2027 my $e = new DC::UI::Entry
1997 on_activate => sub { $cb->(@_); $dialog->hide; 0 }, 2028 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1998 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 }, 2029 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1999 tooltip => $tooltip 2030 tooltip => $tooltip
2000 ); 2031 );
2001 2032
… …
2004 $dialog->show; 2035 $dialog->show;
2005} 2036}
2006 2037
2007sub open_quit_dialog { 2038sub open_quit_dialog {
2008 unless ($QUIT_DIALOG) { 2039 unless ($QUIT_DIALOG) {
2009 $QUIT_DIALOG = new dc::UI::Toplevel 2040 $QUIT_DIALOG = new DC::UI::Toplevel
2010 x => "center", 2041 x => "center",
2011 y => "center", 2042 y => "center",
2012 z => 50, 2043 z => 50,
2013 title => "Really Quit?", 2044 title => "Really Quit?",
2014 on_key_down => sub { 2045 on_key_down => sub {
2015 my ($dialog, $ev) = @_; 2046 my ($dialog, $ev) = @_;
2016 $ev->{sym} == 27 and $dialog->hide; 2047 $ev->{sym} == 27 and $dialog->hide;
2017 } 2048 }
2018 ; 2049 ;
2019 2050
2020 $QUIT_DIALOG->add (my $vb = new dc::UI::VBox expand => 1); 2051 $QUIT_DIALOG->add (my $vb = new DC::UI::VBox expand => 1);
2021 2052
2022 $vb->add (new dc::UI::Label 2053 $vb->add (new DC::UI::Label
2023 text => "You should find a savebed and apply it first!", 2054 text => "You should find a savebed and apply it first!",
2024 max_w => $WIDTH * 0.25, 2055 max_w => $WIDTH * 0.25,
2025 ellipsize => 0, 2056 ellipsize => 0,
2026 ); 2057 );
2027 $vb->add (my $hb = new dc::UI::HBox expand => 1); 2058 $vb->add (my $hb = new DC::UI::HBox expand => 1);
2028 $hb->add (new dc::UI::Button 2059 $hb->add (new DC::UI::Button
2029 text => "Ok", 2060 text => "Ok",
2030 expand => 1, 2061 expand => 1,
2031 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2062 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2032 ); 2063 );
2033 $hb->add (new dc::UI::Button 2064 $hb->add (new DC::UI::Button
2034 text => "Quit anyway", 2065 text => "Quit anyway",
2035 expand => 1, 2066 expand => 1,
2036 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2067 on_activate => sub { EV::unloop EV::UNLOOP_ALL },
2037 ); 2068 );
2038 } 2069 }
… …
2041 $QUIT_DIALOG->grab_focus; 2072 $QUIT_DIALOG->grab_focus;
2042} 2073}
2043 2074
2044sub show_tip_of_the_day { 2075sub show_tip_of_the_day {
2045 # find all tips 2076 # find all tips
2046 my @tod = dc::Pod::find tip_of_the_day => "*"; 2077 my @tod = DC::Pod::find tip_of_the_day => "*";
2047 2078
2048 dc::DB::get state => "tip_of_the_day", sub { 2079 DC::DB::get state => "tip_of_the_day", sub {
2049 my ($todindex) = @_; 2080 my ($todindex) = @_;
2050 $todindex = 0 if $todindex >= @tod; 2081 $todindex = 0 if $todindex >= @tod;
2051 dc::DB::put state => tip_of_the_day => $todindex + 1, sub { }; 2082 DC::DB::put state => tip_of_the_day => $todindex + 1, sub { };
2052 2083
2053 # create dialog 2084 # create dialog
2054 my $dialog; 2085 my $dialog;
2055 2086
2056 my $close = sub { 2087 my $close = sub {
2057 $dialog->destroy; 2088 $dialog->destroy;
2058 }; 2089 };
2059 2090
2060 $dialog = new dc::UI::Toplevel 2091 $dialog = new DC::UI::Toplevel
2061 x => "center", 2092 x => "center",
2062 y => "center", 2093 y => "center",
2063 z => 3, 2094 z => 3,
2064 name => 'tip_of_the_day', 2095 name => 'tip_of_the_day',
2065 force_w => int $WIDTH * 4/9, 2096 force_w => int $WIDTH * 4/9,
2066 force_h => int $WIDTH * 2/9, 2097 force_h => int $WIDTH * 2/9,
2067 title => "Tip of the day #" . (1 + $todindex), 2098 title => "Tip of the day #" . (1 + $todindex),
2068 child => my $vbox = new dc::UI::VBox, 2099 child => my $vbox = new DC::UI::VBox,
2069 has_close_button => 1, 2100 has_close_button => 1,
2070 on_delete => $close, 2101 on_delete => $close,
2071 ; 2102 ;
2072 2103
2073 $vbox->add (my $viewer = new dc::UI::TextScroller 2104 $vbox->add (my $viewer = new DC::UI::TextScroller
2074 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2105 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
2075 $viewer->add_paragraph (dc::Pod::as_paragraphs dc::Pod::section_of $tod[$todindex]); 2106 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $tod[$todindex]);
2076 2107
2077 $vbox->add (my $table = new dc::UI::Table col_expand => [0, 1]); 2108 $vbox->add (my $table = new DC::UI::Table col_expand => [0, 1]);
2078 2109
2079 $table->add_at (0, 0, new dc::UI::Button 2110 $table->add_at (0, 0, new DC::UI::Button
2080 text => "Close", 2111 text => "Close",
2081 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>.", 2112 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>.",
2082 on_activate => $close, 2113 on_activate => $close,
2083 ); 2114 );
2084 2115
2085 $table->add_at (2, 0, new dc::UI::Button 2116 $table->add_at (2, 0, new DC::UI::Button
2086 text => "Next", 2117 text => "Next",
2087 tooltip => "Show the next <b>Tip of the day</b>.", 2118 tooltip => "Show the next <b>Tip of the day</b>.",
2088 on_activate => sub { 2119 on_activate => sub {
2089 $close->(); 2120 $close->();
2090 &show_tip_of_the_day; 2121 &show_tip_of_the_day;
… …
2094 $dialog->show; 2125 $dialog->show;
2095 }; 2126 };
2096} 2127}
2097 2128
2098sub sdl_init { 2129sub sdl_init {
2099 dc::SDL_Init 2130 DC::SDL_Init
2100 and die "SDL::Init failed!\n"; 2131 and die "SDL::Init failed!\n";
2101} 2132}
2102 2133
2103sub video_init { 2134sub video_init {
2104 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2135 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
… …
2107 2138
2108 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2139 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2109 $FULLSCREEN = $CFG->{fullscreen}; 2140 $FULLSCREEN = $CFG->{fullscreen};
2110 $FAST = $CFG->{fast}; 2141 $FAST = $CFG->{fast};
2111 2142
2112 dc::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2143 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2113 or die "SDL_SetVideoMode failed: " . (dc::SDL_GetError) . "\n"; 2144 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2114 2145
2115 $SDL_ACTIVE = 1; 2146 $SDL_ACTIVE = 1;
2116 $LAST_REFRESH = time - 0.01; 2147 $LAST_REFRESH = time - 0.01;
2117 2148
2118 dc::OpenGL::init; 2149 DC::OpenGL::init;
2119 dc::Macro::init; 2150 DC::Macro::init;
2120 2151
2121 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2152 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
2122 2153
2123 $dc::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2154 $DC::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
2124 2155
2125 ############################################################################# 2156 #############################################################################
2126 2157
2127 if ($DEBUG_STATUS) { 2158 if ($DEBUG_STATUS) {
2128 dc::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2159 DC::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
2129 } else { 2160 } else {
2130 # create/configure the widgets 2161 # create/configure the widgets
2131 2162
2132 $dc::UI::ROOT->connect (key_down => sub { 2163 $DC::UI::ROOT->connect (key_down => sub {
2133 my (undef, $ev) = @_; 2164 my (undef, $ev) = @_;
2134 2165
2135 if (my @macros = dc::Macro::find $ev) { 2166 if (my @macros = DC::Macro::find $ev) {
2136 dc::Macro::execute $_ for @macros; 2167 DC::Macro::execute $_ for @macros;
2137 2168
2138 return 1; 2169 return 1;
2139 } 2170 }
2140 2171
2141 0 2172 0
2142 }); 2173 });
2143 2174
2144 $DEBUG_STATUS = new dc::UI::Label 2175 $DEBUG_STATUS = new DC::UI::Label
2145 padding => 0, 2176 padding => 0,
2146 z => 100, 2177 z => 100,
2147 force_x => "max", 2178 force_x => "max",
2148 force_y => 0; 2179 force_y => 0;
2149 $DEBUG_STATUS->show; 2180 $DEBUG_STATUS->show;
2150 2181
2151 $STATUSBOX = new dc::UI::Statusbox; 2182 $STATUSBOX = new DC::UI::Statusbox;
2152 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
2153 2183
2184 $MODBOX = new DC::UI::Label
2185 can_events => 1,
2186 can_hover => 1,
2187 markup => "",
2188 align => 0,
2189 font => $FONT_FIXED,
2190 tooltip => "#modifier_box",
2191 tooltip_width => 0.67,
2192 ;
2193
2194 update_modbox;
2195
2154 (new dc::UI::Frame 2196 (new DC::UI::Frame
2155 bg => [0, 0, 0, 0.4], 2197 bg => [0, 0, 0, 0.4],
2156 force_x => 0, 2198 force_x => 0,
2157 force_y => "max", 2199 force_y => "max",
2158 child => $STATUSBOX, 2200 child => (my $LR = new DC::UI::VBox),
2159 )->show; 2201 )->show;
2160 2202
2203 $LR->add ($STATUSBOX);
2204 $LR->add ($MODBOX);
2205 $LR->add (new DC::UI::Label
2206 align => 0,
2207 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2208 fontsize => 0.5,
2209 fg => [1, 1, 0, 0.7],
2210 );
2211
2161 dc::UI::Toplevel->new ( 2212 DC::UI::Toplevel->new (
2162 title => "Minimap", 2213 title => "Minimap",
2163 name => "mapmap", 2214 name => "mapmap",
2164 x => 0, 2215 x => 0,
2165 y => $FONTSIZE + 8, 2216 y => $FONTSIZE + 8,
2166 border_bg => [1, 1, 1, 192/255], 2217 border_bg => [1, 1, 1, 192/255],
2167 bg => [1, 1, 1, 0], 2218 bg => [1, 1, 1, 0],
2168 child => ($MAPMAP = new dc::MapWidget::MapMap 2219 child => ($MAPMAP = new DC::MapWidget::MapMap
2169 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2220 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
2170 ), 2221 ),
2171 )->show; 2222 )->show;
2172 2223
2173 $MAPWIDGET = new dc::MapWidget; 2224 $MAPWIDGET = new DC::MapWidget;
2174 $MAPWIDGET->connect (activate_console => sub { 2225 $MAPWIDGET->connect (activate_console => sub {
2175 my ($mapwidget, $preset) = @_; 2226 my ($mapwidget, $preset) = @_;
2176 2227
2177 $MESSAGE_WINDOW->activate_console ($preset) 2228 $MESSAGE_DIST->activate_console ($preset)
2178 if $MESSAGE_WINDOW; 2229 if $MESSAGE_DIST;
2179 }); 2230 });
2180 $MAPWIDGET->show; 2231 $MAPWIDGET->show;
2181 $MAPWIDGET->grab_focus; 2232 $MAPWIDGET->grab_focus;
2182 2233
2183 $COMPLETER = new dc::MapWidget::Command:: 2234 $COMPLETER = new DC::MapWidget::Command::
2184 command => { }, 2235 command => { },
2185 tooltip => "#completer_help", 2236 tooltip => "#completer_help",
2186 ; 2237 ;
2187 2238
2188 $SETUP_DIALOG = new dc::UI::Toplevel 2239 $SETUP_DIALOG = new DC::UI::Toplevel
2189 title => "Setup", 2240 title => "Setup",
2190 name => "setup_dialog", 2241 name => "setup_dialog",
2191 x => 'center', 2242 x => 'center',
2192 y => 'center', 2243 y => 'center',
2193 z => 2, 2244 z => 2,
… …
2195 force_h => $::HEIGHT * 0.6, 2246 force_h => $::HEIGHT * 0.6,
2196 has_close_button => 1, 2247 has_close_button => 1,
2197 ; 2248 ;
2198 2249
2199 $METASERVER = metaserver_dialog; 2250 $METASERVER = metaserver_dialog;
2200 $MESSAGE_WINDOW = new dc::UI::MessageWindow; 2251 # the name is changed to not conflict with the older name as users could have hidden it
2252 $MESSAGE_WINDOW = new DC::UI::Dockbar
2253 name => "message_window2",
2254 title => 'Messages',
2255 force_w => $::WIDTH * 0.6,
2256 force_h => $::HEIGHT * 0.25,
2257 ;
2201 2258
2259 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2260
2202 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new dc::UI::Notebook expand => 1, debug => 1, 2261 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2203 filter => new dc::UI::ScrolledWindow expand => 1, scroll_y => 1); 2262 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2204 2263
2205 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2264 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2206 "Configure the server to play on, your username and password."); 2265 "Configure the server to play on, your username and password.");
2207 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2266 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2208 "Configure other server related options."); 2267 "Configure other server related options.");
… …
2220 . "After pressing the combo the binding will be saved automatically and the " 2279 . "After pressing the combo the binding will be saved automatically and the "
2221 . "binding editor closes"); 2280 . "binding editor closes");
2222 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2281 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2223 "Some debuggin' options. Do not ask."); 2282 "Some debuggin' options. Do not ask.");
2224 2283
2225 $BUTTONBAR = new dc::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2284 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2226 2285
2227 $BUTTONBAR->add (new dc::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2286 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2228 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2287 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2229 2288
2230 $BUTTONBAR->add (new dc::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2289# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2231 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2290# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2232 2291
2233 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 2292 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
2234 2293
2235 $BUTTONBAR->add (new dc::UI::Flopper text => "Playerbook", other => player_window, 2294 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2236 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 2295 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2237 2296
2238 $BUTTONBAR->add (new dc::UI::Button 2297 $BUTTONBAR->add (new DC::UI::Button
2239 text => "Save Config", 2298 text => "Save Config",
2240 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 2299 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2241 on_activate => sub { 2300 on_activate => sub {
2242 $::CFG->{layout} = dc::UI::get_layout; 2301 $::CFG->{layout} = DC::UI::get_layout;
2243 dc::write_cfg "$Deliantra::VARDIR/client.cf"; 2302 DC::write_cfg;
2244 status "Configuration Saved"; 2303 status "Configuration Saved";
2245 0 2304 0
2246 }, 2305 },
2247 ); 2306 );
2248 2307
2249 $BUTTONBAR->add (new dc::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2308 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2250 tooltip => "View Documentation"); 2309 tooltip => "View Documentation");
2251 2310
2252
2253 $BUTTONBAR->add (new dc::UI::Button 2311 $BUTTONBAR->add (new DC::UI::Button
2254 text => "Quit", 2312 text => "Quit",
2255 tooltip => "Terminates the program", 2313 tooltip => "Terminates the program",
2256 on_activate => sub { 2314 on_activate => sub {
2257 if ($CONN) { 2315 if ($CONN) {
2258 open_quit_dialog; 2316 open_quit_dialog;
… …
2270 2328
2271 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2329 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2272} 2330}
2273 2331
2274sub video_shutdown { 2332sub video_shutdown {
2275 dc::OpenGL::shutdown; 2333 DC::OpenGL::shutdown;
2276 2334
2277 undef $SDL_ACTIVE; 2335 undef $SDL_ACTIVE;
2278} 2336}
2279 2337
2280my %animate_object; 2338my %animate_object;
… …
2289 } 2347 }
2290 2348
2291 undef $WANT_REFRESH; 2349 undef $WANT_REFRESH;
2292 $_[0]->stop; 2350 $_[0]->stop;
2293 2351
2294 $dc::UI::ROOT->draw; 2352 $DC::UI::ROOT->draw;
2295 dc::SDL_GL_SwapBuffers; 2353 DC::SDL_GL_SwapBuffers;
2296 $LAST_REFRESH = $NOW; 2354 $LAST_REFRESH = $NOW;
2297} 2355}
2298 2356
2299my $want_refresh = EV::idle_ns \&force_refresh; 2357my $want_refresh = EV::prepare_ns \&force_refresh;
2300 2358
2301my $input = EV::periodic 0, 1/60, undef, sub { 2359my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2302 $NOW = time; 2360 $NOW = EV::now;
2303 2361
2304 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2362 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2305 for dc::poll_events; 2363 for DC::poll_events;
2306 2364
2307 if (%animate_object) { 2365 if (%animate_object) {
2308 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2366 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2309 $WANT_REFRESH = 1; 2367 $WANT_REFRESH = 1;
2310 } 2368 }
… …
2322 my ($widget) = @_; 2380 my ($widget) = @_;
2323 delete $animate_object{$widget}; 2381 delete $animate_object{$widget};
2324} 2382}
2325 2383
2326%SDL_CB = ( 2384%SDL_CB = (
2327 dc::SDL_QUIT => sub { 2385 DC::SDL_QUIT => sub {
2328 EV::unloop EV::UNLOOP_ALL; 2386 EV::unloop EV::UNLOOP_ALL;
2329 }, 2387 },
2330 dc::SDL_VIDEORESIZE => sub { 2388 DC::SDL_VIDEORESIZE => sub {
2331 }, 2389 },
2332 dc::SDL_VIDEOEXPOSE => sub { 2390 DC::SDL_VIDEOEXPOSE => sub {
2333 dc::UI::full_refresh; 2391 DC::UI::full_refresh;
2334 }, 2392 },
2335 dc::SDL_ACTIVEEVENT => sub { 2393 DC::SDL_ACTIVEEVENT => sub {
2336# not useful, as APPACTIVE includes only iconified state, not unmapped 2394# not useful, as APPACTIVE includes only iconified state, not unmapped
2337# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, dc::SDL_GetAppState;#d# 2395# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2338# printf "a %x\n", dc::SDL_GetAppState & dc::SDL_APPACTIVE;#d# 2396# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2339# printf "A\n" if $_[0]{state} & dc::SDL_APPACTIVE; 2397# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2340# printf "K\n" if $_[0]{state} & dc::SDL_APPINPUTFOCUS; 2398# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2341# printf "M\n" if $_[0]{state} & dc::SDL_APPMOUSEFOCUS; 2399# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2342 }, 2400 },
2343 dc::SDL_KEYDOWN => sub { 2401 DC::SDL_KEYDOWN => sub {
2344 if ($_[0]{mod} & dc::KMOD_ALT && $_[0]{sym} == 13) { 2402 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2345 # alt-enter 2403 # alt-enter
2346 $FULLSCREEN_ENABLE->toggle; 2404 $FULLSCREEN_ENABLE->toggle;
2347 video_shutdown; 2405 video_shutdown;
2348 video_init; 2406 video_init;
2349 } else { 2407 } else {
2350 dc::UI::feed_sdl_key_down_event ($_[0]); 2408 &DC::UI::feed_sdl_key_down_event;
2351 } 2409 }
2410 update_modbox;
2352 }, 2411 },
2353 dc::SDL_KEYUP => \&dc::UI::feed_sdl_key_up_event, 2412 DC::SDL_KEYUP => sub {
2413 &DC::UI::feed_sdl_key_up_event;
2414 update_modbox;
2415 },
2354 dc::SDL_MOUSEMOTION => \&dc::UI::feed_sdl_motion_event, 2416 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2355 dc::SDL_MOUSEBUTTONDOWN => \&dc::UI::feed_sdl_button_down_event, 2417 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2356 dc::SDL_MOUSEBUTTONUP => \&dc::UI::feed_sdl_button_up_event, 2418 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2357 dc::SDL_USEREVENT => sub { 2419 DC::SDL_USEREVENT => sub {
2358 if ($_[0]{code} == 1) { 2420 if ($_[0]{code} == 1) {
2359 audio_channel_finished $_[0]{data1}; 2421 audio_channel_finished $_[0]{data1};
2360 } elsif ($_[0]{code} == 0) { 2422 } elsif ($_[0]{code} == 0) {
2361 audio_music_finished; 2423 audio_music_finished;
2362 } 2424 }
… …
2369 EV::unloop; 2431 EV::unloop;
2370 #d# TODO calling exit here hangs the process in some futex 2432 #d# TODO calling exit here hangs the process in some futex
2371}; 2433};
2372 2434
2373{ 2435{
2436 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2437
2374 if (-e "$Deliantra::VARDIR/client.cf") { 2438 if (-e "$Deliantra::VARDIR/client.cf") {
2375 dc::read_cfg "$Deliantra::VARDIR/client.cf"; 2439 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2376 } else { 2440 } else {
2377 #TODO: compatibility cruft 2441 #TODO: compatibility cruft
2378 dc::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2442 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2379 print STDERR "INFO: used old configuratrion file\n"; 2443 print STDERR "INFO: used old configuration file\n";
2380 } 2444 }
2381 2445
2382 dc::DB::Server::run; 2446 DC::DB::Server::run;
2383 2447
2448 if ($CFG->{db_schema} < 1) {
2449 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2450 DC::DB::nuke_db;
2451 $CFG->{db_schema} = 1;
2452 DC::write_cfg;
2453 }
2454
2455 DC::DB::open_db;
2456
2384 dc::UI::set_layout ($::CFG->{layout}); 2457 DC::UI::set_layout ($::CFG->{layout});
2385 2458
2386 my %DEF_CFG = ( 2459 my %DEF_CFG = (
2387 sdl_mode => 0, 2460 sdl_mode => 0,
2388 fullscreen => 1, 2461 fullscreen => 1,
2389 fast => 0, 2462 fast => 0,
… …
2412 pickup => 0, 2485 pickup => 0,
2413 inv_sort => "mtime", 2486 inv_sort => "mtime",
2414 default => "profile", # default profile 2487 default => "profile", # default profile
2415 show_tips => 1, 2488 show_tips => 1,
2416 logview_max_par => 1000, 2489 logview_max_par => 1000,
2490 shift_fire_stop => 0,
2417 ); 2491 );
2418 2492
2419 while (my ($k, $v) = each %DEF_CFG) { 2493 while (my ($k, $v) = each %DEF_CFG) {
2420 $CFG->{$k} = $v unless exists $CFG->{$k}; 2494 $CFG->{$k} = $v unless exists $CFG->{$k};
2421 } 2495 }
… …
2435 } 2509 }
2436 } 2510 }
2437 2511
2438 sdl_init; 2512 sdl_init;
2439 2513
2440 @SDL_MODES = dc::SDL_ListModes 8, 8; 2514 @SDL_MODES = DC::SDL_ListModes 8, 8;
2441 @SDL_MODES = dc::SDL_ListModes 5, 0 unless @SDL_MODES; 2515 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2442 @SDL_MODES or dc::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2516 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2443 2517
2444 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2518 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2445 2519
2446 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2520 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2447 2521
2448 { 2522 {
2449 my @fonts = map dc::find_rcfile "fonts/$_", qw( 2523 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2450 DejaVuSans.ttf 2524 DejaVuSans.ttf
2451 DejaVuSansMono.ttf 2525 DejaVuSansMono.ttf
2452 DejaVuSans-Bold.ttf 2526 DejaVuSans-Bold.ttf
2453 DejaVuSansMono-Bold.ttf 2527 DejaVuSansMono-Bold.ttf
2454 DejaVuSans-Oblique.ttf 2528 DejaVuSans-Oblique.ttf
2455 DejaVuSansMono-Oblique.ttf 2529 DejaVuSansMono-Oblique.ttf
2456 DejaVuSans-BoldOblique.ttf 2530 DejaVuSans-BoldOblique.ttf
2457 DejaVuSansMono-BoldOblique.ttf 2531 DejaVuSansMono-BoldOblique.ttf
2458 ); 2532 );
2459 2533
2460 dc::add_font $_ for @fonts; 2534 DC::add_font $_ for @fonts;
2461 2535
2462 dc::pango_init;
2463
2464 $FONT_PROP = new_from_file dc::Font $fonts[0]; 2536 $FONT_PROP = new_from_file DC::Font $fonts[0];
2465 $FONT_FIXED = new_from_file dc::Font $fonts[1]; 2537 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2466 2538
2467 $FONT_PROP->make_default; 2539 $FONT_PROP->make_default;
2540
2541 DC::pango_init;
2468 } 2542 }
2469 2543
2470# compare mono (ft) vs. rgba (cairo) 2544# compare mono (ft) vs. rgba (cairo)
2471# ft - 1.8s, cairo 3s, even in alpha-only mode 2545# ft - 1.8s, cairo 3s, even in alpha-only mode
2472# for my $rgba (0..1) { 2546# for my $rgba (0..1) {
2473# my $t1 = Time::HiRes::time; 2547# my $t1 = Time::HiRes::time;
2474# for (1..1000) { 2548# for (1..1000) {
2475# my $layout = dc::Layout->new ($rgba); 2549# my $layout = DC::Layout->new ($rgba);
2476# $layout->set_text ("hallo" x 100); 2550# $layout->set_text ("hallo" x 100);
2477# $layout->render; 2551# $layout->render;
2478# } 2552# }
2479# my $t2 = Time::HiRes::time; 2553# my $t2 = Time::HiRes::time;
2480# warn $t2-$t1; 2554# warn $t2-$t1;
… …
2489our $STARTUP_CANCEL = EV::idle sub { 2563our $STARTUP_CANCEL = EV::idle sub {
2490 undef $::STARTUP_CANCEL; 2564 undef $::STARTUP_CANCEL;
2491 $startup_done->(); 2565 $startup_done->();
2492}; 2566};
2493 2567
2568delete $SIG{__DIE__};
2494EV::loop; 2569EV::loop;
2495 2570
2496#video_shutdown; 2571#video_shutdown;
2497#audio_shutdown; 2572#audio_shutdown;
2498dc::OpenGL::quit; 2573DC::OpenGL::quit;
2499dc::SDL_Quit; 2574DC::SDL_Quit;
2500dc::DB::Server::stop; 2575DC::DB::Server::stop;
2501 2576
2502=head1 NAME 2577=head1 NAME
2503 2578
2504deliantra - A Deliantra MORPG game client 2579deliantra - A Deliantra MORPG game client
2505 2580

Diff Legend

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