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

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

Diff Legend

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