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.65 by root, Sat Aug 30 06:49:05 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines