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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines