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

Diff Legend

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