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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines