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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines