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.11 by root, Sat Dec 22 06:53:16 2007 UTC vs.
Revision 1.82 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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