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.78 by root, Tue Sep 30 03:05:07 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
690 $LOGIN_BUTTON->set_text ("Logout");
691 $SETUP_DIALOG->hide;
692 770
693 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 771 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
694 772
695 my ($host, $port) = split /:/, $PROFILE->{host};
696
697 $MAP = new CFPlus::Map;
698
699 $CONN = eval { 773 $CONN =
700 new CFPlus::Protocol 774 new DC::Protocol
701 host => $host, 775 host => $host,
702 port => $port || 13327, 776 port => $port,
703 user => $PROFILE->{user}, 777 user => $PROFILE->{user},
704 pass => $PROFILE->{password}, 778 pass => $PROFILE->{password},
705 mapw => $mapsize, 779 mapw => $mapsize,
706 maph => $mapsize, 780 maph => $mapsize,
707 781
708 client => "cfplus $CFPlus::VERSION $] $^O", 782 client => "$DC::VERSION $] $^O",
709 783
710 map_widget => $MAPWIDGET, 784 map_widget => $MAPWIDGET,
711 statusbox => $STATUSBOX, 785 statusbox => $STATUSBOX,
712 map => $MAP, 786 map => $MAP,
713 mapmap => $MAPMAP, 787 mapmap => $MAPMAP,
714 query => \&server_query, 788 query => \&server_query,
715 789
716 setup_req => { 790 setup_req => {
717 smoothing => $CFG->{map_smoothing}*1, 791 smoothing => $CFG->{map_smoothing}*1,
718 }, 792 },
793
794 on_connect => sub {
795 if ($_[0]) {
796 DC::lowdelay fileno $CONN->{fh};
797
798 status "login successful";
799 } else {
800 undef $CONN;
801 status "unable to connect: $!";
802 stop_game();
803 }
804 },
719 }; 805 ;
806}
720 807
721 if ($CONN) { 808sub start_game {
722 CFPlus::lowdelay fileno $CONN->{fh}; 809 status "logging in...";
723 810
724 status "login successful"; 811 $LOGIN_BUTTON->set_text ("Logout");
812 $SETUP_DIALOG->hide;
813
814 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
815
816 $MAP = new DC::Map;
817
818 # hack to make SURE we find the IP address all right
819 # can be removed once AnyEvent::DNS is proven stable.
820 if ($host eq "gameserver.deliantra.net") {
821 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
822 if ($_[0] ne "80.101.114.108") { # Perl
823 status "dns failure, using hardcoded address";
824 $host = "129.13.162.95";
825 }
826
827 dc_connect $host, $port;
828 };
725 } else { 829 } else {
726 status "unable to connect"; 830 dc_connect $host, $port;
727 stop_game();
728 } 831 }
729} 832}
730 833
731sub stop_game { 834sub stop_game {
835 crash "stop_game";
836
732 $LOGIN_BUTTON->set_text ("Login / Register"); 837 $LOGIN_BUTTON->set_text ("Login / Register");
733 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 838 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
734 $SETUP_DIALOG->show; 839 $SETUP_DIALOG->show;
735 $PL_WINDOW->hide; 840 $PL_WINDOW->hide;
736 $SPELL_LIST->clear_spells; 841 $SPELL_LIST->clear_spells;
737 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 842 $DC::UI::ROOT->emit (stop_game => ! ! $CONN);
738 843
739 &audio_music_set_ambient ([]); 844 &audio_music_set_ambient ([]);
740 845
741 return unless $CONN; 846 return unless $CONN;
742 847
748 853
749 undef $MAP; 854 undef $MAP;
750} 855}
751 856
752sub graphics_setup { 857sub graphics_setup {
753 my $vbox = new CFPlus::UI::VBox; 858 my $vbox = new DC::UI::VBox;
754 859
860 {
861 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
862
755 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 863 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
756 864
757 my $row = 0; 865 my $row = 0;
758 866
759 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 867 $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, 868 $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, 869 can_events => 1,
762 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 870 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
763 871
872 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
873 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
874 can_events => 1,
875 tooltip => "This field shows any known issues with your config or driver, such as "
876 . "a non-accelerated display format. You can try to work around these issues "
877 . "by selecting a different video mode, changing the settings below or "
878 . "by installing the right driver for your graphics card.");
879
880 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
881 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
882 value => $CFG->{uitheme},
883 options => [
884 [wood => "Wood (the default)"],
885 [plain => "Plain (very)"],
886 [blue => "Blue (dark)"],
887 [metal => "Metal (light)"],
888 ],
889 tooltip => "Choose the User Interface theme that you like most :)",
890 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
891 );
892
764 my $vidmode_tooltip = 893 my $vidmode_tooltip =
765 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 894 "<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>."; 895 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
767 896
768 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 897 $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); 898 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
770 899
771 $hbox->add (my $mode_slider = new CFPlus::UI::Slider 900 $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], 901 force_w => $WIDTH * 0.1, expand => 1,
902 range => [ ($CFG->{sdl_mode}) x 3 ],
773 tooltip => $vidmode_tooltip); 903 tooltip => $vidmode_tooltip);
774 $hbox->add (my $mode_label = new CFPlus::UI::Label 904 $hbox->add (my $mode_label = new DC::UI::Label
775 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 905 height => 0.8, template => "9999x9999@9+9",
776 can_events => 1, tooltip => $vidmode_tooltip); 906 can_events => 1, tooltip => $vidmode_tooltip);
777 907
778 $mode_slider->connect (changed => sub { 908 $MODE_SLIDER->connect (changed => sub {
779 my ($self, $value) = @_; 909 my ($self, $value) = @_;
780 910
781 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 911 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
782 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 912 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
783 }); 913 });
784 $mode_slider->emit (changed => $mode_slider->{range}[0]); 914 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
785 915
786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 916 $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 917 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
788 state => $CFG->{fullscreen}, 918 state => $CFG->{fullscreen},
789 tooltip => "Bring the client into fullscreen mode.", 919 tooltip => "Bring the client into fullscreen mode.",
790 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 920 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
791 ); 921 );
792 922
793 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 923 $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 924 $table->add_at (1, $row++, new DC::UI::CheckBox
795 state => $CFG->{force_opengl11}, 925 state => $CFG->{force_opengl11},
796 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 926 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 " 927 . "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. " 928 . "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, " 929 . "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 " 930 . "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>", 931 . "<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 } 932 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
803 ); 933 );
804 934
805 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures"); 935 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
806 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 936 $table->add_at (1, $row++, new DC::UI::CheckBox
937 state => $CFG->{disable_alpha},
938 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
939 . "by disabling a number of textures and transparency effects. Normally, these "
940 . "effects do not cost a lot of resources, but some graphics cards might fall "
941 . "back to extremely slow rendering if this is enabled. If disabling this option "
942 . "noticably improves the framerate of the client please report this! "
943 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
944 on_changed => sub {
945 my ($self, $value) = @_;
946 $CFG->{disable_alpha} = $value;
947 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
948 0
949 }
950 );
951
952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
953 $table->add_at (1, $row++, new DC::UI::CheckBox
807 state => $CFG->{texture_compression}, 954 state => $CFG->{texture_compression},
808 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 955 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 " 956 . "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 " 957 . "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.", 958 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
812 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 959 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
813 ); 960 );
814 961
815 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 962 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 963 $table->add_at (1, $row++, new DC::UI::CheckBox
817 state => $CFG->{fast}, 964 state => $CFG->{fast},
818 tooltip => "Lower the visual quality considerably to speed up rendering.", 965 tooltip => "Lower the visual quality considerably to speed up rendering.",
819 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 966 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
820 ); 967 );
821 968
822 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
823 $table->add_at (1, $row++, new CFPlus::UI::Slider 970 $table->add_at (1, $row++, new DC::UI::Slider
824 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 971 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.", 972 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 }, 973 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
827 ); 974 );
828 975
829 $table->add_at (1, $row++, new CFPlus::UI::Button 976 $table->add_at (1, $row++, new DC::UI::Button
830 expand => 1, align => 0, text => "Apply", 977 expand => 1, text => "Apply",
831 tooltip => "Apply the video settings above.", 978 tooltip => "Apply the video settings above.",
832 on_activate => sub { 979 on_activate => sub {
833 video_shutdown (); 980 video_shutdown ();
834 video_init (); 981 video_init ();
982 0
835 0 983 }
836 } 984 );
985 }
986
987 {
988 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
989
990 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
991
992 my $row = 0;
993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
994 $table->add_at (1, $row++, new DC::UI::CheckBox
995 state => $CFG->{smooth_movement},
996 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
997 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
998 . "then disable this option. Changes take effect immdiately.",
999 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
837 ); 1000 );
838 1001
839 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
840 $table->add_at (1, $row++, new CFPlus::UI::Slider 1003 $table->add_at (1, $row++, new DC::UI::Slider
841 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1004 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
842 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1005 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
843 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1006 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
844 ); 1007 );
845 1008
846 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 1009 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
847 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 1010 $table->add_at (1, $row++, new DC::UI::CheckBox
848 state => $CFG->{map_smoothing}, 1011 state => $CFG->{map_smoothing},
849 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1012 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. " 1013 . "This increases load on the graphics subsystem and works only with TRT servers. "
851 . "Changes take effect at next login only.", 1014 . "Changes take effect at next login only.",
852 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1015 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
853 ); 1016 );
854 1017
855 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 1018 $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 1019 $table->add_at (1, $row++, new DC::UI::CheckBox
857 state => $CFG->{fow_enable}, 1020 state => $CFG->{fow_enable},
858 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1021 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 } 1022 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
860 ); 1023 );
861 1024
862 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 1025 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
863 $table->add_at (1, $row++, new CFPlus::UI::Slider 1026 $table->add_at (1, $row++, new DC::UI::Slider
864 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1027 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.", 1028 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 } 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
867 ); 1030 );
868 1031
869 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 1032 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
870 $table->add_at (1, $row++, new CFPlus::UI::Slider 1033 $table->add_at (1, $row++, new DC::UI::Slider
871 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1034 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, " 1035 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.", 1036 . "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 }, 1037 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
875 ); 1038 );
876 1039
877 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 1040 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
878 $table->add_at (1, $row++, new CFPlus::UI::Slider 1041 $table->add_at (1, $row++, new DC::UI::Slider
879 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1042 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.", 1043 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
881 on_changed => sub { 1044 on_changed => sub {
882 $CFG->{gauge_fontsize} = $_[1]; 1045 $CFG->{gauge_fontsize} = $_[1];
883 &set_gauge_window_fontsize; 1046 &set_gauge_window_fontsize;
1047 0
884 0 1048 }
885 } 1049 );
886 );
887 1050
888 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
889 $table->add_at (1, $row++, new CFPlus::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
890 range => [$CFG->{gauge_size}, 0.2, 0.8], 1053 range => [$CFG->{gauge_size}, 0.2, 0.8],
891 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1054 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
892 on_changed => sub { 1055 on_changed => sub {
893 $CFG->{gauge_size} = $_[1]; 1056 $CFG->{gauge_size} = $_[1];
894 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1057 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1058 0
895 0 1059 }
896 } 1060 );
897 ); 1061 }
898 1062
899 $vbox 1063 $vbox
900} 1064}
901 1065
902our $AUDIO_HW_CHUNKSIZE; 1066our $AUDIO_HW_CHUNKSIZE;
903our $AUDIO_INFO; 1067our $AUDIO_INFO;
904 1068
905sub audio_tab_update { 1069sub audio_tab_update {
906 my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec; 1070 my ($freq, $format, $chans) = DC::Mix_QuerySpec;
907 1071
908 $AUDIO_HW_CHUNKSIZE->set_options ([ 1072 $AUDIO_HW_CHUNKSIZE->set_options ([
909 [0, "default", "Use System Default"], 1073 [0, "default", "Use System Default"],
910 map { 1074 map {
911 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050); 1075 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
921 1085
922 $AUDIO_INFO->set_text ($text); 1086 $AUDIO_INFO->set_text ($text);
923} 1087}
924 1088
925sub audio_setup { 1089sub audio_setup {
926 my $vbox = new CFPlus::UI::VBox; 1090 my $vbox = new DC::UI::VBox;
927 1091
928 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]); 1092 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
929 1093
930 my $row = 0; 1094 my $row = 0;
931 1095
932 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1096 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
933 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 1097 $table->add_at (1, $row++, new DC::UI::CheckBox
934 state => $CFG->{audio_enable}, 1098 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.", 1099 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 } 1100 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
937 ); 1101 );
938 1102
939 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1103 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
940 $table->add_at (1, $row, new CFPlus::UI::CheckBox 1104 $table->add_at (1, $row, new DC::UI::CheckBox
941 expand => 1, state => $CFG->{effects_enable}, 1105 expand => 1, state => $CFG->{effects_enable},
942 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1106 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
943 on_changed => sub { 1107 on_changed => sub {
944 $CFG->{effects_enable} = $_[1]; 1108 $CFG->{effects_enable} = $_[1];
945 $CONN->update_fx_want if $CONN; 1109 $CONN->update_fx_want if $CONN;
946 1 1110 1
947 } 1111 }
948 ); 1112 );
949 $table->add_at (2, $row++, new CFPlus::UI::Slider 1113 $table->add_at (2, $row++, new DC::UI::Slider
950 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 1114 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 " 1115 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.", 1116 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
953 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1117 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
954 ); 1118 );
955 1119
956 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 1120 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
957 $table->add_at (1, $row, new CFPlus::UI::CheckBox 1121 $table->add_at (1, $row, new DC::UI::CheckBox
958 expand => 1, state => $CFG->{bgm_enable}, 1122 expand => 1, state => $CFG->{bgm_enable},
959 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1123 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
960 on_changed => sub { 1124 on_changed => sub {
961 $CFG->{bgm_enable} = $_[1]; 1125 $CFG->{bgm_enable} = $_[1];
962 $CONN->update_fx_want if $CONN; 1126 $CONN->update_fx_want if $CONN;
963 audio_music_push; 1127 audio_music_push;
964 1 1128 1
965 } 1129 }
966 ); 1130 );
967 $table->add_at (2, $row++, new CFPlus::UI::Slider 1131 $table->add_at (2, $row++, new DC::UI::Slider
968 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1132 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
969 tooltip => "The volume of the background music. Changes are instant.", 1133 tooltip => "The volume of the background music. Changes are instant.",
970 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1134 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
971 ); 1135 );
972 1136
973 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency"); 1137 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
974 $table->add_at (1, $row++, new CFPlus::UI::Selector 1138 $table->add_at (1, $row++, new DC::UI::Selector
975 c_colspan => 2, expand => 1, 1139 c_colspan => 2, expand => 1,
976 value => $CFG->{audio_hw_frequency}, 1140 value => $CFG->{audio_hw_frequency},
977 options => [ 1141 options => [
978 [ 0, "default" , "Use System Default"], 1142 [ 0, "default" , "Use System Default"],
979 [11025, "11 kHz" , "11kHz (low quality)"], 1143 [11025, "11 kHz" , "11kHz (low quality)"],
987 audio_tab_update; 1151 audio_tab_update;
988 1 1152 1
989 } 1153 }
990 ); 1154 );
991 1155
992 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels"); 1156 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
993 $table->add_at (1, $row++, new CFPlus::UI::Selector 1157 $table->add_at (1, $row++, new DC::UI::Selector
994 c_colspan => 2, expand => 1, 1158 c_colspan => 2, expand => 1,
995 value => $CFG->{audio_hw_channels}, 1159 value => $CFG->{audio_hw_channels},
996 options => [ 1160 options => [
997 [0, "default" , "Use System Default"], 1161 [0, "default" , "Use System Default"],
998 [1, "Mono" , "Mono (single channel, low quality)"], 1162 [1, "Mono" , "Mono (single channel, low quality)"],
999 [2, "Stereo" , "Stereo (dual channe, standard quality)"], 1163 [2, "Stereo" , "Stereo (dual channel, standard quality)"],
1000 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"], 1164 [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)"], 1165 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
1002 ], 1166 ],
1003 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.", 1167 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 { 1168 on_changed => sub {
1006 audio_tab_update; 1170 audio_tab_update;
1007 1 1171 1
1008 } 1172 }
1009 ); 1173 );
1010 1174
1011 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency"); 1175 $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 1176 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1013 c_colspan => 2, expand => 1, 1177 c_colspan => 2, expand => 1,
1014 value => $CFG->{audio_hw_chunksize}, 1178 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 " 1179 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.", 1180 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1017 on_changed => sub { 1181 on_changed => sub {
1020 1 1184 1
1021 } 1185 }
1022 ); 1186 );
1023 1187
1024 # should really be a slider 1188 # should really be a slider
1025 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1189 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1026 $table->add_at (1, $row++, new CFPlus::UI::ValSlider 1190 $table->add_at (1, $row++, new DC::UI::ValSlider
1027 c_colspan => 2, expand => 1, 1191 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.", 1192 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], 1193 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1030 template => ">= 99", 1194 template => ">= 99",
1031 on_changed => sub { 1195 on_changed => sub {
1035 if $value; 1199 if $value;
1036 1; 1200 1;
1037 } 1201 }
1038 ); 1202 );
1039 1203
1040 $table->add_at (1, $row++, new CFPlus::UI::Button 1204 $table->add_at (1, $row++, new DC::UI::Button
1041 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1205 c_colspan => 2, expand => 1, text => "Apply",
1042 tooltip => "Apply the audio settings", 1206 tooltip => "Apply the audio settings",
1043 on_activate => sub { 1207 on_activate => sub {
1044 audio_shutdown (); 1208 audio_shutdown ();
1045 audio_init (); 1209 audio_init ();
1046 0 1210 0
1047 } 1211 }
1048 ); 1212 );
1049 1213
1050 $vbox->add (new CFPlus::UI::FancyFrame 1214 $vbox->add (new DC::UI::FancyFrame
1051 expand => 1, 1215 expand => 1,
1052 label => "Audio Info", 1216 label => "Audio Info",
1053 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0), 1217 child => ($AUDIO_INFO = new DC::UI::Label ellipsise => 0),
1054 ); 1218 );
1055 1219
1056 audio_tab_update; 1220 audio_tab_update;
1057 1221
1058 $vbox 1222 $vbox
1065} 1229}
1066 1230
1067sub make_gauge_window { 1231sub make_gauge_window {
1068 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1232 my $gh = int $HEIGHT * $CFG->{gauge_size};
1069 1233
1070 my $win = new CFPlus::UI::Frame ( 1234 my $win = new DC::UI::Frame (
1071 force_x => 0, 1235 force_x => 0,
1072 force_y => "max", 1236 force_y => "max",
1073 force_w => $WIDTH, 1237 force_w => $WIDTH,
1074 force_h => $gh, 1238 force_h => $gh,
1075 ); 1239 );
1076 1240
1077 $win->add (my $hbox = new CFPlus::UI::HBox 1241 $win->add (my $hbox = new DC::UI::HBox
1078 children => [ 1242 children => [
1079 (new CFPlus::UI::HBox expand => 1), 1243 (new DC::UI::HBox expand => 1),
1080 (new CFPlus::UI::VBox children => [ 1244 (new DC::UI::VBox children => [
1081 (new CFPlus::UI::Empty expand => 1), 1245 (new DC::UI::Empty expand => 1),
1082 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)), 1246 (new DC::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new DC::UI::Table)),
1083 ]), 1247 ]),
1084 (my $vbox = new CFPlus::UI::VBox), 1248 (my $vbox = new DC::UI::VBox),
1085 ], 1249 ],
1086 ); 1250 );
1087 1251
1088 $vbox->add (new CFPlus::UI::HBox 1252 $vbox->add (new DC::UI::HBox
1089 expand => 1, 1253 expand => 1,
1090 children => [ 1254 children => [
1091 (new CFPlus::UI::Empty expand => 1), 1255 (new DC::UI::Empty expand => 1),
1092 (my $hb = new CFPlus::UI::HBox), 1256 (my $hb = new DC::UI::HBox),
1093 ], 1257 ],
1094 ); 1258 );
1095 1259
1096 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1260 $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"); 1261 $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"); 1262 $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"); 1263 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1100 1264
1101 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1265 $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); 1266 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1103 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress); 1267 $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"); 1268 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1105 1269
1106 $GAUGES = { 1270 $GAUGES = {
1107 exp => $exp, prg => $prg, sklprg => $sklprg, 1271 exp => $exp, prg => $prg, sklprg => $sklprg,
1108 win => $win, range => $rng, 1272 win => $win, range => $rng,
1109 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1273 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1113 1277
1114 $win 1278 $win
1115} 1279}
1116 1280
1117sub debug_setup { 1281sub debug_setup {
1118 my $table = new CFPlus::UI::Table; 1282 my $table = new DC::UI::Table;
1119 1283
1120 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1284 $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 }); 1285 $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"); 1286 $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 }); 1287 $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"); 1288 $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 }); 1289 $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"); 1290 $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 }); 1291 $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() } ); 1292 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1129 1293
1130 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1294 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1131 1295
1132 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1296 $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); 1297 $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); 1298 $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); 1299 $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); 1300 $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"); 1301 $t->add_at (1,1, new DC::UI::Label text => "e");
1138 1302
1139 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1303 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1140 1304
1141 $c->add_items ({ 1305 $c->add_items ({
1142 type => "line_loop", 1306 type => "line_loop",
1143 color => [0, 1, 0], 1307 color => [0, 1, 0],
1144 width => 9, 1308 width => 9,
1164 1328
1165 $table 1329 $table
1166} 1330}
1167 1331
1168sub stats_window { 1332sub stats_window {
1169 my $r = new CFPlus::UI::ScrolledWindow ( 1333 my $r = new DC::UI::ScrolledWindow (
1170 expand => 1, 1334 expand => 1,
1171 scroll_y => 1 1335 scroll_y => 1
1172 ); 1336 );
1173 $r->add (my $vb = new CFPlus::UI::VBox); 1337 $r->add (my $vb = new DC::UI::VBox);
1174 1338
1175 $vb->add (new CFPlus::UI::FancyFrame 1339 $vb->add (new DC::UI::FancyFrame
1176 label => "Player", 1340 label => "Player",
1177 child => (my $pi = new CFPlus::UI::VBox), 1341 child => (my $pi = new DC::UI::VBox),
1178 ); 1342 );
1179 1343
1180 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1344 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1181 can_hover => 1, can_events => 1, 1345 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."); 1346 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, 1347 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1184 can_hover => 1, can_events => 1, 1348 can_hover => 1, can_events => 1,
1185 tooltip => "The map you are currently on (if supported by the server)."); 1349 tooltip => "The map you are currently on (if supported by the server).");
1186 1350
1187 $pi->add (my $hb0 = new CFPlus::UI::HBox); 1351 $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, 1352 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1189 can_hover => 1, can_events => 1, 1353 can_hover => 1, can_events => 1,
1190 tooltip => "The weight of the player including all inventory items."); 1354 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, 1355 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1192 can_hover => 1, can_events => 1, 1356 can_hover => 1, can_events => 1,
1193 tooltip => "The weight limit: you cannot carry more than this."); 1357 tooltip => "The weight limit: you cannot carry more than this.");
1194 1358
1195 $vb->add (new CFPlus::UI::FancyFrame 1359 $vb->add (new DC::UI::FancyFrame
1196 label => "Primary/Secondary Statistics", 1360 label => "Primary/Secondary Statistics",
1197 child => (my $hb = new CFPlus::UI::HBox expand => 1), 1361 child => (my $hb = new DC::UI::HBox expand => 1),
1198 ); 1362 );
1199 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 1363 $hb->add (my $tbl = new DC::UI::Table expand => 1);
1200 1364
1201 my $color2 = [1, 1, 0]; 1365 my $color2 = [1, 1, 0];
1202 1366
1203 for ( 1367 for (
1204 [0, 0, st_str => "Str", 30], 1368 [0, 0, st_str => "Str", 30],
1216 [2, 4, st_spd => "Spd", 10.54], 1380 [2, 4, st_spd => "Spd", 10.54],
1217 [2, 5, st_wspd => "WSp", 10.54], 1381 [2, 5, st_wspd => "WSp", 10.54],
1218 ) { 1382 ) {
1219 my ($col, $row, $id, $label, $template) = @$_; 1383 my ($col, $row, $id, $label, $template) = @$_;
1220 1384
1221 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1385 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1222 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1386 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1223 align => +1, template => $template, tooltip => "#stat_$label"); 1387 align => 1, template => $template, tooltip => "#stat_$label");
1224 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1388 $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, 1389 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1226 align => -1, text => $label, tooltip => "#stat_$label"); 1390 align => 0, text => $label, tooltip => "#stat_$label");
1227 } 1391 }
1228 1392
1229 $vb->add (new CFPlus::UI::FancyFrame 1393 $vb->add (new DC::UI::FancyFrame
1230 label => "Resistancies", 1394 label => "Resistancies",
1231 child => (my $tbl2 = new CFPlus::UI::Table expand => 1), 1395 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1232 ); 1396 );
1233 1397
1234 my $row = 0; 1398 my $row = 0;
1235 my $col = 0; 1399 my $col = 0;
1236 1400
1275 1439
1276 for (qw/slow holyw conf fire depl magic 1440 for (qw/slow holyw conf fire depl magic
1277 drain acid pois para deat phys 1441 drain acid pois para deat phys
1278 blind fear tund elec cold ghit/) 1442 blind fear tund elec cold ghit/)
1279 { 1443 {
1280 $tbl2->add_at ($col, $row, 1444 $tbl2->add_at ($col + 2, $row,
1281 $STATWIDS->{"res_$_"} = 1445 $STATWIDS->{"res_$_"} =
1282 new CFPlus::UI::Label 1446 new DC::UI::Label
1283 font => $FONT_FIXED, 1447 font => $FONT_FIXED,
1284 template => "-100%", 1448 template => "-100%",
1285 align => +1, 1449 align => 1,
1286 valign => 0,
1287 can_events => 1, 1450 can_events => 1,
1288 can_hover => 1, 1451 can_hover => 1,
1289 tooltip => $resist_names{$_}->[1], 1452 tooltip => $resist_names{$_}->[1],
1290 ); 1453 );
1291 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image 1454 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1292 font => $FONT_FIXED, 1455 font => $FONT_FIXED,
1293 can_hover => 1, 1456 can_hover => 1,
1294 can_events => 1, 1457 can_events => 1,
1295 path => "ui/resist/resist_$_.png", 1458 path => "ui/resist/resist_$_.png",
1296 tooltip => $resist_names{$_}->[1], 1459 tooltip => $resist_names{$_}->[1],
1297 ); 1460 );
1298 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label 1461 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1299 text => $resist_names{$_}->[0], 1462 text => $resist_names{$_}->[0],
1300 font => $FONT_FIXED, 1463 font => $FONT_FIXED,
1464 align => 1,
1301 can_hover => 1, 1465 can_hover => 1,
1302 can_events => 1, 1466 can_events => 1,
1303 tooltip => $resist_names{$_}->[1], 1467 tooltip => $resist_names{$_}->[1],
1304 ); 1468 );
1305 1469
1306 $row++; 1470 $row++;
1307 if ($row % 6 == 0) { 1471 if ($row % 6 == 0) {
1308 $col += 3; 1472 $col += 4;
1309 $row = 0; 1473 $row = 0;
1310 } 1474 }
1311 } 1475 }
1312 1476
1313 #update_stats_window ({}); 1477 #update_stats_window ({});
1314 1478
1315 $r 1479 $r
1316} 1480}
1317 1481
1318sub skill_window { 1482sub skill_window {
1319 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1483 my $sw = new DC::UI::ScrolledWindow (expand => 1);
1320 1484
1321 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]); 1485 $sw->add ($STATWIDS->{skill_tbl} = new DC::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1322 1486
1323 $sw 1487 $sw
1324} 1488}
1325 1489
1326sub formsep($) { 1490sub formsep($) {
1338 return if $METASERVER_ATIME > time; 1502 return if $METASERVER_ATIME > time;
1339 $METASERVER_ATIME = time + 60; 1503 $METASERVER_ATIME = time + 60;
1340 1504
1341 my $table = $METASERVER->{table}; 1505 my $table = $METASERVER->{table};
1342 $table->clear; 1506 $table->clear;
1343 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1507 $table->add_at (0, 0, my $label = new DC::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
1344 1508
1345 my $ok = 0; 1509 my $ok = 0;
1346 1510
1347 CFPlus::background { 1511 DC::background {
1348 my $ua = CFPlus::lwp_useragent; 1512 my $ua = DC::lwp_useragent;
1349 1513
1350 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content; 1514 DC::background_msg DC::decode_json +(DC::lwp_check $ua->get ($META_SERVER))->decoded_content;
1351 } sub { 1515 } sub {
1352 my ($msg) = @_; 1516 my ($msg) = @_;
1353 if ($msg) { 1517 if ($msg) {
1354 $table->clear; 1518 $table->clear;
1355 1519
1358 "The hostname of the server.", 1522 "The hostname of the server.",
1359 "The time this server has been running without being restarted.", 1523 "The time this server has been running without being restarted.",
1360 "Short information about this server provided by its admins.", 1524 "Short information about this server provided by its admins.",
1361 ); 1525 );
1362 my @col = qw(#Users Host Uptime Version Description); 1526 my @col = qw(#Users Host Uptime Version Description);
1363 $table->add_at ($_, 0, new CFPlus::UI::Label 1527 $table->add_at ($_, 0, new DC::UI::Label
1364 can_hover => 1, can_events => 1, 1528 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1365 align => 0, fg => [1, 1, 0],
1366 text => $col[$_], tooltip => $tip[$_]) 1529 text => $col[$_], tooltip => $tip[$_])
1367 for 0 .. $#col; 1530 for 0 .. $#col;
1368 1531
1369 my @align = qw(1 0 1 1 -1); 1532 my @align = qw(1 0.5 1 1 0);
1370 1533
1371 my $y = 0; 1534 my $y = 0;
1372 for my $m (@{ $msg->{servers} }) { 1535 for my $m (@{ $msg->{servers} }) {
1373 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1536 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1374 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1537 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
1390 1553
1391 $m = [$users, $host, $uptime, $version, $desc]; 1554 $m = [$users, $host, $uptime, $version, $desc];
1392 1555
1393 $y++; 1556 $y++;
1394 1557
1395 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1558 $table->add_at (scalar @$m, $y, new DC::UI::VBox children => [
1396 (new CFPlus::UI::Button 1559 (new DC::UI::Button
1397 text => "Use", 1560 text => "Use",
1398 tooltip => "Put this server into the <b>Host:Port</b> field", 1561 tooltip => "Put this server into the <b>Host:Port</b> field",
1399 on_activate => sub { 1562 on_activate => sub {
1400 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1563 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1401 $METASERVER->hide; 1564 $METASERVER->hide;
1402 0 1565 0
1403 }, 1566 },
1404 ), 1567 ),
1405 (new CFPlus::UI::Empty expand => 1), 1568 (new DC::UI::Empty expand => 1),
1406 ]); 1569 ]);
1407 1570
1408 $table->add_at ($_, $y, new CFPlus::UI::Label 1571 $table->add_at ($_, $y, new DC::UI::Label
1409 max_w => $::WIDTH * 0.4, 1572 max_w => $::WIDTH * 0.4,
1410 ellipsise => 0, 1573 ellipsise => 0,
1411 align => $align[$_], 1574 align => $align[$_],
1412 text => $m->[$_], 1575 text => $m->[$_],
1413 tooltip => $tip[$_], 1576 tooltip => $tip[$_],
1423 }; 1586 };
1424 1587
1425} 1588}
1426 1589
1427sub metaserver_dialog { 1590sub metaserver_dialog {
1428 my $vbox = new CFPlus::UI::VBox; 1591 my $vbox = new DC::UI::VBox;
1429 my $table = new CFPlus::UI::Table; 1592 my $table = new DC::UI::Table;
1430 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1593 $vbox->add (new DC::UI::ScrolledWindow expand => 1, child => $table);
1431 1594
1432 my $dialog = new CFPlus::UI::Toplevel 1595 my $dialog = new DC::UI::Toplevel
1433 title => "Server List", 1596 title => "Server List",
1434 name => 'metaserver_dialog', 1597 name => 'metaserver_dialog',
1435 x => 'center', 1598 x => 'center',
1436 y => 'center', 1599 y => 'center',
1437 z => 3, 1600 z => 3,
1448 1611
1449 $dialog 1612 $dialog
1450} 1613}
1451 1614
1452sub login_setup { 1615sub login_setup {
1453 my $vbox = new CFPlus::UI::VBox; 1616 my $vbox = new DC::UI::VBox;
1454 1617
1455 $vbox->add (new CFPlus::UI::FancyFrame 1618 $vbox->add (new DC::UI::FancyFrame
1456 label => "Login Settings", 1619 label => "Login Settings",
1457 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1620 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1458 ); 1621 );
1459 1622
1460 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1623 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1461 $table->add_at (1, 4, new CFPlus::UI::Entry 1624 $table->add_at (1, 4, new DC::UI::Entry
1462 text => $CFG->{profile}{default}{user}, 1625 text => $CFG->{profile}{default}{user},
1463 tooltip => "The name of your character on the server.", 1626 tooltip => "The name of your character on the server.",
1464 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1627 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1465 ); 1628 );
1466 1629
1467 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1630 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1468 $table->add_at (1, 5, new CFPlus::UI::Entry 1631 $table->add_at (1, 5, new DC::UI::Entry
1469 text => $CFG->{profile}{default}{password}, 1632 text => $CFG->{profile}{default}{password},
1470 hidden => 1, 1633 hidden => 1,
1471 tooltip => "The password for your character.", 1634 tooltip => "The password for your character.",
1472 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1635 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1473 ); 1636 );
1474 1637
1475 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1638 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1476 expand => 1, 1639 expand => 1,
1477 align => 0,
1478 text => "Login / Register", 1640 text => "Login / Register",
1479 tooltip => "This button will either login to the account configured above or register a new account.", 1641 tooltip => "This button will either login to the account configured above or register a new account.",
1480 on_activate => sub { 1642 on_activate => sub {
1481 $CONN ? stop_game 1643 $CONN ? stop_game
1482 : start_game; 1644 : start_game;
1483 1 1645 1
1484 }, 1646 },
1485 ); 1647 );
1486 1648
1487 $vbox->add (new CFPlus::UI::FancyFrame 1649 $vbox->add (new DC::UI::FancyFrame
1488 label => "Registering", 1650 label => "How to Play",
1489 min_h => 200, 1651 min_h => 240,
1490 child => (new CFPlus::UI::Label valign => -1, ellipsise => 0, 1652 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1491 markup => 1653 markup =>
1654 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1655 . "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 " 1656 . "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.", 1657 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1494 ), 1658 ),
1495 ); 1659 );
1496 1660
1497 $vbox 1661 $vbox
1498} 1662}
1499 1663
1500sub server_setup { 1664sub server_setup {
1501 my $vbox = new CFPlus::UI::VBox; 1665 my $vbox = new DC::UI::VBox;
1502 1666
1503 $vbox->add (new CFPlus::UI::FancyFrame 1667 $vbox->add (new DC::UI::FancyFrame
1504 label => "Connection Settings", 1668 label => "Connection Settings",
1505 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1669 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1506 ); 1670 );
1507 1671
1508 my $row = 0; 1672 my $row = 0;
1509 1673
1510 $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1674 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1511 { 1675 {
1512 $table->add_at (1, $row, my $vbox = new CFPlus::UI::VBox); 1676 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1513 1677
1514 $vbox->add ( 1678 $vbox->add (
1515 $HOST_ENTRY = new CFPlus::UI::Entry 1679 $HOST_ENTRY = new DC::UI::Entry
1516 expand => 1, 1680 expand => 1,
1517 text => $CFG->{profile}{default}{host}, 1681 text => $CFG->{profile}{default}{host},
1518 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1682 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1519 on_changed => sub { 1683 on_changed => sub {
1520 my ($self, $value) = @_; 1684 my ($self, $value) = @_;
1521 $CFG->{profile}{default}{host} = $value; 1685 $CFG->{profile}{default}{host} = $value;
1522 1 1686 1
1523 } 1687 }
1524 ); 1688 );
1525 1689
1690 if (0) { #d# disabled
1526 $vbox->add (new CFPlus::UI::Button 1691 $vbox->add (new DC::UI::Button
1527 expand => 1, 1692 expand => 1,
1528 text => "Server List", 1693 text => "Server List",
1529 other => $METASERVER, 1694 other => $METASERVER,
1530 tooltip => "Show a list of available crossfire servers", 1695 tooltip => "Show a list of available Deliantra servers",
1531 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1696 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1532 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1697 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1533 ); 1698 );
1699 }#d#
1534 } 1700 }
1535 1701
1536 $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1702 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1537 $table->add_at (1, $row, new CFPlus::UI::Slider 1703 $table->add_at (1, $row, new DC::UI::Slider
1538 force_w => 100, 1704 force_w => 100,
1539 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1705 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1540 tooltip => "This is the size of the portion of the map update the server sends you. " 1706 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, " 1707 . "If you set this to a high value you will be able to see further, "
1542 . "but you also increase bandwidth requirements and latency. " 1708 . "but you also increase bandwidth requirements and latency. "
1543 . "This option is only used once at log-in.", 1709 . "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 }, 1710 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1545 ); 1711 );
1546 1712
1547 $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1713 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1548 $table->add_at (1, $row, new CFPlus::UI::Entry 1714 $table->add_at (1, $row, new DC::UI::Entry
1549 text => $CFG->{output_rate}, 1715 text => $CFG->{output_rate},
1550 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1716 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1551 . "when sending data. When 0 or unset, the server " 1717 . "when sending data. When 0 or unset, the server "
1552 . "default will be used, which is usually around 100kb/s. Most servers will " 1718 . "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.", 1719 . "dynamically find an optimal rate, so adjust this only when necessary.",
1554 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 }, 1720 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1555 ); 1721 );
1556 1722
1557 $vbox->add (new CFPlus::UI::FancyFrame 1723 $vbox->add (new DC::UI::FancyFrame
1558 label => "Server Info", 1724 label => "Server Info",
1559 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1725 child => ($SERVER_INFO = new DC::UI::Label ellipsise => 0),
1560 ); 1726 );
1561 1727
1562 $vbox 1728 $vbox
1563} 1729}
1564 1730
1565sub client_setup { 1731sub client_setup {
1566 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1732 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1567 1733
1568 my $row = 0; 1734 my $row = 0;
1569 1735
1570 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1736 $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 1737 $table->add_at (1, $row++, new DC::UI::CheckBox
1572 state => $CFG->{show_tips}, 1738 state => $CFG->{show_tips},
1573 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1739 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1574 on_changed => sub { 1740 on_changed => sub {
1575 my ($self, $value) = @_; 1741 my ($self, $value) = @_;
1576 $CFG->{show_tips} = $value; 1742 $CFG->{show_tips} = $value;
1577 0 1743 0
1578 } 1744 }
1579 ); 1745 );
1580 1746
1581 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1747 $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 1748 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1583 text => $CFG->{logview_max_par}, 1749 text => $CFG->{logview_max_par},
1584 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1750 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 " 1751 . "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.", 1752 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1587 on_changed => sub { 1753 on_changed => sub {
1588 my ($self, $value) = @_; 1754 my ($self, $value) = @_;
1589 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1755 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1590 0 1756 0
1591 }, 1757 },
1592 ); 1758 );
1593 1759
1594 $table 1760 $table
1595} 1761}
1596 1762
1597sub autopickup_setup { 1763sub autopickup_setup {
1598 my $r = new CFPlus::UI::ScrolledWindow ( 1764 my $r = new DC::UI::ScrolledWindow (
1599 expand => 1, 1765 expand => 1,
1600 scroll_y => 1 1766 scroll_y => 1
1601 ); 1767 );
1602 $r->add (my $table = new CFPlus::UI::Table 1768 $r->add (my $table = new DC::UI::Table
1603 row_expand => [0], 1769 row_expand => [0],
1604 col_expand => [0, 1, 0, 1], 1770 col_expand => [0, 1, 0, 1],
1605 ); 1771 );
1606 1772
1607 for ( 1773 for (
1641 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1807 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1642 ["Ignore cursed" => PICKUP_NOT_CURSED], 1808 ["Ignore cursed" => PICKUP_NOT_CURSED],
1643 ["Jewelery" => PICKUP_JEWELS], 1809 ["Jewelery" => PICKUP_JEWELS],
1644 ["Flesh" => PICKUP_FLESH], 1810 ["Flesh" => PICKUP_FLESH],
1645 ], 1811 ],
1646 ["Weight/Value ratio", 2, 17] 1812 ["Value/Weight ratio", 2, 17]
1647 ) 1813 )
1648 { 1814 {
1649 my ($title, $x, $y, @bits) = @$_; 1815 my ($title, $x, $y, @bits) = @$_;
1650 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1816 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1651 1817
1652 for (@bits) { 1818 for (@bits) {
1653 ++$y; 1819 ++$y;
1654 1820
1655 my $mask = $_->[1]; 1821 my $mask = $_->[1];
1656 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1822 $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 1823 $table->add_at ($x+1, $y, my $checkbox = new DC::UI::CheckBox
1658 state => $::CFG->{pickup} & $mask, 1824 state => $::CFG->{pickup} & $mask,
1659 on_changed => sub { 1825 on_changed => sub {
1660 my ($box, $value) = @_; 1826 my ($box, $value) = @_;
1661 1827
1662 if ($value) { 1828 if ($value) {
1673 1839
1674 ${$_->[2]} = $checkbox if $_->[2]; 1840 ${$_->[2]} = $checkbox if $_->[2];
1675 } 1841 }
1676 } 1842 }
1677 1843
1678 $table->add_at (2, 18, new CFPlus::UI::ValSlider 1844 $table->add_at (2, 18, new DC::UI::ValSlider
1679 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1845 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1680 template => ">= 99", 1846 template => ">= 99",
1847 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] }, 1848 to_value => sub { ">= " . 5 * $_[0] },
1682 on_changed => sub { 1849 on_changed => sub {
1683 my ($slider, $value) = @_; 1850 my ($slider, $value) = @_;
1684 1851
1685 $::CFG->{pickup} &= ~0xF; 1852 $::CFG->{pickup} &= ~0xF;
1686 $::CFG->{pickup} |= int $value 1853 $::CFG->{pickup} |= int $value
1687 if $value; 1854 if $value;
1688 1; 1855 1;
1689 }); 1856 });
1690 1857
1691 $table->add_at (3, 18, new CFPlus::UI::Button 1858 $table->add_at (3, 18, new DC::UI::Button
1692 text => "set", 1859 text => "set",
1693 on_activate => sub { 1860 on_activate => sub {
1694 $::CONN->send_command ("pickup $::CFG->{pickup}") 1861 $::CONN->send_command ("pickup $::CFG->{pickup}")
1695 if defined $::CONN; 1862 if defined $::CONN;
1696 0 1863 0
1698 1865
1699 $r 1866 $r
1700} 1867}
1701 1868
1702my %SORT_ORDER = ( 1869my %SORT_ORDER = (
1703 type => undef, 1870 type => sub {
1871 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1872 },
1704 mtime => sub { 1873 mtime => sub {
1705 my $NOW = time; 1874 my $NOW = time;
1706 sort { 1875 sort {
1707 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1876 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; 1877 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1717 or $a->{type} <=> $b->{type} 1886 or $a->{type} <=> $b->{type}
1718 } @_ }, 1887 } @_ },
1719); 1888);
1720 1889
1721sub inventory_widget { 1890sub inventory_widget {
1722 my $hb = new CFPlus::UI::HBox homogeneous => 1; 1891 my $hb = new DC::UI::HBox homogeneous => 1;
1723 1892
1724 $hb->add (my $vb1 = new CFPlus::UI::VBox); 1893 $hb->add (my $vb1 = new DC::UI::VBox);
1725 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player"); 1894 $vb1->add (new DC::UI::Label text => "Player");
1726 1895
1727 $vb1->add (my $hb1 = new CFPlus::UI::HBox); 1896 $vb1->add (my $hb1 = new DC::UI::HBox);
1728 1897
1729 use sort 'stable'; 1898 use sort 'stable';
1730 1899
1731 $hb1->add (new CFPlus::UI::Selector 1900 $hb1->add (new DC::UI::Selector
1732 value => $::CFG->{inv_sort}, 1901 value => $::CFG->{inv_sort},
1733 options => [ 1902 options => [
1734 [type => "Type/Name"], 1903 [type => "Type/Name"],
1735 [mtime => "Recent/Normal/Locked"], 1904 [mtime => "Recent/Normal/Locked"],
1736 [weight => "Weight/Type"], 1905 [weight => "Weight/Type"],
1738 on_changed => sub { 1907 on_changed => sub {
1739 $::CFG->{inv_sort} = $_[1]; 1908 $::CFG->{inv_sort} = $_[1];
1740 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1909 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1741 }, 1910 },
1742 ); 1911 );
1743 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1); 1912 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1744 #TODO# update to weigh/maxweight 1913 #TODO# update to weight/maxweight
1745 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1914 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1746 1915
1747 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1916 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1748 $sw1->add ($INV = new CFPlus::UI::Inventory); 1917 $sw1->add ($INV = new DC::UI::Inventory);
1749 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1918 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1750 1919
1751 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1920 $hb->add (my $vb2 = new DC::UI::VBox);
1752 1921
1753 $vb2->add ($INVR_HB = new CFPlus::UI::HBox); 1922 $vb2->add ($INVR_HB = new DC::UI::HBox);
1754 1923
1755 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1924 $vb2->add (my $sw2 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1756 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1925 $sw2->add ($INVR = new DC::UI::Inventory);
1757 1926
1758 # XXX: Call after $INVR = ... because set_opencont sets the items 1927 # XXX: Call after $INVR = ... because set_opencont sets the items
1759 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1928 DC::Protocol::set_opencont ($::CONN, 0, "Floor");
1760 1929
1761 $hb 1930 $hb
1762} 1931}
1763 1932
1764sub media_window { 1933sub media_window {
1765 my $vb = new CFPlus::UI::VBox; 1934 my $vb = new DC::UI::VBox;
1766 1935
1767 $vb->add (new CFPlus::UI::FancyFrame 1936 $vb->add (new DC::UI::FancyFrame
1768 label => "Currently playing music", 1937 label => "Currently playing music",
1769 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0, 1938 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), 1939 child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
1771 ); 1940 );
1772 1941
1773 $vb->add (new CFPlus::UI::FancyFrame 1942 $vb->add (new DC::UI::FancyFrame
1774 label => "Other media used in this session", 1943 label => "Other media used in this session",
1775 expand => 1, 1944 expand => 1,
1776 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller 1945 child => ($LICENSE_WIDGET = new DC::UI::TextScroller
1777 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4), 1946 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1778 ); 1947 );
1779 1948
1780 $vb 1949 $vb
1781} 1950}
1790 or return; 1959 or return;
1791 1960
1792 $LICENSE_WIDGET->add_paragraph ({ 1961 $LICENSE_WIDGET->add_paragraph ({
1793 fg => [1, 1, 1, 1], 1962 fg => [1, 1, 1, 1],
1794 markup => "<small>" 1963 markup => "<small>"
1795 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n" 1964 . "<b>Name:</b> " . (DC::asxml $meta->{name}) . "\n"
1796 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n" 1965 . "<b>Author:</b> " . (DC::asxml $meta->{author}) . "\n"
1797 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n" 1966 . "<b>Source:</b> " . (DC::asxml $meta->{source}) . "\n"
1798 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n" 1967 . "<b>License:</b> " . (DC::asxml $meta->{license}) . "\n"
1799 . "</small>", 1968 . "</small>",
1800 }); 1969 });
1801 $LICENSE_WIDGET->scroll_to_bottom; 1970 $LICENSE_WIDGET->scroll_to_bottom;
1802} 1971}
1803 1972
1811 $PL_WINDOW->show; 1980 $PL_WINDOW->show;
1812 } 1981 }
1813} 1982}
1814 1983
1815sub player_window { 1984sub player_window {
1816 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel 1985 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1817 x => "center", 1986 x => "center",
1818 y => "center", 1987 y => "center",
1819 force_w => $WIDTH * 9/10, 1988 force_w => $WIDTH * 9/10,
1820 force_h => $HEIGHT * 9/10, 1989 force_h => $HEIGHT * 9/10,
1821 title => "Player", 1990 title => "Player",
1823 has_close_button => 1 1992 has_close_button => 1
1824 ; 1993 ;
1825 1994
1826 my $ntb = 1995 my $ntb =
1827 $PL_NOTEBOOK = 1996 $PL_NOTEBOOK =
1828 new CFPlus::UI::Notebook expand => 1; 1997 new DC::UI::Notebook expand => 1;
1829 1998
1830 $ntb->add_tab ( 1999 $ntb->add_tab (
1831 "Statistics (F2)" => $STATS_PAGE = stats_window, 2000 "Statistics (F2)" => $STATS_PAGE = stats_window,
1832 "Shows statistics, where all your Stats and Resistances are shown." 2001 "Shows statistics, where all your Stats and Resistances are shown."
1833 ); 2002 );
1834 $ntb->add_tab ( 2003 $ntb->add_tab (
1835 "Skills (F3)" => $SKILL_PAGE = skill_window, 2004 "Skills (F3)" => $SKILL_PAGE = skill_window,
1836 "Shows all your Skills." 2005 "Shows all your Skills."
1837 ); 2006 );
1838 2007
1839 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 2008 my $spellsw = $SPELL_PAGE = new DC::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1840 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 2009 $spellsw->add ($SPELL_LIST = new DC::UI::SpellList);
1841 $ntb->add_tab ( 2010 $ntb->add_tab (
1842 "Spellbook (F4)" => $spellsw, 2011 "Spellbook (F4)" => $spellsw,
1843 "Displays all spells you have and lets you edit keyboard shortcuts for them." 2012 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1844 ); 2013 );
1845 $ntb->add_tab ( 2014 $ntb->add_tab (
1858 $plwin->add ($ntb); 2027 $plwin->add ($ntb);
1859 $plwin 2028 $plwin
1860} 2029}
1861 2030
1862sub keyboard_setup { 2031sub keyboard_setup {
1863 CFPlus::Macro::keyboard_setup 2032 DC::Macro::keyboard_setup
1864} 2033}
1865 2034
1866sub help_window { 2035sub help_window {
1867 my $win = new CFPlus::UI::Toplevel 2036 my $win = new DC::UI::Toplevel
1868 x => 'center', 2037 x => 'center',
1869 y => 'center', 2038 y => 'center',
1870 z => 4, 2039 z => 4,
1871 name => 'doc_browser', 2040 name => 'doc_browser',
1872 force_w => int $WIDTH * 7/8, 2041 force_w => int $WIDTH * 7/8,
1873 force_h => int $HEIGHT * 7/8, 2042 force_h => int $HEIGHT * 7/8,
1874 title => "Help Browser", 2043 title => "Help Browser",
1875 has_close_button => 1; 2044 has_close_button => 1;
1876 2045
1877 $win->add (my $vbox = new CFPlus::UI::VBox); 2046 $win->add (my $vbox = new DC::UI::VBox);
1878 2047
1879 $vbox->add (new CFPlus::UI::FancyFrame 2048 $vbox->add (new DC::UI::FancyFrame
1880 label => "Navigation", 2049 label => "Navigation",
1881 child => (my $buttons = new CFPlus::UI::HBox), 2050 child => (my $buttons = new DC::UI::HBox),
1882 ); 2051 );
1883 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 2052 $vbox->add (my $viewer = new DC::UI::TextScroller
1884 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2053 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1885 2054
1886 my @history; 2055 my @history;
1887 my @future; 2056 my @future;
1888 my $curnode; 2057 my $curnode;
1890 my $load_node; $load_node = sub { 2059 my $load_node; $load_node = sub {
1891 my ($node, $para) = @_; 2060 my ($node, $para) = @_;
1892 2061
1893 $buttons->clear; 2062 $buttons->clear;
1894 2063
1895 $buttons->add (new CFPlus::UI::Button 2064 $buttons->add (new DC::UI::Button
1896 text => "⇤", 2065 text => "⇤",
1897 tooltip => "back to the starting page", 2066 tooltip => "back to the starting page",
1898 on_activate => sub { 2067 on_activate => sub {
1899 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 2068 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1900 unshift @future, @history; 2069 unshift @future, @history;
1902 $load_node->(@{shift @future}); 2071 $load_node->(@{shift @future});
1903 }, 2072 },
1904 ); 2073 );
1905 2074
1906 if (@history) { 2075 if (@history) {
1907 $buttons->add (new CFPlus::UI::Button 2076 $buttons->add (new DC::UI::Button
1908 text => "⋘", 2077 text => "⋘",
1909 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>", 2078 tooltip => "back to <i>" . (DC::asxml DC::Pod::full_path $history[-1][0]) . "</i>",
1910 on_activate => sub { 2079 on_activate => sub {
1911 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 2080 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1912 $load_node->(@{pop @history}); 2081 $load_node->(@{pop @history});
1913 }, 2082 },
1914 ); 2083 );
1915 } 2084 }
1916 2085
1917 if (@future) { 2086 if (@future) {
1918 $buttons->add (new CFPlus::UI::Button 2087 $buttons->add (new DC::UI::Button
1919 text => "⋙", 2088 text => "⋙",
1920 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>", 2089 tooltip => "forward to <i>" . (DC::asxml DC::Pod::full_path $future[0][0]) . "</i>",
1921 on_activate => sub { 2090 on_activate => sub {
1922 push @history, [$curnode, $viewer->current_paragraph]; 2091 push @history, [$curnode, $viewer->current_paragraph];
1923 $load_node->(@{shift @future}); 2092 $load_node->(@{shift @future});
1924 }, 2093 },
1925 ); 2094 );
1926 } 2095 }
1927 2096
1928 $buttons->add (new CFPlus::UI::Label text => " "); 2097 $buttons->add (new DC::UI::Label text => " ");
1929 2098
1930 my @path = CFPlus::Pod::full_path_of $node; 2099 my @path = DC::Pod::full_path_of $node;
1931 pop @path; # drop current node 2100 pop @path; # drop current node
1932 2101
1933 for my $node (@path) { 2102 for my $node (@path) {
1934 $buttons->add (new CFPlus::UI::Button 2103 $buttons->add (new DC::UI::Button
1935 text => $node->{kw}[0], 2104 text => $node->[DC::Pod::N_KW][0],
1936 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>", 2105 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1937 on_activate => sub { 2106 on_activate => sub {
1938 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2107 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1939 $load_node->($node); 2108 $load_node->($node);
1940 }, 2109 },
1941 ); 2110 );
1942 $buttons->add (new CFPlus::UI::Label text => "/"); 2111 $buttons->add (new DC::UI::Label text => "/");
1943 } 2112 }
1944 2113
1945 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2114 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1946 2115
1947 $curnode = $node; 2116 $curnode = $node;
1948 2117
1949 $viewer->clear; 2118 $viewer->clear;
1950 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 2119 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
1951 $viewer->scroll_to ($para); 2120 $viewer->scroll_to ($para);
1952 }; 2121 };
1953 2122
1954 $load_node->(CFPlus::Pod::find pod => "mainpage"); 2123 $load_node->(DC::Pod::find pod => "mainpage");
1955 2124
1956 $CFPlus::Pod::goto_document = sub { 2125 $DC::Pod::goto_document = sub {
1957 my (@path) = @_; 2126 my (@path) = @_;
1958 2127
1959 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2128 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1960 2129
1961 $load_node->((CFPlus::Pod::find @path)[0]); 2130 $load_node->((DC::Pod::find @path)[0]);
1962 $win->show; 2131 $win->show;
1963 }; 2132 };
1964 2133
1965 $win 2134 $win
1966} 2135}
1967 2136
1968sub open_string_query { 2137sub open_string_query {
1969 my ($title, $cb, $txt, $tooltip) = @_; 2138 my ($title, $cb, $txt, $tooltip) = @_;
1970 my $dialog = new CFPlus::UI::Toplevel 2139 my $dialog = new DC::UI::Toplevel
1971 x => "center", 2140 x => "center",
1972 y => "center", 2141 y => "center",
1973 z => 50, 2142 z => 50,
1974 force_w => $WIDTH * 4/5, 2143 force_w => $WIDTH * 4/5,
1975 title => $title; 2144 title => $title;
1976 2145
1977 $dialog->add ( 2146 $dialog->add (
1978 my $e = new CFPlus::UI::Entry 2147 my $e = new DC::UI::Entry
1979 on_activate => sub { $cb->(@_); $dialog->hide; 0 }, 2148 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1980 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 }, 2149 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1981 tooltip => $tooltip 2150 tooltip => $tooltip
1982 ); 2151 );
1983 2152
1986 $dialog->show; 2155 $dialog->show;
1987} 2156}
1988 2157
1989sub open_quit_dialog { 2158sub open_quit_dialog {
1990 unless ($QUIT_DIALOG) { 2159 unless ($QUIT_DIALOG) {
1991 $QUIT_DIALOG = new CFPlus::UI::Toplevel 2160 $QUIT_DIALOG = new DC::UI::Toplevel
1992 x => "center", 2161 x => "center",
1993 y => "center", 2162 y => "center",
1994 z => 50, 2163 z => 50,
1995 title => "Really Quit?", 2164 title => "Really Quit?",
1996 on_key_down => sub { 2165 on_key_down => sub {
1997 my ($dialog, $ev) = @_; 2166 my ($dialog, $ev) = @_;
1998 $ev->{sym} == 27 and $dialog->hide; 2167 $ev->{sym} == 27 and $dialog->hide;
1999 } 2168 }
2000 ; 2169 ;
2001 2170
2002 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1); 2171 $QUIT_DIALOG->add (my $vb = new DC::UI::VBox expand => 1);
2003 2172
2004 $vb->add (new CFPlus::UI::Label 2173 $vb->add (new DC::UI::Label
2005 text => "You should find a savebed and apply it first!", 2174 text => "You should find a savebed and apply it first!",
2006 max_w => $WIDTH * 0.25, 2175 max_w => $WIDTH * 0.25,
2007 ellipsize => 0, 2176 ellipsize => 0,
2008 ); 2177 );
2009 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 2178 $vb->add (my $hb = new DC::UI::HBox expand => 1);
2010 $hb->add (new CFPlus::UI::Button 2179 $hb->add (new DC::UI::Button
2011 text => "Ok", 2180 text => "Ok",
2012 expand => 1, 2181 expand => 1,
2013 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2182 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2014 ); 2183 );
2015 $hb->add (new CFPlus::UI::Button 2184 $hb->add (new DC::UI::Button
2016 text => "Quit anyway", 2185 text => "Quit anyway",
2017 expand => 1, 2186 expand => 1,
2018 on_activate => sub { Event::unloop_all }, 2187 on_activate => sub {
2188 crash "Quit anyway";
2189 EV::unloop EV::UNLOOP_ALL;
2190 },
2019 ); 2191 );
2020 } 2192 }
2021 2193
2022 $QUIT_DIALOG->show; 2194 $QUIT_DIALOG->show;
2023 $QUIT_DIALOG->grab_focus; 2195 $QUIT_DIALOG->grab_focus;
2024} 2196}
2025 2197
2026sub show_tip_of_the_day { 2198sub show_tip_of_the_day {
2027 # find all tips 2199 # find all tips
2028 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 2200 my @tod = DC::Pod::find tip_of_the_day => "*";
2029 2201
2030 CFPlus::DB::get state => "tip_of_the_day", sub { 2202 DC::DB::get state => "tip_of_the_day", sub {
2031 my ($todindex) = @_; 2203 my ($todindex) = @_;
2032 $todindex = 0 if $todindex >= @tod; 2204 $todindex = 0 if $todindex >= @tod;
2033 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { }; 2205 DC::DB::put state => tip_of_the_day => $todindex + 1, sub { };
2034 2206
2035 # create dialog 2207 # create dialog
2036 my $dialog; 2208 my $dialog;
2037 2209
2038 my $close = sub { 2210 my $close = sub {
2039 $dialog->destroy; 2211 $dialog->destroy;
2040 }; 2212 };
2041 2213
2042 $dialog = new CFPlus::UI::Toplevel 2214 $dialog = new DC::UI::Toplevel
2043 x => "center", 2215 x => "center",
2044 y => "center", 2216 y => "center",
2045 z => 3, 2217 z => 3,
2046 name => 'tip_of_the_day', 2218 name => 'tip_of_the_day',
2047 force_w => int $WIDTH * 4/9, 2219 force_w => int $WIDTH * 4/9,
2048 force_h => int $WIDTH * 2/9, 2220 force_h => int $WIDTH * 2/9,
2049 title => "Tip of the day #" . (1 + $todindex), 2221 title => "Tip of the day #" . (1 + $todindex),
2050 child => my $vbox = new CFPlus::UI::VBox, 2222 child => my $vbox = new DC::UI::VBox,
2051 has_close_button => 1, 2223 has_close_button => 1,
2052 on_delete => $close, 2224 on_delete => $close,
2053 ; 2225 ;
2054 2226
2055 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 2227 $vbox->add (my $viewer = new DC::UI::TextScroller
2056 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2228 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]); 2229 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $tod[$todindex]);
2058 2230
2059 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 2231 $vbox->add (my $table = new DC::UI::Table col_expand => [0, 1]);
2060 2232
2061 $table->add_at (0, 0, new CFPlus::UI::Button 2233 $table->add_at (0, 0, new DC::UI::Button
2062 text => "Close", 2234 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>.", 2235 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, 2236 on_activate => $close,
2065 ); 2237 );
2066 2238
2067 $table->add_at (2, 0, new CFPlus::UI::Button 2239 $table->add_at (2, 0, new DC::UI::Button
2068 text => "Next", 2240 text => "Next",
2069 tooltip => "Show the next <b>Tip of the day</b>.", 2241 tooltip => "Show the next <b>Tip of the day</b>.",
2070 on_activate => sub { 2242 on_activate => sub {
2071 $close->(); 2243 $close->();
2072 &show_tip_of_the_day; 2244 &show_tip_of_the_day;
2076 $dialog->show; 2248 $dialog->show;
2077 }; 2249 };
2078} 2250}
2079 2251
2080sub sdl_init { 2252sub sdl_init {
2081 CFPlus::SDL_Init 2253 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2082 and die "SDL::Init failed!\n"; 2254 and die "SDL::Init failed!\n";
2083} 2255}
2084 2256
2085sub video_init { 2257sub video_init {
2258 DC::set_theme $CFG->{uitheme};
2259
2260 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2261 $SDL_REINIT = 0;
2262
2263 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2264 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2265 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2266 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2267
2268 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2269
2086 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2270 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2271 $CFG->{sdl_mode} = 0; # lowest resolution by default
2272
2273 # now choose biggest mode <= 1024x768
2274 for (0 .. $#SDL_MODES) {
2275 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2276 $CFG->{sdl_mode} = $_;
2277 }
2278 }
2279 }
2087 2280
2088 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2281 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2089 2282
2090 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2283 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2091 $FULLSCREEN = $CFG->{fullscreen}; 2284 $FULLSCREEN = $CFG->{fullscreen};
2092 $FAST = $CFG->{fast}; 2285 $FAST = $CFG->{fast};
2093 2286
2287 # 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 2288 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2289 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2095 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 2290 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2096 2291
2097 $SDL_ACTIVE = 1; 2292 $SDL_ACTIVE = 1;
2098 $LAST_REFRESH = time - 0.01; 2293 $LAST_REFRESH = time - 0.01;
2099 2294
2100 CFPlus::OpenGL::init; 2295 DC::OpenGL::init;
2101 CFPlus::Macro::init; 2296 DC::Macro::init;
2102 2297
2103 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2298 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
2104 2299
2105 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2300 $DC::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
2106 2301
2107 ############################################################################# 2302 #############################################################################
2108 2303
2109 if ($DEBUG_STATUS) { 2304 if ($DEBUG_STATUS) {
2110 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2305 DC::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
2111 } else { 2306 } else {
2112 # create/configure the widgets 2307 # create/configure the widgets
2113 2308
2114 $CFPlus::UI::ROOT->connect (key_down => sub { 2309 $DC::UI::ROOT->connect (key_down => sub {
2115 my (undef, $ev) = @_; 2310 my (undef, $ev) = @_;
2116 2311
2117 if (my @macros = CFPlus::Macro::find $ev) { 2312 if (my @macros = DC::Macro::find $ev) {
2118 CFPlus::Macro::execute $_ for @macros; 2313 DC::Macro::execute $_ for @macros;
2119 2314
2120 return 1; 2315 return 1;
2121 } 2316 }
2122 2317
2123 0 2318 0
2124 }); 2319 });
2125 2320
2126 $DEBUG_STATUS = new CFPlus::UI::Label 2321 $DEBUG_STATUS = new DC::UI::Label
2127 padding => 0, 2322 padding => 0,
2128 z => 100, 2323 z => 100,
2129 force_x => "max", 2324 force_x => "max",
2130 force_y => 0; 2325 force_y => 0;
2131 $DEBUG_STATUS->show; 2326 $DEBUG_STATUS->show;
2132 2327
2133 $STATUSBOX = new CFPlus::UI::Statusbox; 2328 $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 2329
2330 $MODBOX = new DC::UI::Label
2331 can_events => 1,
2332 can_hover => 1,
2333 markup => "",
2334 align => 0,
2335 font => $FONT_FIXED,
2336 tooltip => "#modifier_box",
2337 tooltip_width => 0.67,
2338 ;
2339
2340 update_modbox;
2341
2136 (new CFPlus::UI::Frame 2342 (new DC::UI::Frame
2137 bg => [0, 0, 0, 0.4], 2343 bg => [0, 0, 0, 0.4],
2138 force_x => 0, 2344 force_x => 0,
2139 force_y => "max", 2345 force_y => "max",
2140 child => $STATUSBOX, 2346 child => (my $LR = new DC::UI::VBox),
2141 )->show; 2347 )->show;
2142 2348
2349 $LR->add ($STATUSBOX);
2350 $LR->add ($MODBOX);
2351 $LR->add (new DC::UI::Label
2352 align => 0,
2353 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2354 fontsize => 0.5,
2355 fg => [1, 1, 0, 0.7],
2356 );
2357
2143 CFPlus::UI::Toplevel->new ( 2358 DC::UI::Toplevel->new (
2144 title => "Minimap", 2359 title => "Minimap",
2145 name => "mapmap", 2360 name => "mapmap",
2146 x => 0, 2361 x => 0,
2147 y => $FONTSIZE + 8, 2362 y => $FONTSIZE + 8,
2148 border_bg => [1, 1, 1, 192/255], 2363 border_bg => [1, 1, 1, 192/255],
2149 bg => [1, 1, 1, 0], 2364 bg => [1, 1, 1, 0],
2150 child => ($MAPMAP = new CFPlus::MapWidget::MapMap 2365 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.", 2366 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2152 ), 2367 ),
2153 )->show; 2368 )->show;
2154 2369
2155 $MAPWIDGET = new CFPlus::MapWidget; 2370 $MAPWIDGET = new DC::MapWidget;
2156 $MAPWIDGET->connect (activate_console => sub { 2371 $MAPWIDGET->connect (activate_console => sub {
2157 my ($mapwidget, $preset) = @_; 2372 my ($mapwidget, $preset) = @_;
2158 2373
2159 $MESSAGE_WINDOW->activate_console ($preset) 2374 $MESSAGE_DIST->activate_console ($preset)
2160 if $MESSAGE_WINDOW; 2375 if $MESSAGE_DIST;
2161 }); 2376 });
2162 $MAPWIDGET->show; 2377 $MAPWIDGET->show;
2163 $MAPWIDGET->grab_focus; 2378 $MAPWIDGET->grab_focus;
2164 2379
2165 $COMPLETER = new CFPlus::MapWidget::Command:: 2380 $COMPLETER = new DC::MapWidget::Command::
2166 command => { }, 2381 command => { },
2167 tooltip => "#completer_help", 2382 tooltip => "#completer_help",
2168 ; 2383 ;
2169 2384
2170 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2385 $SETUP_DIALOG = new DC::UI::Toplevel
2171 title => "Setup", 2386 title => "Setup",
2172 name => "setup_dialog", 2387 name => "setup_dialog",
2173 x => 'center', 2388 x => 'center',
2174 y => 'center', 2389 y => 'center',
2175 z => 2, 2390 z => 2,
2177 force_h => $::HEIGHT * 0.6, 2392 force_h => $::HEIGHT * 0.6,
2178 has_close_button => 1, 2393 has_close_button => 1,
2179 ; 2394 ;
2180 2395
2181 $METASERVER = metaserver_dialog; 2396 $METASERVER = metaserver_dialog;
2182 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow; 2397 # the name is changed to not conflict with the older name as users could have hidden it
2398 $MESSAGE_WINDOW = new DC::UI::Dockbar
2399 name => "message_window2",
2400 title => 'Messages',
2401 force_w => $::WIDTH * 0.6,
2402 force_h => $::HEIGHT * 0.25,
2403 ;
2183 2404
2405 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2406
2184 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2407 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2185 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2408 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2186 2409
2187 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2410 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2188 "Configure the server to play on, your username and password."); 2411 "Configure the server to play on, your username and password.");
2189 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2412 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2190 "Configure other server related options."); 2413 "Configure other server related options.");
2202 . "After pressing the combo the binding will be saved automatically and the " 2425 . "After pressing the combo the binding will be saved automatically and the "
2203 . "binding editor closes"); 2426 . "binding editor closes");
2204 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2427 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2205 "Some debuggin' options. Do not ask."); 2428 "Some debuggin' options. Do not ask.");
2206 2429
2207 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2430 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2208 2431
2209 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2432 $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."); 2433 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2211 2434
2212 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2435# $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."); 2436# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2214 2437
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 2438 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 2439
2217 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2440 $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."); 2441 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2219 2442
2220 $BUTTONBAR->add (new CFPlus::UI::Button 2443 $BUTTONBAR->add (new DC::UI::Button
2221 text => "Save Config", 2444 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.", 2445 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 { 2446 on_activate => sub {
2224 $::CFG->{layout} = CFPlus::UI::get_layout; 2447 $::CFG->{layout} = DC::UI::get_layout;
2225 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc"; 2448 DC::write_cfg;
2226 status "Configuration Saved"; 2449 status "Configuration Saved";
2227 0 2450 0
2228 }, 2451 },
2229 ); 2452 );
2230 2453
2231 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2454 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2232 tooltip => "View Documentation"); 2455 tooltip => "View Documentation");
2233 2456
2234
2235 $BUTTONBAR->add (new CFPlus::UI::Button 2457 $BUTTONBAR->add (new DC::UI::Button
2236 text => "Quit", 2458 text => "Quit",
2237 tooltip => "Terminates the program", 2459 tooltip => "Terminates the program",
2238 on_activate => sub { 2460 on_activate => sub {
2239 if ($CONN) { 2461 if ($CONN) {
2240 open_quit_dialog; 2462 open_quit_dialog;
2241 } else { 2463 } else {
2242 Event::unloop_all; 2464 EV::unloop EV::UNLOOP_ALL;
2243 } 2465 }
2244 0 2466 0
2245 }, 2467 },
2246 ); 2468 );
2247 2469
2248 $BUTTONBAR->show; 2470 $BUTTONBAR->show;
2249 $SETUP_DIALOG->show; 2471 $SETUP_DIALOG->show;
2250 $MESSAGE_WINDOW->show; 2472 $MESSAGE_WINDOW->show;
2251 } 2473 }
2252 2474
2475 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2476 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2477
2478 $CAVEAT_LABEL->set_text ("None :)");
2479 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2480 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2481
2253 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2482 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2254} 2483}
2255 2484
2256sub video_shutdown { 2485sub video_shutdown {
2257 CFPlus::OpenGL::shutdown; 2486 DC::OpenGL::shutdown;
2487 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2258 2488
2259 undef $SDL_ACTIVE; 2489 undef $SDL_ACTIVE;
2260} 2490}
2261 2491
2262my %animate_object; 2492my %animate_object;
2268 if ($ENV{CFPLUS_DEBUG} & 4) { 2498 if ($ENV{CFPLUS_DEBUG} & 4) {
2269 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2499 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2270 debug sprintf "%3.2f", $fps; 2500 debug sprintf "%3.2f", $fps;
2271 } 2501 }
2272 2502
2503 undef $WANT_REFRESH;
2504 $_[0]->stop;
2505
2273 $CFPlus::UI::ROOT->draw; 2506 $DC::UI::ROOT->draw;
2274 CFPlus::SDL_GL_SwapBuffers; 2507 DC::SDL_GL_SwapBuffers;
2275 $LAST_REFRESH = $NOW; 2508 $LAST_REFRESH = $NOW;
2276 $WANT_REFRESH->stop;
2277} 2509}
2278 2510
2279$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh); 2511my $want_refresh = EV::prepare_ns \&force_refresh;
2280 2512
2281my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub { 2513my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2282 $NOW = time; 2514 $NOW = EV::now;
2283 2515
2284 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2516 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2285 for CFPlus::poll_events; 2517 for DC::poll_events;
2286 2518
2287 if (%animate_object) { 2519 if (%animate_object) {
2288 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2520 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2289 $WANT_REFRESH->start; 2521 $WANT_REFRESH = 1;
2290 } 2522 }
2523
2524 $want_refresh->start
2525 if $WANT_REFRESH;
2291}); 2526};
2292 2527
2293sub animation_start { 2528sub animation_start {
2294 my ($widget) = @_; 2529 my ($widget) = @_;
2295 $animate_object{$widget} = $widget; 2530 $animate_object{$widget} = $widget;
2296} 2531}
2299 my ($widget) = @_; 2534 my ($widget) = @_;
2300 delete $animate_object{$widget}; 2535 delete $animate_object{$widget};
2301} 2536}
2302 2537
2303%SDL_CB = ( 2538%SDL_CB = (
2304 CFPlus::SDL_QUIT => sub { 2539 DC::SDL_QUIT => sub {
2305 Event::unloop_all; 2540 crash "SDL_QUIT";
2541 EV::unloop EV::UNLOOP_ALL;
2306 }, 2542 },
2307 CFPlus::SDL_VIDEORESIZE => sub { 2543 DC::SDL_VIDEORESIZE => sub {
2308 }, 2544 },
2309 CFPlus::SDL_VIDEOEXPOSE => sub { 2545 DC::SDL_VIDEOEXPOSE => sub {
2310 CFPlus::UI::full_refresh; 2546 DC::UI::full_refresh;
2311 }, 2547 },
2312 CFPlus::SDL_ACTIVEEVENT => sub { 2548 DC::SDL_ACTIVEEVENT => sub {
2313# not useful, as APPACTIVE include sonly iconified state, not unmapped 2549# 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# 2550# 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# 2551# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2316# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2552# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2317# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2553# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2318# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2554# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2319 }, 2555 },
2320 CFPlus::SDL_KEYDOWN => sub { 2556 DC::SDL_KEYDOWN => sub {
2321 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2557 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2322 # alt-enter 2558 # alt-enter
2559 video_shutdown;
2323 $FULLSCREEN_ENABLE->toggle; 2560 $FULLSCREEN_ENABLE->toggle;
2324 video_shutdown;
2325 video_init; 2561 video_init;
2326 } else { 2562 } else {
2327 CFPlus::UI::feed_sdl_key_down_event ($_[0]); 2563 &DC::UI::feed_sdl_key_down_event;
2328 } 2564 }
2565 update_modbox;
2329 }, 2566 },
2330 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event, 2567 DC::SDL_KEYUP => sub {
2568 &DC::UI::feed_sdl_key_up_event;
2569 update_modbox;
2570 },
2331 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event, 2571 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2332 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event, 2572 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2333 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event, 2573 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2334 CFPlus::SDL_USEREVENT => sub { 2574 DC::SDL_USEREVENT => sub {
2335 if ($_[0]{code} == 1) { 2575 if ($_[0]{code} == 1) {
2336 audio_channel_finished $_[0]{data1}; 2576 audio_channel_finished $_[0]{data1};
2337 } elsif ($_[0]{code} == 0) { 2577 } elsif ($_[0]{code} == 0) {
2338 audio_music_finished; 2578 audio_music_finished;
2339 } 2579 }
2340 }, 2580 },
2341); 2581);
2342 2582
2343############################################################################# 2583#############################################################################
2344 2584
2345$SIG{INT} = $SIG{TERM} = sub { exit }; 2585$SIG{INT} = $SIG{TERM} = sub {
2586 EV::unloop;
2587 #d# TODO calling exit here hangs the process in some futex
2588};
2346 2589
2347{ 2590# due to mac os x + sdl combined briandamage, we need this contortion
2348 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2591sub main {
2592 {
2593 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2594
2595 if (-e "$Deliantra::VARDIR/client.cf") {
2596 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2597 } else {
2598 #TODO: compatibility cruft
2599 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2600 print STDERR "INFO: used old configuration file\n";
2601 }
2602
2349 CFPlus::DB::Server::run; 2603 DC::DB::Server::run;
2350 2604
2605 if ($CFG->{db_schema} < 1) {
2606 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2607 DC::DB::nuke_db;
2608 $CFG->{db_schema} = 1;
2609 DC::write_cfg;
2610 }
2611
2612 DC::DB::open_db;
2613
2351 CFPlus::UI::set_layout ($::CFG->{layout}); 2614 DC::UI::set_layout ($::CFG->{layout});
2352 2615
2353 my %DEF_CFG = ( 2616 my %DEF_CFG = (
2354 sdl_mode => 0, 2617 sdl_mode => undef,
2355 fullscreen => 0, 2618 fullscreen => 1,
2356 fast => 0, 2619 fast => 0,
2357 force_opengl11 => undef, 2620 force_opengl11 => undef,
2621 disable_alpha => 0,
2622 smooth_movement => 1,
2358 texture_compression => 1, 2623 texture_compression => 1,
2359 map_scale => 1, 2624 map_scale => 1,
2360 fow_enable => 1, 2625 fow_enable => 1,
2361 fow_intensity => 0, 2626 fow_intensity => 0,
2362 map_smoothing => 1, 2627 map_smoothing => 1,
2363 gui_fontsize => 1, 2628 gui_fontsize => 1,
2364 log_fontsize => 0.7, 2629 log_fontsize => 0.7,
2365 gauge_fontsize => 1, 2630 gauge_fontsize => 1,
2366 gauge_size => 0.35, 2631 gauge_size => 0.35,
2367 stat_fontsize => 0.7, 2632 stat_fontsize => 0.7,
2368 mapsize => 100, 2633 mapsize => 100,
2369 audio_enable => 1, 2634 audio_enable => 1,
2370 audio_hw_channels => 0, 2635 audio_hw_channels => 0,
2371 audio_hw_frequency => 0, 2636 audio_hw_frequency => 0,
2372 audio_hw_chunksize => 0, 2637 audio_hw_chunksize => 0,
2373 audio_mix_channels => 8, 2638 audio_mix_channels => 8,
2374 effects_enable => 1, 2639 effects_enable => 1,
2375 effects_volume => 1, 2640 effects_volume => 1,
2376 bgm_enable => 1, 2641 bgm_enable => 1,
2377 bgm_volume => 0.5, 2642 bgm_volume => 0.5,
2378 output_rate => "", 2643 output_rate => "",
2379 pickup => 0, 2644 pickup => 0,
2380 inv_sort => "mtime", 2645 inv_sort => "mtime",
2381 default => "profile", # default profile 2646 default => "profile", # default profile
2382 show_tips => 1, 2647 show_tips => 1,
2383 logview_max_par => 1000, 2648 logview_max_par => 1000,
2649 shift_fire_stop => 0,
2650 uitheme => "wood",
2384 ); 2651 );
2385 2652
2386 while (my ($k, $v) = each %DEF_CFG) { 2653 while (my ($k, $v) = each %DEF_CFG) {
2387 $CFG->{$k} = $v unless exists $CFG->{$k}; 2654 $CFG->{$k} = $v unless exists $CFG->{$k};
2388 } 2655 }
2389 2656
2390 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2657 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2391 $PROFILE = $CFG->{profile}{default}; 2658 $PROFILE = $CFG->{profile}{default};
2392 2659
2393 # convert old bindings (only default profile matters) 2660 # convert old bindings (only default profile matters)
2394 if (my $bindings = delete $PROFILE->{bindings}) { 2661 if (my $bindings = delete $PROFILE->{bindings}) {
2395 while (my ($mod, $syms) = each %$bindings) { 2662 while (my ($mod, $syms) = each %$bindings) {
2396 while (my ($sym, $cmds) = each %$syms) { 2663 while (my ($sym, $cmds) = each %$syms) {
2397 push @{ $PROFILE->{macro} }, { 2664 push @{ $PROFILE->{macro} }, {
2398 accelkey => [$mod*1, $sym*1], 2665 accelkey => [$mod*1, $sym*1],
2399 action => $cmds, 2666 action => $cmds,
2667 };
2400 }; 2668 }
2401 } 2669 }
2402 } 2670 }
2403 }
2404 2671
2405 sdl_init; 2672 sdl_init;
2406 2673
2407 @SDL_MODES = CFPlus::SDL_ListModes 8, 8; 2674 {
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( 2675 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2417 DejaVuSans.ttf 2676 DejaVuSans.ttf
2418 DejaVuSansMono.ttf 2677 DejaVuSansMono.ttf
2419 DejaVuSans-Bold.ttf 2678 DejaVuSans-Bold.ttf
2420 DejaVuSansMono-Bold.ttf 2679 DejaVuSansMono-Bold.ttf
2421 DejaVuSans-Oblique.ttf 2680 DejaVuSans-Oblique.ttf
2422 DejaVuSansMono-Oblique.ttf 2681 DejaVuSansMono-Oblique.ttf
2423 DejaVuSans-BoldOblique.ttf 2682 DejaVuSans-BoldOblique.ttf
2424 DejaVuSansMono-BoldOblique.ttf 2683 DejaVuSansMono-BoldOblique.ttf
2425 ); 2684 );
2426 2685
2427 CFPlus::add_font $_ for @fonts; 2686 DC::add_font $_ for @fonts;
2428 2687
2429 CFPlus::pango_init;
2430
2431 $FONT_PROP = new_from_file CFPlus::Font $fonts[0]; 2688 $FONT_PROP = new_from_file DC::Font $fonts[0];
2432 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1]; 2689 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2433 2690
2434 $FONT_PROP->make_default; 2691 $FONT_PROP->make_default;
2435 } 2692
2693 DC::pango_init;
2694 }
2436 2695
2437# compare mono (ft) vs. rgba (cairo) 2696# compare mono (ft) vs. rgba (cairo)
2438# ft - 1.8s, cairo 3s, even in alpha-only mode 2697# ft - 1.8s, cairo 3s, even in alpha-only mode
2439# for my $rgba (0..1) { 2698# for my $rgba (0..1) {
2440# my $t1 = Time::HiRes::time; 2699# my $t1 = Time::HiRes::time;
2441# for (1..1000) { 2700# for (1..1000) {
2442# my $layout = CFPlus::Layout->new ($rgba); 2701# my $layout = DC::Layout->new ($rgba);
2443# $layout->set_text ("hallo" x 100); 2702# $layout->set_text ("hallo" x 100);
2444# $layout->render; 2703# $layout->render;
2445# } 2704# }
2446# my $t2 = Time::HiRes::time; 2705# my $t2 = Time::HiRes::time;
2447# warn $t2-$t1; 2706# warn $t2-$t1;
2448# } 2707# }
2449 2708
2450 video_init; 2709 video_init;
2451 audio_init; 2710 audio_init;
2452} 2711 }
2453 2712
2454show_tip_of_the_day if $CFG->{show_tips}; 2713 show_tip_of_the_day if $CFG->{show_tips};
2455 2714
2456Event->idle (cb => sub { 2715 our $STARTUP_CANCEL = EV::idle sub {
2457 $_[0]->w->cancel; 2716 undef $::STARTUP_CANCEL;
2458 $startup_done->(); 2717 $startup_done->();
2459}); 2718 };
2460 2719
2461Event::loop; 2720 delete $SIG{__DIE__};
2721 EV::loop;
2462 2722
2463#video_shutdown; 2723#video_shutdown;
2464#audio_shutdown; 2724#audio_shutdown;
2465CFPlus::SDL_Quit; 2725 DC::OpenGL::quit;
2726 DC::SDL_Quit;
2466CFPlus::DB::Server::stop; 2727 DC::DB::Server::stop;
2728}
2729
2730DC::SDL_braino; # see sub above
2467 2731
2468=head1 NAME 2732=head1 NAME
2469 2733
2470deliantra - A Deliantra MORPG game client 2734deliantra - A Deliantra MORPG game client
2471 2735
2488 4 show fps 2752 4 show fps
2489 8 suppress tooltips 2753 8 suppress tooltips
2490 2754
2491=head1 AUTHOR 2755=head1 AUTHOR
2492 2756
2493Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2757Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2494 2758
2495 2759
2496 2760

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines