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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines