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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines