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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines