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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.117 by elmex, Tue Aug 15 06:30:05 2006 UTC vs.
Revision 1.220 by root, Tue Aug 21 02:39:17 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 54
21 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
22 } 67 }
23} 68}
24 69
25# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 72 if %PAR::LibCache;
28 73
29use Time::HiRes 'time'; 74use Time::HiRes 'time';
30use Event; 75use Event;
76use List::Util qw(max min);
31 77
32use Crossfire; 78use Crossfire;
33use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
34 80
35use Compress::LZF; 81use Compress::LZF;
36 82
37use CFPlus; 83use CFPlus;
38use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
39use CFPlus::Protocol; 85use CFPlus::Protocol;
86use CFPlus::DB;
40use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
41use CFPlus::Pod; 92use CFPlus::Pod;
42use CFPlus::BindingEditor;
43use CFPlus::MapWidget; 93use CFPlus::MapWidget;
94use CFPlus::Macro;
44 95
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 97$SIG{PIPE} = 'IGNORE';
47 98
48$Event::Eval = 0; 99$Event::Eval = 1;
49$Event::DIED = sub { 100$Event::DIED = sub {
50 # TODO: display dialog box or so 101 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 102};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 103
66my $MAX_FPS = 60; 104my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 105my $MIN_FPS = 5; # unused as of yet
68 106
69our $META_SERVER = "crossfire.real-time.com:13326"; 107our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 108
71our $LAST_REFRESH; 109our $LAST_REFRESH;
72our $NOW; 110our $NOW;
73 111
74our $CFG; 112our $CFG;
75our $CONN; 113our $CONN;
114our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 115our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 116
78our $WANT_REFRESH; 117our $WANT_REFRESH;
79our $CAN_REFRESH;
80 118
81our @SDL_MODES; 119our @SDL_MODES;
82our $WIDTH; 120our $WIDTH;
83our $HEIGHT; 121our $HEIGHT;
84our $FULLSCREEN; 122our $FULLSCREEN;
89 127
90our $MAP; 128our $MAP;
91our $MAPMAP; 129our $MAPMAP;
92our $MAPWIDGET; 130our $MAPWIDGET;
93our $BUTTONBAR; 131our $BUTTONBAR;
94our $LOGVIEW;
95our $CONSOLE;
96our $METASERVER; 132our $METASERVER;
97our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
98our $QUIT_DIALOG; 134our $QUIT_DIALOG;
99our $HOST_ENTRY; 135our $HOST_ENTRY;
100our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
107our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
108 144
109our $PL_NOTEBOOK; 145our $PL_NOTEBOOK;
110our $PL_WINDOW; 146our $PL_WINDOW;
111 147
148our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET;
150
112our $INVENTORY_PAGE; 151our $INVENTORY_PAGE;
113our $STATS_PAGE; 152our $STATS_PAGE;
114our $SKILL_PAGE; 153our $SKILL_PAGE;
115our $SPELL_PAGE; 154our $SPELL_PAGE;
155our $SPELL_LIST;
116 156
117our $HELP_WINDOW; 157our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 158our $MESSAGE_WINDOW;
119our $FLOORBOX; 159our $FLOORBOX;
120our $GAUGES; 160our $GAUGES;
121our $STATWIDS; 161our $STATWIDS;
122 162
123our $SDL_ACTIVE; 163our $SDL_ACTIVE;
124our %SDL_CB; 164our %SDL_CB;
125 165
126our $SDL_MIXER;
127our @SOUNDS; # event => file mapping
128our %AUDIO_CHUNKS; # audio files
129
130our $ALT_ENTER_MESSAGE; 166our $ALT_ENTER_MESSAGE;
131our $STATUSBOX; 167our $STATUSBOX;
132our $DEBUG_STATUS; 168our $DEBUG_STATUS;
133 169
134our $INV; 170our $INV;
135our $INVR; 171our $INVR;
136our $INV_RIGHT_HB; 172our $INVR_HB;
137 173
138our $BIND_EDITOR; 174#############################################################################
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG;
142 175
143sub status { 176sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 177 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 178}
146 179
147sub debug { 180sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 181 $DEBUG_STATUS->set_text ($_[0]);
149} 182}
183
184sub message {
185 my ($para) = @_;
186 $MESSAGE_WINDOW->message ($para);
187}
188
189#############################################################################
190#TODO: maybe move into own audio module...
191
192our $SDL_MIXER;
193
194our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
195our $MUSIC_WANT; # arryref of ambient music we want to play
196our @MUSIC_HAVE; # ambient music we have on disk
197our $MUSIC_START;
198our @MUSIC_JINGLE; # which jingles to play next
199our $MUSIC_PLAYING_DATA;
200our $MUSIC_PLAYING_META;
201our $MUSIC_PLAYER;
202our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
203
204our %AUDIO_CHUNK; # audio "files"
205our %AUDIO_PLAY; # which audio faces should be played
206
207sub audio_channel_finished {
208 my ($channel) = @_;
209
210# warn "channel $channel finished\n";#d#
211}
212
213sub audio_sound_push($) {
214 my ($face) = @_;
215
216 $CFG->{effects_enable}
217 or return;
218
219 $AUDIO_PLAY{$face}
220 or return;
221
222 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $channel->set_position_r ($dx, $dy, 20);
229 $chunk->play ($channel);
230 }
231 } else {
232 # sound_meta not set means data is in flight either way
233 my $meta = $CONN->{face}[$face]
234 or return;
235
236 $meta->{data}
237 or return;
238
239 # if its a jingle, play it as ambient music
240 if ($meta->{data}{jingle}) {
241 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
242 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
243 &audio_music_push ($face);
244 }
245 } else {
246 # fetch from database
247 CFPlus::DB::get res_data => $meta->{name}, sub {
248 my $rwops = new CFPlus::RW $_[0];
249 my $chunk = new CFPlus::MixChunk $rwops
250 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
251 $chunk->volume (($meta->{data}{volume} || 1) * 128);
252 $AUDIO_CHUNK{$face} = $chunk;
253
254 audio_sound_push ($face);
255 };
256 }
257 }
258}
259
260sub audio_sound_play {
261 my ($face, $dx, $dy, $vol) = @_;
262
263 $SDL_MIXER
264 or return;
265 $CFG->{effects_enable}
266 or return;
267
268 my $queue = $AUDIO_PLAY{$face} ||= [];
269 push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
270 audio_sound_push $face
271 unless @$queue > 1;
272}
273
274sub audio_music_set_meta {
275 my ($meta) = @_;
276
277 $MUSIC_PLAYING_META = $meta;
278 $MUSIC_PLAYING_WIDGET->set_markup (
279 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
282 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
283 );
284}
285
286sub audio_music_update_volume {
287 return unless $MUSIC_PLAYING_META;
288 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
289 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
290 CFPlus::MixMusic::volume $base * $volume * 128;
291}
292
293sub audio_music_start {
294 my $meta = $MUSIC_PLAYING_META;
295
296 CFPlus::DB::get res_data => $meta->{name}, sub {
297 return unless $SDL_MIXER;
298
299 # music might have changed...
300 $meta eq $MUSIC_PLAYING_META
301 or return &audio_music_start ();
302
303 audio_music_update_volume;
304
305 $MUSIC_PLAYING_DATA = \$_[0];
306
307 my $rwops = $meta->{path}
308 ? new_from_file CFPlus::RW $meta->{path}
309 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
310
311 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
312 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
313
314 my $NOW = time;
315
316 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
317 my $pos = $MUSIC_PLAYING_META->{stop_pos};
318 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
319 $MUSIC_START = time - $pos;
320 } else {
321 $MUSIC_PLAYER->play (0);
322 $MUSIC_START = time;
323 }
324
325 delete $meta->{stop_time};
326 delete $meta->{stop_pos};
327 }
328}
329
330sub audio_music_push {
331 return unless $SDL_MIXER;
332
333 my $fade_out;
334
335 if (@MUSIC_JINGLE) {
336 @MUSIC_HAVE = $MUSIC_JINGLE[0];
337 $fade_out = 333;
338 } else {
339 return unless $CFG->{bgm_enable};
340
341 my @have =
342 grep $_ && $_->{data},
343 map $CONN->{face}[$_],
344 @$MUSIC_WANT;
345
346 @MUSIC_HAVE = @have
347 if @have;
348
349 # default MUSIC_HAVE == MUSIC_DEFAULT
350 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
351 $fade_out = 1000;
352 }
353
354 # if the currently playing song is acceptable, let it continue
355 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
356
357 my $NOW = time;
358
359 if ($MUSIC_PLAYING_META) {
360 $MUSIC_PLAYING_META->{stop_time} = $NOW;
361 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
362 CFPlus::MixMusic::fade_out $fade_out;
363 } else {
364 # sort by stop time, oldest first
365 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
366
367 # if the most recently-played piece played very recently,
368 # resume it, else choose the oldest piece for rotation.
369 audio_music_set_meta
370 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
371 ? $MUSIC_HAVE[-1]
372 : $MUSIC_HAVE[0];
373
374 audio_music_start;
375 }
376}
377
378sub audio_music_set_ambient {
379 my ($songs) = @_;
380
381 $MUSIC_WANT = $songs;
382 audio_music_push;
383}
384
385sub audio_music_finished {
386 # we compress multiple jingles of the same type
387 shift @MUSIC_JINGLE
388 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
389
390 $MUSIC_PLAYING_WIDGET->clear;
391
392 undef $MUSIC_PLAYER;
393 undef $MUSIC_PLAYING_META;
394 undef $MUSIC_PLAYING_DATA;
395
396 audio_music_push;
397}
398
399sub audio_init {
400 if ($CFG->{audio_enable}) {
401 $ENV{MIX_EFFECTSMAXSPEED} = 1;
402 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
403
404 unless ($SDL_MIXER) {
405 status "Unable to open sound device: there will be no sound";
406 return;
407 }
408
409 CFPlus::Mix_AllocateChannels 16;
410
411 audio_music_finished;
412 } else {
413 undef $SDL_MIXER;
414 }
415}
416
417sub audio_shutdown {
418 undef $MUSIC_PLAYER;
419 undef $MUSIC_PLAYING_META;
420 undef $MUSIC_PLAYING_DATA;
421
422 $MUSIC_WANT = [];
423 @MUSIC_JINGLE = ();
424 %AUDIO_PLAY = ();
425 %AUDIO_CHUNK = ();
426
427 CFPlus::Mix_CloseAudio if $SDL_MIXER;
428 undef $SDL_MIXER;
429}
430
431#############################################################################
150 432
151sub destroy_query_dialog { 433sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 434 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 435 if $_[0]{query_dialog};
154} 436}
155 437
438# FIXME: a very ugly hack to wait for stat update look below! #d#
439our $QUERY_TIMER; #d#
440
156# server query dialog 441# server query dialog
157sub server_query { 442sub server_query {
158 my ($conn, $flags, $prompt) = @_; 443 my ($conn, $flags, $prompt) = @_;
444
445 # FIXME: a very ugly hack to wait for stat update #d#
446 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
447 unless ($QUERY_TIMER) {
448 $QUERY_TIMER =
449 Event->timer (
450 after => 1,
451 cb => sub {
452 server_query ($conn, $flags, $prompt, 1);
453 $QUERY_TIMER = undef
454 }
455 );
456 return;
457 }
458 }
159 459
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 460 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 461 x => "center",
162 y => "center", 462 y => "center",
163 title => "Server Query", 463 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 464 child => my $vbox = new CFPlus::UI::VBox,
165 ; 465 ;
166 466
167 my @dialog = my $label = new CFPlus::UI::Label 467 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 468 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 469 ellipsise => 0,
170 text => $prompt; 470 text => $prompt;
171 471
172 if ($flags & CS_QUERY_YESNO) { 472 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 473 push @dialog, my $hbox = new CFPlus::UI::HBox;
190 ); 490 );
191 491
192 $dialog->grab_focus; 492 $dialog->grab_focus;
193 493
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 494 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "#charcreation_focus";
196
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 495 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 496 $dialog->{tooltip} = "#charcreation_focus";
199 497
200 unshift @dialog, new CFPlus::UI::Label 498 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 499 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 500 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 501 markup => "\nOr use your keyboard and the text entry below:\n";
204 502
205 unshift @dialog, my $table = new CFPlus::UI::Table; 503 unshift @dialog, my $table = new CFPlus::UI::Table;
206 504
207 $table->add (0, 0, new CFPlus::UI::Button 505 $table->add_at (0, 0, new CFPlus::UI::Button
208 text => "Next Race", 506 text => "Next Race",
209 on_activate => sub { 507 on_activate => sub {
210 $conn->send ("reply n"); 508 $conn->send ("reply n");
211 destroy_query_dialog $conn; 509 destroy_query_dialog $conn;
212 0 510 0
213 }, 511 },
214 ); 512 );
215 $table->add (2, 0, new CFPlus::UI::Button 513 $table->add_at (2, 0, new CFPlus::UI::Button
216 text => "Accept", 514 text => "Accept",
217 on_activate => sub { 515 on_activate => sub {
218 $conn->send ("reply d"); 516 $conn->send ("reply d");
219 destroy_query_dialog $conn; 517 destroy_query_dialog $conn;
220 0 518 0
221 }, 519 },
222 ); 520 );
223 521
522 if ($conn->{chargen_race_description}) {
523 unshift @dialog, new CFPlus::UI::Label
524 max_w => $::WIDTH * 0.8,
525 ellipsise => 0,
526 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
527 ;
528 }
529
530 unshift @dialog, new CFPlus::UI::Face
531 face => $conn->{player}{face},
532 bg => [.2, .2, .2, 1],
533 min_w => 64,
534 min_h => 64,
535 ;
536
537 if ($conn->{chargen_race_title}) {
538 unshift @dialog, new CFPlus::UI::Label
539 allign => 1,
540 ellipsise => 0,
541 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
542 ;
543 }
544
224 unshift @dialog, new CFPlus::UI::Label 545 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 546 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 547 ellipsise => 0,
227 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 548 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 ; 549 ;
232 $conn->send ("reply $stat"); 553 $conn->send ("reply $stat");
233 destroy_query_dialog $conn; 554 destroy_query_dialog $conn;
234 return; 555 return;
235 } 556 }
236 557
237 $STATS_PAGE->show;
238 $MESSAGE_WINDOW->hide;
239
240 unshift @dialog, new CFPlus::UI::Label 558 unshift @dialog, new CFPlus::UI::Label
241 max_w => $::WIDTH * 0.4, 559 max_w => $::WIDTH * 0.4,
242 ellipsise => 0, 560 ellipsise => 0,
243 markup => "\nOr use your keyboard and the text entry below:\n"; 561 markup => "\nOr use your keyboard and the text entry below:\n";
244 562
245 unshift @dialog, my $table = new CFPlus::UI::Table; 563 unshift @dialog, my $table = new CFPlus::UI::Table;
246 564
247 # left: re-roll 565 # left: re-roll
248 $table->add (0, 0, new CFPlus::UI::Button 566 $table->add_at (0, 0, new CFPlus::UI::Button
249 text => "Roll Again", 567 text => "Roll Again",
250 on_activate => sub { 568 on_activate => sub {
251 $conn->send ("reply y"); 569 $conn->send ("reply y");
252 destroy_query_dialog $conn; 570 destroy_query_dialog $conn;
253 0 571 0
267 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 585 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
268 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 586 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
269 ], 587 ],
270 ), 1 .. 2; 588 ), 1 .. 2;
271 589
272 $table->add (2, 0, new CFPlus::UI::Button 590 $table->add_at (2, 0, new CFPlus::UI::Button
273 text => "Swap Stats", 591 text => "Swap Stats",
274 on_activate => sub { 592 on_activate => sub {
275 $conn->{stat_change_with} = $sw2->{value}; 593 $conn->{stat_change_with} = $sw2->{value};
276 $conn->send ("reply $sw1->{value}"); 594 $conn->send ("reply $sw1->{value}");
277 destroy_query_dialog $conn; 595 destroy_query_dialog $conn;
278 0 596 0
279 }, 597 },
280 ); 598 );
281 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 599 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
282 600
283 # right: accept 601 # right: accept
284 $table->add (4, 0, new CFPlus::UI::Button 602 $table->add_at (4, 0, new CFPlus::UI::Button
285 text => "Accept", 603 text => "Accept",
286 on_activate => sub { 604 on_activate => sub {
287 $conn->send ("reply n"); 605 $conn->send ("reply n");
288 $STATS_PAGE->hide; 606 $STATS_PAGE->hide;
289 destroy_query_dialog $conn; 607 destroy_query_dialog $conn;
354 $LOGIN_BUTTON->set_text ("Logout"); 672 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 673 $SETUP_DIALOG->hide;
356 674
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 675 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 676
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 677 my ($host, $port) = split /:/, $PROFILE->{host};
360 678
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 679 $MAP = new CFPlus::Map;
362 680
363 $CONN = eval { 681 $CONN = eval {
364 new CFPlus::Protocol 682 new CFPlus::Protocol
365 host => $host, 683 host => $host,
366 port => $port || 13327, 684 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 685 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 686 pass => $PROFILE->{password},
369 mapw => $mapsize, 687 mapw => $mapsize,
370 maph => $mapsize, 688 maph => $mapsize,
371 689
690 client => "cfplus $CFPlus::VERSION $] $^O",
691
372 map_widget => $MAPWIDGET, 692 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 693 statusbox => $STATUSBOX,
375 map => $MAP, 694 map => $MAP,
376 mapmap => $MAPMAP, 695 mapmap => $MAPMAP,
377 query => \&server_query, 696 query => \&server_query,
378 697
379 sound_play => sub { 698 setup_req => {
380 my ($x, $y, $soundnum, $type) = @_; 699 smoothing => $CFG->{map_smoothing}*1,
381
382 $SDL_MIXER
383 or return;
384
385 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
386 or return;
387
388 $chunk->play;
389 }, 700 },
390 }; 701 };
391 702
392 if ($CONN) { 703 if ($CONN) {
393 CFPlus::lowdelay fileno $CONN->{fh}; 704 CFPlus::lowdelay fileno $CONN->{fh};
402sub stop_game { 713sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 714 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 715 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 716 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 717 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 718 $SPELL_LIST->clear_spells;
719 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
720
721 &audio_music_set_ambient ([]);
408 722
409 return unless $CONN; 723 return unless $CONN;
410 724
411 status "connection closed"; 725 status "connection closed";
412 726
420sub graphics_setup { 734sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 735 my $vbox = new CFPlus::UI::VBox;
422 736
423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 737 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
424 738
739 my $row = 0;
740
741 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
742 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
743 can_events => 1,
744 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
745
746 my $vidmode_tooltip =
747 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
748 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
749
425 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 750 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
426 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 751 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 752
753 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
428 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 754 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
429 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 755 tooltip => $vidmode_tooltip);
756 $hbox->add (my $mode_label = new CFPlus::UI::Label
757 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
758 can_events => 1, tooltip => $vidmode_tooltip);
430 759
431 $mode_slider->connect (changed => sub { 760 $mode_slider->connect (changed => sub {
432 my ($self, $value) = @_; 761 my ($self, $value) = @_;
433 762
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 763 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 764 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
436 }); 765 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 766 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438 767
439 my $row = 1;
440
441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 768 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
442 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 769 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 770 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 771 tooltip => "Bring the client into fullscreen mode.",
445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
446 ); 773 );
447 774
775 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
777 state => $CFG->{force_opengl11},
778 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
779 . "higher memory usage and slower performance. It will, however, help tremendously on "
780 . "cards that claim to support a feature but fall back to software rendering. "
781 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
782 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
783 . "experience extremely low framerates and your card should do better, try this option.</b>",
784 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
785 );
786
787 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
788 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
789 state => $CFG->{texture_compression},
790 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
791 . "will save a lot of memory and increase performance. The compression algorithm "
792 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
793 . "forced OpenGL 1.1 mode.",
794 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
795 );
796
448 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 797 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
449 $table->add (1, $row++, new CFPlus::UI::CheckBox 798 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
450 state => $CFG->{fast}, 799 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 800 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 801 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 802 );
454 803
804 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
805 $table->add_at (1, $row++, new CFPlus::UI::Slider
806 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
807 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
808 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
809 );
810
811 $table->add_at (1, $row++, new CFPlus::UI::Button
812 expand => 1, align => 0, text => "Apply",
813 tooltip => "Apply the video settings above.",
814 on_activate => sub {
815 video_shutdown ();
816 video_init ();
817 0
818 }
819 );
820
455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 821 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
456 $table->add (1, $row++, new CFPlus::UI::Slider 822 $table->add_at (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 823 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 824 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 825 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
460 ); 826 );
461 827
828 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
829 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
830 state => $CFG->{map_smoothing},
831 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
832 . "This increases load on the graphics subsystem and works only with TRT servers. "
833 . "Changes take effect at next login only.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
835 );
836
462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 837 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
463 $table->add (1, $row++, new CFPlus::UI::CheckBox 838 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 839 state => $CFG->{fow_enable},
465 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 840 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
466 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 841 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
467 ); 842 );
468 843
469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 844 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
470 $table->add (1, $row++, new CFPlus::UI::Slider 845 $table->add_at (1, $row++, new CFPlus::UI::Slider
471 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 846 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
472 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 847 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
473 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 848 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
474 ); 849 );
475 850
476 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
477 $table->add (1, $row++, new CFPlus::UI::CheckBox
478 state => $CFG->{fow_smooth},
479 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
480 on_changed => sub {
481 my ($self, $value) = @_;
482 $CFG->{fow_smooth} = $value;
483 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
484 0
485 }
486 );
487
488 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
489 $table->add (1, $row++, new CFPlus::UI::Slider
490 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
491 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
492 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
493 );
494
495 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 851 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
496 $table->add (1, $row++, new CFPlus::UI::Slider 852 $table->add_at (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 853 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
498 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 854 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
855 . "but you still need to press apply to correctly re-layout the widget.",
499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 856 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
500 ); 857 );
501 858
502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 859 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
503 $table->add (1, $row++, new CFPlus::UI::Slider 860 $table->add_at (1, $row++, new CFPlus::UI::Slider
504 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 861 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
505 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 862 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
506 on_changed => sub { 863 on_changed => sub {
507 $CFG->{gauge_fontsize} = $_[1]; 864 $CFG->{gauge_fontsize} = $_[1];
508 &set_gauge_window_fontsize; 865 &set_gauge_window_fontsize;
509 0 866 0
510 } 867 }
511 ); 868 );
512 869
513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 870 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
514 $table->add (1, $row++, new CFPlus::UI::Slider 871 $table->add_at (1, $row++, new CFPlus::UI::Slider
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 872 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 873 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
517 on_changed => sub { 874 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 875 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 876 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0 877 0
521 } 878 }
522 ); 879 );
523 880
524 $table->add (1, $row++, new CFPlus::UI::Button
525 expand => 1, align => 0, text => "Apply",
526 tooltip => "Apply the video settings",
527 on_activate => sub {
528 video_shutdown ();
529 video_init ();
530 0
531 }
532 );
533
534 $vbox 881 $vbox
535} 882}
536 883
537sub audio_setup { 884sub audio_setup {
538 my $vbox = new CFPlus::UI::VBox; 885 my $vbox = new CFPlus::UI::VBox;
539 886
540 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 887 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
541 888
542 my $row = 0; 889 my $row = 0;
543 890
544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 891 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
545 $table->add (1, $row++, new CFPlus::UI::CheckBox 892 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
546 state => $CFG->{audio_enable}, 893 state => $CFG->{audio_enable},
547 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.", 894 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.",
548 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 895 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
549 ); 896 );
550# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 897# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
551# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 898# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
552# $CFG->{effects_volume} = $_[1]; 899# $CFG->{effects_volume} = $_[1];
553# }); 900# });
901
902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
903 $table->add_at (1, $row, new CFPlus::UI::CheckBox
904 expand => 1, state => $CFG->{effects_enable},
905 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
906 on_changed => sub {
907 $CFG->{effects_enable} = $_[1];
908 $CONN->update_fx_want if $CONN;
909 0
910 }
911 );
912 $table->add_at (2, $row++, new CFPlus::UI::Slider
913 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
914 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
915 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
916 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
917 );
918
554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 919 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
555 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
556 $hbox->add (new CFPlus::UI::CheckBox 920 $table->add_at (1, $row, new CFPlus::UI::CheckBox
557 expand => 1, state => $CFG->{bgm_enable}, 921 expand => 1, state => $CFG->{bgm_enable},
558 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 922 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
559 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 923 on_changed => sub {
924 $CFG->{bgm_enable} = $_[1];
925 $CONN->update_fx_want if $CONN;
926 audio_music_push;
927 0
928 }
560 ); 929 );
561 $hbox->add (new CFPlus::UI::Slider 930 $table->add_at (2, $row++, new CFPlus::UI::Slider
562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
563 tooltip => "The volume of the background music. Changes are instant.", 932 tooltip => "The volume of the background music. Changes are instant.",
564 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 933 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
565 ); 934 );
566 935
567 $table->add (1, $row++, new CFPlus::UI::Button 936 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply", 937 c_colspan => 2, expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the audio settings", 938 tooltip => "Apply the audio settings",
570 on_activate => sub { 939 on_activate => sub {
571 audio_shutdown (); 940 audio_shutdown ();
572 audio_init (); 941 audio_init ();
573 0 942 0
616 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 985 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
617 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 986 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
618 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 987 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
619 988
620 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 989 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
990 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
621 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 991 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
622 992
623 $GAUGES = { 993 $GAUGES = {
624 exp => $exp, win => $win, range => $rng, 994 exp => $exp, prg => $prg, win => $win, range => $rng,
625 food => $fg, mana => $mg, hp => $hg, grace => $gg 995 food => $fg, mana => $mg, hp => $hg, grace => $gg
626 }; 996 };
627 997
628 &set_gauge_window_fontsize; 998 &set_gauge_window_fontsize;
629 999
631} 1001}
632 1002
633sub debug_setup { 1003sub debug_setup {
634 my $table = new CFPlus::UI::Table; 1004 my $table = new CFPlus::UI::Table;
635 1005
636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1006 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
637 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 1007 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
638 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 1008 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 1009 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 1010 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 1011 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 1012 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 1013 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1014 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644 1015
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 1016 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
646 1017
647 for my $x (0..2) { 1018 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
648 for my $y (0 .. 2) { 1019 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
649 $table->add ($x + 3, $y, 1020 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
650 new CFPlus::UI::Entry 1021 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
651 text => $default_smooth[$x * 3 + $y], 1022 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
652 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 1023 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
653 ); 1024
654 } 1025 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1026
1027 $c->add_items ({
1028 type => "line_loop",
1029 color => [0, 1, 0],
1030 width => 9,
1031 coord_mode => "abs",
1032 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
655 } 1033 });
656 1034
1035 $c->add_items ({
1036 type => "lines",
1037 color => [1, 1, 0],
1038 width => 2,
1039 coord_mode => "rel",
1040 coord => [[0,0], [1,1], [1,0], [0,1]],
1041 });
1042
1043 $c->add_items ({
1044 type => "polygon",
1045 color => [0, 0.43, 0],
1046 width => 2,
1047 coord_mode => "rel",
1048 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1049 });
657 1050
658 $table 1051 $table
659} 1052}
660 1053
661sub stats_window { 1054sub stats_window {
709 [2, 4, st_spd => "Spd", 10.54], 1102 [2, 4, st_spd => "Spd", 10.54],
710 [2, 5, st_wspd => "WSp", 10.54], 1103 [2, 5, st_wspd => "WSp", 10.54],
711 ) { 1104 ) {
712 my ($col, $row, $id, $label, $template) = @$_; 1105 my ($col, $row, $id, $label, $template) = @$_;
713 1106
714 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1107 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
715 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1108 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
716 align => +1, template => $template, tooltip => "#stat_$label"); 1109 align => +1, template => $template, tooltip => "#stat_$label");
717 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1110 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
718 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1111 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
719 align => -1, text => $label, tooltip => "#stat_$label"); 1112 align => -1, text => $label, tooltip => "#stat_$label");
720 } 1113 }
721 1114
722 $vb->add (new CFPlus::UI::FancyFrame 1115 $vb->add (new CFPlus::UI::FancyFrame
763 cold => ["Cold", 1156 cold => ["Cold",
764 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1157 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
765 ghit => ["Ghost hit", 1158 ghit => ["Ghost hit",
766 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1159 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
767 ); 1160 );
1161
768 for (qw/slow holyw conf fire depl magic 1162 for (qw/slow holyw conf fire depl magic
769 drain acid pois para deat phys 1163 drain acid pois para deat phys
770 blind fear tund elec cold ghit/) 1164 blind fear tund elec cold ghit/)
771 { 1165 {
772 $tbl2->add ($col, $row, 1166 $tbl2->add_at ($col, $row,
773 $STATWIDS->{"res_$_"} = 1167 $STATWIDS->{"res_$_"} =
774 new CFPlus::UI::Label 1168 new CFPlus::UI::Label
775 font => $FONT_FIXED, 1169 font => $FONT_FIXED,
776 template => "-100%", 1170 template => "-100%",
777 align => +1, 1171 align => +1,
778 valign => 0, 1172 valign => 0,
779 can_events => 1, 1173 can_events => 1,
780 can_hover => 1, 1174 can_hover => 1,
781 tooltip => $resist_names{$_}->[1], 1175 tooltip => $resist_names{$_}->[1],
782 ); 1176 );
783 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1177 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
784 font => $FONT_FIXED, 1178 font => $FONT_FIXED,
785 can_hover => 1, 1179 can_hover => 1,
786 can_events => 1, 1180 can_events => 1,
787 path => "ui/resist/resist_$_.png", 1181 path => "ui/resist/resist_$_.png",
788 tooltip => $resist_names{$_}->[1], 1182 tooltip => $resist_names{$_}->[1],
789 ); 1183 );
790 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1184 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
791 text => $resist_names{$_}->[0], 1185 text => $resist_names{$_}->[0],
792 font => $FONT_FIXED, 1186 font => $FONT_FIXED,
793 can_hover => 1, 1187 can_hover => 1,
794 can_events => 1, 1188 can_events => 1,
795 tooltip => $resist_names{$_}->[1], 1189 tooltip => $resist_names{$_}->[1],
807 $r 1201 $r
808} 1202}
809 1203
810sub skill_window { 1204sub skill_window {
811 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1205 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1206
812 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1207 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1208
813 $sw 1209 $sw
814} 1210}
815 1211
816sub formsep($) { 1212sub formsep($) {
817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1213 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
828 return if $METASERVER_ATIME > time; 1224 return if $METASERVER_ATIME > time;
829 $METASERVER_ATIME = time + 60; 1225 $METASERVER_ATIME = time + 60;
830 1226
831 my $table = $METASERVER->{table}; 1227 my $table = $METASERVER->{table};
832 $table->clear; 1228 $table->clear;
833 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1229 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834 1230
835 my $buf; 1231 my $ok = 0;
836 1232
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1233 CFPlus::background {
1234 my $ua = CFPlus::lwp_useragent;
838 1235
839 unless ($fh) { 1236 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 1237 } sub {
841 return; 1238 my ($msg) = @_;
842 } 1239 if ($msg) {
843
844 Event->io (fd => $fh, poll => 'r', cb => sub {
845 my $res = sysread $fh, $buf, 8192, length $buf;
846
847 if (!defined $res) {
848 $_[0]->w->cancel;
849 $label->set_text ("error while retrieving server list: $!");
850 } elsif ($res == 0) {
851 $_[0]->w->cancel;
852 status "server list retrieved";
853
854 utf8::decode $buf if utf8::valid $buf;
855
856 $table->clear; 1240 $table->clear;
857 1241
858 my @tip = ( 1242 my @tip = (
859 "The current number of users logged in on the server.", 1243 "The current number of users logged in on the server.",
860 "The hostname of the server.", 1244 "The hostname of the server.",
861 "The time this server has been running without being restarted.", 1245 "The time this server has been running without being restarted.",
862 "The server software version - a '+' indicates a Crossfire+ server.", 1246 "The server software version - a '+' indicates a Crossfire+ server.",
863 "Short information about this server provided by its admins.", 1247 "Short information about this server provided by its admins.",
864 ); 1248 );
865 my @col = qw(#Users Host Uptime Version Description); 1249 my @col = qw(#Users Host Uptime Version Description);
866 $table->add ($_, 0, new CFPlus::UI::Label 1250 $table->add_at ($_, 0, new CFPlus::UI::Label
867 can_hover => 1, can_events => 1, 1251 can_hover => 1, can_events => 1,
868 align => 0, fg => [1, 1, 0], 1252 align => 0, fg => [1, 1, 0],
869 text => $col[$_], tooltip => $tip[$_]) 1253 text => $col[$_], tooltip => $tip[$_])
870 for 0 .. $#col; 1254 for 0 .. $#col;
871 1255
872 my @align = qw(1 0 1 1 -1); 1256 my @align = qw(1 0 1 1 -1);
873 1257
874 my $y = 0; 1258 my $y = 0;
875 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1259 for my $m (@{ $msg->{servers} }) {
876 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1260 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1261 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
877 1262
878 for ($desc) { 1263 for ($desc) {
879 s/<br>/\n/gi; 1264 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 1265 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 1266 s/<.*?>//sgi;
882 s/&/&amp;/g; 1267 s/&amp;/&/g;
883 s/</&lt;/g; 1268 s/&lt;/</g;
884 s/>/&gt;/g; 1269 s/&gt;/>/g;
885 } 1270 }
886 1271
887 $uptime = sprintf "%dd %02d:%02d:%02d", 1272 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 1273 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 1274 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 1275 (int $uptime / 60) % 60,
891 $m->[8] % 60; 1276 $uptime % 60;
892 1277
893 $m = [$users, $host, $uptime, $version, $desc]; 1278 $m = [$users, $host, $uptime, $version, $desc];
894 1279
895 $y++; 1280 $y++;
896 1281
897 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1282 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
898 (new CFPlus::UI::Button 1283 (new CFPlus::UI::Button
899 text => "Use", 1284 text => "Use",
900 tooltip => "Put this server into the <b>Host:Port</b> field", 1285 tooltip => "Put this server into the <b>Host:Port</b> field",
901 on_activate => sub { 1286 on_activate => sub {
902 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1287 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
905 }, 1290 },
906 ), 1291 ),
907 (new CFPlus::UI::Empty expand => 1), 1292 (new CFPlus::UI::Empty expand => 1),
908 ]); 1293 ]);
909 1294
910 $table->add ($_, $y, new CFPlus::UI::Label 1295 $table->add_at ($_, $y, new CFPlus::UI::Label
1296 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 1297 ellipsise => 0,
912 align => $align[$_], 1298 align => $align[$_],
913 text => $m->[$_], 1299 text => $m->[$_],
914 tooltip => $tip[$_], 1300 tooltip => $tip[$_],
1301 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 1302 can_hover => 1,
916 can_events => 1, 1303 can_events => 1,
917 fontsize => 0.8) 1304 fontsize => 0.8)
918 for 0 .. $#$m; 1305 for 0 .. $#$m;
919 } 1306 }
1307 } else {
1308 $ok or $label->set_text ("error while contacting metaserver");
920 } 1309 }
921 }); 1310 };
1311
922} 1312}
923 1313
924sub metaserver_dialog { 1314sub metaserver_dialog {
925 my $vbox = new CFPlus::UI::VBox; 1315 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFPlus::UI::Table; 1316 my $table = new CFPlus::UI::Table;
930 title => "Server List", 1320 title => "Server List",
931 name => 'metaserver_dialog', 1321 name => 'metaserver_dialog',
932 x => 'center', 1322 x => 'center',
933 y => 'center', 1323 y => 'center',
934 z => 3, 1324 z => 3,
1325 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 1326 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 1327 child => $vbox,
937 has_close_button => 1, 1328 has_close_button => 1,
938 table => $table, 1329 table => $table,
939 on_visibility_change => sub { 1330 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 1331 update_metaserver ($_[0]) if $_[1];
950 1341
951 $vbox->add (new CFPlus::UI::FancyFrame 1342 $vbox->add (new CFPlus::UI::FancyFrame
952 label => "Connection Settings", 1343 label => "Connection Settings",
953 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1344 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
954 ); 1345 );
955 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1346 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
956 1347
957 { 1348 {
958 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1349 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
959 1350
960 $vbox->add ( 1351 $vbox->add (
961 $HOST_ENTRY = new CFPlus::UI::Entry 1352 $HOST_ENTRY = new CFPlus::UI::Entry
962 expand => 1, 1353 expand => 1,
963 text => $CFG->{profile}{default}{host}, 1354 text => $CFG->{profile}{default}{host},
964 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1355 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
965 on_changed => sub { 1356 on_changed => sub {
966 my ($self, $value) = @_; 1357 my ($self, $value) = @_;
967 $CFG->{profile}{default}{host} = $value; 1358 $CFG->{profile}{default}{host} = $value;
968 0 1359 1
969 } 1360 }
970 ); 1361 );
971 1362
972 $vbox->add (new CFPlus::UI::Button 1363 $vbox->add (new CFPlus::UI::Button
973 expand => 1, 1364 expand => 1,
974 text => "Server List", 1365 text => "Server List",
975 other => $METASERVER, 1366 other => $METASERVER,
976 tooltip => "Show a list of available crossfire servers", 1367 tooltip => "Show a list of available crossfire servers",
977 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1368 on_activate => sub { $METASERVER->toggle_visibility; 0 },
978 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1369 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
979 ); 1370 );
980 } 1371 }
981 1372
982 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1373 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
983 $table->add (1, 4, new CFPlus::UI::Entry 1374 $table->add_at (1, 4, new CFPlus::UI::Entry
984 text => $CFG->{profile}{default}{user}, 1375 text => $CFG->{profile}{default}{user},
985 tooltip => "The name of your character on the server", 1376 tooltip => "The name of your character on the server",
986 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1377 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
987 ); 1378 );
988 1379
989 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1380 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
990 $table->add (1, 5, new CFPlus::UI::Entry 1381 $table->add_at (1, 5, new CFPlus::UI::Entry
991 text => $CFG->{profile}{default}{password}, 1382 text => $CFG->{profile}{default}{password},
992 hidden => 1, 1383 hidden => 1,
993 tooltip => "The password for your character", 1384 tooltip => "The password for your character",
994 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1385 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
995 ); 1386 );
996 1387
997 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1388 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
998 $table->add (1, 7, new CFPlus::UI::Slider 1389 $table->add_at (1, 7, new CFPlus::UI::Slider
999 force_w => 100, 1390 force_w => 100,
1000 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1391 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1001 tooltip => "This is the size of the portion of the map update the server sends you. " 1392 tooltip => "This is the size of the portion of the map update the server sends you. "
1002 . "If you set this to a high value you will be able to see further, " 1393 . "If you set this to a high value you will be able to see further, "
1003 . "but you also increase bandwidth requirements and latency. " 1394 . "but you also increase bandwidth requirements and latency. "
1004 . "This option is only used once at log-in.", 1395 . "This option is only used once at log-in.",
1005 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1396 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1006 ); 1397 );
1007 1398
1008 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1399 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1009 $table->add (1, 8, new CFPlus::UI::CheckBox 1400 $table->add_at (1, 8, new CFPlus::UI::Entry
1010 state => $CFG->{face_prefetch}, 1401 text => $CFG->{output_rate},
1011 tooltip => "<b>Background Image Prefetch</b>\n\n" 1402 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1012 . "If enabled, the client automatically pre-fetches images from the server. " 1403 . "when sending data. When 0 or unset, the server "
1013 . "This might increase or create lag, but increases the chances " 1404 . "default will be used, which is usually around 100kb/s. Most servers will "
1014 . "of faces being ready for display when you encounter them. " 1405 . "dynamically find an optimal rate, so adjust this only when necessary.",
1015 . "It also uses up server bandwidth on every connect, "
1016 . "so only set it if you really need to prefetch images. "
1017 . "This option can be set and unset any time.",
1018 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1406 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1019 ); 1407 );
1020 1408
1021 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1409 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1022 $table->add (1, 9, new CFPlus::UI::Entry 1410 $table->add_at (1, 9, new CFPlus::UI::Entry
1023 text => $CFG->{output_count}, 1411 text => $CFG->{output_count},
1024 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1412 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1025 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1413 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1026 ); 1414 );
1027 1415
1028 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1416 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1029 $table->add (1, 10, new CFPlus::UI::Entry 1417 $table->add_at (1, 10, new CFPlus::UI::Entry
1030 text => $CFG->{output_sync}, 1418 text => $CFG->{output_sync},
1031 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1419 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1032 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1420 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1033 ); 1421 );
1034 1422
1035 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1423 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1036 expand => 1, 1424 expand => 1,
1037 align => 0, 1425 align => 0,
1038 text => "Login", 1426 text => "Login",
1039 on_activate => sub { 1427 on_activate => sub {
1040 $CONN ? stop_game 1428 $CONN ? stop_game
1041 : start_game; 1429 : start_game;
1042 0 1430 1
1043 }, 1431 },
1044 );
1045
1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1047 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1048 text => $CFG->{say_command},
1049 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1050 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1051 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1052 on_changed => sub {
1053 my ($self, $value) = @_;
1054 $CFG->{say_command} = $value;
1055 0
1056 }
1057 ); 1432 );
1058 1433
1059 $vbox->add (new CFPlus::UI::FancyFrame 1434 $vbox->add (new CFPlus::UI::FancyFrame
1060 label => "Server Info", 1435 label => "Server Info",
1061 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1436 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1062 ); 1437 );
1063 1438
1064 $vbox 1439 $vbox
1065} 1440}
1066 1441
1067sub message_window { 1442sub client_setup {
1068 my $window = new CFPlus::UI::Toplevel 1443 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1069 name => "message_window",
1070 title => "Messages",
1071 border_bg => [1, 1, 1, 1],
1072 x => "max",
1073 y => 0,
1074 force_w => $::WIDTH * 0.4,
1075 force_h => $::HEIGHT * 0.5,
1076 child => (my $vbox = new CFPlus::UI::VBox),
1077 has_close_button => 1;
1078 1444
1079 $vbox->add ($LOGVIEW); 1445 my $row = 0;
1080 1446
1081 $vbox->add (my $input = new CFPlus::UI::Entry 1447 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1082 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1448 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1083 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1449 state => $CFG->{show_tips},
1084 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1450 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1085 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1086 on_focus_in => sub { 1451 on_changed => sub {
1087 my ($input, $prev_focus) = @_; 1452 my ($self, $value) = @_;
1088 1453 $CFG->{show_tips} = $value;
1089 delete $input->{refocus_map};
1090
1091 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1092 $input->{refocus_map} = 1;
1093 } 1454 0
1094 delete $input->{auto_activated}; 1455 }
1456 );
1095 1457
1458 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1459 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1460 text => $CFG->{logview_max_par},
1461 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1462 . "sends more messages than this number, older messages get removed to save memory and "
1463 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1464 on_changed => sub {
1465 my ($self, $value) = @_;
1466 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1096 0 1467 0
1097 }, 1468 },
1098 on_activate => sub {
1099 my ($input, $text) = @_;
1100 $input->set_text ('');
1101
1102 if ($text =~ /^\/(.*)/) {
1103 $::CONN->user_send ($1);
1104 } else {
1105 my $say_cmd = $::CFG->{say_command} || 'say';
1106 $::CONN->user_send ("$say_cmd $text");
1107 }
1108 if ($input->{refocus_map}) {
1109 delete $input->{refocus_map};
1110 $MAPWIDGET->focus_in
1111 }
1112
1113 0
1114 },
1115 on_escape => sub {
1116 $MAPWIDGET->grab_focus;
1117
1118 0
1119 },
1120 );
1121
1122 $CONSOLE = {
1123 window => $window,
1124 input => $input,
1125 }; 1469 );
1126 1470
1127 $window 1471 $table
1128}
1129
1130sub open_string_query {
1131 my ($title, $cb, $txt, $tooltip) = @_;
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $title;
1138
1139 $dialog->add (
1140 my $e = new CFPlus::UI::Entry
1141 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1142 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1143 tooltip => $tooltip
1144 );
1145
1146 $e->grab_focus;
1147 $e->set_text ($txt) if $txt;
1148 $dialog->show;
1149}
1150
1151sub open_quit_dialog {
1152 unless ($QUIT_DIALOG) {
1153 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1154 x => "center",
1155 y => "center",
1156 z => 50,
1157 title => "Really Quit?",
1158 on_key_down => sub {
1159 my ($dialog, $ev) = @_;
1160 $ev->{sym} == 27 and $dialog->hide;
1161 }
1162 ;
1163
1164 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1165
1166 $vb->add (new CFPlus::UI::Label
1167 text => "You should find a savebed and apply it first!",
1168 max_w => $WIDTH * 0.25,
1169 ellipsize => 0,
1170 );
1171 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1172 $hb->add (new CFPlus::UI::Button
1173 text => "Ok",
1174 expand => 1,
1175 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1176 );
1177 $hb->add (new CFPlus::UI::Button
1178 text => "Quit anyway",
1179 expand => 1,
1180 on_activate => sub { exit },
1181 );
1182 }
1183
1184 $QUIT_DIALOG->show;
1185 $QUIT_DIALOG->grab_focus;
1186} 1472}
1187 1473
1188sub autopickup_setup { 1474sub autopickup_setup {
1475 my $r = new CFPlus::UI::ScrolledWindow (
1476 expand => 1,
1477 scroll_y => 1
1478 );
1189 my $table = new CFPlus::UI::Table; 1479 $r->add (my $table = new CFPlus::UI::Table
1480 row_expand => [0],
1481 col_expand => [0, 1, 0, 1],
1482 );
1190 1483
1191 for ( 1484 for (
1192 ["General", 0, 0, 1485 ["General", 0, 0,
1193 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1486 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1194 ["Inhibit autopickup" => PICKUP_INHIBIT], 1487 ["Inhibit autopickup" => PICKUP_INHIBIT],
1208 ["Boots" => PICKUP_BOOTS], 1501 ["Boots" => PICKUP_BOOTS],
1209 ["Gloves" => PICKUP_GLOVES], 1502 ["Gloves" => PICKUP_GLOVES],
1210 ["Cloaks" => PICKUP_CLOAK], 1503 ["Cloaks" => PICKUP_CLOAK],
1211 ], 1504 ],
1212 1505
1213 ["Readables", 2, 2, 1506 ["Readables", 2, 0,
1214 ["Spellbooks" => PICKUP_SPELLBOOK], 1507 ["Spellbooks" => PICKUP_SPELLBOOK],
1215 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1508 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1216 ["Normal Books/Scrolls" => PICKUP_READABLES], 1509 ["Normal Books/Scrolls" => PICKUP_READABLES],
1217 ], 1510 ],
1218 ["Misc", 2, 7, 1511 ["Misc", 2, 5,
1219 ["Food" => PICKUP_FOOD], 1512 ["Food" => PICKUP_FOOD],
1220 ["Drinks" => PICKUP_DRINK], 1513 ["Drinks" => PICKUP_DRINK],
1221 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1514 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1222 ["Keys" => PICKUP_KEY], 1515 ["Keys" => PICKUP_KEY],
1223 ["Magical Items" => PICKUP_MAGICAL], 1516 ["Magical Items" => PICKUP_MAGICAL],
1224 ["Potions" => PICKUP_POTION], 1517 ["Potions" => PICKUP_POTION],
1225 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1518 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1226 ["Ignore cursed" => PICKUP_NOT_CURSED], 1519 ["Ignore cursed" => PICKUP_NOT_CURSED],
1227 ["Jewelery" => PICKUP_JEWELS], 1520 ["Jewelery" => PICKUP_JEWELS],
1521 ["Flesh" => PICKUP_FLESH],
1228 ], 1522 ],
1229 ["Weight/Value ratio", 2, 17] 1523 ["Weight/Value ratio", 2, 17]
1230 ) 1524 )
1231 { 1525 {
1232 my ($title, $x, $y, @bits) = @$_; 1526 my ($title, $x, $y, @bits) = @$_;
1233 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1527 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1234 1528
1235 for (@bits) { 1529 for (@bits) {
1236 ++$y; 1530 ++$y;
1237 1531
1238 my $mask = $_->[1]; 1532 my $mask = $_->[1];
1239 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1533 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1240 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1534 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1241 state => $::CFG->{pickup} & $mask, 1535 state => $::CFG->{pickup} & $mask,
1242 on_changed => sub { 1536 on_changed => sub {
1243 my ($box, $value) = @_; 1537 my ($box, $value) = @_;
1244 1538
1245 if ($value) { 1539 if ($value) {
1256 1550
1257 ${$_->[2]} = $checkbox if $_->[2]; 1551 ${$_->[2]} = $checkbox if $_->[2];
1258 } 1552 }
1259 } 1553 }
1260 1554
1261 $table->add (2, 18, new CFPlus::UI::ValSlider 1555 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1262 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1556 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1263 template => ">= 99", 1557 template => ">= 99",
1264 to_value => sub { ">= " . 5 * $_[0] }, 1558 to_value => sub { ">= " . 5 * $_[0] },
1265 on_changed => sub { 1559 on_changed => sub {
1266 my ($slider, $value) = @_; 1560 my ($slider, $value) = @_;
1269 $::CFG->{pickup} |= int $value 1563 $::CFG->{pickup} |= int $value
1270 if $value; 1564 if $value;
1271 1; 1565 1;
1272 }); 1566 });
1273 1567
1274 $table->add (3, 18, new CFPlus::UI::Button 1568 $table->add_at (3, 18, new CFPlus::UI::Button
1275 text => "set", 1569 text => "set",
1276 on_activate => sub { 1570 on_activate => sub {
1277 $::CONN->send_command ("pickup $::CFG->{pickup}") 1571 $::CONN->send_command ("pickup $::CFG->{pickup}")
1278 if defined $::CONN; 1572 if defined $::CONN;
1279 0 1573 0
1280 }); 1574 });
1281 1575
1282 $table 1576 $r
1283} 1577}
1284 1578
1285my %SORT_ORDER = ( 1579my %SORT_ORDER = (
1286 type => undef, 1580 type => undef,
1287 mtime => sub { sort { 1581 mtime => sub {
1582 my $NOW = time;
1583 sort {
1584 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1585 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1586
1288 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1587 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1289 or $b->{mtime} <=> $a->{mtime} 1588 or $btime <=> $atime
1290 or $a->{type} <=> $b->{type} 1589 or $a->{type} <=> $b->{type}
1590 } @_
1291 } @_ }, 1591 },
1292 weight => sub { sort { 1592 weight => sub { sort {
1293 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1593 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1294 or $a->{type} <=> $b->{type} 1594 or $a->{type} <=> $b->{type}
1295 } @_ }, 1595 } @_ },
1296); 1596);
1321 #TODO# update to weigh/maxweight 1621 #TODO# update to weigh/maxweight
1322 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1622 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1323 1623
1324 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1624 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1325 $sw1->add ($INV = new CFPlus::UI::Inventory); 1625 $sw1->add ($INV = new CFPlus::UI::Inventory);
1626 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1326 1627
1327 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1628 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1328 1629
1329 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1630 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1330 1631
1331 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1632 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1332 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1633 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1333 1634
1334 # XXX: Call after $INVR = ... because set_opencont sets the items 1635 # XXX: Call after $INVR = ... because set_opencont sets the items
1335 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1636 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1336 1637
1337 $hb 1638 $hb
1639}
1640
1641sub media_window {
1642 my $vb = new CFPlus::UI::VBox;
1643
1644 $vb->add (new CFPlus::UI::FancyFrame
1645 label => "Currently playing music",
1646 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1647 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1648 );
1649
1650 $vb->add (new CFPlus::UI::FancyFrame
1651 label => "Other media used in this session",
1652 expand => 1,
1653 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1654 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1655 );
1656
1657 $vb
1658}
1659
1660sub add_license {
1661 my ($meta) = @_;
1662
1663 $meta = $meta->{data}
1664 or return;
1665
1666 $meta->{license} || $meta->{author} || $meta->{source}
1667 or return;
1668
1669 $LICENSE_WIDGET->add_paragraph ({
1670 fg => [1, 1, 1, 1],
1671 markup => "<small>"
1672 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1673 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1674 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1675 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1676 . "</small>",
1677 });
1678 $LICENSE_WIDGET->scroll_to_bottom;
1338} 1679}
1339 1680
1340sub toggle_player_page { 1681sub toggle_player_page {
1341 my ($widget) = @_; 1682 my ($widget) = @_;
1342 1683
1359 has_close_button => 1 1700 has_close_button => 1
1360 ; 1701 ;
1361 1702
1362 my $ntb = 1703 my $ntb =
1363 $PL_NOTEBOOK = 1704 $PL_NOTEBOOK =
1364 new CFPlus::UI::Notebook expand => 1, debug => 1; 1705 new CFPlus::UI::Notebook expand => 1;
1365 1706
1366 $ntb->add ( 1707 $ntb->add_tab (
1367 "Statistics (F2)" => $STATS_PAGE = stats_window, 1708 "Statistics (F2)" => $STATS_PAGE = stats_window,
1368 "Shows statistics, where all your Stats and Resistances are shown." 1709 "Shows statistics, where all your Stats and Resistances are shown."
1369 ); 1710 );
1370 $ntb->add ( 1711 $ntb->add_tab (
1371 "Skills (F3)" => $SKILL_PAGE = skill_window, 1712 "Skills (F3)" => $SKILL_PAGE = skill_window,
1372 "Shows all your Skills." 1713 "Shows all your Skills."
1373 ); 1714 );
1374 1715
1375 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1716 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1376 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1717 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1377 $ntb->add ( 1718 $ntb->add_tab (
1378 "Spellbook (F4)" => $spellsw, 1719 "Spellbook (F4)" => $spellsw,
1379 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1720 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1380 ); 1721 );
1381 $ntb->add ( 1722 $ntb->add_tab (
1382 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1723 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1383 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1724 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1384 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1725 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1385 ); 1726 );
1727 $ntb->add_tab (Pickup => autopickup_setup,
1728 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1729
1730 $ntb->add_tab (Media => media_window,
1731 "License, Author and Source info for media sent by the server.");
1386 1732
1387 $ntb->set_current_page ($INVENTORY_PAGE); 1733 $ntb->set_current_page ($INVENTORY_PAGE);
1388 1734
1389 $plwin->add ($ntb); 1735 $plwin->add ($ntb);
1390 $plwin 1736 $plwin
1391} 1737}
1392 1738
1393sub update_bindings {
1394 $BIND_UPD_CB->() if $BIND_UPD_CB;
1395}
1396
1397sub keyboard_setup { 1739sub keyboard_setup {
1398 my $binding_list = new CFPlus::UI::VBox; 1740 CFPlus::Macro::keyboard_setup
1399
1400 my $refresh;
1401 $refresh = $BIND_UPD_CB = sub {
1402 $binding_list->clear ();
1403
1404 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1405 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1406 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1407 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1408
1409 my $lbl = join "; ", @$cmds;
1410 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1411 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1412 $hb->add (new CFPlus::UI::Button
1413 text => "delete",
1414 tooltip => "Deletes the binding",
1415 on_activate => sub {
1416 $binding_list->remove ($hb);
1417 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1418 0
1419 });
1420
1421 $hb->add (new CFPlus::UI::Button
1422 text => "edit",
1423 tooltip => "Edits the binding",
1424 on_activate => sub {
1425 $::BIND_EDITOR->set_binding (
1426 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1427 sub {
1428 my ($nmod, $nsym, $ncmds) = @_;
1429 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1430 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1431 $refresh->();
1432 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1433 $SETUP_DIALOG->show;
1434 },
1435 sub {
1436 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1437 $SETUP_DIALOG->show;
1438 });
1439 $::BIND_EDITOR->show;
1440 $SETUP_DIALOG->hide;
1441 0
1442 });
1443
1444 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1445 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1446 }
1447 }
1448 };
1449
1450 my $vb = new CFPlus::UI::VBox;
1451 $vb->add (new CFPlus::UI::FancyFrame
1452 label => "Options",
1453 child => (my $hb = new CFPlus::UI::HBox),
1454 );
1455 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1456 $hb->add (new CFPlus::UI::CheckBox
1457 expand => 1,
1458 state => $CFG->{shift_fire_stop},
1459 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1460 on_changed => sub {
1461 my ($cbox, $value) = @_;
1462 $CFG->{shift_fire_stop} = $value;
1463 0
1464 });
1465
1466 $vb->add (new CFPlus::UI::FancyFrame
1467 label => "Bindings",
1468 child => $binding_list);
1469 $vb->add (my $hb = new CFPlus::UI::HBox);
1470
1471 $hb->add (new CFPlus::UI::Button
1472 text => "record new",
1473 expand => 1,
1474 tooltip => "This button opens the binding editor with an empty binding.",
1475 on_activate => sub {
1476 $::BIND_EDITOR->set_binding (undef, undef, [],
1477 sub {
1478 my ($mod, $sym, $cmds) = @_;
1479 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1480 $refresh->();
1481 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1482 $SETUP_DIALOG->show;
1483 },
1484 sub {
1485 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1486 $SETUP_DIALOG->show;
1487 },
1488 );
1489 $SETUP_DIALOG->hide;
1490 $::BIND_EDITOR->show;
1491 0
1492 },
1493 );
1494
1495 $hb->add (new CFPlus::UI::Button
1496 text => "close",
1497 tooltip => "Closes the binding window",
1498 expand => 1,
1499 on_activate => sub {
1500 $SETUP_DIALOG->hide;
1501 0
1502 }
1503 );
1504
1505 $refresh->();
1506
1507 $vb
1508} 1741}
1509 1742
1510sub help_window { 1743sub help_window {
1511 my $win = new CFPlus::UI::Toplevel 1744 my $win = new CFPlus::UI::Toplevel
1512 x => 'center', 1745 x => 'center',
1513 y => 'center', 1746 y => 'center',
1514 z => 2, 1747 z => 4,
1515 name => 'doc_browser', 1748 name => 'doc_browser',
1516 force_w => int $WIDTH * 7/8, 1749 force_w => int $WIDTH * 7/8,
1517 force_h => int $HEIGHT * 7/8, 1750 force_h => int $HEIGHT * 7/8,
1518 title => "Help Browser", 1751 title => "Help Browser",
1519 has_close_button => 1; 1752 has_close_button => 1;
1607 }; 1840 };
1608 1841
1609 $win 1842 $win
1610} 1843}
1611 1844
1845sub open_string_query {
1846 my ($title, $cb, $txt, $tooltip) = @_;
1847 my $dialog = new CFPlus::UI::Toplevel
1848 x => "center",
1849 y => "center",
1850 z => 50,
1851 force_w => $WIDTH * 4/5,
1852 title => $title;
1853
1854 $dialog->add (
1855 my $e = new CFPlus::UI::Entry
1856 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1857 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1858 tooltip => $tooltip
1859 );
1860
1861 $e->grab_focus;
1862 $e->set_text ($txt) if $txt;
1863 $dialog->show;
1864}
1865
1866sub open_quit_dialog {
1867 unless ($QUIT_DIALOG) {
1868 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1869 x => "center",
1870 y => "center",
1871 z => 50,
1872 title => "Really Quit?",
1873 on_key_down => sub {
1874 my ($dialog, $ev) = @_;
1875 $ev->{sym} == 27 and $dialog->hide;
1876 }
1877 ;
1878
1879 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1880
1881 $vb->add (new CFPlus::UI::Label
1882 text => "You should find a savebed and apply it first!",
1883 max_w => $WIDTH * 0.25,
1884 ellipsize => 0,
1885 );
1886 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1887 $hb->add (new CFPlus::UI::Button
1888 text => "Ok",
1889 expand => 1,
1890 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1891 );
1892 $hb->add (new CFPlus::UI::Button
1893 text => "Quit anyway",
1894 expand => 1,
1895 on_activate => sub { Event::unloop_all },
1896 );
1897 }
1898
1899 $QUIT_DIALOG->show;
1900 $QUIT_DIALOG->grab_focus;
1901}
1902
1903sub show_tip_of_the_day {
1904 # find all tips
1905 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1906
1907 CFPlus::DB::get state => "tip_of_the_day", sub {
1908 my ($todindex) = @_;
1909 $todindex = 0 if $todindex >= @tod;
1910 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1911
1912 # create dialog
1913 my $dialog;
1914
1915 my $close = sub {
1916 $dialog->destroy;
1917 };
1918
1919 $dialog = new CFPlus::UI::Toplevel
1920 x => "center",
1921 y => "center",
1922 z => 3,
1923 name => 'tip_of_the_day',
1924 force_w => int $WIDTH * 4/9,
1925 force_h => int $WIDTH * 2/9,
1926 title => "Tip of the day #" . (1 + $todindex),
1927 child => my $vbox = new CFPlus::UI::VBox,
1928 has_close_button => 1,
1929 on_delete => $close,
1930 ;
1931
1932 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1933 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1934 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1935
1936 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1937
1938 $table->add_at (0, 0, new CFPlus::UI::Button
1939 text => "Close",
1940 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>.",
1941 on_activate => $close,
1942 );
1943
1944 $table->add_at (2, 0, new CFPlus::UI::Button
1945 text => "Next",
1946 tooltip => "Show the next <b>Tip of the day</b>.",
1947 on_activate => sub {
1948 $close->();
1949 &show_tip_of_the_day;
1950 },
1951 );
1952
1953 $dialog->show;
1954 };
1955}
1956
1612sub sdl_init { 1957sub sdl_init {
1613 CFPlus::SDL_Init 1958 CFPlus::SDL_Init
1614 and die "SDL::Init failed!\n"; 1959 and die "SDL::Init failed!\n";
1615} 1960}
1616 1961
1617sub video_init { 1962sub video_init {
1618 sdl_init;
1619
1620 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1963 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1621 1964
1622 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1965 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1623 1966
1624 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1967 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1625 $FULLSCREEN = $CFG->{fullscreen}; 1968 $FULLSCREEN = $CFG->{fullscreen};
1626 $FAST = $CFG->{fast}; 1969 $FAST = $CFG->{fast};
1627 1970
1628 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1971 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1629 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1972 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1630 1973
1631 $SDL_ACTIVE = 1; 1974 $SDL_ACTIVE = 1;
1632 $LAST_REFRESH = time - 0.01; 1975 $LAST_REFRESH = time - 0.01;
1633 1976
1648 padding => 0, 1991 padding => 0,
1649 z => 100, 1992 z => 100,
1650 force_x => "max", 1993 force_x => "max",
1651 force_y => 0; 1994 force_y => 0;
1652 $DEBUG_STATUS->show; 1995 $DEBUG_STATUS->show;
1653
1654 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1655 1996
1656 $STATUSBOX = new CFPlus::UI::Statusbox; 1997 $STATUSBOX = new CFPlus::UI::Statusbox;
1657 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1998 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1658 1999
1659 (new CFPlus::UI::Frame 2000 (new CFPlus::UI::Frame
1677 2018
1678 $MAPWIDGET = new CFPlus::MapWidget; 2019 $MAPWIDGET = new CFPlus::MapWidget;
1679 $MAPWIDGET->connect (activate_console => sub { 2020 $MAPWIDGET->connect (activate_console => sub {
1680 my ($mapwidget, $preset) = @_; 2021 my ($mapwidget, $preset) = @_;
1681 2022
1682 if ($CONSOLE) { 2023 $MESSAGE_WINDOW->activate_console ($preset)
1683 $CONSOLE->{input}->{auto_activated} = 1; 2024 if $MESSAGE_WINDOW;
1684 $CONSOLE->{input}->grab_focus;
1685
1686 if ($preset && $CONSOLE->{input}->get_text eq '') {
1687 $CONSOLE->{input}->set_text ($preset);
1688 }
1689 }
1690 }); 2025 });
1691 $MAPWIDGET->show; 2026 $MAPWIDGET->show;
1692 $MAPWIDGET->grab_focus; 2027 $MAPWIDGET->grab_focus;
1693
1694 $LOGVIEW = new CFPlus::UI::TextScroller
1695 expand => 1,
1696 font => $FONT_FIXED,
1697 fontsize => $::CFG->{log_fontsize},
1698 indent => -4,
1699 can_hover => 1,
1700 can_events => 1,
1701 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1702 ;
1703 2028
1704 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2029 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1705 title => "Setup", 2030 title => "Setup",
1706 name => "setup_dialog", 2031 name => "setup_dialog",
1707 x => 'center', 2032 x => 'center',
1711 force_h => $::HEIGHT * 0.6, 2036 force_h => $::HEIGHT * 0.6,
1712 has_close_button => 1, 2037 has_close_button => 1,
1713 ; 2038 ;
1714 2039
1715 $METASERVER = metaserver_dialog; 2040 $METASERVER = metaserver_dialog;
2041 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1716 2042
1717 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2043 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1718 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2044 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1719 2045
1720 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2046 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1721 "Configure the server to play on, your username, password and other server-related options."); 2047 "Configure the server to play on, your username, password and other server-related options.");
1722 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2048 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1723 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2049 "Configure various client-specific settings.");
1724 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2050 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1725 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2051 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1726 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2052 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1727 "Configure the use of audio, sound effects and background music."); 2053 "Configure the use of audio, sound effects and background music.");
1728 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2054 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1729 "Lets you define, edit and delete key bindings." 2055 "Lets you define, edit and delete key bindings."
1730 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2056 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1731 . "with nothing set and the recording started. After doing the actions you " 2057 . "with nothing set and the recording started. After doing the actions you "
1732 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2058 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1733 . "After pressing the combo the binding will be saved automatically and the " 2059 . "After pressing the combo the binding will be saved automatically and the "
1734 . "binding editor closes"); 2060 . "binding editor closes");
1735 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2061 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1736 "Some debuggin' options. Do not ask."); 2062 "Some debuggin' options. Do not ask.");
1737 2063
1738 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2064 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1739 2065
1740 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2066 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1741 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2067 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1742 2068
1743 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2069 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1744 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2070 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1745 2071
1746 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 2072 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
1747 2073
1748 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2074 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1760 ); 2086 );
1761 2087
1762 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2088 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1763 tooltip => "View Documentation"); 2089 tooltip => "View Documentation");
1764 2090
2091
1765 $BUTTONBAR->add (new CFPlus::UI::Button 2092 $BUTTONBAR->add (new CFPlus::UI::Button
1766 text => "Quit", 2093 text => "Quit",
1767 tooltip => "Terminates the program", 2094 tooltip => "Terminates the program",
1768 on_activate => sub { 2095 on_activate => sub {
1769 if ($CONN) { 2096 if ($CONN) {
1770 open_quit_dialog; 2097 open_quit_dialog;
1771 } else { 2098 } else {
1772 exit; 2099 Event::unloop_all;
1773 } 2100 }
1774 0 2101 0
1775 }, 2102 },
1776 ); 2103 );
1777 2104
1778 $BUTTONBAR->show; 2105 $BUTTONBAR->show;
1779 $SETUP_DIALOG->show; 2106 $SETUP_DIALOG->show;
2107 $MESSAGE_WINDOW->show;
1780 } 2108 }
1781 2109
1782 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2110 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1783} 2111}
1784 2112
1786 CFPlus::OpenGL::shutdown; 2114 CFPlus::OpenGL::shutdown;
1787 2115
1788 undef $SDL_ACTIVE; 2116 undef $SDL_ACTIVE;
1789} 2117}
1790 2118
1791my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1792my $bgmusic;#TODO#hack#d#
1793
1794sub audio_channel_finished {
1795 my ($channel) = @_;
1796
1797 #warn "channel $channel finished\n";#d#
1798}
1799
1800sub audio_music_finished {
1801 return unless $CFG->{bgm_enable};
1802
1803 # TODO: hack, do play loop and mood music
1804 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1805 $bgmusic->play (0);
1806
1807 push @bgmusic, shift @bgmusic;
1808}
1809
1810sub audio_init {
1811 if ($CFG->{audio_enable}) {
1812 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1813 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1814
1815 unless ($SDL_MIXER) {
1816 status "Unable to open sound device: there will be no sound";
1817 return;
1818 }
1819
1820 CFPlus::Mix_AllocateChannels 8;
1821 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1822
1823 audio_music_finished;
1824
1825 while (<$fh>) {
1826 next if /^\s*#/;
1827 next if /^\s*$/;
1828
1829 my ($file, $volume, $event) = split /\s+/, $_, 3;
1830
1831 push @SOUNDS, "$volume,$file";
1832
1833 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1834 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1835 $chunk->volume ($volume * 128 / 100);
1836 $chunk
1837 };
1838 }
1839 } else {
1840 status "unable to open sound config: $!";
1841 }
1842 }
1843}
1844
1845sub audio_shutdown {
1846 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1847 undef $SDL_MIXER;
1848 @SOUNDS = ();
1849 %AUDIO_CHUNKS = ();
1850}
1851
1852my %animate_object; 2119my %animate_object;
1853my $animate_timer; 2120my $animate_timer;
1854 2121
1855my $fps = 9; 2122my $fps = 9;
1856 2123
1857my %demo;#d#
1858
1859sub force_refresh { 2124sub force_refresh {
2125 if ($ENV{CFPLUS_DEBUG} & 4) {
1860 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2126 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1861 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2127 debug sprintf "%3.2f", $fps;
2128 }
1862 2129
1863 $CFPlus::UI::ROOT->draw; 2130 $CFPlus::UI::ROOT->draw;
1864 2131 CFPlus::SDL_GL_SwapBuffers;
1865 $WANT_REFRESH = 0;
1866 $CAN_REFRESH = 0;
1867 $LAST_REFRESH = $NOW; 2132 $LAST_REFRESH = $NOW;
1868 2133 $WANT_REFRESH->stop;
1869 CFPlus::SDL_GL_SwapBuffers;
1870} 2134}
1871 2135
2136$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2137
1872my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2138my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1873 $NOW = time; 2139 $NOW = time;
1874 2140
1875 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2141 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1876 for CFPlus::SDL_PollEvent; 2142 for CFPlus::poll_events;
1877 2143
1878 if (%animate_object) { 2144 if (%animate_object) {
1879 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2145 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1880 $WANT_REFRESH++; 2146 $WANT_REFRESH->start;
1881 }
1882
1883 if ($WANT_REFRESH) {
1884 force_refresh;
1885 } else {
1886 $CAN_REFRESH = 1;
1887 } 2147 }
1888}); 2148});
1889 2149
1890sub animation_start { 2150sub animation_start {
1891 my ($widget) = @_; 2151 my ($widget) = @_;
1895sub animation_stop { 2155sub animation_stop {
1896 my ($widget) = @_; 2156 my ($widget) = @_;
1897 delete $animate_object{$widget}; 2157 delete $animate_object{$widget};
1898} 2158}
1899 2159
1900# check once/second for faces that need to be prefetched
1901# this should, of course, only run on demand, but
1902# SDL forces worse things on us....
1903
1904Event->timer (after => 1, interval => 0.25, cb => sub {
1905 $CONN->face_prefetch
1906 if $CONN;
1907});
1908
1909%SDL_CB = ( 2160%SDL_CB = (
1910 CFPlus::SDL_QUIT => sub { 2161 CFPlus::SDL_QUIT => sub {
1911 Event::unloop -1; 2162 exit;
1912 }, 2163 },
1913 CFPlus::SDL_VIDEORESIZE => sub { 2164 CFPlus::SDL_VIDEORESIZE => sub {
1914 }, 2165 },
1915 CFPlus::SDL_VIDEOEXPOSE => sub { 2166 CFPlus::SDL_VIDEOEXPOSE => sub {
1916 CFPlus::UI::full_refresh; 2167 CFPlus::UI::full_refresh;
1917 }, 2168 },
1918 CFPlus::SDL_ACTIVEEVENT => sub { 2169 CFPlus::SDL_ACTIVEEVENT => sub {
1919# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2170# not useful, as APPACTIVE include sonly iconified state, not unmapped
2171# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2172# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2173# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2174# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2175# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1920 }, 2176 },
1921 CFPlus::SDL_KEYDOWN => sub { 2177 CFPlus::SDL_KEYDOWN => sub {
1922 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2178 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1923 # alt-enter 2179 # alt-enter
1924 $FULLSCREEN_ENABLE->toggle; 2180 $FULLSCREEN_ENABLE->toggle;
1945 2201
1946$SIG{INT} = $SIG{TERM} = sub { exit }; 2202$SIG{INT} = $SIG{TERM} = sub { exit };
1947 2203
1948{ 2204{
1949 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2205 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2206 CFPlus::DB::Server::run;
2207
1950 CFPlus::UI::set_layout ($::CFG->{layout}); 2208 CFPlus::UI::set_layout ($::CFG->{layout});
1951 2209
1952 my %DEF_CFG = ( 2210 my %DEF_CFG = (
1953 sdl_mode => 0, 2211 sdl_mode => 0,
1954 width => 640,
1955 height => 480,
1956 fullscreen => 0, 2212 fullscreen => 0,
1957 fast => 0, 2213 fast => 0,
2214 force_opengl11 => undef,
2215 texture_compression => 1,
1958 map_scale => 1, 2216 map_scale => 1,
1959 fow_enable => 1, 2217 fow_enable => 1,
1960 fow_intensity => 0.45, 2218 fow_intensity => 0,
1961 fow_smooth => 0, 2219 map_smoothing => 1,
1962 gui_fontsize => 1, 2220 gui_fontsize => 1,
1963 log_fontsize => 0.7, 2221 log_fontsize => 0.7,
1964 gauge_fontsize => 1, 2222 gauge_fontsize => 1,
1965 gauge_size => 0.35, 2223 gauge_size => 0.35,
1966 stat_fontsize => 0.7, 2224 stat_fontsize => 0.7,
1967 mapsize => 100, 2225 mapsize => 100,
1968 say_command => 'say',
1969 audio_enable => 1, 2226 audio_enable => 1,
2227 effects_enable => 1,
2228 effects_volume => 1,
1970 bgm_enable => 1, 2229 bgm_enable => 1,
1971 bgm_volume => 0.25, 2230 bgm_volume => 0.5,
1972 face_prefetch => 0,
1973 output_sync => 1, 2231 output_sync => 1,
1974 output_count => 1, 2232 output_count => 1,
2233 output_rate => "",
1975 pickup => 0, 2234 pickup => 0,
1976 inv_sort => "mtime", 2235 inv_sort => "mtime",
1977 default => "profile", # default profile 2236 default => "profile", # default profile
2237 show_tips => 1,
2238 logview_max_par => 1000,
1978 ); 2239 );
1979 2240
1980 while (my ($k, $v) = each %DEF_CFG) { 2241 while (my ($k, $v) = each %DEF_CFG) {
1981 $CFG->{$k} = $v unless exists $CFG->{$k}; 2242 $CFG->{$k} = $v unless exists $CFG->{$k};
1982 } 2243 }
1983 2244
1984 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2245 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2246 $PROFILE = $CFG->{profile}{default};
2247
2248 # convert old bindings (only default profile matters)
2249 if (my $bindings = delete $PROFILE->{bindings}) {
2250 while (my ($mod, $syms) = each %$bindings) {
2251 while (my ($sym, $cmds) = each %$syms) {
2252 push @{ $PROFILE->{macro} }, {
2253 accelkey => [$mod*1, $sym*1],
2254 action => $cmds,
2255 };
2256 }
2257 }
2258 }
1985 2259
1986 sdl_init; 2260 sdl_init;
1987 2261
1988 @SDL_MODES = reverse 2262 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1989 grep $_->[0] >= 640 && $_->[1] >= 480, 2263 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1990 CFPlus::SDL_ListModes;
1991
1992 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2264 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2265
2266 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1993 2267
1994 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2268 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1995 2269
1996 { 2270 {
1997 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2271 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2026# } 2300# }
2027# my $t2 = Time::HiRes::time; 2301# my $t2 = Time::HiRes::time;
2028# warn $t2-$t1; 2302# warn $t2-$t1;
2029# } 2303# }
2030 2304
2305 $startup_done->();
2306
2031 video_init; 2307 video_init;
2032 audio_init; 2308 audio_init;
2033} 2309}
2034 2310
2311show_tip_of_the_day if $CFG->{show_tips};
2312
2035Event::loop; 2313Event::loop;
2314
2315#video_shutdown;
2316#audio_shutdown;
2036#CFPlus::SDL_Quit; 2317CFPlus::SDL_Quit;
2037#CFPlus::_exit 0; 2318CFPlus::DB::Server::stop;
2038
2039END { CFPlus::SDL_Quit }
2040 2319
2041=head1 NAME 2320=head1 NAME
2042 2321
2043cfplus - A Crossfire+ and Crossfire game client 2322cfplus - A Crossfire TRT and Crossfire game client
2044 2323
2045=head1 SYNOPSIS 2324=head1 SYNOPSIS
2046 2325
2047Just run it - no commandline arguments are supported. 2326Just run it - no commandline arguments are supported.
2048 2327
2049=head1 USAGE 2328=head1 USAGE
2050 2329
2051cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2330cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2052fullscreen and interactively. 2331be used in fullscreen mode and interactively.
2053 2332
2054=head1 DEBUGGING 2333=head1 DEBUGGING
2055 2334
2056 2335
2057CFPLUS_DEBUG - environment variable 2336CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines