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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.5 by root, Wed Nov 14 23:50:29 2007 UTC vs.
Revision 1.108 by root, Thu Apr 8 04:49:32 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines