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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines