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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines