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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines