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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines