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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines