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.8 by root, Wed Dec 5 10:49:18 2007 UTC vs.
Revision 1.67 by root, Mon Sep 1 10:00:29 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines