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

Diff Legend

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