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.3 by root, Sat Nov 3 12:08:44 2007 UTC vs.
Revision 1.43 by root, Wed May 21 23:35:55 2008 UTC

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

Diff Legend

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