ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

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

Diff Legend

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