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

Diff Legend

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