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.1 by root, Sun Oct 14 15:33:31 2007 UTC vs.
Revision 1.67 by root, Mon Sep 1 10:00:29 2008 UTC

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

Diff Legend

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