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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines