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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines