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.42 by elmex, Thu May 8 18:25:25 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 {
700 new CFPlus::Protocol 743 new DC::Protocol
701 host => $host, 744 host => $host,
702 port => $port || 13327, 745 port => $port || 13327,
703 user => $PROFILE->{user}, 746 user => $PROFILE->{user},
704 pass => $PROFILE->{password}, 747 pass => $PROFILE->{password},
705 mapw => $mapsize, 748 mapw => $mapsize,
706 maph => $mapsize, 749 maph => $mapsize,
707 750
708 client => "cfplus $CFPlus::VERSION $] $^O", 751 client => "$DC::VERSION $] $^O",
709 752
710 map_widget => $MAPWIDGET, 753 map_widget => $MAPWIDGET,
711 statusbox => $STATUSBOX, 754 statusbox => $STATUSBOX,
712 map => $MAP, 755 map => $MAP,
713 mapmap => $MAPMAP, 756 mapmap => $MAPMAP,
… …
717 smoothing => $CFG->{map_smoothing}*1, 760 smoothing => $CFG->{map_smoothing}*1,
718 }, 761 },
719 }; 762 };
720 763
721 if ($CONN) { 764 if ($CONN) {
722 CFPlus::lowdelay fileno $CONN->{fh}; 765 DC::lowdelay fileno $CONN->{fh};
723 766
724 status "login successful"; 767 status "login successful";
725 } else { 768 } else {
769 warn $@;
726 status "unable to connect"; 770 status "unable to connect";
727 stop_game(); 771 stop_game();
728 } 772 }
729} 773}
730 774
… …
732 $LOGIN_BUTTON->set_text ("Login / Register"); 776 $LOGIN_BUTTON->set_text ("Login / Register");
733 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 777 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
734 $SETUP_DIALOG->show; 778 $SETUP_DIALOG->show;
735 $PL_WINDOW->hide; 779 $PL_WINDOW->hide;
736 $SPELL_LIST->clear_spells; 780 $SPELL_LIST->clear_spells;
737 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 781 $DC::UI::ROOT->emit (stop_game => ! ! $CONN);
738 782
739 &audio_music_set_ambient ([]); 783 &audio_music_set_ambient ([]);
740 784
741 return unless $CONN; 785 return unless $CONN;
742 786
… …
748 792
749 undef $MAP; 793 undef $MAP;
750} 794}
751 795
752sub graphics_setup { 796sub graphics_setup {
753 my $vbox = new CFPlus::UI::VBox; 797 my $vbox = new DC::UI::VBox;
754 798
755 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 799 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
756 800
757 my $row = 0; 801 my $row = 0;
758 802
759 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 803 $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, 804 $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, 805 can_events => 1,
762 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 806 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
763 807
764 my $vidmode_tooltip = 808 my $vidmode_tooltip =
765 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 809 "<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>."; 810 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
767 811
768 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 812 $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); 813 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
770 814
771 $hbox->add (my $mode_slider = new CFPlus::UI::Slider 815 $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], 816 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
773 tooltip => $vidmode_tooltip); 817 tooltip => $vidmode_tooltip);
774 $hbox->add (my $mode_label = new CFPlus::UI::Label 818 $hbox->add (my $mode_label = new DC::UI::Label
775 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 819 height => 0.8, template => "9999x9999@9+9",
776 can_events => 1, tooltip => $vidmode_tooltip); 820 can_events => 1, tooltip => $vidmode_tooltip);
777 821
778 $mode_slider->connect (changed => sub { 822 $mode_slider->connect (changed => sub {
779 my ($self, $value) = @_; 823 my ($self, $value) = @_;
780 824
781 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 825 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
782 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 826 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
783 }); 827 });
784 $mode_slider->emit (changed => $mode_slider->{range}[0]); 828 $mode_slider->emit (changed => $mode_slider->{range}[0]);
785 829
786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 830 $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 831 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
788 state => $CFG->{fullscreen}, 832 state => $CFG->{fullscreen},
789 tooltip => "Bring the client into fullscreen mode.", 833 tooltip => "Bring the client into fullscreen mode.",
790 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 834 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
791 ); 835 );
792 836
793 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 837 $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 838 $table->add_at (1, $row++, new DC::UI::CheckBox
795 state => $CFG->{force_opengl11}, 839 state => $CFG->{force_opengl11},
796 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 840 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 " 841 . "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. " 842 . "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, " 843 . "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 " 844 . "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>", 845 . "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 } 846 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
803 ); 847 );
804 848
805 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures"); 849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
806 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 850 $table->add_at (1, $row++, new DC::UI::CheckBox
807 state => $CFG->{texture_compression}, 851 state => $CFG->{texture_compression},
808 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 852 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 " 853 . "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 " 854 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
811 . "forced OpenGL 1.1 mode.", 855 . "forced OpenGL 1.1 mode.",
812 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 856 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
813 ); 857 );
814 858
815 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 859 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 860 $table->add_at (1, $row++, new DC::UI::CheckBox
817 state => $CFG->{fast}, 861 state => $CFG->{fast},
818 tooltip => "Lower the visual quality considerably to speed up rendering.", 862 tooltip => "Lower the visual quality considerably to speed up rendering.",
819 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 863 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
820 ); 864 );
821 865
822 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 866 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
823 $table->add_at (1, $row++, new CFPlus::UI::Slider 867 $table->add_at (1, $row++, new DC::UI::Slider
824 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 868 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.", 869 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 }, 870 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
827 ); 871 );
828 872
829 $table->add_at (1, $row++, new CFPlus::UI::Button 873 $table->add_at (1, $row++, new DC::UI::Button
830 expand => 1, align => 0, text => "Apply", 874 expand => 1, text => "Apply",
831 tooltip => "Apply the video settings above.", 875 tooltip => "Apply the video settings above.",
832 on_activate => sub { 876 on_activate => sub {
833 video_shutdown (); 877 video_shutdown ();
834 video_init (); 878 video_init ();
835 0 879 0
836 } 880 }
837 ); 881 );
838 882
839 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
840 $table->add_at (1, $row++, new CFPlus::UI::Slider 884 $table->add_at (1, $row++, new DC::UI::Slider
841 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 885 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
842 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 886 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
843 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 887 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
844 ); 888 );
845 889
846 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
847 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 891 $table->add_at (1, $row++, new DC::UI::CheckBox
848 state => $CFG->{map_smoothing}, 892 state => $CFG->{map_smoothing},
849 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 893 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. " 894 . "This increases load on the graphics subsystem and works only with TRT servers. "
851 . "Changes take effect at next login only.", 895 . "Changes take effect at next login only.",
852 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 896 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
853 ); 897 );
854 898
855 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 899 $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 900 $table->add_at (1, $row++, new DC::UI::CheckBox
857 state => $CFG->{fow_enable}, 901 state => $CFG->{fow_enable},
858 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 902 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 } 903 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
860 ); 904 );
861 905
862 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 906 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
863 $table->add_at (1, $row++, new CFPlus::UI::Slider 907 $table->add_at (1, $row++, new DC::UI::Slider
864 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 908 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.", 909 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 } 910 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
867 ); 911 );
868 912
869 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
870 $table->add_at (1, $row++, new CFPlus::UI::Slider 914 $table->add_at (1, $row++, new DC::UI::Slider
871 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 915 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, " 916 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.", 917 . "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 }, 918 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
875 ); 919 );
876 920
877 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
878 $table->add_at (1, $row++, new CFPlus::UI::Slider 922 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 923 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.", 924 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
881 on_changed => sub { 925 on_changed => sub {
882 $CFG->{gauge_fontsize} = $_[1]; 926 $CFG->{gauge_fontsize} = $_[1];
883 &set_gauge_window_fontsize; 927 &set_gauge_window_fontsize;
884 0 928 0
885 } 929 }
886 ); 930 );
887 931
888 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
889 $table->add_at (1, $row++, new CFPlus::UI::Slider 933 $table->add_at (1, $row++, new DC::UI::Slider
890 range => [$CFG->{gauge_size}, 0.2, 0.8], 934 range => [$CFG->{gauge_size}, 0.2, 0.8],
891 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 935 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
892 on_changed => sub { 936 on_changed => sub {
893 $CFG->{gauge_size} = $_[1]; 937 $CFG->{gauge_size} = $_[1];
894 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 938 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
901 945
902our $AUDIO_HW_CHUNKSIZE; 946our $AUDIO_HW_CHUNKSIZE;
903our $AUDIO_INFO; 947our $AUDIO_INFO;
904 948
905sub audio_tab_update { 949sub audio_tab_update {
906 my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec; 950 my ($freq, $format, $chans) = DC::Mix_QuerySpec;
907 951
908 $AUDIO_HW_CHUNKSIZE->set_options ([ 952 $AUDIO_HW_CHUNKSIZE->set_options ([
909 [0, "default", "Use System Default"], 953 [0, "default", "Use System Default"],
910 map { 954 map {
911 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050); 955 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
… …
921 965
922 $AUDIO_INFO->set_text ($text); 966 $AUDIO_INFO->set_text ($text);
923} 967}
924 968
925sub audio_setup { 969sub audio_setup {
926 my $vbox = new CFPlus::UI::VBox; 970 my $vbox = new DC::UI::VBox;
927 971
928 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]); 972 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
929 973
930 my $row = 0; 974 my $row = 0;
931 975
932 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
933 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 977 $table->add_at (1, $row++, new DC::UI::CheckBox
934 state => $CFG->{audio_enable}, 978 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.", 979 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 } 980 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
937 ); 981 );
938 982
939 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects"); 983 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
940 $table->add_at (1, $row, new CFPlus::UI::CheckBox 984 $table->add_at (1, $row, new DC::UI::CheckBox
941 expand => 1, state => $CFG->{effects_enable}, 985 expand => 1, state => $CFG->{effects_enable},
942 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 986 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
943 on_changed => sub { 987 on_changed => sub {
944 $CFG->{effects_enable} = $_[1]; 988 $CFG->{effects_enable} = $_[1];
945 $CONN->update_fx_want if $CONN; 989 $CONN->update_fx_want if $CONN;
946 1 990 1
947 } 991 }
948 ); 992 );
949 $table->add_at (2, $row++, new CFPlus::UI::Slider 993 $table->add_at (2, $row++, new DC::UI::Slider
950 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 994 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 " 995 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.", 996 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
953 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 997 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
954 ); 998 );
955 999
956 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 1000 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
957 $table->add_at (1, $row, new CFPlus::UI::CheckBox 1001 $table->add_at (1, $row, new DC::UI::CheckBox
958 expand => 1, state => $CFG->{bgm_enable}, 1002 expand => 1, state => $CFG->{bgm_enable},
959 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1003 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
960 on_changed => sub { 1004 on_changed => sub {
961 $CFG->{bgm_enable} = $_[1]; 1005 $CFG->{bgm_enable} = $_[1];
962 $CONN->update_fx_want if $CONN; 1006 $CONN->update_fx_want if $CONN;
963 audio_music_push; 1007 audio_music_push;
964 1 1008 1
965 } 1009 }
966 ); 1010 );
967 $table->add_at (2, $row++, new CFPlus::UI::Slider 1011 $table->add_at (2, $row++, new DC::UI::Slider
968 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1012 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
969 tooltip => "The volume of the background music. Changes are instant.", 1013 tooltip => "The volume of the background music. Changes are instant.",
970 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1014 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
971 ); 1015 );
972 1016
973 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency"); 1017 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
974 $table->add_at (1, $row++, new CFPlus::UI::Selector 1018 $table->add_at (1, $row++, new DC::UI::Selector
975 c_colspan => 2, expand => 1, 1019 c_colspan => 2, expand => 1,
976 value => $CFG->{audio_hw_frequency}, 1020 value => $CFG->{audio_hw_frequency},
977 options => [ 1021 options => [
978 [ 0, "default" , "Use System Default"], 1022 [ 0, "default" , "Use System Default"],
979 [11025, "11 kHz" , "11kHz (low quality)"], 1023 [11025, "11 kHz" , "11kHz (low quality)"],
… …
987 audio_tab_update; 1031 audio_tab_update;
988 1 1032 1
989 } 1033 }
990 ); 1034 );
991 1035
992 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels"); 1036 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
993 $table->add_at (1, $row++, new CFPlus::UI::Selector 1037 $table->add_at (1, $row++, new DC::UI::Selector
994 c_colspan => 2, expand => 1, 1038 c_colspan => 2, expand => 1,
995 value => $CFG->{audio_hw_channels}, 1039 value => $CFG->{audio_hw_channels},
996 options => [ 1040 options => [
997 [0, "default" , "Use System Default"], 1041 [0, "default" , "Use System Default"],
998 [1, "Mono" , "Mono (single channel, low quality)"], 1042 [1, "Mono" , "Mono (single channel, low quality)"],
999 [2, "Stereo" , "Stereo (dual channe, standard quality)"], 1043 [2, "Stereo" , "Stereo (dual channel, standard quality)"],
1000 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"], 1044 [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)"], 1045 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
1002 ], 1046 ],
1003 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.", 1047 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 { 1048 on_changed => sub {
… …
1006 audio_tab_update; 1050 audio_tab_update;
1007 1 1051 1
1008 } 1052 }
1009 ); 1053 );
1010 1054
1011 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency"); 1055 $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 1056 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1013 c_colspan => 2, expand => 1, 1057 c_colspan => 2, expand => 1,
1014 value => $CFG->{audio_hw_chunksize}, 1058 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 " 1059 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.", 1060 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1017 on_changed => sub { 1061 on_changed => sub {
… …
1020 1 1064 1
1021 } 1065 }
1022 ); 1066 );
1023 1067
1024 # should really be a slider 1068 # should really be a slider
1025 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1026 $table->add_at (1, $row++, new CFPlus::UI::ValSlider 1070 $table->add_at (1, $row++, new DC::UI::ValSlider
1027 c_colspan => 2, expand => 1, 1071 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.", 1072 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], 1073 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1030 template => ">= 99", 1074 template => ">= 99",
1031 on_changed => sub { 1075 on_changed => sub {
… …
1035 if $value; 1079 if $value;
1036 1; 1080 1;
1037 } 1081 }
1038 ); 1082 );
1039 1083
1040 $table->add_at (1, $row++, new CFPlus::UI::Button 1084 $table->add_at (1, $row++, new DC::UI::Button
1041 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1085 c_colspan => 2, expand => 1, text => "Apply",
1042 tooltip => "Apply the audio settings", 1086 tooltip => "Apply the audio settings",
1043 on_activate => sub { 1087 on_activate => sub {
1044 audio_shutdown (); 1088 audio_shutdown ();
1045 audio_init (); 1089 audio_init ();
1046 0 1090 0
1047 } 1091 }
1048 ); 1092 );
1049 1093
1050 $vbox->add (new CFPlus::UI::FancyFrame 1094 $vbox->add (new DC::UI::FancyFrame
1051 expand => 1, 1095 expand => 1,
1052 label => "Audio Info", 1096 label => "Audio Info",
1053 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0), 1097 child => ($AUDIO_INFO = new DC::UI::Label ellipsise => 0),
1054 ); 1098 );
1055 1099
1056 audio_tab_update; 1100 audio_tab_update;
1057 1101
1058 $vbox 1102 $vbox
… …
1065} 1109}
1066 1110
1067sub make_gauge_window { 1111sub make_gauge_window {
1068 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1112 my $gh = int $HEIGHT * $CFG->{gauge_size};
1069 1113
1070 my $win = new CFPlus::UI::Frame ( 1114 my $win = new DC::UI::Frame (
1071 force_x => 0, 1115 force_x => 0,
1072 force_y => "max", 1116 force_y => "max",
1073 force_w => $WIDTH, 1117 force_w => $WIDTH,
1074 force_h => $gh, 1118 force_h => $gh,
1075 ); 1119 );
1076 1120
1077 $win->add (my $hbox = new CFPlus::UI::HBox 1121 $win->add (my $hbox = new DC::UI::HBox
1078 children => [ 1122 children => [
1079 (new CFPlus::UI::HBox expand => 1), 1123 (new DC::UI::HBox expand => 1),
1080 (new CFPlus::UI::VBox children => [ 1124 (new DC::UI::VBox children => [
1081 (new CFPlus::UI::Empty expand => 1), 1125 (new DC::UI::Empty expand => 1),
1082 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)), 1126 (new DC::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new DC::UI::Table)),
1083 ]), 1127 ]),
1084 (my $vbox = new CFPlus::UI::VBox), 1128 (my $vbox = new DC::UI::VBox),
1085 ], 1129 ],
1086 ); 1130 );
1087 1131
1088 $vbox->add (new CFPlus::UI::HBox 1132 $vbox->add (new DC::UI::HBox
1089 expand => 1, 1133 expand => 1,
1090 children => [ 1134 children => [
1091 (new CFPlus::UI::Empty expand => 1), 1135 (new DC::UI::Empty expand => 1),
1092 (my $hb = new CFPlus::UI::HBox), 1136 (my $hb = new DC::UI::HBox),
1093 ], 1137 ],
1094 ); 1138 );
1095 1139
1096 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1140 $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"); 1141 $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"); 1142 $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"); 1143 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1100 1144
1101 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1145 $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); 1146 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1103 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress); 1147 $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"); 1148 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1105 1149
1106 $GAUGES = { 1150 $GAUGES = {
1107 exp => $exp, prg => $prg, sklprg => $sklprg, 1151 exp => $exp, prg => $prg, sklprg => $sklprg,
1108 win => $win, range => $rng, 1152 win => $win, range => $rng,
1109 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1153 hp => $hg, mana => $mg, grace => $gg, food => $fg,
… …
1113 1157
1114 $win 1158 $win
1115} 1159}
1116 1160
1117sub debug_setup { 1161sub debug_setup {
1118 my $table = new CFPlus::UI::Table; 1162 my $table = new DC::UI::Table;
1119 1163
1120 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1164 $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 }); 1165 $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"); 1166 $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 }); 1167 $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"); 1168 $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 }); 1169 $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"); 1170 $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 }); 1171 $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() } ); 1172 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1129 1173
1130 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1174 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1131 1175
1132 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1176 $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); 1177 $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); 1178 $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); 1179 $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); 1180 $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"); 1181 $t->add_at (1,1, new DC::UI::Label text => "e");
1138 1182
1139 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1183 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1140 1184
1141 $c->add_items ({ 1185 $c->add_items ({
1142 type => "line_loop", 1186 type => "line_loop",
1143 color => [0, 1, 0], 1187 color => [0, 1, 0],
1144 width => 9, 1188 width => 9,
… …
1164 1208
1165 $table 1209 $table
1166} 1210}
1167 1211
1168sub stats_window { 1212sub stats_window {
1169 my $r = new CFPlus::UI::ScrolledWindow ( 1213 my $r = new DC::UI::ScrolledWindow (
1170 expand => 1, 1214 expand => 1,
1171 scroll_y => 1 1215 scroll_y => 1
1172 ); 1216 );
1173 $r->add (my $vb = new CFPlus::UI::VBox); 1217 $r->add (my $vb = new DC::UI::VBox);
1174 1218
1175 $vb->add (new CFPlus::UI::FancyFrame 1219 $vb->add (new DC::UI::FancyFrame
1176 label => "Player", 1220 label => "Player",
1177 child => (my $pi = new CFPlus::UI::VBox), 1221 child => (my $pi = new DC::UI::VBox),
1178 ); 1222 );
1179 1223
1180 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1224 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1181 can_hover => 1, can_events => 1, 1225 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."); 1226 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, 1227 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1184 can_hover => 1, can_events => 1, 1228 can_hover => 1, can_events => 1,
1185 tooltip => "The map you are currently on (if supported by the server)."); 1229 tooltip => "The map you are currently on (if supported by the server).");
1186 1230
1187 $pi->add (my $hb0 = new CFPlus::UI::HBox); 1231 $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, 1232 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1189 can_hover => 1, can_events => 1, 1233 can_hover => 1, can_events => 1,
1190 tooltip => "The weight of the player including all inventory items."); 1234 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, 1235 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1192 can_hover => 1, can_events => 1, 1236 can_hover => 1, can_events => 1,
1193 tooltip => "The weight limit: you cannot carry more than this."); 1237 tooltip => "The weight limit: you cannot carry more than this.");
1194 1238
1195 $vb->add (new CFPlus::UI::FancyFrame 1239 $vb->add (new DC::UI::FancyFrame
1196 label => "Primary/Secondary Statistics", 1240 label => "Primary/Secondary Statistics",
1197 child => (my $hb = new CFPlus::UI::HBox expand => 1), 1241 child => (my $hb = new DC::UI::HBox expand => 1),
1198 ); 1242 );
1199 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 1243 $hb->add (my $tbl = new DC::UI::Table expand => 1);
1200 1244
1201 my $color2 = [1, 1, 0]; 1245 my $color2 = [1, 1, 0];
1202 1246
1203 for ( 1247 for (
1204 [0, 0, st_str => "Str", 30], 1248 [0, 0, st_str => "Str", 30],
… …
1216 [2, 4, st_spd => "Spd", 10.54], 1260 [2, 4, st_spd => "Spd", 10.54],
1217 [2, 5, st_wspd => "WSp", 10.54], 1261 [2, 5, st_wspd => "WSp", 10.54],
1218 ) { 1262 ) {
1219 my ($col, $row, $id, $label, $template) = @$_; 1263 my ($col, $row, $id, $label, $template) = @$_;
1220 1264
1221 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1265 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1222 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1266 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1223 align => +1, template => $template, tooltip => "#stat_$label"); 1267 align => 1, template => $template, tooltip => "#stat_$label");
1224 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1268 $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, 1269 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1226 align => -1, text => $label, tooltip => "#stat_$label"); 1270 align => 0, text => $label, tooltip => "#stat_$label");
1227 } 1271 }
1228 1272
1229 $vb->add (new CFPlus::UI::FancyFrame 1273 $vb->add (new DC::UI::FancyFrame
1230 label => "Resistancies", 1274 label => "Resistancies",
1231 child => (my $tbl2 = new CFPlus::UI::Table expand => 1), 1275 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1232 ); 1276 );
1233 1277
1234 my $row = 0; 1278 my $row = 0;
1235 my $col = 0; 1279 my $col = 0;
1236 1280
… …
1275 1319
1276 for (qw/slow holyw conf fire depl magic 1320 for (qw/slow holyw conf fire depl magic
1277 drain acid pois para deat phys 1321 drain acid pois para deat phys
1278 blind fear tund elec cold ghit/) 1322 blind fear tund elec cold ghit/)
1279 { 1323 {
1280 $tbl2->add_at ($col, $row, 1324 $tbl2->add_at ($col + 2, $row,
1281 $STATWIDS->{"res_$_"} = 1325 $STATWIDS->{"res_$_"} =
1282 new CFPlus::UI::Label 1326 new DC::UI::Label
1283 font => $FONT_FIXED, 1327 font => $FONT_FIXED,
1284 template => "-100%", 1328 template => "-100%",
1285 align => +1, 1329 align => 1,
1286 valign => 0,
1287 can_events => 1, 1330 can_events => 1,
1288 can_hover => 1, 1331 can_hover => 1,
1289 tooltip => $resist_names{$_}->[1], 1332 tooltip => $resist_names{$_}->[1],
1290 ); 1333 );
1291 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image 1334 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1292 font => $FONT_FIXED, 1335 font => $FONT_FIXED,
1293 can_hover => 1, 1336 can_hover => 1,
1294 can_events => 1, 1337 can_events => 1,
1295 path => "ui/resist/resist_$_.png", 1338 path => "ui/resist/resist_$_.png",
1296 tooltip => $resist_names{$_}->[1], 1339 tooltip => $resist_names{$_}->[1],
1297 ); 1340 );
1298 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label 1341 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1299 text => $resist_names{$_}->[0], 1342 text => $resist_names{$_}->[0],
1300 font => $FONT_FIXED, 1343 font => $FONT_FIXED,
1344 align => 1,
1301 can_hover => 1, 1345 can_hover => 1,
1302 can_events => 1, 1346 can_events => 1,
1303 tooltip => $resist_names{$_}->[1], 1347 tooltip => $resist_names{$_}->[1],
1304 ); 1348 );
1305 1349
1306 $row++; 1350 $row++;
1307 if ($row % 6 == 0) { 1351 if ($row % 6 == 0) {
1308 $col += 3; 1352 $col += 4;
1309 $row = 0; 1353 $row = 0;
1310 } 1354 }
1311 } 1355 }
1312 1356
1313 #update_stats_window ({}); 1357 #update_stats_window ({});
1314 1358
1315 $r 1359 $r
1316} 1360}
1317 1361
1318sub skill_window { 1362sub skill_window {
1319 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1363 my $sw = new DC::UI::ScrolledWindow (expand => 1);
1320 1364
1321 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]); 1365 $sw->add ($STATWIDS->{skill_tbl} = new DC::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1322 1366
1323 $sw 1367 $sw
1324} 1368}
1325 1369
1326sub formsep($) { 1370sub formsep($) {
… …
1338 return if $METASERVER_ATIME > time; 1382 return if $METASERVER_ATIME > time;
1339 $METASERVER_ATIME = time + 60; 1383 $METASERVER_ATIME = time + 60;
1340 1384
1341 my $table = $METASERVER->{table}; 1385 my $table = $METASERVER->{table};
1342 $table->clear; 1386 $table->clear;
1343 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1387 $table->add_at (0, 0, my $label = new DC::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
1344 1388
1345 my $ok = 0; 1389 my $ok = 0;
1346 1390
1347 CFPlus::background { 1391 DC::background {
1348 my $ua = CFPlus::lwp_useragent; 1392 my $ua = DC::lwp_useragent;
1349 1393
1350 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content; 1394 DC::background_msg DC::decode_json +(DC::lwp_check $ua->get ($META_SERVER))->decoded_content;
1351 } sub { 1395 } sub {
1352 my ($msg) = @_; 1396 my ($msg) = @_;
1353 if ($msg) { 1397 if ($msg) {
1354 $table->clear; 1398 $table->clear;
1355 1399
… …
1358 "The hostname of the server.", 1402 "The hostname of the server.",
1359 "The time this server has been running without being restarted.", 1403 "The time this server has been running without being restarted.",
1360 "Short information about this server provided by its admins.", 1404 "Short information about this server provided by its admins.",
1361 ); 1405 );
1362 my @col = qw(#Users Host Uptime Version Description); 1406 my @col = qw(#Users Host Uptime Version Description);
1363 $table->add_at ($_, 0, new CFPlus::UI::Label 1407 $table->add_at ($_, 0, new DC::UI::Label
1364 can_hover => 1, can_events => 1, 1408 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1365 align => 0, fg => [1, 1, 0],
1366 text => $col[$_], tooltip => $tip[$_]) 1409 text => $col[$_], tooltip => $tip[$_])
1367 for 0 .. $#col; 1410 for 0 .. $#col;
1368 1411
1369 my @align = qw(1 0 1 1 -1); 1412 my @align = qw(1 0.5 1 1 0);
1370 1413
1371 my $y = 0; 1414 my $y = 0;
1372 for my $m (@{ $msg->{servers} }) { 1415 for my $m (@{ $msg->{servers} }) {
1373 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1416 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1374 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1417 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
… …
1390 1433
1391 $m = [$users, $host, $uptime, $version, $desc]; 1434 $m = [$users, $host, $uptime, $version, $desc];
1392 1435
1393 $y++; 1436 $y++;
1394 1437
1395 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1438 $table->add_at (scalar @$m, $y, new DC::UI::VBox children => [
1396 (new CFPlus::UI::Button 1439 (new DC::UI::Button
1397 text => "Use", 1440 text => "Use",
1398 tooltip => "Put this server into the <b>Host:Port</b> field", 1441 tooltip => "Put this server into the <b>Host:Port</b> field",
1399 on_activate => sub { 1442 on_activate => sub {
1400 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1443 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1401 $METASERVER->hide; 1444 $METASERVER->hide;
1402 0 1445 0
1403 }, 1446 },
1404 ), 1447 ),
1405 (new CFPlus::UI::Empty expand => 1), 1448 (new DC::UI::Empty expand => 1),
1406 ]); 1449 ]);
1407 1450
1408 $table->add_at ($_, $y, new CFPlus::UI::Label 1451 $table->add_at ($_, $y, new DC::UI::Label
1409 max_w => $::WIDTH * 0.4, 1452 max_w => $::WIDTH * 0.4,
1410 ellipsise => 0, 1453 ellipsise => 0,
1411 align => $align[$_], 1454 align => $align[$_],
1412 text => $m->[$_], 1455 text => $m->[$_],
1413 tooltip => $tip[$_], 1456 tooltip => $tip[$_],
… …
1423 }; 1466 };
1424 1467
1425} 1468}
1426 1469
1427sub metaserver_dialog { 1470sub metaserver_dialog {
1428 my $vbox = new CFPlus::UI::VBox; 1471 my $vbox = new DC::UI::VBox;
1429 my $table = new CFPlus::UI::Table; 1472 my $table = new DC::UI::Table;
1430 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1473 $vbox->add (new DC::UI::ScrolledWindow expand => 1, child => $table);
1431 1474
1432 my $dialog = new CFPlus::UI::Toplevel 1475 my $dialog = new DC::UI::Toplevel
1433 title => "Server List", 1476 title => "Server List",
1434 name => 'metaserver_dialog', 1477 name => 'metaserver_dialog',
1435 x => 'center', 1478 x => 'center',
1436 y => 'center', 1479 y => 'center',
1437 z => 3, 1480 z => 3,
… …
1448 1491
1449 $dialog 1492 $dialog
1450} 1493}
1451 1494
1452sub login_setup { 1495sub login_setup {
1453 my $vbox = new CFPlus::UI::VBox; 1496 my $vbox = new DC::UI::VBox;
1454 1497
1455 $vbox->add (new CFPlus::UI::FancyFrame 1498 $vbox->add (new DC::UI::FancyFrame
1456 label => "Login Settings", 1499 label => "Login Settings",
1457 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1500 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1458 ); 1501 );
1459 1502
1460 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1503 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1461 $table->add_at (1, 4, new CFPlus::UI::Entry 1504 $table->add_at (1, 4, new DC::UI::Entry
1462 text => $CFG->{profile}{default}{user}, 1505 text => $CFG->{profile}{default}{user},
1463 tooltip => "The name of your character on the server.", 1506 tooltip => "The name of your character on the server.",
1464 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1507 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1465 ); 1508 );
1466 1509
1467 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1510 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1468 $table->add_at (1, 5, new CFPlus::UI::Entry 1511 $table->add_at (1, 5, new DC::UI::Entry
1469 text => $CFG->{profile}{default}{password}, 1512 text => $CFG->{profile}{default}{password},
1470 hidden => 1, 1513 hidden => 1,
1471 tooltip => "The password for your character.", 1514 tooltip => "The password for your character.",
1472 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1515 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1473 ); 1516 );
1474 1517
1475 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1518 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1476 expand => 1, 1519 expand => 1,
1477 align => 0,
1478 text => "Login / Register", 1520 text => "Login / Register",
1479 tooltip => "This button will either login to the account configured above or register a new account.", 1521 tooltip => "This button will either login to the account configured above or register a new account.",
1480 on_activate => sub { 1522 on_activate => sub {
1481 $CONN ? stop_game 1523 $CONN ? stop_game
1482 : start_game; 1524 : start_game;
1483 1 1525 1
1484 }, 1526 },
1485 ); 1527 );
1486 1528
1487 $vbox->add (new CFPlus::UI::FancyFrame 1529 $vbox->add (new DC::UI::FancyFrame
1488 label => "Registering", 1530 label => "Registering",
1489 min_h => 200, 1531 min_h => 200,
1490 child => (new CFPlus::UI::Label valign => -1, ellipsise => 0, 1532 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1491 markup => 1533 markup =>
1492 "To register a new account, choose a username that hasn't been taken yet and " 1534 "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.", 1535 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1494 ), 1536 ),
1495 ); 1537 );
1496 1538
1497 $vbox 1539 $vbox
1498} 1540}
1499 1541
1500sub server_setup { 1542sub server_setup {
1501 my $vbox = new CFPlus::UI::VBox; 1543 my $vbox = new DC::UI::VBox;
1502 1544
1503 $vbox->add (new CFPlus::UI::FancyFrame 1545 $vbox->add (new DC::UI::FancyFrame
1504 label => "Connection Settings", 1546 label => "Connection Settings",
1505 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1547 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1506 ); 1548 );
1507 1549
1508 my $row = 0; 1550 my $row = 0;
1509 1551
1510 $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1552 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1511 { 1553 {
1512 $table->add_at (1, $row, my $vbox = new CFPlus::UI::VBox); 1554 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1513 1555
1514 $vbox->add ( 1556 $vbox->add (
1515 $HOST_ENTRY = new CFPlus::UI::Entry 1557 $HOST_ENTRY = new DC::UI::Entry
1516 expand => 1, 1558 expand => 1,
1517 text => $CFG->{profile}{default}{host}, 1559 text => $CFG->{profile}{default}{host},
1518 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1560 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1519 on_changed => sub { 1561 on_changed => sub {
1520 my ($self, $value) = @_; 1562 my ($self, $value) = @_;
1521 $CFG->{profile}{default}{host} = $value; 1563 $CFG->{profile}{default}{host} = $value;
1522 1 1564 1
1523 } 1565 }
1524 ); 1566 );
1525 1567
1568 if (0) { #d# disabled
1526 $vbox->add (new CFPlus::UI::Button 1569 $vbox->add (new DC::UI::Button
1527 expand => 1, 1570 expand => 1,
1528 text => "Server List", 1571 text => "Server List",
1529 other => $METASERVER, 1572 other => $METASERVER,
1530 tooltip => "Show a list of available crossfire servers", 1573 tooltip => "Show a list of available Deliantra servers",
1531 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1574 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1532 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1575 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1533 ); 1576 );
1577 }#d#
1534 } 1578 }
1535 1579
1536 $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1580 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1537 $table->add_at (1, $row, new CFPlus::UI::Slider 1581 $table->add_at (1, $row, new DC::UI::Slider
1538 force_w => 100, 1582 force_w => 100,
1539 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1583 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1540 tooltip => "This is the size of the portion of the map update the server sends you. " 1584 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, " 1585 . "If you set this to a high value you will be able to see further, "
1542 . "but you also increase bandwidth requirements and latency. " 1586 . "but you also increase bandwidth requirements and latency. "
1543 . "This option is only used once at log-in.", 1587 . "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 }, 1588 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1545 ); 1589 );
1546 1590
1547 $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1591 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1548 $table->add_at (1, $row, new CFPlus::UI::Entry 1592 $table->add_at (1, $row, new DC::UI::Entry
1549 text => $CFG->{output_rate}, 1593 text => $CFG->{output_rate},
1550 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1594 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1551 . "when sending data. When 0 or unset, the server " 1595 . "when sending data. When 0 or unset, the server "
1552 . "default will be used, which is usually around 100kb/s. Most servers will " 1596 . "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.", 1597 . "dynamically find an optimal rate, so adjust this only when necessary.",
1554 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 }, 1598 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1555 ); 1599 );
1556 1600
1557 $vbox->add (new CFPlus::UI::FancyFrame 1601 $vbox->add (new DC::UI::FancyFrame
1558 label => "Server Info", 1602 label => "Server Info",
1559 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1603 child => ($SERVER_INFO = new DC::UI::Label ellipsise => 0),
1560 ); 1604 );
1561 1605
1562 $vbox 1606 $vbox
1563} 1607}
1564 1608
1565sub client_setup { 1609sub client_setup {
1566 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1610 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1567 1611
1568 my $row = 0; 1612 my $row = 0;
1569 1613
1570 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1614 $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 1615 $table->add_at (1, $row++, new DC::UI::CheckBox
1572 state => $CFG->{show_tips}, 1616 state => $CFG->{show_tips},
1573 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1617 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1574 on_changed => sub { 1618 on_changed => sub {
1575 my ($self, $value) = @_; 1619 my ($self, $value) = @_;
1576 $CFG->{show_tips} = $value; 1620 $CFG->{show_tips} = $value;
1577 0 1621 0
1578 } 1622 }
1579 ); 1623 );
1580 1624
1581 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1625 $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 1626 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1583 text => $CFG->{logview_max_par}, 1627 text => $CFG->{logview_max_par},
1584 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1628 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 " 1629 . "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.", 1630 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1587 on_changed => sub { 1631 on_changed => sub {
1588 my ($self, $value) = @_; 1632 my ($self, $value) = @_;
1589 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1633 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1590 0 1634 0
1591 }, 1635 },
1592 ); 1636 );
1593 1637
1594 $table 1638 $table
1595} 1639}
1596 1640
1597sub autopickup_setup { 1641sub autopickup_setup {
1598 my $r = new CFPlus::UI::ScrolledWindow ( 1642 my $r = new DC::UI::ScrolledWindow (
1599 expand => 1, 1643 expand => 1,
1600 scroll_y => 1 1644 scroll_y => 1
1601 ); 1645 );
1602 $r->add (my $table = new CFPlus::UI::Table 1646 $r->add (my $table = new DC::UI::Table
1603 row_expand => [0], 1647 row_expand => [0],
1604 col_expand => [0, 1, 0, 1], 1648 col_expand => [0, 1, 0, 1],
1605 ); 1649 );
1606 1650
1607 for ( 1651 for (
… …
1645 ], 1689 ],
1646 ["Weight/Value ratio", 2, 17] 1690 ["Weight/Value ratio", 2, 17]
1647 ) 1691 )
1648 { 1692 {
1649 my ($title, $x, $y, @bits) = @$_; 1693 my ($title, $x, $y, @bits) = @$_;
1650 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1694 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1651 1695
1652 for (@bits) { 1696 for (@bits) {
1653 ++$y; 1697 ++$y;
1654 1698
1655 my $mask = $_->[1]; 1699 my $mask = $_->[1];
1656 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1700 $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 1701 $table->add_at ($x+1, $y, my $checkbox = new DC::UI::CheckBox
1658 state => $::CFG->{pickup} & $mask, 1702 state => $::CFG->{pickup} & $mask,
1659 on_changed => sub { 1703 on_changed => sub {
1660 my ($box, $value) = @_; 1704 my ($box, $value) = @_;
1661 1705
1662 if ($value) { 1706 if ($value) {
… …
1673 1717
1674 ${$_->[2]} = $checkbox if $_->[2]; 1718 ${$_->[2]} = $checkbox if $_->[2];
1675 } 1719 }
1676 } 1720 }
1677 1721
1678 $table->add_at (2, 18, new CFPlus::UI::ValSlider 1722 $table->add_at (2, 18, new DC::UI::ValSlider
1679 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1723 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1680 template => ">= 99", 1724 template => ">= 99",
1681 to_value => sub { ">= " . 5 * $_[0] }, 1725 to_value => sub { ">= " . 5 * $_[0] },
1682 on_changed => sub { 1726 on_changed => sub {
1683 my ($slider, $value) = @_; 1727 my ($slider, $value) = @_;
… …
1686 $::CFG->{pickup} |= int $value 1730 $::CFG->{pickup} |= int $value
1687 if $value; 1731 if $value;
1688 1; 1732 1;
1689 }); 1733 });
1690 1734
1691 $table->add_at (3, 18, new CFPlus::UI::Button 1735 $table->add_at (3, 18, new DC::UI::Button
1692 text => "set", 1736 text => "set",
1693 on_activate => sub { 1737 on_activate => sub {
1694 $::CONN->send_command ("pickup $::CFG->{pickup}") 1738 $::CONN->send_command ("pickup $::CFG->{pickup}")
1695 if defined $::CONN; 1739 if defined $::CONN;
1696 0 1740 0
… …
1698 1742
1699 $r 1743 $r
1700} 1744}
1701 1745
1702my %SORT_ORDER = ( 1746my %SORT_ORDER = (
1703 type => undef, 1747 type => sub {
1748 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1749 },
1704 mtime => sub { 1750 mtime => sub {
1705 my $NOW = time; 1751 my $NOW = time;
1706 sort { 1752 sort {
1707 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1753 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; 1754 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1717 or $a->{type} <=> $b->{type} 1763 or $a->{type} <=> $b->{type}
1718 } @_ }, 1764 } @_ },
1719); 1765);
1720 1766
1721sub inventory_widget { 1767sub inventory_widget {
1722 my $hb = new CFPlus::UI::HBox homogeneous => 1; 1768 my $hb = new DC::UI::HBox homogeneous => 1;
1723 1769
1724 $hb->add (my $vb1 = new CFPlus::UI::VBox); 1770 $hb->add (my $vb1 = new DC::UI::VBox);
1725 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player"); 1771 $vb1->add (new DC::UI::Label text => "Player");
1726 1772
1727 $vb1->add (my $hb1 = new CFPlus::UI::HBox); 1773 $vb1->add (my $hb1 = new DC::UI::HBox);
1728 1774
1729 use sort 'stable'; 1775 use sort 'stable';
1730 1776
1731 $hb1->add (new CFPlus::UI::Selector 1777 $hb1->add (new DC::UI::Selector
1732 value => $::CFG->{inv_sort}, 1778 value => $::CFG->{inv_sort},
1733 options => [ 1779 options => [
1734 [type => "Type/Name"], 1780 [type => "Type/Name"],
1735 [mtime => "Recent/Normal/Locked"], 1781 [mtime => "Recent/Normal/Locked"],
1736 [weight => "Weight/Type"], 1782 [weight => "Weight/Type"],
… …
1738 on_changed => sub { 1784 on_changed => sub {
1739 $::CFG->{inv_sort} = $_[1]; 1785 $::CFG->{inv_sort} = $_[1];
1740 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1786 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1741 }, 1787 },
1742 ); 1788 );
1743 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1); 1789 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1744 #TODO# update to weigh/maxweight 1790 #TODO# update to weigh/maxweight
1745 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1791 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1746 1792
1747 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1793 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1748 $sw1->add ($INV = new CFPlus::UI::Inventory); 1794 $sw1->add ($INV = new DC::UI::Inventory);
1749 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1795 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1750 1796
1751 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1797 $hb->add (my $vb2 = new DC::UI::VBox);
1752 1798
1753 $vb2->add ($INVR_HB = new CFPlus::UI::HBox); 1799 $vb2->add ($INVR_HB = new DC::UI::HBox);
1754 1800
1755 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1801 $vb2->add (my $sw2 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1756 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1802 $sw2->add ($INVR = new DC::UI::Inventory);
1757 1803
1758 # XXX: Call after $INVR = ... because set_opencont sets the items 1804 # XXX: Call after $INVR = ... because set_opencont sets the items
1759 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1805 DC::Protocol::set_opencont ($::CONN, 0, "Floor");
1760 1806
1761 $hb 1807 $hb
1762} 1808}
1763 1809
1764sub media_window { 1810sub media_window {
1765 my $vb = new CFPlus::UI::VBox; 1811 my $vb = new DC::UI::VBox;
1766 1812
1767 $vb->add (new CFPlus::UI::FancyFrame 1813 $vb->add (new DC::UI::FancyFrame
1768 label => "Currently playing music", 1814 label => "Currently playing music",
1769 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0, 1815 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), 1816 child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
1771 ); 1817 );
1772 1818
1773 $vb->add (new CFPlus::UI::FancyFrame 1819 $vb->add (new DC::UI::FancyFrame
1774 label => "Other media used in this session", 1820 label => "Other media used in this session",
1775 expand => 1, 1821 expand => 1,
1776 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller 1822 child => ($LICENSE_WIDGET = new DC::UI::TextScroller
1777 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4), 1823 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1778 ); 1824 );
1779 1825
1780 $vb 1826 $vb
1781} 1827}
… …
1790 or return; 1836 or return;
1791 1837
1792 $LICENSE_WIDGET->add_paragraph ({ 1838 $LICENSE_WIDGET->add_paragraph ({
1793 fg => [1, 1, 1, 1], 1839 fg => [1, 1, 1, 1],
1794 markup => "<small>" 1840 markup => "<small>"
1795 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n" 1841 . "<b>Name:</b> " . (DC::asxml $meta->{name}) . "\n"
1796 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n" 1842 . "<b>Author:</b> " . (DC::asxml $meta->{author}) . "\n"
1797 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n" 1843 . "<b>Source:</b> " . (DC::asxml $meta->{source}) . "\n"
1798 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n" 1844 . "<b>License:</b> " . (DC::asxml $meta->{license}) . "\n"
1799 . "</small>", 1845 . "</small>",
1800 }); 1846 });
1801 $LICENSE_WIDGET->scroll_to_bottom; 1847 $LICENSE_WIDGET->scroll_to_bottom;
1802} 1848}
1803 1849
… …
1811 $PL_WINDOW->show; 1857 $PL_WINDOW->show;
1812 } 1858 }
1813} 1859}
1814 1860
1815sub player_window { 1861sub player_window {
1816 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel 1862 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1817 x => "center", 1863 x => "center",
1818 y => "center", 1864 y => "center",
1819 force_w => $WIDTH * 9/10, 1865 force_w => $WIDTH * 9/10,
1820 force_h => $HEIGHT * 9/10, 1866 force_h => $HEIGHT * 9/10,
1821 title => "Player", 1867 title => "Player",
… …
1823 has_close_button => 1 1869 has_close_button => 1
1824 ; 1870 ;
1825 1871
1826 my $ntb = 1872 my $ntb =
1827 $PL_NOTEBOOK = 1873 $PL_NOTEBOOK =
1828 new CFPlus::UI::Notebook expand => 1; 1874 new DC::UI::Notebook expand => 1;
1829 1875
1830 $ntb->add_tab ( 1876 $ntb->add_tab (
1831 "Statistics (F2)" => $STATS_PAGE = stats_window, 1877 "Statistics (F2)" => $STATS_PAGE = stats_window,
1832 "Shows statistics, where all your Stats and Resistances are shown." 1878 "Shows statistics, where all your Stats and Resistances are shown."
1833 ); 1879 );
1834 $ntb->add_tab ( 1880 $ntb->add_tab (
1835 "Skills (F3)" => $SKILL_PAGE = skill_window, 1881 "Skills (F3)" => $SKILL_PAGE = skill_window,
1836 "Shows all your Skills." 1882 "Shows all your Skills."
1837 ); 1883 );
1838 1884
1839 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1885 my $spellsw = $SPELL_PAGE = new DC::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1840 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1886 $spellsw->add ($SPELL_LIST = new DC::UI::SpellList);
1841 $ntb->add_tab ( 1887 $ntb->add_tab (
1842 "Spellbook (F4)" => $spellsw, 1888 "Spellbook (F4)" => $spellsw,
1843 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1889 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1844 ); 1890 );
1845 $ntb->add_tab ( 1891 $ntb->add_tab (
… …
1858 $plwin->add ($ntb); 1904 $plwin->add ($ntb);
1859 $plwin 1905 $plwin
1860} 1906}
1861 1907
1862sub keyboard_setup { 1908sub keyboard_setup {
1863 CFPlus::Macro::keyboard_setup 1909 DC::Macro::keyboard_setup
1864} 1910}
1865 1911
1866sub help_window { 1912sub help_window {
1867 my $win = new CFPlus::UI::Toplevel 1913 my $win = new DC::UI::Toplevel
1868 x => 'center', 1914 x => 'center',
1869 y => 'center', 1915 y => 'center',
1870 z => 4, 1916 z => 4,
1871 name => 'doc_browser', 1917 name => 'doc_browser',
1872 force_w => int $WIDTH * 7/8, 1918 force_w => int $WIDTH * 7/8,
1873 force_h => int $HEIGHT * 7/8, 1919 force_h => int $HEIGHT * 7/8,
1874 title => "Help Browser", 1920 title => "Help Browser",
1875 has_close_button => 1; 1921 has_close_button => 1;
1876 1922
1877 $win->add (my $vbox = new CFPlus::UI::VBox); 1923 $win->add (my $vbox = new DC::UI::VBox);
1878 1924
1879 $vbox->add (new CFPlus::UI::FancyFrame 1925 $vbox->add (new DC::UI::FancyFrame
1880 label => "Navigation", 1926 label => "Navigation",
1881 child => (my $buttons = new CFPlus::UI::HBox), 1927 child => (my $buttons = new DC::UI::HBox),
1882 ); 1928 );
1883 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1929 $vbox->add (my $viewer = new DC::UI::TextScroller
1884 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1930 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1885 1931
1886 my @history; 1932 my @history;
1887 my @future; 1933 my @future;
1888 my $curnode; 1934 my $curnode;
… …
1890 my $load_node; $load_node = sub { 1936 my $load_node; $load_node = sub {
1891 my ($node, $para) = @_; 1937 my ($node, $para) = @_;
1892 1938
1893 $buttons->clear; 1939 $buttons->clear;
1894 1940
1895 $buttons->add (new CFPlus::UI::Button 1941 $buttons->add (new DC::UI::Button
1896 text => "⇤", 1942 text => "⇤",
1897 tooltip => "back to the starting page", 1943 tooltip => "back to the starting page",
1898 on_activate => sub { 1944 on_activate => sub {
1899 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 1945 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1900 unshift @future, @history; 1946 unshift @future, @history;
… …
1902 $load_node->(@{shift @future}); 1948 $load_node->(@{shift @future});
1903 }, 1949 },
1904 ); 1950 );
1905 1951
1906 if (@history) { 1952 if (@history) {
1907 $buttons->add (new CFPlus::UI::Button 1953 $buttons->add (new DC::UI::Button
1908 text => "⋘", 1954 text => "⋘",
1909 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>", 1955 tooltip => "back to <i>" . (DC::asxml DC::Pod::full_path $history[-1][0]) . "</i>",
1910 on_activate => sub { 1956 on_activate => sub {
1911 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 1957 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1912 $load_node->(@{pop @history}); 1958 $load_node->(@{pop @history});
1913 }, 1959 },
1914 ); 1960 );
1915 } 1961 }
1916 1962
1917 if (@future) { 1963 if (@future) {
1918 $buttons->add (new CFPlus::UI::Button 1964 $buttons->add (new DC::UI::Button
1919 text => "⋙", 1965 text => "⋙",
1920 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>", 1966 tooltip => "forward to <i>" . (DC::asxml DC::Pod::full_path $future[0][0]) . "</i>",
1921 on_activate => sub { 1967 on_activate => sub {
1922 push @history, [$curnode, $viewer->current_paragraph]; 1968 push @history, [$curnode, $viewer->current_paragraph];
1923 $load_node->(@{shift @future}); 1969 $load_node->(@{shift @future});
1924 }, 1970 },
1925 ); 1971 );
1926 } 1972 }
1927 1973
1928 $buttons->add (new CFPlus::UI::Label text => " "); 1974 $buttons->add (new DC::UI::Label text => " ");
1929 1975
1930 my @path = CFPlus::Pod::full_path_of $node; 1976 my @path = DC::Pod::full_path_of $node;
1931 pop @path; # drop current node 1977 pop @path; # drop current node
1932 1978
1933 for my $node (@path) { 1979 for my $node (@path) {
1934 $buttons->add (new CFPlus::UI::Button 1980 $buttons->add (new DC::UI::Button
1935 text => $node->{kw}[0], 1981 text => $node->[DC::Pod::N_KW][0],
1936 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>", 1982 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1937 on_activate => sub { 1983 on_activate => sub {
1938 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1984 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1939 $load_node->($node); 1985 $load_node->($node);
1940 }, 1986 },
1941 ); 1987 );
1942 $buttons->add (new CFPlus::UI::Label text => "/"); 1988 $buttons->add (new DC::UI::Label text => "/");
1943 } 1989 }
1944 1990
1945 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 1991 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1946 1992
1947 $curnode = $node; 1993 $curnode = $node;
1948 1994
1949 $viewer->clear; 1995 $viewer->clear;
1950 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1996 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
1951 $viewer->scroll_to ($para); 1997 $viewer->scroll_to ($para);
1952 }; 1998 };
1953 1999
1954 $load_node->(CFPlus::Pod::find pod => "mainpage"); 2000 $load_node->(DC::Pod::find pod => "mainpage");
1955 2001
1956 $CFPlus::Pod::goto_document = sub { 2002 $DC::Pod::goto_document = sub {
1957 my (@path) = @_; 2003 my (@path) = @_;
1958 2004
1959 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2005 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1960 2006
1961 $load_node->((CFPlus::Pod::find @path)[0]); 2007 $load_node->((DC::Pod::find @path)[0]);
1962 $win->show; 2008 $win->show;
1963 }; 2009 };
1964 2010
1965 $win 2011 $win
1966} 2012}
1967 2013
1968sub open_string_query { 2014sub open_string_query {
1969 my ($title, $cb, $txt, $tooltip) = @_; 2015 my ($title, $cb, $txt, $tooltip) = @_;
1970 my $dialog = new CFPlus::UI::Toplevel 2016 my $dialog = new DC::UI::Toplevel
1971 x => "center", 2017 x => "center",
1972 y => "center", 2018 y => "center",
1973 z => 50, 2019 z => 50,
1974 force_w => $WIDTH * 4/5, 2020 force_w => $WIDTH * 4/5,
1975 title => $title; 2021 title => $title;
1976 2022
1977 $dialog->add ( 2023 $dialog->add (
1978 my $e = new CFPlus::UI::Entry 2024 my $e = new DC::UI::Entry
1979 on_activate => sub { $cb->(@_); $dialog->hide; 0 }, 2025 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1980 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 }, 2026 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1981 tooltip => $tooltip 2027 tooltip => $tooltip
1982 ); 2028 );
1983 2029
… …
1986 $dialog->show; 2032 $dialog->show;
1987} 2033}
1988 2034
1989sub open_quit_dialog { 2035sub open_quit_dialog {
1990 unless ($QUIT_DIALOG) { 2036 unless ($QUIT_DIALOG) {
1991 $QUIT_DIALOG = new CFPlus::UI::Toplevel 2037 $QUIT_DIALOG = new DC::UI::Toplevel
1992 x => "center", 2038 x => "center",
1993 y => "center", 2039 y => "center",
1994 z => 50, 2040 z => 50,
1995 title => "Really Quit?", 2041 title => "Really Quit?",
1996 on_key_down => sub { 2042 on_key_down => sub {
1997 my ($dialog, $ev) = @_; 2043 my ($dialog, $ev) = @_;
1998 $ev->{sym} == 27 and $dialog->hide; 2044 $ev->{sym} == 27 and $dialog->hide;
1999 } 2045 }
2000 ; 2046 ;
2001 2047
2002 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1); 2048 $QUIT_DIALOG->add (my $vb = new DC::UI::VBox expand => 1);
2003 2049
2004 $vb->add (new CFPlus::UI::Label 2050 $vb->add (new DC::UI::Label
2005 text => "You should find a savebed and apply it first!", 2051 text => "You should find a savebed and apply it first!",
2006 max_w => $WIDTH * 0.25, 2052 max_w => $WIDTH * 0.25,
2007 ellipsize => 0, 2053 ellipsize => 0,
2008 ); 2054 );
2009 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 2055 $vb->add (my $hb = new DC::UI::HBox expand => 1);
2010 $hb->add (new CFPlus::UI::Button 2056 $hb->add (new DC::UI::Button
2011 text => "Ok", 2057 text => "Ok",
2012 expand => 1, 2058 expand => 1,
2013 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2059 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2014 ); 2060 );
2015 $hb->add (new CFPlus::UI::Button 2061 $hb->add (new DC::UI::Button
2016 text => "Quit anyway", 2062 text => "Quit anyway",
2017 expand => 1, 2063 expand => 1,
2018 on_activate => sub { Event::unloop_all }, 2064 on_activate => sub { EV::unloop EV::UNLOOP_ALL },
2019 ); 2065 );
2020 } 2066 }
2021 2067
2022 $QUIT_DIALOG->show; 2068 $QUIT_DIALOG->show;
2023 $QUIT_DIALOG->grab_focus; 2069 $QUIT_DIALOG->grab_focus;
2024} 2070}
2025 2071
2026sub show_tip_of_the_day { 2072sub show_tip_of_the_day {
2027 # find all tips 2073 # find all tips
2028 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 2074 my @tod = DC::Pod::find tip_of_the_day => "*";
2029 2075
2030 CFPlus::DB::get state => "tip_of_the_day", sub { 2076 DC::DB::get state => "tip_of_the_day", sub {
2031 my ($todindex) = @_; 2077 my ($todindex) = @_;
2032 $todindex = 0 if $todindex >= @tod; 2078 $todindex = 0 if $todindex >= @tod;
2033 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { }; 2079 DC::DB::put state => tip_of_the_day => $todindex + 1, sub { };
2034 2080
2035 # create dialog 2081 # create dialog
2036 my $dialog; 2082 my $dialog;
2037 2083
2038 my $close = sub { 2084 my $close = sub {
2039 $dialog->destroy; 2085 $dialog->destroy;
2040 }; 2086 };
2041 2087
2042 $dialog = new CFPlus::UI::Toplevel 2088 $dialog = new DC::UI::Toplevel
2043 x => "center", 2089 x => "center",
2044 y => "center", 2090 y => "center",
2045 z => 3, 2091 z => 3,
2046 name => 'tip_of_the_day', 2092 name => 'tip_of_the_day',
2047 force_w => int $WIDTH * 4/9, 2093 force_w => int $WIDTH * 4/9,
2048 force_h => int $WIDTH * 2/9, 2094 force_h => int $WIDTH * 2/9,
2049 title => "Tip of the day #" . (1 + $todindex), 2095 title => "Tip of the day #" . (1 + $todindex),
2050 child => my $vbox = new CFPlus::UI::VBox, 2096 child => my $vbox = new DC::UI::VBox,
2051 has_close_button => 1, 2097 has_close_button => 1,
2052 on_delete => $close, 2098 on_delete => $close,
2053 ; 2099 ;
2054 2100
2055 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 2101 $vbox->add (my $viewer = new DC::UI::TextScroller
2056 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2102 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]); 2103 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $tod[$todindex]);
2058 2104
2059 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 2105 $vbox->add (my $table = new DC::UI::Table col_expand => [0, 1]);
2060 2106
2061 $table->add_at (0, 0, new CFPlus::UI::Button 2107 $table->add_at (0, 0, new DC::UI::Button
2062 text => "Close", 2108 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>.", 2109 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, 2110 on_activate => $close,
2065 ); 2111 );
2066 2112
2067 $table->add_at (2, 0, new CFPlus::UI::Button 2113 $table->add_at (2, 0, new DC::UI::Button
2068 text => "Next", 2114 text => "Next",
2069 tooltip => "Show the next <b>Tip of the day</b>.", 2115 tooltip => "Show the next <b>Tip of the day</b>.",
2070 on_activate => sub { 2116 on_activate => sub {
2071 $close->(); 2117 $close->();
2072 &show_tip_of_the_day; 2118 &show_tip_of_the_day;
… …
2076 $dialog->show; 2122 $dialog->show;
2077 }; 2123 };
2078} 2124}
2079 2125
2080sub sdl_init { 2126sub sdl_init {
2081 CFPlus::SDL_Init 2127 DC::SDL_Init
2082 and die "SDL::Init failed!\n"; 2128 and die "SDL::Init failed!\n";
2083} 2129}
2084 2130
2085sub video_init { 2131sub video_init {
2086 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2132 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
… …
2089 2135
2090 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2136 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2091 $FULLSCREEN = $CFG->{fullscreen}; 2137 $FULLSCREEN = $CFG->{fullscreen};
2092 $FAST = $CFG->{fast}; 2138 $FAST = $CFG->{fast};
2093 2139
2094 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2140 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2095 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 2141 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2096 2142
2097 $SDL_ACTIVE = 1; 2143 $SDL_ACTIVE = 1;
2098 $LAST_REFRESH = time - 0.01; 2144 $LAST_REFRESH = time - 0.01;
2099 2145
2100 CFPlus::OpenGL::init; 2146 DC::OpenGL::init;
2101 CFPlus::Macro::init; 2147 DC::Macro::init;
2102 2148
2103 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2149 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
2104 2150
2105 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2151 $DC::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
2106 2152
2107 ############################################################################# 2153 #############################################################################
2108 2154
2109 if ($DEBUG_STATUS) { 2155 if ($DEBUG_STATUS) {
2110 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2156 DC::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
2111 } else { 2157 } else {
2112 # create/configure the widgets 2158 # create/configure the widgets
2113 2159
2114 $CFPlus::UI::ROOT->connect (key_down => sub { 2160 $DC::UI::ROOT->connect (key_down => sub {
2115 my (undef, $ev) = @_; 2161 my (undef, $ev) = @_;
2116 2162
2117 if (my @macros = CFPlus::Macro::find $ev) { 2163 if (my @macros = DC::Macro::find $ev) {
2118 CFPlus::Macro::execute $_ for @macros; 2164 DC::Macro::execute $_ for @macros;
2119 2165
2120 return 1; 2166 return 1;
2121 } 2167 }
2122 2168
2123 0 2169 0
2124 }); 2170 });
2125 2171
2126 $DEBUG_STATUS = new CFPlus::UI::Label 2172 $DEBUG_STATUS = new DC::UI::Label
2127 padding => 0, 2173 padding => 0,
2128 z => 100, 2174 z => 100,
2129 force_x => "max", 2175 force_x => "max",
2130 force_y => 0; 2176 force_y => 0;
2131 $DEBUG_STATUS->show; 2177 $DEBUG_STATUS->show;
2132 2178
2133 $STATUSBOX = new CFPlus::UI::Statusbox; 2179 $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 2180
2181 $MODBOX = new DC::UI::Label
2182 can_events => 1,
2183 can_hover => 1,
2184 markup => "",
2185 align => 0,
2186 font => $FONT_FIXED,
2187 tooltip => "#modifier_box",
2188 tooltip_width => 0.67,
2189 ;
2190
2191 update_modbox;
2192
2136 (new CFPlus::UI::Frame 2193 (new DC::UI::Frame
2137 bg => [0, 0, 0, 0.4], 2194 bg => [0, 0, 0, 0.4],
2138 force_x => 0, 2195 force_x => 0,
2139 force_y => "max", 2196 force_y => "max",
2140 child => $STATUSBOX, 2197 child => (my $LR = new DC::UI::VBox),
2141 )->show; 2198 )->show;
2142 2199
2200 $LR->add ($STATUSBOX);
2201 $LR->add ($MODBOX);
2202 $LR->add (new DC::UI::Label
2203 align => 0,
2204 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2205 fontsize => 0.5,
2206 fg => [1, 1, 0, 0.7],
2207 );
2208
2143 CFPlus::UI::Toplevel->new ( 2209 DC::UI::Toplevel->new (
2144 title => "Minimap", 2210 title => "Minimap",
2145 name => "mapmap", 2211 name => "mapmap",
2146 x => 0, 2212 x => 0,
2147 y => $FONTSIZE + 8, 2213 y => $FONTSIZE + 8,
2148 border_bg => [1, 1, 1, 192/255], 2214 border_bg => [1, 1, 1, 192/255],
2149 bg => [1, 1, 1, 0], 2215 bg => [1, 1, 1, 0],
2150 child => ($MAPMAP = new CFPlus::MapWidget::MapMap 2216 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.", 2217 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
2152 ), 2218 ),
2153 )->show; 2219 )->show;
2154 2220
2155 $MAPWIDGET = new CFPlus::MapWidget; 2221 $MAPWIDGET = new DC::MapWidget;
2156 $MAPWIDGET->connect (activate_console => sub { 2222 $MAPWIDGET->connect (activate_console => sub {
2157 my ($mapwidget, $preset) = @_; 2223 my ($mapwidget, $preset) = @_;
2158 2224
2159 $MESSAGE_WINDOW->activate_console ($preset) 2225 $MESSAGE_DIST->activate_console ($preset)
2160 if $MESSAGE_WINDOW; 2226 if $MESSAGE_DIST;
2161 }); 2227 });
2162 $MAPWIDGET->show; 2228 $MAPWIDGET->show;
2163 $MAPWIDGET->grab_focus; 2229 $MAPWIDGET->grab_focus;
2164 2230
2165 $COMPLETER = new CFPlus::MapWidget::Command:: 2231 $COMPLETER = new DC::MapWidget::Command::
2166 command => { }, 2232 command => { },
2167 tooltip => "#completer_help", 2233 tooltip => "#completer_help",
2168 ; 2234 ;
2169 2235
2170 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2236 $SETUP_DIALOG = new DC::UI::Toplevel
2171 title => "Setup", 2237 title => "Setup",
2172 name => "setup_dialog", 2238 name => "setup_dialog",
2173 x => 'center', 2239 x => 'center',
2174 y => 'center', 2240 y => 'center',
2175 z => 2, 2241 z => 2,
… …
2177 force_h => $::HEIGHT * 0.6, 2243 force_h => $::HEIGHT * 0.6,
2178 has_close_button => 1, 2244 has_close_button => 1,
2179 ; 2245 ;
2180 2246
2181 $METASERVER = metaserver_dialog; 2247 $METASERVER = metaserver_dialog;
2182 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow; 2248 # the name is changed to not conflict with the older name as users could have hidden it
2249 $MESSAGE_WINDOW = new DC::UI::Dockbar
2250 name => "message_window2",
2251 title => 'Messages',
2252 force_w => $::WIDTH * 0.6,
2253 force_h => $::HEIGHT * 0.25,
2254 ;
2183 2255
2256 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2257
2184 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2258 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2185 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2259 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2186 2260
2187 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2261 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2188 "Configure the server to play on, your username and password."); 2262 "Configure the server to play on, your username and password.");
2189 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2263 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2190 "Configure other server related options."); 2264 "Configure other server related options.");
… …
2202 . "After pressing the combo the binding will be saved automatically and the " 2276 . "After pressing the combo the binding will be saved automatically and the "
2203 . "binding editor closes"); 2277 . "binding editor closes");
2204 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2278 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2205 "Some debuggin' options. Do not ask."); 2279 "Some debuggin' options. Do not ask.");
2206 2280
2207 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2281 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2208 2282
2209 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2283 $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."); 2284 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2211 2285
2212 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2286# $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."); 2287# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2214 2288
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 2289 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 2290
2217 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2291 $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."); 2292 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2219 2293
2220 $BUTTONBAR->add (new CFPlus::UI::Button 2294 $BUTTONBAR->add (new DC::UI::Button
2221 text => "Save Config", 2295 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.", 2296 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 { 2297 on_activate => sub {
2224 $::CFG->{layout} = CFPlus::UI::get_layout; 2298 $::CFG->{layout} = DC::UI::get_layout;
2225 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc"; 2299 DC::write_cfg;
2226 status "Configuration Saved"; 2300 status "Configuration Saved";
2227 0 2301 0
2228 }, 2302 },
2229 ); 2303 );
2230 2304
2231 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2305 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2232 tooltip => "View Documentation"); 2306 tooltip => "View Documentation");
2233 2307
2234
2235 $BUTTONBAR->add (new CFPlus::UI::Button 2308 $BUTTONBAR->add (new DC::UI::Button
2236 text => "Quit", 2309 text => "Quit",
2237 tooltip => "Terminates the program", 2310 tooltip => "Terminates the program",
2238 on_activate => sub { 2311 on_activate => sub {
2239 if ($CONN) { 2312 if ($CONN) {
2240 open_quit_dialog; 2313 open_quit_dialog;
2241 } else { 2314 } else {
2242 Event::unloop_all; 2315 EV::unloop EV::UNLOOP_ALL;
2243 } 2316 }
2244 0 2317 0
2245 }, 2318 },
2246 ); 2319 );
2247 2320
… …
2252 2325
2253 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2326 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2254} 2327}
2255 2328
2256sub video_shutdown { 2329sub video_shutdown {
2257 CFPlus::OpenGL::shutdown; 2330 DC::OpenGL::shutdown;
2258 2331
2259 undef $SDL_ACTIVE; 2332 undef $SDL_ACTIVE;
2260} 2333}
2261 2334
2262my %animate_object; 2335my %animate_object;
… …
2268 if ($ENV{CFPLUS_DEBUG} & 4) { 2341 if ($ENV{CFPLUS_DEBUG} & 4) {
2269 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2342 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2270 debug sprintf "%3.2f", $fps; 2343 debug sprintf "%3.2f", $fps;
2271 } 2344 }
2272 2345
2346 undef $WANT_REFRESH;
2347 $_[0]->stop;
2348
2273 $CFPlus::UI::ROOT->draw; 2349 $DC::UI::ROOT->draw;
2274 CFPlus::SDL_GL_SwapBuffers; 2350 DC::SDL_GL_SwapBuffers;
2275 $LAST_REFRESH = $NOW; 2351 $LAST_REFRESH = $NOW;
2276 $WANT_REFRESH->stop;
2277} 2352}
2278 2353
2279$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh); 2354my $want_refresh = EV::prepare_ns \&force_refresh;
2280 2355
2281my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub { 2356my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2282 $NOW = time; 2357 $NOW = EV::now;
2283 2358
2284 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2359 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2285 for CFPlus::poll_events; 2360 for DC::poll_events;
2286 2361
2287 if (%animate_object) { 2362 if (%animate_object) {
2288 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2363 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2289 $WANT_REFRESH->start; 2364 $WANT_REFRESH = 1;
2290 } 2365 }
2366
2367 $want_refresh->start
2368 if $WANT_REFRESH;
2291}); 2369};
2292 2370
2293sub animation_start { 2371sub animation_start {
2294 my ($widget) = @_; 2372 my ($widget) = @_;
2295 $animate_object{$widget} = $widget; 2373 $animate_object{$widget} = $widget;
2296} 2374}
… …
2299 my ($widget) = @_; 2377 my ($widget) = @_;
2300 delete $animate_object{$widget}; 2378 delete $animate_object{$widget};
2301} 2379}
2302 2380
2303%SDL_CB = ( 2381%SDL_CB = (
2304 CFPlus::SDL_QUIT => sub { 2382 DC::SDL_QUIT => sub {
2305 Event::unloop_all; 2383 EV::unloop EV::UNLOOP_ALL;
2306 }, 2384 },
2307 CFPlus::SDL_VIDEORESIZE => sub { 2385 DC::SDL_VIDEORESIZE => sub {
2308 }, 2386 },
2309 CFPlus::SDL_VIDEOEXPOSE => sub { 2387 DC::SDL_VIDEOEXPOSE => sub {
2310 CFPlus::UI::full_refresh; 2388 DC::UI::full_refresh;
2311 }, 2389 },
2312 CFPlus::SDL_ACTIVEEVENT => sub { 2390 DC::SDL_ACTIVEEVENT => sub {
2313# not useful, as APPACTIVE include sonly iconified state, not unmapped 2391# 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# 2392# 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# 2393# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2316# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2394# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2317# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2395# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2318# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2396# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2319 }, 2397 },
2320 CFPlus::SDL_KEYDOWN => sub { 2398 DC::SDL_KEYDOWN => sub {
2321 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2399 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2322 # alt-enter 2400 # alt-enter
2323 $FULLSCREEN_ENABLE->toggle; 2401 $FULLSCREEN_ENABLE->toggle;
2324 video_shutdown; 2402 video_shutdown;
2325 video_init; 2403 video_init;
2326 } else { 2404 } else {
2327 CFPlus::UI::feed_sdl_key_down_event ($_[0]); 2405 &DC::UI::feed_sdl_key_down_event;
2328 } 2406 }
2407 update_modbox;
2329 }, 2408 },
2330 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event, 2409 DC::SDL_KEYUP => sub {
2410 &DC::UI::feed_sdl_key_up_event;
2411 update_modbox;
2412 },
2331 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event, 2413 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2332 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event, 2414 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2333 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event, 2415 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2334 CFPlus::SDL_USEREVENT => sub { 2416 DC::SDL_USEREVENT => sub {
2335 if ($_[0]{code} == 1) { 2417 if ($_[0]{code} == 1) {
2336 audio_channel_finished $_[0]{data1}; 2418 audio_channel_finished $_[0]{data1};
2337 } elsif ($_[0]{code} == 0) { 2419 } elsif ($_[0]{code} == 0) {
2338 audio_music_finished; 2420 audio_music_finished;
2339 } 2421 }
2340 }, 2422 },
2341); 2423);
2342 2424
2343############################################################################# 2425#############################################################################
2344 2426
2345$SIG{INT} = $SIG{TERM} = sub { exit }; 2427$SIG{INT} = $SIG{TERM} = sub {
2428 EV::unloop;
2429 #d# TODO calling exit here hangs the process in some futex
2430};
2346 2431
2347{ 2432{
2348 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2433 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2434
2435 if (-e "$Deliantra::VARDIR/client.cf") {
2436 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2437 } else {
2438 #TODO: compatibility cruft
2439 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2440 print STDERR "INFO: used old configuration file\n";
2441 }
2442
2349 CFPlus::DB::Server::run; 2443 DC::DB::Server::run;
2350 2444
2445 if ($CFG->{db_schema} < 1) {
2446 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2447 DC::DB::nuke_db;
2448 $CFG->{db_schema} = 1;
2449 DC::write_cfg;
2450 }
2451
2452 DC::DB::open_db;
2453
2351 CFPlus::UI::set_layout ($::CFG->{layout}); 2454 DC::UI::set_layout ($::CFG->{layout});
2352 2455
2353 my %DEF_CFG = ( 2456 my %DEF_CFG = (
2354 sdl_mode => 0, 2457 sdl_mode => 0,
2355 fullscreen => 1, 2458 fullscreen => 1,
2356 fast => 0, 2459 fast => 0,
… …
2379 pickup => 0, 2482 pickup => 0,
2380 inv_sort => "mtime", 2483 inv_sort => "mtime",
2381 default => "profile", # default profile 2484 default => "profile", # default profile
2382 show_tips => 1, 2485 show_tips => 1,
2383 logview_max_par => 1000, 2486 logview_max_par => 1000,
2487 shift_fire_stop => 0,
2384 ); 2488 );
2385 2489
2386 while (my ($k, $v) = each %DEF_CFG) { 2490 while (my ($k, $v) = each %DEF_CFG) {
2387 $CFG->{$k} = $v unless exists $CFG->{$k}; 2491 $CFG->{$k} = $v unless exists $CFG->{$k};
2388 } 2492 }
… …
2402 } 2506 }
2403 } 2507 }
2404 2508
2405 sdl_init; 2509 sdl_init;
2406 2510
2407 @SDL_MODES = CFPlus::SDL_ListModes 8, 8; 2511 @SDL_MODES = DC::SDL_ListModes 8, 8;
2408 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES; 2512 @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)"; 2513 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2410 2514
2411 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2515 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2412 2516
2413 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2517 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2414 2518
2415 { 2519 {
2416 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2520 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2417 DejaVuSans.ttf 2521 DejaVuSans.ttf
2418 DejaVuSansMono.ttf 2522 DejaVuSansMono.ttf
2419 DejaVuSans-Bold.ttf 2523 DejaVuSans-Bold.ttf
2420 DejaVuSansMono-Bold.ttf 2524 DejaVuSansMono-Bold.ttf
2421 DejaVuSans-Oblique.ttf 2525 DejaVuSans-Oblique.ttf
2422 DejaVuSansMono-Oblique.ttf 2526 DejaVuSansMono-Oblique.ttf
2423 DejaVuSans-BoldOblique.ttf 2527 DejaVuSans-BoldOblique.ttf
2424 DejaVuSansMono-BoldOblique.ttf 2528 DejaVuSansMono-BoldOblique.ttf
2425 ); 2529 );
2426 2530
2427 CFPlus::add_font $_ for @fonts; 2531 DC::add_font $_ for @fonts;
2428 2532
2429 CFPlus::pango_init;
2430
2431 $FONT_PROP = new_from_file CFPlus::Font $fonts[0]; 2533 $FONT_PROP = new_from_file DC::Font $fonts[0];
2432 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1]; 2534 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2433 2535
2434 $FONT_PROP->make_default; 2536 $FONT_PROP->make_default;
2537
2538 DC::pango_init;
2435 } 2539 }
2436 2540
2437# compare mono (ft) vs. rgba (cairo) 2541# compare mono (ft) vs. rgba (cairo)
2438# ft - 1.8s, cairo 3s, even in alpha-only mode 2542# ft - 1.8s, cairo 3s, even in alpha-only mode
2439# for my $rgba (0..1) { 2543# for my $rgba (0..1) {
2440# my $t1 = Time::HiRes::time; 2544# my $t1 = Time::HiRes::time;
2441# for (1..1000) { 2545# for (1..1000) {
2442# my $layout = CFPlus::Layout->new ($rgba); 2546# my $layout = DC::Layout->new ($rgba);
2443# $layout->set_text ("hallo" x 100); 2547# $layout->set_text ("hallo" x 100);
2444# $layout->render; 2548# $layout->render;
2445# } 2549# }
2446# my $t2 = Time::HiRes::time; 2550# my $t2 = Time::HiRes::time;
2447# warn $t2-$t1; 2551# warn $t2-$t1;
… …
2451 audio_init; 2555 audio_init;
2452} 2556}
2453 2557
2454show_tip_of_the_day if $CFG->{show_tips}; 2558show_tip_of_the_day if $CFG->{show_tips};
2455 2559
2456Event->idle (cb => sub { 2560our $STARTUP_CANCEL = EV::idle sub {
2457 $_[0]->w->cancel; 2561 undef $::STARTUP_CANCEL;
2458 $startup_done->(); 2562 $startup_done->();
2459}); 2563};
2460 2564
2565delete $SIG{__DIE__};
2461Event::loop; 2566EV::loop;
2462 2567
2463#video_shutdown; 2568#video_shutdown;
2464#audio_shutdown; 2569#audio_shutdown;
2570DC::OpenGL::quit;
2465CFPlus::SDL_Quit; 2571DC::SDL_Quit;
2466CFPlus::DB::Server::stop; 2572DC::DB::Server::stop;
2467 2573
2468=head1 NAME 2574=head1 NAME
2469 2575
2470deliantra - A Deliantra MORPG game client 2576deliantra - A Deliantra MORPG game client
2471 2577

Diff Legend

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