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.10 by root, Sat Dec 22 06:51:08 2007 UTC vs.
Revision 1.75 by root, Wed Sep 3 10:08:18 2008 UTC

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

Diff Legend

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