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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines