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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines