ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.2 by root, Fri Oct 19 23:10:32 2007 UTC vs.
Revision 1.64 by root, Sat Aug 30 04:43:02 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines