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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines