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.5 by root, Wed Nov 14 23:50:29 2007 UTC vs.
Revision 1.96 by root, Mon Jul 27 23:08:41 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines