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.2 by root, Fri Oct 19 23:10:32 2007 UTC vs.
Revision 1.49 by root, Mon Jul 7 12:56:07 2008 UTC

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

Diff Legend

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