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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines