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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines