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.6 by root, Mon Dec 3 22:37:10 2007 UTC vs.
Revision 1.60 by root, Tue Aug 19 21:48:28 2008 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines