ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.2 by root, Fri Oct 19 23:10:32 2007 UTC vs.
Revision 1.107 by root, Thu Apr 8 03:51:26 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines