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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines