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.4 by root, Mon Nov 12 23:25:37 2007 UTC vs.
Revision 1.25 by elmex, Sun Jan 6 17:40:45 2008 UTC

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

Diff Legend

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