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.4 by root, Mon Nov 12 23:25:37 2007 UTC vs.
Revision 1.85 by root, Sun Jan 11 03:19:47 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines