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.2 by root, Fri Oct 19 23:10:32 2007 UTC vs.
Revision 1.96 by root, Mon Jul 27 23:08:41 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines