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.12 by root, Wed Dec 26 13:35:06 2007 UTC vs.
Revision 1.81 by root, Mon Dec 22 02:33:30 2008 UTC

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

Diff Legend

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