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.5 by root, Wed Nov 14 23:50:29 2007 UTC vs.
Revision 1.76 by root, Wed Sep 3 12:50:43 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines