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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines