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.15 by root, Wed Dec 26 18:20:46 2007 UTC vs.
Revision 1.78 by root, Tue Sep 30 03:05:07 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 Deliantra; 87use Deliantra;
89use Deliantra::Protocol::Constants; 88use Deliantra::Protocol::Constants;
90 89
90use AnyEvent::Util ();
91use AnyEvent::DNS;
92use AnyEvent::Socket ();
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
695 $LOGIN_BUTTON->set_text ("Logout");
696 $SETUP_DIALOG->hide;
697 770
698 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 771 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
699 772
700 my ($host, $port) = split /:/, $PROFILE->{host};
701
702 $MAP = new CFPlus::Map;
703
704 $CONN = eval { 773 $CONN =
705 new CFPlus::Protocol 774 new DC::Protocol
706 host => $host, 775 host => $host,
707 port => $port || 13327, 776 port => $port,
708 user => $PROFILE->{user}, 777 user => $PROFILE->{user},
709 pass => $PROFILE->{password}, 778 pass => $PROFILE->{password},
710 mapw => $mapsize, 779 mapw => $mapsize,
711 maph => $mapsize, 780 maph => $mapsize,
712 781
713 client => "cfplus $CFPlus::VERSION $] $^O", 782 client => "$DC::VERSION $] $^O",
714 783
715 map_widget => $MAPWIDGET, 784 map_widget => $MAPWIDGET,
716 statusbox => $STATUSBOX, 785 statusbox => $STATUSBOX,
717 map => $MAP, 786 map => $MAP,
718 mapmap => $MAPMAP, 787 mapmap => $MAPMAP,
719 query => \&server_query, 788 query => \&server_query,
720 789
721 setup_req => { 790 setup_req => {
722 smoothing => $CFG->{map_smoothing}*1, 791 smoothing => $CFG->{map_smoothing}*1,
723 }, 792 },
793
794 on_connect => sub {
795 if ($_[0]) {
796 DC::lowdelay fileno $CONN->{fh};
797
798 status "login successful";
799 } else {
800 undef $CONN;
801 status "unable to connect: $!";
802 stop_game();
803 }
804 },
724 }; 805 ;
806}
725 807
726 if ($CONN) { 808sub start_game {
727 CFPlus::lowdelay fileno $CONN->{fh}; 809 status "logging in...";
728 810
729 status "login successful"; 811 $LOGIN_BUTTON->set_text ("Logout");
812 $SETUP_DIALOG->hide;
813
814 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
815
816 $MAP = new DC::Map;
817
818 # hack to make SURE we find the IP address all right
819 # can be removed once AnyEvent::DNS is proven stable.
820 if ($host eq "gameserver.deliantra.net") {
821 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
822 if ($_[0] ne "80.101.114.108") { # Perl
823 status "dns failure, using hardcoded address";
824 $host = "129.13.162.95";
825 }
826
827 dc_connect $host, $port;
828 };
730 } else { 829 } else {
731 status "unable to connect"; 830 dc_connect $host, $port;
732 stop_game();
733 } 831 }
734} 832}
735 833
736sub stop_game { 834sub stop_game {
835 crash "stop_game";
836
737 $LOGIN_BUTTON->set_text ("Login / Register"); 837 $LOGIN_BUTTON->set_text ("Login / Register");
738 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 838 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
739 $SETUP_DIALOG->show; 839 $SETUP_DIALOG->show;
740 $PL_WINDOW->hide; 840 $PL_WINDOW->hide;
741 $SPELL_LIST->clear_spells; 841 $SPELL_LIST->clear_spells;
742 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 842 $DC::UI::ROOT->emit (stop_game => ! ! $CONN);
743 843
744 &audio_music_set_ambient ([]); 844 &audio_music_set_ambient ([]);
745 845
746 return unless $CONN; 846 return unless $CONN;
747 847
… …
753 853
754 undef $MAP; 854 undef $MAP;
755} 855}
756 856
757sub graphics_setup { 857sub graphics_setup {
758 my $vbox = new CFPlus::UI::VBox; 858 my $vbox = new DC::UI::VBox;
759 859
860 {
861 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
862
760 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 863 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
761 864
762 my $row = 0; 865 my $row = 0;
763 866
764 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 867 $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, 868 $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, 869 can_events => 1,
767 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 870 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
768 871
872 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
873 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
874 can_events => 1,
875 tooltip => "This field shows any known issues with your config or driver, such as "
876 . "a non-accelerated display format. You can try to work around these issues "
877 . "by selecting a different video mode, changing the settings below or "
878 . "by installing the right driver for your graphics card.");
879
880 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
881 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
882 value => $CFG->{uitheme},
883 options => [
884 [wood => "Wood (the default)"],
885 [plain => "Plain (very)"],
886 [blue => "Blue (dark)"],
887 [metal => "Metal (light)"],
888 ],
889 tooltip => "Choose the User Interface theme that you like most :)",
890 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
891 );
892
769 my $vidmode_tooltip = 893 my $vidmode_tooltip =
770 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 894 "<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>."; 895 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
772 896
773 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 897 $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); 898 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
775 899
776 $hbox->add (my $mode_slider = new CFPlus::UI::Slider 900 $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], 901 force_w => $WIDTH * 0.1, expand => 1,
902 range => [ ($CFG->{sdl_mode}) x 3 ],
778 tooltip => $vidmode_tooltip); 903 tooltip => $vidmode_tooltip);
779 $hbox->add (my $mode_label = new CFPlus::UI::Label 904 $hbox->add (my $mode_label = new DC::UI::Label
780 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", 905 height => 0.8, template => "9999x9999@9+9",
781 can_events => 1, tooltip => $vidmode_tooltip); 906 can_events => 1, tooltip => $vidmode_tooltip);
782 907
783 $mode_slider->connect (changed => sub { 908 $MODE_SLIDER->connect (changed => sub {
784 my ($self, $value) = @_; 909 my ($self, $value) = @_;
785 910
786 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 911 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
787 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 912 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
788 }); 913 });
789 $mode_slider->emit (changed => $mode_slider->{range}[0]); 914 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
790 915
791 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 916 $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 917 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
793 state => $CFG->{fullscreen}, 918 state => $CFG->{fullscreen},
794 tooltip => "Bring the client into fullscreen mode.", 919 tooltip => "Bring the client into fullscreen mode.",
795 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 920 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
796 ); 921 );
797 922
798 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 923 $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 924 $table->add_at (1, $row++, new DC::UI::CheckBox
800 state => $CFG->{force_opengl11}, 925 state => $CFG->{force_opengl11},
801 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 926 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 " 927 . "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. " 928 . "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, " 929 . "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 " 930 . "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>", 931 . "<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 } 932 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
808 ); 933 );
809 934
810 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures"); 935 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
811 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 936 $table->add_at (1, $row++, new DC::UI::CheckBox
937 state => $CFG->{disable_alpha},
938 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
939 . "by disabling a number of textures and transparency effects. Normally, these "
940 . "effects do not cost a lot of resources, but some graphics cards might fall "
941 . "back to extremely slow rendering if this is enabled. If disabling this option "
942 . "noticably improves the framerate of the client please report this! "
943 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
944 on_changed => sub {
945 my ($self, $value) = @_;
946 $CFG->{disable_alpha} = $value;
947 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
948 0
949 }
950 );
951
952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
953 $table->add_at (1, $row++, new DC::UI::CheckBox
812 state => $CFG->{texture_compression}, 954 state => $CFG->{texture_compression},
813 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 955 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 " 956 . "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 " 957 . "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.", 958 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 959 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
818 ); 960 );
819 961
820 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 962 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
821 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 963 $table->add_at (1, $row++, new DC::UI::CheckBox
822 state => $CFG->{fast}, 964 state => $CFG->{fast},
823 tooltip => "Lower the visual quality considerably to speed up rendering.", 965 tooltip => "Lower the visual quality considerably to speed up rendering.",
824 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 966 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
825 ); 967 );
826 968
827 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
828 $table->add_at (1, $row++, new CFPlus::UI::Slider 970 $table->add_at (1, $row++, new DC::UI::Slider
829 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 971 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.", 972 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 }, 973 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
832 ); 974 );
833 975
834 $table->add_at (1, $row++, new CFPlus::UI::Button 976 $table->add_at (1, $row++, new DC::UI::Button
835 expand => 1, align => 0, text => "Apply", 977 expand => 1, text => "Apply",
836 tooltip => "Apply the video settings above.", 978 tooltip => "Apply the video settings above.",
837 on_activate => sub { 979 on_activate => sub {
838 video_shutdown (); 980 video_shutdown ();
839 video_init (); 981 video_init ();
982 0
840 0 983 }
841 } 984 );
985 }
986
987 {
988 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
989
990 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
991
992 my $row = 0;
993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
994 $table->add_at (1, $row++, new DC::UI::CheckBox
995 state => $CFG->{smooth_movement},
996 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
997 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
998 . "then disable this option. Changes take effect immdiately.",
999 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
842 ); 1000 );
843 1001
844 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
845 $table->add_at (1, $row++, new CFPlus::UI::Slider 1003 $table->add_at (1, $row++, new DC::UI::Slider
846 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1004 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
847 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1005 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
848 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1006 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
849 ); 1007 );
850 1008
851 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); 1009 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
852 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 1010 $table->add_at (1, $row++, new DC::UI::CheckBox
853 state => $CFG->{map_smoothing}, 1011 state => $CFG->{map_smoothing},
854 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1012 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. " 1013 . "This increases load on the graphics subsystem and works only with TRT servers. "
856 . "Changes take effect at next login only.", 1014 . "Changes take effect at next login only.",
857 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1015 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
858 ); 1016 );
859 1017
860 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 1018 $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 1019 $table->add_at (1, $row++, new DC::UI::CheckBox
862 state => $CFG->{fow_enable}, 1020 state => $CFG->{fow_enable},
863 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1021 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 } 1022 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
865 ); 1023 );
866 1024
867 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 1025 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
868 $table->add_at (1, $row++, new CFPlus::UI::Slider 1026 $table->add_at (1, $row++, new DC::UI::Slider
869 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1027 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.", 1028 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 } 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
872 ); 1030 );
873 1031
874 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 1032 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
875 $table->add_at (1, $row++, new CFPlus::UI::Slider 1033 $table->add_at (1, $row++, new DC::UI::Slider
876 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1034 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, " 1035 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.", 1036 . "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 }, 1037 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
880 ); 1038 );
881 1039
882 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 1040 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
883 $table->add_at (1, $row++, new CFPlus::UI::Slider 1041 $table->add_at (1, $row++, new DC::UI::Slider
884 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1042 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.", 1043 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
886 on_changed => sub { 1044 on_changed => sub {
887 $CFG->{gauge_fontsize} = $_[1]; 1045 $CFG->{gauge_fontsize} = $_[1];
888 &set_gauge_window_fontsize; 1046 &set_gauge_window_fontsize;
1047 0
889 0 1048 }
890 } 1049 );
891 );
892 1050
893 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
894 $table->add_at (1, $row++, new CFPlus::UI::Slider 1052 $table->add_at (1, $row++, new DC::UI::Slider
895 range => [$CFG->{gauge_size}, 0.2, 0.8], 1053 range => [$CFG->{gauge_size}, 0.2, 0.8],
896 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1054 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
897 on_changed => sub { 1055 on_changed => sub {
898 $CFG->{gauge_size} = $_[1]; 1056 $CFG->{gauge_size} = $_[1];
899 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1057 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1058 0
900 0 1059 }
901 } 1060 );
902 ); 1061 }
903 1062
904 $vbox 1063 $vbox
905} 1064}
906 1065
907our $AUDIO_HW_CHUNKSIZE; 1066our $AUDIO_HW_CHUNKSIZE;
908our $AUDIO_INFO; 1067our $AUDIO_INFO;
909 1068
910sub audio_tab_update { 1069sub audio_tab_update {
911 my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec; 1070 my ($freq, $format, $chans) = DC::Mix_QuerySpec;
912 1071
913 $AUDIO_HW_CHUNKSIZE->set_options ([ 1072 $AUDIO_HW_CHUNKSIZE->set_options ([
914 [0, "default", "Use System Default"], 1073 [0, "default", "Use System Default"],
915 map { 1074 map {
916 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050); 1075 my $ms = sprintf "%dms", 1000 * $_ / ($CFG->{audio_hw_frequency} || 22050);
… …
926 1085
927 $AUDIO_INFO->set_text ($text); 1086 $AUDIO_INFO->set_text ($text);
928} 1087}
929 1088
930sub audio_setup { 1089sub audio_setup {
931 my $vbox = new CFPlus::UI::VBox; 1090 my $vbox = new DC::UI::VBox;
932 1091
933 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]); 1092 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
934 1093
935 my $row = 0; 1094 my $row = 0;
936 1095
937 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 1096 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
938 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 1097 $table->add_at (1, $row++, new DC::UI::CheckBox
939 state => $CFG->{audio_enable}, 1098 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.", 1099 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 } 1100 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
942 ); 1101 );
943 1102
944 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects"); 1103 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
945 $table->add_at (1, $row, new CFPlus::UI::CheckBox 1104 $table->add_at (1, $row, new DC::UI::CheckBox
946 expand => 1, state => $CFG->{effects_enable}, 1105 expand => 1, state => $CFG->{effects_enable},
947 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 1106 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
948 on_changed => sub { 1107 on_changed => sub {
949 $CFG->{effects_enable} = $_[1]; 1108 $CFG->{effects_enable} = $_[1];
950 $CONN->update_fx_want if $CONN; 1109 $CONN->update_fx_want if $CONN;
951 1 1110 1
952 } 1111 }
953 ); 1112 );
954 $table->add_at (2, $row++, new CFPlus::UI::Slider 1113 $table->add_at (2, $row++, new DC::UI::Slider
955 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 1114 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 " 1115 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.", 1116 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
958 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 } 1117 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
959 ); 1118 );
960 1119
961 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 1120 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
962 $table->add_at (1, $row, new CFPlus::UI::CheckBox 1121 $table->add_at (1, $row, new DC::UI::CheckBox
963 expand => 1, state => $CFG->{bgm_enable}, 1122 expand => 1, state => $CFG->{bgm_enable},
964 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 1123 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
965 on_changed => sub { 1124 on_changed => sub {
966 $CFG->{bgm_enable} = $_[1]; 1125 $CFG->{bgm_enable} = $_[1];
967 $CONN->update_fx_want if $CONN; 1126 $CONN->update_fx_want if $CONN;
968 audio_music_push; 1127 audio_music_push;
969 1 1128 1
970 } 1129 }
971 ); 1130 );
972 $table->add_at (2, $row++, new CFPlus::UI::Slider 1131 $table->add_at (2, $row++, new DC::UI::Slider
973 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 1132 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
974 tooltip => "The volume of the background music. Changes are instant.", 1133 tooltip => "The volume of the background music. Changes are instant.",
975 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 1134 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
976 ); 1135 );
977 1136
978 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency"); 1137 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
979 $table->add_at (1, $row++, new CFPlus::UI::Selector 1138 $table->add_at (1, $row++, new DC::UI::Selector
980 c_colspan => 2, expand => 1, 1139 c_colspan => 2, expand => 1,
981 value => $CFG->{audio_hw_frequency}, 1140 value => $CFG->{audio_hw_frequency},
982 options => [ 1141 options => [
983 [ 0, "default" , "Use System Default"], 1142 [ 0, "default" , "Use System Default"],
984 [11025, "11 kHz" , "11kHz (low quality)"], 1143 [11025, "11 kHz" , "11kHz (low quality)"],
… …
992 audio_tab_update; 1151 audio_tab_update;
993 1 1152 1
994 } 1153 }
995 ); 1154 );
996 1155
997 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels"); 1156 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
998 $table->add_at (1, $row++, new CFPlus::UI::Selector 1157 $table->add_at (1, $row++, new DC::UI::Selector
999 c_colspan => 2, expand => 1, 1158 c_colspan => 2, expand => 1,
1000 value => $CFG->{audio_hw_channels}, 1159 value => $CFG->{audio_hw_channels},
1001 options => [ 1160 options => [
1002 [0, "default" , "Use System Default"], 1161 [0, "default" , "Use System Default"],
1003 [1, "Mono" , "Mono (single channel, low quality)"], 1162 [1, "Mono" , "Mono (single channel, low quality)"],
… …
1011 audio_tab_update; 1170 audio_tab_update;
1012 1 1171 1
1013 } 1172 }
1014 ); 1173 );
1015 1174
1016 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency"); 1175 $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 1176 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
1018 c_colspan => 2, expand => 1, 1177 c_colspan => 2, expand => 1,
1019 value => $CFG->{audio_hw_chunksize}, 1178 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 " 1179 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.", 1180 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1022 on_changed => sub { 1181 on_changed => sub {
… …
1025 1 1184 1
1026 } 1185 }
1027 ); 1186 );
1028 1187
1029 # should really be a slider 1188 # should really be a slider
1030 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices"); 1189 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
1031 $table->add_at (1, $row++, new CFPlus::UI::ValSlider 1190 $table->add_at (1, $row++, new DC::UI::ValSlider
1032 c_colspan => 2, expand => 1, 1191 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.", 1192 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], 1193 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1035 template => ">= 99", 1194 template => ">= 99",
1036 on_changed => sub { 1195 on_changed => sub {
… …
1040 if $value; 1199 if $value;
1041 1; 1200 1;
1042 } 1201 }
1043 ); 1202 );
1044 1203
1045 $table->add_at (1, $row++, new CFPlus::UI::Button 1204 $table->add_at (1, $row++, new DC::UI::Button
1046 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1205 c_colspan => 2, expand => 1, text => "Apply",
1047 tooltip => "Apply the audio settings", 1206 tooltip => "Apply the audio settings",
1048 on_activate => sub { 1207 on_activate => sub {
1049 audio_shutdown (); 1208 audio_shutdown ();
1050 audio_init (); 1209 audio_init ();
1051 0 1210 0
1052 } 1211 }
1053 ); 1212 );
1054 1213
1055 $vbox->add (new CFPlus::UI::FancyFrame 1214 $vbox->add (new DC::UI::FancyFrame
1056 expand => 1, 1215 expand => 1,
1057 label => "Audio Info", 1216 label => "Audio Info",
1058 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0), 1217 child => ($AUDIO_INFO = new DC::UI::Label ellipsise => 0),
1059 ); 1218 );
1060 1219
1061 audio_tab_update; 1220 audio_tab_update;
1062 1221
1063 $vbox 1222 $vbox
… …
1070} 1229}
1071 1230
1072sub make_gauge_window { 1231sub make_gauge_window {
1073 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1232 my $gh = int $HEIGHT * $CFG->{gauge_size};
1074 1233
1075 my $win = new CFPlus::UI::Frame ( 1234 my $win = new DC::UI::Frame (
1076 force_x => 0, 1235 force_x => 0,
1077 force_y => "max", 1236 force_y => "max",
1078 force_w => $WIDTH, 1237 force_w => $WIDTH,
1079 force_h => $gh, 1238 force_h => $gh,
1080 ); 1239 );
1081 1240
1082 $win->add (my $hbox = new CFPlus::UI::HBox 1241 $win->add (my $hbox = new DC::UI::HBox
1083 children => [ 1242 children => [
1084 (new CFPlus::UI::HBox expand => 1), 1243 (new DC::UI::HBox expand => 1),
1085 (new CFPlus::UI::VBox children => [ 1244 (new DC::UI::VBox children => [
1086 (new CFPlus::UI::Empty expand => 1), 1245 (new DC::UI::Empty expand => 1),
1087 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)), 1246 (new DC::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new DC::UI::Table)),
1088 ]), 1247 ]),
1089 (my $vbox = new CFPlus::UI::VBox), 1248 (my $vbox = new DC::UI::VBox),
1090 ], 1249 ],
1091 ); 1250 );
1092 1251
1093 $vbox->add (new CFPlus::UI::HBox 1252 $vbox->add (new DC::UI::HBox
1094 expand => 1, 1253 expand => 1,
1095 children => [ 1254 children => [
1096 (new CFPlus::UI::Empty expand => 1), 1255 (new DC::UI::Empty expand => 1),
1097 (my $hb = new CFPlus::UI::HBox), 1256 (my $hb = new DC::UI::HBox),
1098 ], 1257 ],
1099 ); 1258 );
1100 1259
1101 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1260 $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"); 1261 $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"); 1262 $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"); 1263 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1105 1264
1106 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1265 $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); 1266 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1108 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress); 1267 $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"); 1268 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1110 1269
1111 $GAUGES = { 1270 $GAUGES = {
1112 exp => $exp, prg => $prg, sklprg => $sklprg, 1271 exp => $exp, prg => $prg, sklprg => $sklprg,
1113 win => $win, range => $rng, 1272 win => $win, range => $rng,
1114 hp => $hg, mana => $mg, grace => $gg, food => $fg, 1273 hp => $hg, mana => $mg, grace => $gg, food => $fg,
… …
1118 1277
1119 $win 1278 $win
1120} 1279}
1121 1280
1122sub debug_setup { 1281sub debug_setup {
1123 my $table = new CFPlus::UI::Table; 1282 my $table = new DC::UI::Table;
1124 1283
1125 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1284 $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 }); 1285 $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"); 1286 $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 }); 1287 $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"); 1288 $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 }); 1289 $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"); 1290 $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 }); 1291 $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() } ); 1292 $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
1134 1293
1135 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 1294 $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
1136 1295
1137 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0); 1296 $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); 1297 $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); 1298 $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); 1299 $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); 1300 $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"); 1301 $t->add_at (1,1, new DC::UI::Label text => "e");
1143 1302
1144 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas); 1303 $table->add_at (7, 6, my $c = new DC::UI::Canvas);
1145 1304
1146 $c->add_items ({ 1305 $c->add_items ({
1147 type => "line_loop", 1306 type => "line_loop",
1148 color => [0, 1, 0], 1307 color => [0, 1, 0],
1149 width => 9, 1308 width => 9,
… …
1169 1328
1170 $table 1329 $table
1171} 1330}
1172 1331
1173sub stats_window { 1332sub stats_window {
1174 my $r = new CFPlus::UI::ScrolledWindow ( 1333 my $r = new DC::UI::ScrolledWindow (
1175 expand => 1, 1334 expand => 1,
1176 scroll_y => 1 1335 scroll_y => 1
1177 ); 1336 );
1178 $r->add (my $vb = new CFPlus::UI::VBox); 1337 $r->add (my $vb = new DC::UI::VBox);
1179 1338
1180 $vb->add (new CFPlus::UI::FancyFrame 1339 $vb->add (new DC::UI::FancyFrame
1181 label => "Player", 1340 label => "Player",
1182 child => (my $pi = new CFPlus::UI::VBox), 1341 child => (my $pi = new DC::UI::VBox),
1183 ); 1342 );
1184 1343
1185 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1344 $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
1186 can_hover => 1, can_events => 1, 1345 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."); 1346 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, 1347 $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
1189 can_hover => 1, can_events => 1, 1348 can_hover => 1, can_events => 1,
1190 tooltip => "The map you are currently on (if supported by the server)."); 1349 tooltip => "The map you are currently on (if supported by the server).");
1191 1350
1192 $pi->add (my $hb0 = new CFPlus::UI::HBox); 1351 $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, 1352 $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
1194 can_hover => 1, can_events => 1, 1353 can_hover => 1, can_events => 1,
1195 tooltip => "The weight of the player including all inventory items."); 1354 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, 1355 $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
1197 can_hover => 1, can_events => 1, 1356 can_hover => 1, can_events => 1,
1198 tooltip => "The weight limit: you cannot carry more than this."); 1357 tooltip => "The weight limit: you cannot carry more than this.");
1199 1358
1200 $vb->add (new CFPlus::UI::FancyFrame 1359 $vb->add (new DC::UI::FancyFrame
1201 label => "Primary/Secondary Statistics", 1360 label => "Primary/Secondary Statistics",
1202 child => (my $hb = new CFPlus::UI::HBox expand => 1), 1361 child => (my $hb = new DC::UI::HBox expand => 1),
1203 ); 1362 );
1204 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 1363 $hb->add (my $tbl = new DC::UI::Table expand => 1);
1205 1364
1206 my $color2 = [1, 1, 0]; 1365 my $color2 = [1, 1, 0];
1207 1366
1208 for ( 1367 for (
1209 [0, 0, st_str => "Str", 30], 1368 [0, 0, st_str => "Str", 30],
… …
1221 [2, 4, st_spd => "Spd", 10.54], 1380 [2, 4, st_spd => "Spd", 10.54],
1222 [2, 5, st_wspd => "WSp", 10.54], 1381 [2, 5, st_wspd => "WSp", 10.54],
1223 ) { 1382 ) {
1224 my ($col, $row, $id, $label, $template) = @$_; 1383 my ($col, $row, $id, $label, $template) = @$_;
1225 1384
1226 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1385 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
1227 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1386 font => $FONT_FIXED, can_hover => 1, can_events => 1,
1228 align => +1, template => $template, tooltip => "#stat_$label"); 1387 align => 1, template => $template, tooltip => "#stat_$label");
1229 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1388 $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, 1389 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
1231 align => -1, text => $label, tooltip => "#stat_$label"); 1390 align => 0, text => $label, tooltip => "#stat_$label");
1232 } 1391 }
1233 1392
1234 $vb->add (new CFPlus::UI::FancyFrame 1393 $vb->add (new DC::UI::FancyFrame
1235 label => "Resistancies", 1394 label => "Resistancies",
1236 child => (my $tbl2 = new CFPlus::UI::Table expand => 1), 1395 child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
1237 ); 1396 );
1238 1397
1239 my $row = 0; 1398 my $row = 0;
1240 my $col = 0; 1399 my $col = 0;
1241 1400
… …
1280 1439
1281 for (qw/slow holyw conf fire depl magic 1440 for (qw/slow holyw conf fire depl magic
1282 drain acid pois para deat phys 1441 drain acid pois para deat phys
1283 blind fear tund elec cold ghit/) 1442 blind fear tund elec cold ghit/)
1284 { 1443 {
1285 $tbl2->add_at ($col, $row, 1444 $tbl2->add_at ($col + 2, $row,
1286 $STATWIDS->{"res_$_"} = 1445 $STATWIDS->{"res_$_"} =
1287 new CFPlus::UI::Label 1446 new DC::UI::Label
1288 font => $FONT_FIXED, 1447 font => $FONT_FIXED,
1289 template => "-100%", 1448 template => "-100%",
1290 align => +1, 1449 align => 1,
1291 valign => 0,
1292 can_events => 1, 1450 can_events => 1,
1293 can_hover => 1, 1451 can_hover => 1,
1294 tooltip => $resist_names{$_}->[1], 1452 tooltip => $resist_names{$_}->[1],
1295 ); 1453 );
1296 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image 1454 $tbl2->add_at ($col + 1, $row, new DC::UI::Image
1297 font => $FONT_FIXED, 1455 font => $FONT_FIXED,
1298 can_hover => 1, 1456 can_hover => 1,
1299 can_events => 1, 1457 can_events => 1,
1300 path => "ui/resist/resist_$_.png", 1458 path => "ui/resist/resist_$_.png",
1301 tooltip => $resist_names{$_}->[1], 1459 tooltip => $resist_names{$_}->[1],
1302 ); 1460 );
1303 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label 1461 $tbl2->add_at ($col + 0, $row, new DC::UI::Label
1304 text => $resist_names{$_}->[0], 1462 text => $resist_names{$_}->[0],
1305 font => $FONT_FIXED, 1463 font => $FONT_FIXED,
1464 align => 1,
1306 can_hover => 1, 1465 can_hover => 1,
1307 can_events => 1, 1466 can_events => 1,
1308 tooltip => $resist_names{$_}->[1], 1467 tooltip => $resist_names{$_}->[1],
1309 ); 1468 );
1310 1469
1311 $row++; 1470 $row++;
1312 if ($row % 6 == 0) { 1471 if ($row % 6 == 0) {
1313 $col += 3; 1472 $col += 4;
1314 $row = 0; 1473 $row = 0;
1315 } 1474 }
1316 } 1475 }
1317 1476
1318 #update_stats_window ({}); 1477 #update_stats_window ({});
1319 1478
1320 $r 1479 $r
1321} 1480}
1322 1481
1323sub skill_window { 1482sub skill_window {
1324 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1483 my $sw = new DC::UI::ScrolledWindow (expand => 1);
1325 1484
1326 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]); 1485 $sw->add ($STATWIDS->{skill_tbl} = new DC::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1327 1486
1328 $sw 1487 $sw
1329} 1488}
1330 1489
1331sub formsep($) { 1490sub formsep($) {
… …
1343 return if $METASERVER_ATIME > time; 1502 return if $METASERVER_ATIME > time;
1344 $METASERVER_ATIME = time + 60; 1503 $METASERVER_ATIME = time + 60;
1345 1504
1346 my $table = $METASERVER->{table}; 1505 my $table = $METASERVER->{table};
1347 $table->clear; 1506 $table->clear;
1348 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1507 $table->add_at (0, 0, my $label = new DC::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
1349 1508
1350 my $ok = 0; 1509 my $ok = 0;
1351 1510
1352 CFPlus::background { 1511 DC::background {
1353 my $ua = CFPlus::lwp_useragent; 1512 my $ua = DC::lwp_useragent;
1354 1513
1355 CFPlus::background_msg CFPlus::decode_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content; 1514 DC::background_msg DC::decode_json +(DC::lwp_check $ua->get ($META_SERVER))->decoded_content;
1356 } sub { 1515 } sub {
1357 my ($msg) = @_; 1516 my ($msg) = @_;
1358 if ($msg) { 1517 if ($msg) {
1359 $table->clear; 1518 $table->clear;
1360 1519
… …
1363 "The hostname of the server.", 1522 "The hostname of the server.",
1364 "The time this server has been running without being restarted.", 1523 "The time this server has been running without being restarted.",
1365 "Short information about this server provided by its admins.", 1524 "Short information about this server provided by its admins.",
1366 ); 1525 );
1367 my @col = qw(#Users Host Uptime Version Description); 1526 my @col = qw(#Users Host Uptime Version Description);
1368 $table->add_at ($_, 0, new CFPlus::UI::Label 1527 $table->add_at ($_, 0, new DC::UI::Label
1369 can_hover => 1, can_events => 1, 1528 can_hover => 1, can_events => 1, fg => [1, 1, 0],
1370 align => 0, fg => [1, 1, 0],
1371 text => $col[$_], tooltip => $tip[$_]) 1529 text => $col[$_], tooltip => $tip[$_])
1372 for 0 .. $#col; 1530 for 0 .. $#col;
1373 1531
1374 my @align = qw(1 0 1 1 -1); 1532 my @align = qw(1 0.5 1 1 0);
1375 1533
1376 my $y = 0; 1534 my $y = 0;
1377 for my $m (@{ $msg->{servers} }) { 1535 for my $m (@{ $msg->{servers} }) {
1378 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = 1536 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1379 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; 1537 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
… …
1395 1553
1396 $m = [$users, $host, $uptime, $version, $desc]; 1554 $m = [$users, $host, $uptime, $version, $desc];
1397 1555
1398 $y++; 1556 $y++;
1399 1557
1400 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1558 $table->add_at (scalar @$m, $y, new DC::UI::VBox children => [
1401 (new CFPlus::UI::Button 1559 (new DC::UI::Button
1402 text => "Use", 1560 text => "Use",
1403 tooltip => "Put this server into the <b>Host:Port</b> field", 1561 tooltip => "Put this server into the <b>Host:Port</b> field",
1404 on_activate => sub { 1562 on_activate => sub {
1405 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1563 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
1406 $METASERVER->hide; 1564 $METASERVER->hide;
1407 0 1565 0
1408 }, 1566 },
1409 ), 1567 ),
1410 (new CFPlus::UI::Empty expand => 1), 1568 (new DC::UI::Empty expand => 1),
1411 ]); 1569 ]);
1412 1570
1413 $table->add_at ($_, $y, new CFPlus::UI::Label 1571 $table->add_at ($_, $y, new DC::UI::Label
1414 max_w => $::WIDTH * 0.4, 1572 max_w => $::WIDTH * 0.4,
1415 ellipsise => 0, 1573 ellipsise => 0,
1416 align => $align[$_], 1574 align => $align[$_],
1417 text => $m->[$_], 1575 text => $m->[$_],
1418 tooltip => $tip[$_], 1576 tooltip => $tip[$_],
… …
1428 }; 1586 };
1429 1587
1430} 1588}
1431 1589
1432sub metaserver_dialog { 1590sub metaserver_dialog {
1433 my $vbox = new CFPlus::UI::VBox; 1591 my $vbox = new DC::UI::VBox;
1434 my $table = new CFPlus::UI::Table; 1592 my $table = new DC::UI::Table;
1435 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1593 $vbox->add (new DC::UI::ScrolledWindow expand => 1, child => $table);
1436 1594
1437 my $dialog = new CFPlus::UI::Toplevel 1595 my $dialog = new DC::UI::Toplevel
1438 title => "Server List", 1596 title => "Server List",
1439 name => 'metaserver_dialog', 1597 name => 'metaserver_dialog',
1440 x => 'center', 1598 x => 'center',
1441 y => 'center', 1599 y => 'center',
1442 z => 3, 1600 z => 3,
… …
1453 1611
1454 $dialog 1612 $dialog
1455} 1613}
1456 1614
1457sub login_setup { 1615sub login_setup {
1458 my $vbox = new CFPlus::UI::VBox; 1616 my $vbox = new DC::UI::VBox;
1459 1617
1460 $vbox->add (new CFPlus::UI::FancyFrame 1618 $vbox->add (new DC::UI::FancyFrame
1461 label => "Login Settings", 1619 label => "Login Settings",
1462 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1620 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1463 ); 1621 );
1464 1622
1465 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1623 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1466 $table->add_at (1, 4, new CFPlus::UI::Entry 1624 $table->add_at (1, 4, new DC::UI::Entry
1467 text => $CFG->{profile}{default}{user}, 1625 text => $CFG->{profile}{default}{user},
1468 tooltip => "The name of your character on the server.", 1626 tooltip => "The name of your character on the server.",
1469 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1627 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1470 ); 1628 );
1471 1629
1472 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1630 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1473 $table->add_at (1, 5, new CFPlus::UI::Entry 1631 $table->add_at (1, 5, new DC::UI::Entry
1474 text => $CFG->{profile}{default}{password}, 1632 text => $CFG->{profile}{default}{password},
1475 hidden => 1, 1633 hidden => 1,
1476 tooltip => "The password for your character.", 1634 tooltip => "The password for your character.",
1477 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1635 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1478 ); 1636 );
1479 1637
1480 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1638 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1481 expand => 1, 1639 expand => 1,
1482 align => 0,
1483 text => "Login / Register", 1640 text => "Login / Register",
1484 tooltip => "This button will either login to the account configured above or register a new account.", 1641 tooltip => "This button will either login to the account configured above or register a new account.",
1485 on_activate => sub { 1642 on_activate => sub {
1486 $CONN ? stop_game 1643 $CONN ? stop_game
1487 : start_game; 1644 : start_game;
1488 1 1645 1
1489 }, 1646 },
1490 ); 1647 );
1491 1648
1492 $vbox->add (new CFPlus::UI::FancyFrame 1649 $vbox->add (new DC::UI::FancyFrame
1493 label => "Registering", 1650 label => "How to Play",
1494 min_h => 200, 1651 min_h => 240,
1495 child => (new CFPlus::UI::Label valign => -1, ellipsise => 0, 1652 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1496 markup => 1653 markup =>
1654 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1655 . "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 " 1656 . "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.", 1657 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1499 ), 1658 ),
1500 ); 1659 );
1501 1660
1502 $vbox 1661 $vbox
1503} 1662}
1504 1663
1505sub server_setup { 1664sub server_setup {
1506 my $vbox = new CFPlus::UI::VBox; 1665 my $vbox = new DC::UI::VBox;
1507 1666
1508 $vbox->add (new CFPlus::UI::FancyFrame 1667 $vbox->add (new DC::UI::FancyFrame
1509 label => "Connection Settings", 1668 label => "Connection Settings",
1510 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1669 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1511 ); 1670 );
1512 1671
1513 my $row = 0; 1672 my $row = 0;
1514 1673
1515 $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1674 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
1516 { 1675 {
1517 $table->add_at (1, $row, my $vbox = new CFPlus::UI::VBox); 1676 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1518 1677
1519 $vbox->add ( 1678 $vbox->add (
1520 $HOST_ENTRY = new CFPlus::UI::Entry 1679 $HOST_ENTRY = new DC::UI::Entry
1521 expand => 1, 1680 expand => 1,
1522 text => $CFG->{profile}{default}{host}, 1681 text => $CFG->{profile}{default}{host},
1523 tooltip => "The hostname or ip address of the Deliantra server to connect to", 1682 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1524 on_changed => sub { 1683 on_changed => sub {
1525 my ($self, $value) = @_; 1684 my ($self, $value) = @_;
1526 $CFG->{profile}{default}{host} = $value; 1685 $CFG->{profile}{default}{host} = $value;
1527 1 1686 1
1528 } 1687 }
1529 ); 1688 );
1530 1689
1531 if (0) { #d# disabled 1690 if (0) { #d# disabled
1532 $vbox->add (new CFPlus::UI::Button 1691 $vbox->add (new DC::UI::Button
1533 expand => 1, 1692 expand => 1,
1534 text => "Server List", 1693 text => "Server List",
1535 other => $METASERVER, 1694 other => $METASERVER,
1536 tooltip => "Show a list of available crossfire servers", 1695 tooltip => "Show a list of available Deliantra servers",
1537 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1696 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1538 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 }, 1697 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1539 ); 1698 );
1540 }#d# 1699 }#d#
1541 } 1700 }
1542 1701
1543 $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1702 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
1544 $table->add_at (1, $row, new CFPlus::UI::Slider 1703 $table->add_at (1, $row, new DC::UI::Slider
1545 force_w => 100, 1704 force_w => 100,
1546 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1705 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1547 tooltip => "This is the size of the portion of the map update the server sends you. " 1706 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, " 1707 . "If you set this to a high value you will be able to see further, "
1549 . "but you also increase bandwidth requirements and latency. " 1708 . "but you also increase bandwidth requirements and latency. "
1550 . "This option is only used once at log-in.", 1709 . "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 }, 1710 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1552 ); 1711 );
1553 1712
1554 $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1713 $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
1555 $table->add_at (1, $row, new CFPlus::UI::Entry 1714 $table->add_at (1, $row, new DC::UI::Entry
1556 text => $CFG->{output_rate}, 1715 text => $CFG->{output_rate},
1557 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed " 1716 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1558 . "when sending data. When 0 or unset, the server " 1717 . "when sending data. When 0 or unset, the server "
1559 . "default will be used, which is usually around 100kb/s. Most servers will " 1718 . "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.", 1719 . "dynamically find an optimal rate, so adjust this only when necessary.",
1561 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 }, 1720 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1562 ); 1721 );
1563 1722
1564 $vbox->add (new CFPlus::UI::FancyFrame 1723 $vbox->add (new DC::UI::FancyFrame
1565 label => "Server Info", 1724 label => "Server Info",
1566 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1725 child => ($SERVER_INFO = new DC::UI::Label ellipsise => 0),
1567 ); 1726 );
1568 1727
1569 $vbox 1728 $vbox
1570} 1729}
1571 1730
1572sub client_setup { 1731sub client_setup {
1573 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1732 my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
1574 1733
1575 my $row = 0; 1734 my $row = 0;
1576 1735
1577 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1736 $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 1737 $table->add_at (1, $row++, new DC::UI::CheckBox
1579 state => $CFG->{show_tips}, 1738 state => $CFG->{show_tips},
1580 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1739 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1581 on_changed => sub { 1740 on_changed => sub {
1582 my ($self, $value) = @_; 1741 my ($self, $value) = @_;
1583 $CFG->{show_tips} = $value; 1742 $CFG->{show_tips} = $value;
1584 0 1743 0
1585 } 1744 }
1586 ); 1745 );
1587 1746
1588 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1747 $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 1748 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1590 text => $CFG->{logview_max_par}, 1749 text => $CFG->{logview_max_par},
1591 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1750 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 " 1751 . "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.", 1752 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1594 on_changed => sub { 1753 on_changed => sub {
1595 my ($self, $value) = @_; 1754 my ($self, $value) = @_;
1596 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 1755 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1597 0 1756 0
1598 }, 1757 },
1599 ); 1758 );
1600 1759
1601 $table 1760 $table
1602} 1761}
1603 1762
1604sub autopickup_setup { 1763sub autopickup_setup {
1605 my $r = new CFPlus::UI::ScrolledWindow ( 1764 my $r = new DC::UI::ScrolledWindow (
1606 expand => 1, 1765 expand => 1,
1607 scroll_y => 1 1766 scroll_y => 1
1608 ); 1767 );
1609 $r->add (my $table = new CFPlus::UI::Table 1768 $r->add (my $table = new DC::UI::Table
1610 row_expand => [0], 1769 row_expand => [0],
1611 col_expand => [0, 1, 0, 1], 1770 col_expand => [0, 1, 0, 1],
1612 ); 1771 );
1613 1772
1614 for ( 1773 for (
… …
1648 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1807 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1649 ["Ignore cursed" => PICKUP_NOT_CURSED], 1808 ["Ignore cursed" => PICKUP_NOT_CURSED],
1650 ["Jewelery" => PICKUP_JEWELS], 1809 ["Jewelery" => PICKUP_JEWELS],
1651 ["Flesh" => PICKUP_FLESH], 1810 ["Flesh" => PICKUP_FLESH],
1652 ], 1811 ],
1653 ["Weight/Value ratio", 2, 17] 1812 ["Value/Weight ratio", 2, 17]
1654 ) 1813 )
1655 { 1814 {
1656 my ($title, $x, $y, @bits) = @$_; 1815 my ($title, $x, $y, @bits) = @$_;
1657 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1816 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1658 1817
1659 for (@bits) { 1818 for (@bits) {
1660 ++$y; 1819 ++$y;
1661 1820
1662 my $mask = $_->[1]; 1821 my $mask = $_->[1];
1663 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1822 $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 1823 $table->add_at ($x+1, $y, my $checkbox = new DC::UI::CheckBox
1665 state => $::CFG->{pickup} & $mask, 1824 state => $::CFG->{pickup} & $mask,
1666 on_changed => sub { 1825 on_changed => sub {
1667 my ($box, $value) = @_; 1826 my ($box, $value) = @_;
1668 1827
1669 if ($value) { 1828 if ($value) {
… …
1680 1839
1681 ${$_->[2]} = $checkbox if $_->[2]; 1840 ${$_->[2]} = $checkbox if $_->[2];
1682 } 1841 }
1683 } 1842 }
1684 1843
1685 $table->add_at (2, 18, new CFPlus::UI::ValSlider 1844 $table->add_at (2, 18, new DC::UI::ValSlider
1686 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1845 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1687 template => ">= 99", 1846 template => ">= 99",
1847 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] }, 1848 to_value => sub { ">= " . 5 * $_[0] },
1689 on_changed => sub { 1849 on_changed => sub {
1690 my ($slider, $value) = @_; 1850 my ($slider, $value) = @_;
1691 1851
1692 $::CFG->{pickup} &= ~0xF; 1852 $::CFG->{pickup} &= ~0xF;
1693 $::CFG->{pickup} |= int $value 1853 $::CFG->{pickup} |= int $value
1694 if $value; 1854 if $value;
1695 1; 1855 1;
1696 }); 1856 });
1697 1857
1698 $table->add_at (3, 18, new CFPlus::UI::Button 1858 $table->add_at (3, 18, new DC::UI::Button
1699 text => "set", 1859 text => "set",
1700 on_activate => sub { 1860 on_activate => sub {
1701 $::CONN->send_command ("pickup $::CFG->{pickup}") 1861 $::CONN->send_command ("pickup $::CFG->{pickup}")
1702 if defined $::CONN; 1862 if defined $::CONN;
1703 0 1863 0
… …
1705 1865
1706 $r 1866 $r
1707} 1867}
1708 1868
1709my %SORT_ORDER = ( 1869my %SORT_ORDER = (
1710 type => undef, 1870 type => sub {
1871 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1872 },
1711 mtime => sub { 1873 mtime => sub {
1712 my $NOW = time; 1874 my $NOW = time;
1713 sort { 1875 sort {
1714 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1876 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; 1877 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
1724 or $a->{type} <=> $b->{type} 1886 or $a->{type} <=> $b->{type}
1725 } @_ }, 1887 } @_ },
1726); 1888);
1727 1889
1728sub inventory_widget { 1890sub inventory_widget {
1729 my $hb = new CFPlus::UI::HBox homogeneous => 1; 1891 my $hb = new DC::UI::HBox homogeneous => 1;
1730 1892
1731 $hb->add (my $vb1 = new CFPlus::UI::VBox); 1893 $hb->add (my $vb1 = new DC::UI::VBox);
1732 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player"); 1894 $vb1->add (new DC::UI::Label text => "Player");
1733 1895
1734 $vb1->add (my $hb1 = new CFPlus::UI::HBox); 1896 $vb1->add (my $hb1 = new DC::UI::HBox);
1735 1897
1736 use sort 'stable'; 1898 use sort 'stable';
1737 1899
1738 $hb1->add (new CFPlus::UI::Selector 1900 $hb1->add (new DC::UI::Selector
1739 value => $::CFG->{inv_sort}, 1901 value => $::CFG->{inv_sort},
1740 options => [ 1902 options => [
1741 [type => "Type/Name"], 1903 [type => "Type/Name"],
1742 [mtime => "Recent/Normal/Locked"], 1904 [mtime => "Recent/Normal/Locked"],
1743 [weight => "Weight/Type"], 1905 [weight => "Weight/Type"],
… …
1745 on_changed => sub { 1907 on_changed => sub {
1746 $::CFG->{inv_sort} = $_[1]; 1908 $::CFG->{inv_sort} = $_[1];
1747 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1909 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1748 }, 1910 },
1749 ); 1911 );
1750 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1); 1912 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1751 #TODO# update to weigh/maxweight 1913 #TODO# update to weight/maxweight
1752 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1914 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1753 1915
1754 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1916 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1755 $sw1->add ($INV = new CFPlus::UI::Inventory); 1917 $sw1->add ($INV = new DC::UI::Inventory);
1756 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1918 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1757 1919
1758 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1920 $hb->add (my $vb2 = new DC::UI::VBox);
1759 1921
1760 $vb2->add ($INVR_HB = new CFPlus::UI::HBox); 1922 $vb2->add ($INVR_HB = new DC::UI::HBox);
1761 1923
1762 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1924 $vb2->add (my $sw2 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1763 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1925 $sw2->add ($INVR = new DC::UI::Inventory);
1764 1926
1765 # XXX: Call after $INVR = ... because set_opencont sets the items 1927 # XXX: Call after $INVR = ... because set_opencont sets the items
1766 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1928 DC::Protocol::set_opencont ($::CONN, 0, "Floor");
1767 1929
1768 $hb 1930 $hb
1769} 1931}
1770 1932
1771sub media_window { 1933sub media_window {
1772 my $vb = new CFPlus::UI::VBox; 1934 my $vb = new DC::UI::VBox;
1773 1935
1774 $vb->add (new CFPlus::UI::FancyFrame 1936 $vb->add (new DC::UI::FancyFrame
1775 label => "Currently playing music", 1937 label => "Currently playing music",
1776 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0, 1938 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), 1939 child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
1778 ); 1940 );
1779 1941
1780 $vb->add (new CFPlus::UI::FancyFrame 1942 $vb->add (new DC::UI::FancyFrame
1781 label => "Other media used in this session", 1943 label => "Other media used in this session",
1782 expand => 1, 1944 expand => 1,
1783 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller 1945 child => ($LICENSE_WIDGET = new DC::UI::TextScroller
1784 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4), 1946 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1785 ); 1947 );
1786 1948
1787 $vb 1949 $vb
1788} 1950}
… …
1797 or return; 1959 or return;
1798 1960
1799 $LICENSE_WIDGET->add_paragraph ({ 1961 $LICENSE_WIDGET->add_paragraph ({
1800 fg => [1, 1, 1, 1], 1962 fg => [1, 1, 1, 1],
1801 markup => "<small>" 1963 markup => "<small>"
1802 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n" 1964 . "<b>Name:</b> " . (DC::asxml $meta->{name}) . "\n"
1803 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n" 1965 . "<b>Author:</b> " . (DC::asxml $meta->{author}) . "\n"
1804 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n" 1966 . "<b>Source:</b> " . (DC::asxml $meta->{source}) . "\n"
1805 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n" 1967 . "<b>License:</b> " . (DC::asxml $meta->{license}) . "\n"
1806 . "</small>", 1968 . "</small>",
1807 }); 1969 });
1808 $LICENSE_WIDGET->scroll_to_bottom; 1970 $LICENSE_WIDGET->scroll_to_bottom;
1809} 1971}
1810 1972
… …
1818 $PL_WINDOW->show; 1980 $PL_WINDOW->show;
1819 } 1981 }
1820} 1982}
1821 1983
1822sub player_window { 1984sub player_window {
1823 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel 1985 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1824 x => "center", 1986 x => "center",
1825 y => "center", 1987 y => "center",
1826 force_w => $WIDTH * 9/10, 1988 force_w => $WIDTH * 9/10,
1827 force_h => $HEIGHT * 9/10, 1989 force_h => $HEIGHT * 9/10,
1828 title => "Player", 1990 title => "Player",
… …
1830 has_close_button => 1 1992 has_close_button => 1
1831 ; 1993 ;
1832 1994
1833 my $ntb = 1995 my $ntb =
1834 $PL_NOTEBOOK = 1996 $PL_NOTEBOOK =
1835 new CFPlus::UI::Notebook expand => 1; 1997 new DC::UI::Notebook expand => 1;
1836 1998
1837 $ntb->add_tab ( 1999 $ntb->add_tab (
1838 "Statistics (F2)" => $STATS_PAGE = stats_window, 2000 "Statistics (F2)" => $STATS_PAGE = stats_window,
1839 "Shows statistics, where all your Stats and Resistances are shown." 2001 "Shows statistics, where all your Stats and Resistances are shown."
1840 ); 2002 );
1841 $ntb->add_tab ( 2003 $ntb->add_tab (
1842 "Skills (F3)" => $SKILL_PAGE = skill_window, 2004 "Skills (F3)" => $SKILL_PAGE = skill_window,
1843 "Shows all your Skills." 2005 "Shows all your Skills."
1844 ); 2006 );
1845 2007
1846 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 2008 my $spellsw = $SPELL_PAGE = new DC::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1847 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 2009 $spellsw->add ($SPELL_LIST = new DC::UI::SpellList);
1848 $ntb->add_tab ( 2010 $ntb->add_tab (
1849 "Spellbook (F4)" => $spellsw, 2011 "Spellbook (F4)" => $spellsw,
1850 "Displays all spells you have and lets you edit keyboard shortcuts for them." 2012 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1851 ); 2013 );
1852 $ntb->add_tab ( 2014 $ntb->add_tab (
… …
1865 $plwin->add ($ntb); 2027 $plwin->add ($ntb);
1866 $plwin 2028 $plwin
1867} 2029}
1868 2030
1869sub keyboard_setup { 2031sub keyboard_setup {
1870 CFPlus::Macro::keyboard_setup 2032 DC::Macro::keyboard_setup
1871} 2033}
1872 2034
1873sub help_window { 2035sub help_window {
1874 my $win = new CFPlus::UI::Toplevel 2036 my $win = new DC::UI::Toplevel
1875 x => 'center', 2037 x => 'center',
1876 y => 'center', 2038 y => 'center',
1877 z => 4, 2039 z => 4,
1878 name => 'doc_browser', 2040 name => 'doc_browser',
1879 force_w => int $WIDTH * 7/8, 2041 force_w => int $WIDTH * 7/8,
1880 force_h => int $HEIGHT * 7/8, 2042 force_h => int $HEIGHT * 7/8,
1881 title => "Help Browser", 2043 title => "Help Browser",
1882 has_close_button => 1; 2044 has_close_button => 1;
1883 2045
1884 $win->add (my $vbox = new CFPlus::UI::VBox); 2046 $win->add (my $vbox = new DC::UI::VBox);
1885 2047
1886 $vbox->add (new CFPlus::UI::FancyFrame 2048 $vbox->add (new DC::UI::FancyFrame
1887 label => "Navigation", 2049 label => "Navigation",
1888 child => (my $buttons = new CFPlus::UI::HBox), 2050 child => (my $buttons = new DC::UI::HBox),
1889 ); 2051 );
1890 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 2052 $vbox->add (my $viewer = new DC::UI::TextScroller
1891 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2053 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1892 2054
1893 my @history; 2055 my @history;
1894 my @future; 2056 my @future;
1895 my $curnode; 2057 my $curnode;
… …
1897 my $load_node; $load_node = sub { 2059 my $load_node; $load_node = sub {
1898 my ($node, $para) = @_; 2060 my ($node, $para) = @_;
1899 2061
1900 $buttons->clear; 2062 $buttons->clear;
1901 2063
1902 $buttons->add (new CFPlus::UI::Button 2064 $buttons->add (new DC::UI::Button
1903 text => "⇤", 2065 text => "⇤",
1904 tooltip => "back to the starting page", 2066 tooltip => "back to the starting page",
1905 on_activate => sub { 2067 on_activate => sub {
1906 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 2068 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1907 unshift @future, @history; 2069 unshift @future, @history;
… …
1909 $load_node->(@{shift @future}); 2071 $load_node->(@{shift @future});
1910 }, 2072 },
1911 ); 2073 );
1912 2074
1913 if (@history) { 2075 if (@history) {
1914 $buttons->add (new CFPlus::UI::Button 2076 $buttons->add (new DC::UI::Button
1915 text => "⋘", 2077 text => "⋘",
1916 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>", 2078 tooltip => "back to <i>" . (DC::asxml DC::Pod::full_path $history[-1][0]) . "</i>",
1917 on_activate => sub { 2079 on_activate => sub {
1918 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 2080 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1919 $load_node->(@{pop @history}); 2081 $load_node->(@{pop @history});
1920 }, 2082 },
1921 ); 2083 );
1922 } 2084 }
1923 2085
1924 if (@future) { 2086 if (@future) {
1925 $buttons->add (new CFPlus::UI::Button 2087 $buttons->add (new DC::UI::Button
1926 text => "⋙", 2088 text => "⋙",
1927 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>", 2089 tooltip => "forward to <i>" . (DC::asxml DC::Pod::full_path $future[0][0]) . "</i>",
1928 on_activate => sub { 2090 on_activate => sub {
1929 push @history, [$curnode, $viewer->current_paragraph]; 2091 push @history, [$curnode, $viewer->current_paragraph];
1930 $load_node->(@{shift @future}); 2092 $load_node->(@{shift @future});
1931 }, 2093 },
1932 ); 2094 );
1933 } 2095 }
1934 2096
1935 $buttons->add (new CFPlus::UI::Label text => " "); 2097 $buttons->add (new DC::UI::Label text => " ");
1936 2098
1937 my @path = CFPlus::Pod::full_path_of $node; 2099 my @path = DC::Pod::full_path_of $node;
1938 pop @path; # drop current node 2100 pop @path; # drop current node
1939 2101
1940 for my $node (@path) { 2102 for my $node (@path) {
1941 $buttons->add (new CFPlus::UI::Button 2103 $buttons->add (new DC::UI::Button
1942 text => $node->{kw}[0], 2104 text => $node->[DC::Pod::N_KW][0],
1943 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>", 2105 tooltip => "go to <i>" . (DC::asxml DC::Pod::full_path $node) . "</i>",
1944 on_activate => sub { 2106 on_activate => sub {
1945 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2107 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1946 $load_node->($node); 2108 $load_node->($node);
1947 }, 2109 },
1948 ); 2110 );
1949 $buttons->add (new CFPlus::UI::Label text => "/"); 2111 $buttons->add (new DC::UI::Label text => "/");
1950 } 2112 }
1951 2113
1952 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); 2114 $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
1953 2115
1954 $curnode = $node; 2116 $curnode = $node;
1955 2117
1956 $viewer->clear; 2118 $viewer->clear;
1957 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 2119 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
1958 $viewer->scroll_to ($para); 2120 $viewer->scroll_to ($para);
1959 }; 2121 };
1960 2122
1961 $load_node->(CFPlus::Pod::find pod => "mainpage"); 2123 $load_node->(DC::Pod::find pod => "mainpage");
1962 2124
1963 $CFPlus::Pod::goto_document = sub { 2125 $DC::Pod::goto_document = sub {
1964 my (@path) = @_; 2126 my (@path) = @_;
1965 2127
1966 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 2128 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1967 2129
1968 $load_node->((CFPlus::Pod::find @path)[0]); 2130 $load_node->((DC::Pod::find @path)[0]);
1969 $win->show; 2131 $win->show;
1970 }; 2132 };
1971 2133
1972 $win 2134 $win
1973} 2135}
1974 2136
1975sub open_string_query { 2137sub open_string_query {
1976 my ($title, $cb, $txt, $tooltip) = @_; 2138 my ($title, $cb, $txt, $tooltip) = @_;
1977 my $dialog = new CFPlus::UI::Toplevel 2139 my $dialog = new DC::UI::Toplevel
1978 x => "center", 2140 x => "center",
1979 y => "center", 2141 y => "center",
1980 z => 50, 2142 z => 50,
1981 force_w => $WIDTH * 4/5, 2143 force_w => $WIDTH * 4/5,
1982 title => $title; 2144 title => $title;
1983 2145
1984 $dialog->add ( 2146 $dialog->add (
1985 my $e = new CFPlus::UI::Entry 2147 my $e = new DC::UI::Entry
1986 on_activate => sub { $cb->(@_); $dialog->hide; 0 }, 2148 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1987 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 }, 2149 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1988 tooltip => $tooltip 2150 tooltip => $tooltip
1989 ); 2151 );
1990 2152
… …
1993 $dialog->show; 2155 $dialog->show;
1994} 2156}
1995 2157
1996sub open_quit_dialog { 2158sub open_quit_dialog {
1997 unless ($QUIT_DIALOG) { 2159 unless ($QUIT_DIALOG) {
1998 $QUIT_DIALOG = new CFPlus::UI::Toplevel 2160 $QUIT_DIALOG = new DC::UI::Toplevel
1999 x => "center", 2161 x => "center",
2000 y => "center", 2162 y => "center",
2001 z => 50, 2163 z => 50,
2002 title => "Really Quit?", 2164 title => "Really Quit?",
2003 on_key_down => sub { 2165 on_key_down => sub {
2004 my ($dialog, $ev) = @_; 2166 my ($dialog, $ev) = @_;
2005 $ev->{sym} == 27 and $dialog->hide; 2167 $ev->{sym} == 27 and $dialog->hide;
2006 } 2168 }
2007 ; 2169 ;
2008 2170
2009 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1); 2171 $QUIT_DIALOG->add (my $vb = new DC::UI::VBox expand => 1);
2010 2172
2011 $vb->add (new CFPlus::UI::Label 2173 $vb->add (new DC::UI::Label
2012 text => "You should find a savebed and apply it first!", 2174 text => "You should find a savebed and apply it first!",
2013 max_w => $WIDTH * 0.25, 2175 max_w => $WIDTH * 0.25,
2014 ellipsize => 0, 2176 ellipsize => 0,
2015 ); 2177 );
2016 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 2178 $vb->add (my $hb = new DC::UI::HBox expand => 1);
2017 $hb->add (new CFPlus::UI::Button 2179 $hb->add (new DC::UI::Button
2018 text => "Ok", 2180 text => "Ok",
2019 expand => 1, 2181 expand => 1,
2020 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2182 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2021 ); 2183 );
2022 $hb->add (new CFPlus::UI::Button 2184 $hb->add (new DC::UI::Button
2023 text => "Quit anyway", 2185 text => "Quit anyway",
2024 expand => 1, 2186 expand => 1,
2025 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2187 on_activate => sub {
2188 crash "Quit anyway";
2189 EV::unloop EV::UNLOOP_ALL;
2190 },
2026 ); 2191 );
2027 } 2192 }
2028 2193
2029 $QUIT_DIALOG->show; 2194 $QUIT_DIALOG->show;
2030 $QUIT_DIALOG->grab_focus; 2195 $QUIT_DIALOG->grab_focus;
2031} 2196}
2032 2197
2033sub show_tip_of_the_day { 2198sub show_tip_of_the_day {
2034 # find all tips 2199 # find all tips
2035 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 2200 my @tod = DC::Pod::find tip_of_the_day => "*";
2036 2201
2037 CFPlus::DB::get state => "tip_of_the_day", sub { 2202 DC::DB::get state => "tip_of_the_day", sub {
2038 my ($todindex) = @_; 2203 my ($todindex) = @_;
2039 $todindex = 0 if $todindex >= @tod; 2204 $todindex = 0 if $todindex >= @tod;
2040 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { }; 2205 DC::DB::put state => tip_of_the_day => $todindex + 1, sub { };
2041 2206
2042 # create dialog 2207 # create dialog
2043 my $dialog; 2208 my $dialog;
2044 2209
2045 my $close = sub { 2210 my $close = sub {
2046 $dialog->destroy; 2211 $dialog->destroy;
2047 }; 2212 };
2048 2213
2049 $dialog = new CFPlus::UI::Toplevel 2214 $dialog = new DC::UI::Toplevel
2050 x => "center", 2215 x => "center",
2051 y => "center", 2216 y => "center",
2052 z => 3, 2217 z => 3,
2053 name => 'tip_of_the_day', 2218 name => 'tip_of_the_day',
2054 force_w => int $WIDTH * 4/9, 2219 force_w => int $WIDTH * 4/9,
2055 force_h => int $WIDTH * 2/9, 2220 force_h => int $WIDTH * 2/9,
2056 title => "Tip of the day #" . (1 + $todindex), 2221 title => "Tip of the day #" . (1 + $todindex),
2057 child => my $vbox = new CFPlus::UI::VBox, 2222 child => my $vbox = new DC::UI::VBox,
2058 has_close_button => 1, 2223 has_close_button => 1,
2059 on_delete => $close, 2224 on_delete => $close,
2060 ; 2225 ;
2061 2226
2062 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 2227 $vbox->add (my $viewer = new DC::UI::TextScroller
2063 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 2228 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]); 2229 $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $tod[$todindex]);
2065 2230
2066 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 2231 $vbox->add (my $table = new DC::UI::Table col_expand => [0, 1]);
2067 2232
2068 $table->add_at (0, 0, new CFPlus::UI::Button 2233 $table->add_at (0, 0, new DC::UI::Button
2069 text => "Close", 2234 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>.", 2235 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, 2236 on_activate => $close,
2072 ); 2237 );
2073 2238
2074 $table->add_at (2, 0, new CFPlus::UI::Button 2239 $table->add_at (2, 0, new DC::UI::Button
2075 text => "Next", 2240 text => "Next",
2076 tooltip => "Show the next <b>Tip of the day</b>.", 2241 tooltip => "Show the next <b>Tip of the day</b>.",
2077 on_activate => sub { 2242 on_activate => sub {
2078 $close->(); 2243 $close->();
2079 &show_tip_of_the_day; 2244 &show_tip_of_the_day;
… …
2083 $dialog->show; 2248 $dialog->show;
2084 }; 2249 };
2085} 2250}
2086 2251
2087sub sdl_init { 2252sub sdl_init {
2088 CFPlus::SDL_Init 2253 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2089 and die "SDL::Init failed!\n"; 2254 and die "SDL::Init failed!\n";
2090} 2255}
2091 2256
2092sub video_init { 2257sub video_init {
2258 DC::set_theme $CFG->{uitheme};
2259
2260 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2261 $SDL_REINIT = 0;
2262
2263 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2264 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2265 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2266 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2267
2268 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2269
2093 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2270 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2271 $CFG->{sdl_mode} = 0; # lowest resolution by default
2272
2273 # now choose biggest mode <= 1024x768
2274 for (0 .. $#SDL_MODES) {
2275 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2276 $CFG->{sdl_mode} = $_;
2277 }
2278 }
2279 }
2094 2280
2095 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2281 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2096 2282
2097 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2283 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2098 $FULLSCREEN = $CFG->{fullscreen}; 2284 $FULLSCREEN = $CFG->{fullscreen};
2099 $FAST = $CFG->{fast}; 2285 $FAST = $CFG->{fast};
2100 2286
2287 # 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 2288 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2289 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2102 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 2290 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2103 2291
2104 $SDL_ACTIVE = 1; 2292 $SDL_ACTIVE = 1;
2105 $LAST_REFRESH = time - 0.01; 2293 $LAST_REFRESH = time - 0.01;
2106 2294
2107 CFPlus::OpenGL::init; 2295 DC::OpenGL::init;
2108 CFPlus::Macro::init; 2296 DC::Macro::init;
2109 2297
2110 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2298 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
2111 2299
2112 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2300 $DC::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
2113 2301
2114 ############################################################################# 2302 #############################################################################
2115 2303
2116 if ($DEBUG_STATUS) { 2304 if ($DEBUG_STATUS) {
2117 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2305 DC::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
2118 } else { 2306 } else {
2119 # create/configure the widgets 2307 # create/configure the widgets
2120 2308
2121 $CFPlus::UI::ROOT->connect (key_down => sub { 2309 $DC::UI::ROOT->connect (key_down => sub {
2122 my (undef, $ev) = @_; 2310 my (undef, $ev) = @_;
2123 2311
2124 if (my @macros = CFPlus::Macro::find $ev) { 2312 if (my @macros = DC::Macro::find $ev) {
2125 CFPlus::Macro::execute $_ for @macros; 2313 DC::Macro::execute $_ for @macros;
2126 2314
2127 return 1; 2315 return 1;
2128 } 2316 }
2129 2317
2130 0 2318 0
2131 }); 2319 });
2132 2320
2133 $DEBUG_STATUS = new CFPlus::UI::Label 2321 $DEBUG_STATUS = new DC::UI::Label
2134 padding => 0, 2322 padding => 0,
2135 z => 100, 2323 z => 100,
2136 force_x => "max", 2324 force_x => "max",
2137 force_y => 0; 2325 force_y => 0;
2138 $DEBUG_STATUS->show; 2326 $DEBUG_STATUS->show;
2139 2327
2140 $STATUSBOX = new CFPlus::UI::Statusbox; 2328 $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 2329
2330 $MODBOX = new DC::UI::Label
2331 can_events => 1,
2332 can_hover => 1,
2333 markup => "",
2334 align => 0,
2335 font => $FONT_FIXED,
2336 tooltip => "#modifier_box",
2337 tooltip_width => 0.67,
2338 ;
2339
2340 update_modbox;
2341
2143 (new CFPlus::UI::Frame 2342 (new DC::UI::Frame
2144 bg => [0, 0, 0, 0.4], 2343 bg => [0, 0, 0, 0.4],
2145 force_x => 0, 2344 force_x => 0,
2146 force_y => "max", 2345 force_y => "max",
2147 child => $STATUSBOX, 2346 child => (my $LR = new DC::UI::VBox),
2148 )->show; 2347 )->show;
2149 2348
2349 $LR->add ($STATUSBOX);
2350 $LR->add ($MODBOX);
2351 $LR->add (new DC::UI::Label
2352 align => 0,
2353 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2354 fontsize => 0.5,
2355 fg => [1, 1, 0, 0.7],
2356 );
2357
2150 CFPlus::UI::Toplevel->new ( 2358 DC::UI::Toplevel->new (
2151 title => "Minimap", 2359 title => "Minimap",
2152 name => "mapmap", 2360 name => "mapmap",
2153 x => 0, 2361 x => 0,
2154 y => $FONTSIZE + 8, 2362 y => $FONTSIZE + 8,
2155 border_bg => [1, 1, 1, 192/255], 2363 border_bg => [1, 1, 1, 192/255],
2156 bg => [1, 1, 1, 0], 2364 bg => [1, 1, 1, 0],
2157 child => ($MAPMAP = new CFPlus::MapWidget::MapMap 2365 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.", 2366 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2159 ), 2367 ),
2160 )->show; 2368 )->show;
2161 2369
2162 $MAPWIDGET = new CFPlus::MapWidget; 2370 $MAPWIDGET = new DC::MapWidget;
2163 $MAPWIDGET->connect (activate_console => sub { 2371 $MAPWIDGET->connect (activate_console => sub {
2164 my ($mapwidget, $preset) = @_; 2372 my ($mapwidget, $preset) = @_;
2165 2373
2166 $MESSAGE_WINDOW->activate_console ($preset) 2374 $MESSAGE_DIST->activate_console ($preset)
2167 if $MESSAGE_WINDOW; 2375 if $MESSAGE_DIST;
2168 }); 2376 });
2169 $MAPWIDGET->show; 2377 $MAPWIDGET->show;
2170 $MAPWIDGET->grab_focus; 2378 $MAPWIDGET->grab_focus;
2171 2379
2172 $COMPLETER = new CFPlus::MapWidget::Command:: 2380 $COMPLETER = new DC::MapWidget::Command::
2173 command => { }, 2381 command => { },
2174 tooltip => "#completer_help", 2382 tooltip => "#completer_help",
2175 ; 2383 ;
2176 2384
2177 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2385 $SETUP_DIALOG = new DC::UI::Toplevel
2178 title => "Setup", 2386 title => "Setup",
2179 name => "setup_dialog", 2387 name => "setup_dialog",
2180 x => 'center', 2388 x => 'center',
2181 y => 'center', 2389 y => 'center',
2182 z => 2, 2390 z => 2,
… …
2184 force_h => $::HEIGHT * 0.6, 2392 force_h => $::HEIGHT * 0.6,
2185 has_close_button => 1, 2393 has_close_button => 1,
2186 ; 2394 ;
2187 2395
2188 $METASERVER = metaserver_dialog; 2396 $METASERVER = metaserver_dialog;
2189 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow; 2397 # the name is changed to not conflict with the older name as users could have hidden it
2398 $MESSAGE_WINDOW = new DC::UI::Dockbar
2399 name => "message_window2",
2400 title => 'Messages',
2401 force_w => $::WIDTH * 0.6,
2402 force_h => $::HEIGHT * 0.25,
2403 ;
2190 2404
2405 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2406
2191 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2407 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2192 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2408 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2193 2409
2194 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2410 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2195 "Configure the server to play on, your username and password."); 2411 "Configure the server to play on, your username and password.");
2196 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2412 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
2197 "Configure other server related options."); 2413 "Configure other server related options.");
… …
2209 . "After pressing the combo the binding will be saved automatically and the " 2425 . "After pressing the combo the binding will be saved automatically and the "
2210 . "binding editor closes"); 2426 . "binding editor closes");
2211 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2427 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2212 "Some debuggin' options. Do not ask."); 2428 "Some debuggin' options. Do not ask.");
2213 2429
2214 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2430 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
2215 2431
2216 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2432 $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."); 2433 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2218 2434
2219 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW, 2435# $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."); 2436# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2221 2437
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 2438 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 2439
2224 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2440 $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."); 2441 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2226 2442
2227 $BUTTONBAR->add (new CFPlus::UI::Button 2443 $BUTTONBAR->add (new DC::UI::Button
2228 text => "Save Config", 2444 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.", 2445 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 { 2446 on_activate => sub {
2231 $::CFG->{layout} = CFPlus::UI::get_layout; 2447 $::CFG->{layout} = DC::UI::get_layout;
2232 CFPlus::write_cfg "$Deliantra::VARDIR/client.cf"; 2448 DC::write_cfg;
2233 status "Configuration Saved"; 2449 status "Configuration Saved";
2234 0 2450 0
2235 }, 2451 },
2236 ); 2452 );
2237 2453
2238 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2454 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2239 tooltip => "View Documentation"); 2455 tooltip => "View Documentation");
2240 2456
2241
2242 $BUTTONBAR->add (new CFPlus::UI::Button 2457 $BUTTONBAR->add (new DC::UI::Button
2243 text => "Quit", 2458 text => "Quit",
2244 tooltip => "Terminates the program", 2459 tooltip => "Terminates the program",
2245 on_activate => sub { 2460 on_activate => sub {
2246 if ($CONN) { 2461 if ($CONN) {
2247 open_quit_dialog; 2462 open_quit_dialog;
… …
2255 $BUTTONBAR->show; 2470 $BUTTONBAR->show;
2256 $SETUP_DIALOG->show; 2471 $SETUP_DIALOG->show;
2257 $MESSAGE_WINDOW->show; 2472 $MESSAGE_WINDOW->show;
2258 } 2473 }
2259 2474
2475 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2476 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2477
2478 $CAVEAT_LABEL->set_text ("None :)");
2479 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2480 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2481
2260 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2482 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2261} 2483}
2262 2484
2263sub video_shutdown { 2485sub video_shutdown {
2264 CFPlus::OpenGL::shutdown; 2486 DC::OpenGL::shutdown;
2487 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2265 2488
2266 undef $SDL_ACTIVE; 2489 undef $SDL_ACTIVE;
2267} 2490}
2268 2491
2269my %animate_object; 2492my %animate_object;
… …
2275 if ($ENV{CFPLUS_DEBUG} & 4) { 2498 if ($ENV{CFPLUS_DEBUG} & 4) {
2276 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; 2499 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
2277 debug sprintf "%3.2f", $fps; 2500 debug sprintf "%3.2f", $fps;
2278 } 2501 }
2279 2502
2280 $WANT_REFRESH->stop; 2503 undef $WANT_REFRESH;
2504 $_[0]->stop;
2281 2505
2282 $CFPlus::UI::ROOT->draw; 2506 $DC::UI::ROOT->draw;
2283 CFPlus::SDL_GL_SwapBuffers; 2507 DC::SDL_GL_SwapBuffers;
2284 $LAST_REFRESH = $NOW; 2508 $LAST_REFRESH = $NOW;
2285} 2509}
2286 2510
2287$WANT_REFRESH = EV::idle_ns \&force_refresh; 2511my $want_refresh = EV::prepare_ns \&force_refresh;
2288 2512
2289# 0.015 is server tick time / 8 ~~ 66.6...hz
2290my $input = EV::periodic 0, 0.015, undef, sub { 2513my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2291 $NOW = time; 2514 $NOW = EV::now;
2292 2515
2293 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2516 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2294 for CFPlus::poll_events; 2517 for DC::poll_events;
2295 2518
2296 if (%animate_object) { 2519 if (%animate_object) {
2297 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2520 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2298 $WANT_REFRESH->start; 2521 $WANT_REFRESH = 1;
2299 } 2522 }
2523
2524 $want_refresh->start
2525 if $WANT_REFRESH;
2300}; 2526};
2301 2527
2302sub animation_start { 2528sub animation_start {
2303 my ($widget) = @_; 2529 my ($widget) = @_;
2304 $animate_object{$widget} = $widget; 2530 $animate_object{$widget} = $widget;
… …
2308 my ($widget) = @_; 2534 my ($widget) = @_;
2309 delete $animate_object{$widget}; 2535 delete $animate_object{$widget};
2310} 2536}
2311 2537
2312%SDL_CB = ( 2538%SDL_CB = (
2313 CFPlus::SDL_QUIT => sub { 2539 DC::SDL_QUIT => sub {
2540 crash "SDL_QUIT";
2314 EV::unloop EV::UNLOOP_ALL; 2541 EV::unloop EV::UNLOOP_ALL;
2315 }, 2542 },
2316 CFPlus::SDL_VIDEORESIZE => sub { 2543 DC::SDL_VIDEORESIZE => sub {
2317 }, 2544 },
2318 CFPlus::SDL_VIDEOEXPOSE => sub { 2545 DC::SDL_VIDEOEXPOSE => sub {
2319 CFPlus::UI::full_refresh; 2546 DC::UI::full_refresh;
2320 }, 2547 },
2321 CFPlus::SDL_ACTIVEEVENT => sub { 2548 DC::SDL_ACTIVEEVENT => sub {
2322# not useful, as APPACTIVE includes only iconified state, not unmapped 2549# not useful, as APPACTIVE includes only iconified state, not unmapped
2323# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d# 2550# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2324# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d# 2551# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2325# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2552# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2326# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2553# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2327# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2554# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2328 }, 2555 },
2329 CFPlus::SDL_KEYDOWN => sub { 2556 DC::SDL_KEYDOWN => sub {
2330 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2557 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2331 # alt-enter 2558 # alt-enter
2559 video_shutdown;
2332 $FULLSCREEN_ENABLE->toggle; 2560 $FULLSCREEN_ENABLE->toggle;
2333 video_shutdown;
2334 video_init; 2561 video_init;
2335 } else { 2562 } else {
2336 CFPlus::UI::feed_sdl_key_down_event ($_[0]); 2563 &DC::UI::feed_sdl_key_down_event;
2337 } 2564 }
2565 update_modbox;
2338 }, 2566 },
2339 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event, 2567 DC::SDL_KEYUP => sub {
2568 &DC::UI::feed_sdl_key_up_event;
2569 update_modbox;
2570 },
2340 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event, 2571 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
2341 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event, 2572 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
2342 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event, 2573 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
2343 CFPlus::SDL_USEREVENT => sub { 2574 DC::SDL_USEREVENT => sub {
2344 if ($_[0]{code} == 1) { 2575 if ($_[0]{code} == 1) {
2345 audio_channel_finished $_[0]{data1}; 2576 audio_channel_finished $_[0]{data1};
2346 } elsif ($_[0]{code} == 0) { 2577 } elsif ($_[0]{code} == 0) {
2347 audio_music_finished; 2578 audio_music_finished;
2348 } 2579 }
… …
2354$SIG{INT} = $SIG{TERM} = sub { 2585$SIG{INT} = $SIG{TERM} = sub {
2355 EV::unloop; 2586 EV::unloop;
2356 #d# TODO calling exit here hangs the process in some futex 2587 #d# TODO calling exit here hangs the process in some futex
2357}; 2588};
2358 2589
2359{ 2590# due to mac os x + sdl combined briandamage, we need this contortion
2591sub main {
2592 {
2593 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2594
2360 if (-e "$Deliantra::VARDIR/client.cf") { 2595 if (-e "$Deliantra::VARDIR/client.cf") {
2361 CFPlus::read_cfg "$Deliantra::VARDIR/client.cf"; 2596 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2362 } else { 2597 } else {
2363 #TODO: compatibility cruft 2598 #TODO: compatibility cruft
2364 CFPlus::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2599 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2365 print STDERR "INFO: used old configuratrion file\n"; 2600 print STDERR "INFO: used old configuration file\n";
2366 } 2601 }
2367 2602
2368 CFPlus::DB::Server::run; 2603 DC::DB::Server::run;
2369 2604
2605 if ($CFG->{db_schema} < 1) {
2606 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2607 DC::DB::nuke_db;
2608 $CFG->{db_schema} = 1;
2609 DC::write_cfg;
2610 }
2611
2612 DC::DB::open_db;
2613
2370 CFPlus::UI::set_layout ($::CFG->{layout}); 2614 DC::UI::set_layout ($::CFG->{layout});
2371 2615
2372 my %DEF_CFG = ( 2616 my %DEF_CFG = (
2373 sdl_mode => 0, 2617 sdl_mode => undef,
2374 fullscreen => 1, 2618 fullscreen => 1,
2375 fast => 0, 2619 fast => 0,
2376 force_opengl11 => undef, 2620 force_opengl11 => undef,
2621 disable_alpha => 0,
2622 smooth_movement => 1,
2377 texture_compression => 1, 2623 texture_compression => 1,
2378 map_scale => 1, 2624 map_scale => 1,
2379 fow_enable => 1, 2625 fow_enable => 1,
2380 fow_intensity => 0, 2626 fow_intensity => 0,
2381 map_smoothing => 1, 2627 map_smoothing => 1,
2382 gui_fontsize => 1, 2628 gui_fontsize => 1,
2383 log_fontsize => 0.7, 2629 log_fontsize => 0.7,
2384 gauge_fontsize => 1, 2630 gauge_fontsize => 1,
2385 gauge_size => 0.35, 2631 gauge_size => 0.35,
2386 stat_fontsize => 0.7, 2632 stat_fontsize => 0.7,
2387 mapsize => 100, 2633 mapsize => 100,
2388 audio_enable => 1, 2634 audio_enable => 1,
2389 audio_hw_channels => 0, 2635 audio_hw_channels => 0,
2390 audio_hw_frequency => 0, 2636 audio_hw_frequency => 0,
2391 audio_hw_chunksize => 0, 2637 audio_hw_chunksize => 0,
2392 audio_mix_channels => 8, 2638 audio_mix_channels => 8,
2393 effects_enable => 1, 2639 effects_enable => 1,
2394 effects_volume => 1, 2640 effects_volume => 1,
2395 bgm_enable => 1, 2641 bgm_enable => 1,
2396 bgm_volume => 0.5, 2642 bgm_volume => 0.5,
2397 output_rate => "", 2643 output_rate => "",
2398 pickup => 0, 2644 pickup => 0,
2399 inv_sort => "mtime", 2645 inv_sort => "mtime",
2400 default => "profile", # default profile 2646 default => "profile", # default profile
2401 show_tips => 1, 2647 show_tips => 1,
2402 logview_max_par => 1000, 2648 logview_max_par => 1000,
2649 shift_fire_stop => 0,
2650 uitheme => "wood",
2403 ); 2651 );
2404 2652
2405 while (my ($k, $v) = each %DEF_CFG) { 2653 while (my ($k, $v) = each %DEF_CFG) {
2406 $CFG->{$k} = $v unless exists $CFG->{$k}; 2654 $CFG->{$k} = $v unless exists $CFG->{$k};
2407 } 2655 }
2408 2656
2409 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2657 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2410 $PROFILE = $CFG->{profile}{default}; 2658 $PROFILE = $CFG->{profile}{default};
2411 2659
2412 # convert old bindings (only default profile matters) 2660 # convert old bindings (only default profile matters)
2413 if (my $bindings = delete $PROFILE->{bindings}) { 2661 if (my $bindings = delete $PROFILE->{bindings}) {
2414 while (my ($mod, $syms) = each %$bindings) { 2662 while (my ($mod, $syms) = each %$bindings) {
2415 while (my ($sym, $cmds) = each %$syms) { 2663 while (my ($sym, $cmds) = each %$syms) {
2416 push @{ $PROFILE->{macro} }, { 2664 push @{ $PROFILE->{macro} }, {
2417 accelkey => [$mod*1, $sym*1], 2665 accelkey => [$mod*1, $sym*1],
2418 action => $cmds, 2666 action => $cmds,
2667 };
2419 }; 2668 }
2420 } 2669 }
2421 } 2670 }
2422 }
2423 2671
2424 sdl_init; 2672 sdl_init;
2425 2673
2426 @SDL_MODES = CFPlus::SDL_ListModes 8, 8; 2674 {
2427 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2428 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2429
2430 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2431
2432 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2433
2434 {
2435 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2675 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2436 DejaVuSans.ttf 2676 DejaVuSans.ttf
2437 DejaVuSansMono.ttf 2677 DejaVuSansMono.ttf
2438 DejaVuSans-Bold.ttf 2678 DejaVuSans-Bold.ttf
2439 DejaVuSansMono-Bold.ttf 2679 DejaVuSansMono-Bold.ttf
2440 DejaVuSans-Oblique.ttf 2680 DejaVuSans-Oblique.ttf
2441 DejaVuSansMono-Oblique.ttf 2681 DejaVuSansMono-Oblique.ttf
2442 DejaVuSans-BoldOblique.ttf 2682 DejaVuSans-BoldOblique.ttf
2443 DejaVuSansMono-BoldOblique.ttf 2683 DejaVuSansMono-BoldOblique.ttf
2444 ); 2684 );
2445 2685
2446 CFPlus::add_font $_ for @fonts; 2686 DC::add_font $_ for @fonts;
2447 2687
2448 CFPlus::pango_init;
2449
2450 $FONT_PROP = new_from_file CFPlus::Font $fonts[0]; 2688 $FONT_PROP = new_from_file DC::Font $fonts[0];
2451 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1]; 2689 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2452 2690
2453 $FONT_PROP->make_default; 2691 $FONT_PROP->make_default;
2454 } 2692
2693 DC::pango_init;
2694 }
2455 2695
2456# compare mono (ft) vs. rgba (cairo) 2696# compare mono (ft) vs. rgba (cairo)
2457# ft - 1.8s, cairo 3s, even in alpha-only mode 2697# ft - 1.8s, cairo 3s, even in alpha-only mode
2458# for my $rgba (0..1) { 2698# for my $rgba (0..1) {
2459# my $t1 = Time::HiRes::time; 2699# my $t1 = Time::HiRes::time;
2460# for (1..1000) { 2700# for (1..1000) {
2461# my $layout = CFPlus::Layout->new ($rgba); 2701# my $layout = DC::Layout->new ($rgba);
2462# $layout->set_text ("hallo" x 100); 2702# $layout->set_text ("hallo" x 100);
2463# $layout->render; 2703# $layout->render;
2464# } 2704# }
2465# my $t2 = Time::HiRes::time; 2705# my $t2 = Time::HiRes::time;
2466# warn $t2-$t1; 2706# warn $t2-$t1;
2467# } 2707# }
2468 2708
2469 video_init; 2709 video_init;
2470 audio_init; 2710 audio_init;
2471} 2711 }
2472 2712
2473show_tip_of_the_day if $CFG->{show_tips}; 2713 show_tip_of_the_day if $CFG->{show_tips};
2474 2714
2475our $STARTUP_CANCEL = EV::idle sub { 2715 our $STARTUP_CANCEL = EV::idle sub {
2476 undef $::STARTUP_CANCEL; 2716 undef $::STARTUP_CANCEL;
2477 $startup_done->(); 2717 $startup_done->();
2478}; 2718 };
2479 2719
2720 delete $SIG{__DIE__};
2480EV::loop; 2721 EV::loop;
2481 2722
2482#video_shutdown; 2723#video_shutdown;
2483#audio_shutdown; 2724#audio_shutdown;
2484CFPlus::SDL_Quit; 2725 DC::OpenGL::quit;
2726 DC::SDL_Quit;
2485CFPlus::DB::Server::stop; 2727 DC::DB::Server::stop;
2728}
2729
2730DC::SDL_braino; # see sub above
2486 2731
2487=head1 NAME 2732=head1 NAME
2488 2733
2489deliantra - A Deliantra MORPG game client 2734deliantra - A Deliantra MORPG game client
2490 2735
… …
2507 4 show fps 2752 4 show fps
2508 8 suppress tooltips 2753 8 suppress tooltips
2509 2754
2510=head1 AUTHOR 2755=head1 AUTHOR
2511 2756
2512Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2757Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2513 2758
2514 2759
2515 2760

Diff Legend

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