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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.3 by root, Sat Nov 3 12:08:44 2007 UTC vs.
Revision 1.98 by root, Mon Dec 21 03:30:23 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines