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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines