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

Diff Legend

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