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.5 by root, Wed Nov 14 23:50:29 2007 UTC vs.
Revision 1.100 by root, Tue Dec 22 01:37:42 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines