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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines