ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines