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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines