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.57 by root, Wed Jul 23 03:38:34 2008 UTC

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

Diff Legend

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