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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines