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.15 by root, Wed Dec 26 18:20:46 2007 UTC vs.
Revision 1.114 by root, Fri Apr 23 16:30:39 2010 UTC

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

Diff Legend

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