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.1 by root, Sun Oct 14 15:33:31 2007 UTC vs.
Revision 1.68 by root, Mon Sep 1 10:17:42 2008 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines