ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.2 by root, Fri Oct 19 23:10:32 2007 UTC vs.
Revision 1.79 by root, Fri Dec 19 22:06:53 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines