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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines