ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.9 by root, Wed Dec 5 19:44:12 2007 UTC vs.
Revision 1.84 by root, Fri Jan 9 22:38:17 2009 UTC

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

Diff Legend

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