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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines