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.15 by root, Wed Dec 26 18:20:46 2007 UTC vs.
Revision 1.100 by root, Tue Dec 22 01:37:42 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines