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.7 by root, Mon Dec 3 22:48:25 2007 UTC vs.
Revision 1.95 by root, Sun Apr 26 19:10:57 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines