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.13 by root, Wed Dec 26 15:18:16 2007 UTC vs.
Revision 1.66 by root, Mon Sep 1 09:12:08 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines