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.1 by root, Sun Oct 14 15:33:31 2007 UTC vs.
Revision 1.47 by root, Mon Jul 7 05:02:03 2008 UTC

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

Diff Legend

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