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.8 by root, Wed Dec 5 10:49:18 2007 UTC vs.
Revision 1.110 by root, Mon Apr 12 02:03:33 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines