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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines