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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines