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.98 by root, Mon Dec 21 03:30:23 2009 UTC

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

Diff Legend

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