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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.4 by root, Mon Nov 12 23:25:37 2007 UTC vs.
Revision 1.82 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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