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.112 by root, Sun Aug 13 20:01:14 2006 UTC vs.
Revision 1.207 by root, Thu Aug 9 11:02:08 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; 118our $CAN_REFRESH;
80 119
89 128
90our $MAP; 129our $MAP;
91our $MAPMAP; 130our $MAPMAP;
92our $MAPWIDGET; 131our $MAPWIDGET;
93our $BUTTONBAR; 132our $BUTTONBAR;
94our $LOGVIEW;
95our $CONSOLE;
96our $METASERVER; 133our $METASERVER;
97our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
98our $QUIT_DIALOG; 135our $QUIT_DIALOG;
99our $HOST_ENTRY; 136our $HOST_ENTRY;
100our $FULLSCREEN_ENABLE; 137our $FULLSCREEN_ENABLE;
107our $SETUP_KEYBOARD; 144our $SETUP_KEYBOARD;
108 145
109our $PL_NOTEBOOK; 146our $PL_NOTEBOOK;
110our $PL_WINDOW; 147our $PL_WINDOW;
111 148
149our $MUSIC_PLAYING_WIDGET;
150our $LICENSE_WIDGET;
151
112our $INVENTORY_PAGE; 152our $INVENTORY_PAGE;
113our $STATS_PAGE; 153our $STATS_PAGE;
114our $SKILL_PAGE; 154our $SKILL_PAGE;
115our $SPELL_PAGE; 155our $SPELL_PAGE;
156our $SPELL_LIST;
116 157
117our $HELP_WINDOW; 158our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 159our $MESSAGE_WINDOW;
119our $FLOORBOX; 160our $FLOORBOX;
120our $GAUGES; 161our $GAUGES;
121our $STATWIDS; 162our $STATWIDS;
122 163
123our $SDL_ACTIVE; 164our $SDL_ACTIVE;
124our %SDL_CB; 165our %SDL_CB;
125 166
126our $SDL_MIXER;
127our @SOUNDS; # event => file mapping
128our %AUDIO_CHUNKS; # audio files
129
130our $ALT_ENTER_MESSAGE; 167our $ALT_ENTER_MESSAGE;
131our $STATUSBOX; 168our $STATUSBOX;
132our $DEBUG_STATUS; 169our $DEBUG_STATUS;
133 170
134our $INV; 171our $INV;
135our $INVR; 172our $INVR;
136our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
137 174
138our $BIND_EDITOR;
139our $BIND_UPD_CB;
140
141our $PICKUP_CFG; 175our $PICKUP_CFG;
176
177#############################################################################
142 178
143sub status { 179sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 180 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 181}
146 182
147sub debug { 183sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 184 $DEBUG_STATUS->set_text ($_[0]);
149} 185}
186
187sub message {
188 my ($para) = @_;
189 $MESSAGE_WINDOW->message ($para);
190}
191
192#############################################################################
193#TODO: maybe move into own audio module...
194
195our $SDL_MIXER;
196
197our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
198our $MUSIC_WANT; # arryref of ambient music we want to play
199our @MUSIC_HAVE; # ambient music we have on disk
200our $MUSIC_START;
201our @MUSIC_JINGLE; # which jingles to play next
202our $MUSIC_PLAYING_DATA;
203our $MUSIC_PLAYING_META;
204our $MUSIC_PLAYER;
205our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
206
207our %AUDIO_CHUNK; # audio "files"
208our %AUDIO_PLAY; # which audio faces should be played
209
210sub audio_channel_finished {
211 my ($channel) = @_;
212
213# warn "channel $channel finished\n";#d#
214}
215
216sub audio_sound_push($) {
217 my ($face) = @_;
218
219 $CFG->{effects_enable}
220 or return;
221
222 $AUDIO_PLAY{$face}
223 or return;
224
225 if (my $chunk = $AUDIO_CHUNK{$face}) {
226 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
227 my (undef, $dx, $dy, $vol) = @$_;
228
229 my $channel = CFPlus::Channel::find;
230 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
231 $channel->set_position_r ($dx, $dy, 20);
232 $chunk->play ($channel);
233 }
234 } else {
235 # sound_meta not set means data is in flight either way
236 my $meta = $CONN->{sound_meta}{$face}
237 or return;
238
239 # if its a jingle, play it as ambient music
240 if ($meta->{meta}{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->{meta}{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.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
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->{meta}{name}) . "\n"
280 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
281 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
282 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
283 );
284}
285
286sub audio_music_update_volume {
287 return unless $MUSIC_PLAYING_META;
288 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
289 my $base = $MUSIC_PLAYING_META->{meta}{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 $_,
343 map $CONN->{music_meta}{$_},
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) = @_;
159 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 }
459
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 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
448 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 775 $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 776 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
450 state => $CFG->{fast}, 777 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 778 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 779 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 780 );
454 781
782 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
783 $table->add_at (1, $row++, new CFPlus::UI::Slider
784 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
785 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
786 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
787 );
788
789 $table->add_at (1, $row++, new CFPlus::UI::Button
790 expand => 1, align => 0, text => "Apply",
791 tooltip => "Apply the video settings above.",
792 on_activate => sub {
793 video_shutdown ();
794 video_init ();
795 0
796 }
797 );
798
455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 799 $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 800 $table->add_at (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 801 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 802 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 803 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
460 ); 804 );
461 805
806 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
807 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
808 state => $CFG->{map_smoothing},
809 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
810 . "This increases load on the graphics subsystem and works only with 2.x servers. "
811 . "Changes take effect at next connection only.",
812 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
813 );
814
462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 815 $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 816 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 817 state => $CFG->{fow_enable},
465 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 818 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 } 819 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
467 ); 820 );
468 821
469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 822 $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 823 $table->add_at (1, $row++, new CFPlus::UI::Slider
471 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 824 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.", 825 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 } 826 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
474 ); 827 );
475 828
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"); 829 $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 830 $table->add_at (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 831 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.", 832 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
499 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 833 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
500 ); 834 );
501 835
502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 836 $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 837 $table->add_at (1, $row++, new CFPlus::UI::Slider
504 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 838 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.", 839 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
506 on_changed => sub { 840 on_changed => sub {
507 $CFG->{gauge_fontsize} = $_[1]; 841 $CFG->{gauge_fontsize} = $_[1];
508 &set_gauge_window_fontsize; 842 &set_gauge_window_fontsize;
509 0 843 0
510 } 844 }
511 ); 845 );
512 846
513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 847 $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 848 $table->add_at (1, $row++, new CFPlus::UI::Slider
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 849 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 850 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
517 on_changed => sub { 851 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 852 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 853 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0 854 0
521 } 855 }
522 ); 856 );
523 857
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 858 $vbox
535} 859}
536 860
537sub audio_setup { 861sub audio_setup {
538 my $vbox = new CFPlus::UI::VBox; 862 my $vbox = new CFPlus::UI::VBox;
539 863
540 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 864 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
541 865
542 my $row = 0; 866 my $row = 0;
543 867
544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 868 $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 869 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
546 state => $CFG->{audio_enable}, 870 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.", 871 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 } 872 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
549 ); 873 );
550# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 874# $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 { 875# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
552# $CFG->{effects_volume} = $_[1]; 876# $CFG->{effects_volume} = $_[1];
553# }); 877# });
878
879 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
880 $table->add_at (1, $row, new CFPlus::UI::CheckBox
881 expand => 1, state => $CFG->{effects_enable},
882 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
883 on_changed => sub {
884 $CFG->{effects_enable} = $_[1];
885 $CONN->update_fx_want if $CONN;
886 0
887 }
888 );
889 $table->add_at (2, $row++, new CFPlus::UI::Slider
890 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
891 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
892 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
893 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
894 );
895
554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 896 $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 897 $table->add_at (1, $row, new CFPlus::UI::CheckBox
557 expand => 1, state => $CFG->{bgm_enable}, 898 expand => 1, state => $CFG->{bgm_enable},
558 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 899 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 } 900 on_changed => sub {
901 $CFG->{bgm_enable} = $_[1];
902 $CONN->update_fx_want if $CONN;
903 0
904 }
560 ); 905 );
561 $hbox->add (new CFPlus::UI::Slider 906 $table->add_at (2, $row++, new CFPlus::UI::Slider
562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 907 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
563 tooltip => "The volume of the background music. Changes are instant.", 908 tooltip => "The volume of the background music. Changes are instant.",
564 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 909 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
565 ); 910 );
566 911
567 $table->add (1, $row++, new CFPlus::UI::Button 912 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply", 913 c_colspan => 2, expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the audio settings", 914 tooltip => "Apply the audio settings",
570 on_activate => sub { 915 on_activate => sub {
571 audio_shutdown (); 916 audio_shutdown ();
572 audio_init (); 917 audio_init ();
573 0 918 0
631} 976}
632 977
633sub debug_setup { 978sub debug_setup {
634 my $table = new CFPlus::UI::Table; 979 my $table = new CFPlus::UI::Table;
635 980
636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 981 $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 }); 982 $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"); 983 $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 }); 984 $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"); 985 $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 }); 986 $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"); 987 $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 }); 988 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
989 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644 990
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 991 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
646 992
647 for my $x (0..2) { 993 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
648 for my $y (0 .. 2) { 994 $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, 995 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
650 new CFPlus::UI::Entry 996 $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], 997 $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 }, 998 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
653 ); 999
654 } 1000 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1001
1002 $c->add_items ({
1003 type => "line_loop",
1004 color => [0, 1, 0],
1005 width => 9,
1006 coord_mode => "abs",
1007 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
655 } 1008 });
656 1009
1010 $c->add_items ({
1011 type => "lines",
1012 color => [1, 1, 0],
1013 width => 2,
1014 coord_mode => "rel",
1015 coord => [[0,0], [1,1], [1,0], [0,1]],
1016 });
1017
1018 $c->add_items ({
1019 type => "polygon",
1020 color => [0, 0.43, 0],
1021 width => 2,
1022 coord_mode => "rel",
1023 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1024 });
657 1025
658 $table 1026 $table
659} 1027}
660 1028
661sub stats_window { 1029sub stats_window {
663 expand => 1, 1031 expand => 1,
664 scroll_y => 1 1032 scroll_y => 1
665 ); 1033 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 1034 $r->add (my $vb = new CFPlus::UI::VBox);
667 1035
1036 $vb->add (new CFPlus::UI::FancyFrame
1037 label => "Player",
1038 child => (my $pi = new CFPlus::UI::VBox),
1039 );
1040
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1041 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 1042 can_hover => 1, can_events => 1,
670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 1043 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
671 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 1044 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 1045 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 1046 tooltip => "The map you are currently on (if supported by the server).");
674 1047
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 1048 $pi->add (my $hb0 = new CFPlus::UI::HBox);
676 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 1049 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 1050 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 1051 tooltip => "The weight of the player including all inventory items.");
679 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 1052 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
680 can_hover => 1, can_events => 1, 1053 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 1054 tooltip => "The weight limit: you cannot carry more than this.");
682 1055
1056 $vb->add (new CFPlus::UI::FancyFrame
1057 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 1058 child => (my $hb = new CFPlus::UI::HBox expand => 1),
1059 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 1060 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 1061
686 my $color2 = [1, 1, 0]; 1062 my $color2 = [1, 1, 0];
687 1063
688 for ( 1064 for (
701 [2, 4, st_spd => "Spd", 10.54], 1077 [2, 4, st_spd => "Spd", 10.54],
702 [2, 5, st_wspd => "WSp", 10.54], 1078 [2, 5, st_wspd => "WSp", 10.54],
703 ) { 1079 ) {
704 my ($col, $row, $id, $label, $template) = @$_; 1080 my ($col, $row, $id, $label, $template) = @$_;
705 1081
706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1082 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
707 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1083 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
708 align => +1, template => $template, tooltip => "#stat_$label"); 1084 align => +1, template => $template, tooltip => "#stat_$label");
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1085 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
710 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1086 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 1087 align => -1, text => $label, tooltip => "#stat_$label");
712 } 1088 }
713 1089
1090 $vb->add (new CFPlus::UI::FancyFrame
1091 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 1092 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
1093 );
715 1094
716 my $row = 0; 1095 my $row = 0;
717 my $col = 0; 1096 my $col = 0;
718 1097
719 my %resist_names = ( 1098 my %resist_names = (
752 cold => ["Cold", 1131 cold => ["Cold",
753 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1132 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
754 ghit => ["Ghost hit", 1133 ghit => ["Ghost hit",
755 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1134 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
756 ); 1135 );
1136
757 for (qw/slow holyw conf fire depl magic 1137 for (qw/slow holyw conf fire depl magic
758 drain acid pois para deat phys 1138 drain acid pois para deat phys
759 blind fear tund elec cold ghit/) 1139 blind fear tund elec cold ghit/)
760 { 1140 {
761 $tbl2->add ($col, $row, 1141 $tbl2->add_at ($col, $row,
762 $STATWIDS->{"res_$_"} = 1142 $STATWIDS->{"res_$_"} =
763 new CFPlus::UI::Label 1143 new CFPlus::UI::Label
764 font => $FONT_FIXED, 1144 font => $FONT_FIXED,
765 template => "-100%", 1145 template => "-100%",
766 align => +1, 1146 align => +1,
767 valign => 0, 1147 valign => 0,
768 can_events => 1, 1148 can_events => 1,
769 can_hover => 1, 1149 can_hover => 1,
770 tooltip => $resist_names{$_}->[1], 1150 tooltip => $resist_names{$_}->[1],
771 ); 1151 );
772 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1152 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
773 font => $FONT_FIXED, 1153 font => $FONT_FIXED,
774 can_hover => 1, 1154 can_hover => 1,
775 can_events => 1, 1155 can_events => 1,
776 path => "ui/resist/resist_$_.png", 1156 path => "ui/resist/resist_$_.png",
777 tooltip => $resist_names{$_}->[1], 1157 tooltip => $resist_names{$_}->[1],
778 ); 1158 );
779 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1159 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
780 text => $resist_names{$_}->[0], 1160 text => $resist_names{$_}->[0],
781 font => $FONT_FIXED, 1161 font => $FONT_FIXED,
782 can_hover => 1, 1162 can_hover => 1,
783 can_events => 1, 1163 can_events => 1,
784 tooltip => $resist_names{$_}->[1], 1164 tooltip => $resist_names{$_}->[1],
817 return if $METASERVER_ATIME > time; 1197 return if $METASERVER_ATIME > time;
818 $METASERVER_ATIME = time + 60; 1198 $METASERVER_ATIME = time + 60;
819 1199
820 my $table = $METASERVER->{table}; 1200 my $table = $METASERVER->{table};
821 $table->clear; 1201 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1202 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 1203
824 my $buf; 1204 my $ok = 0;
825 1205
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1206 CFPlus::background {
1207 my $ua = CFPlus::lwp_useragent;
827 1208
828 unless ($fh) { 1209 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 1210 } sub {
830 return; 1211 my ($msg) = @_;
831 } 1212 if ($msg) {
832
833 Event->io (fd => $fh, poll => 'r', cb => sub {
834 my $res = sysread $fh, $buf, 8192, length $buf;
835
836 if (!defined $res) {
837 $_[0]->w->cancel;
838 $label->set_text ("error while retrieving server list: $!");
839 } elsif ($res == 0) {
840 $_[0]->w->cancel;
841 status "server list retrieved";
842
843 utf8::decode $buf if utf8::valid $buf;
844
845 $table->clear; 1213 $table->clear;
846 1214
847 my @tip = ( 1215 my @tip = (
848 "The current number of users logged in on the server.", 1216 "The current number of users logged in on the server.",
849 "The hostname of the server.", 1217 "The hostname of the server.",
850 "The time this server has been running without being restarted.", 1218 "The time this server has been running without being restarted.",
851 "The server software version - a '+' indicates a Crossfire+ server.", 1219 "The server software version - a '+' indicates a Crossfire+ server.",
852 "Short information about this server provided by its admins.", 1220 "Short information about this server provided by its admins.",
853 ); 1221 );
854 my @col = qw(#Users Host Uptime Version Description); 1222 my @col = qw(#Users Host Uptime Version Description);
855 $table->add ($_, 0, new CFPlus::UI::Label 1223 $table->add_at ($_, 0, new CFPlus::UI::Label
856 can_hover => 1, can_events => 1, 1224 can_hover => 1, can_events => 1,
857 align => 0, fg => [1, 1, 0], 1225 align => 0, fg => [1, 1, 0],
858 text => $col[$_], tooltip => $tip[$_]) 1226 text => $col[$_], tooltip => $tip[$_])
859 for 0 .. $#col; 1227 for 0 .. $#col;
860 1228
861 my @align = qw(1 0 1 1 -1); 1229 my @align = qw(1 0 1 1 -1);
862 1230
863 my $y = 0; 1231 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1232 for my $m (@{ $msg->{servers} }) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1233 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1234 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
866 1235
867 for ($desc) { 1236 for ($desc) {
868 s/<br>/\n/gi; 1237 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 1238 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 1239 s/<.*?>//sgi;
871 s/&/&amp;/g; 1240 s/&amp;/&/g;
872 s/</&lt;/g; 1241 s/&lt;/</g;
873 s/>/&gt;/g; 1242 s/&gt;/>/g;
874 } 1243 }
875 1244
876 $uptime = sprintf "%dd %02d:%02d:%02d", 1245 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 1246 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 1247 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 1248 (int $uptime / 60) % 60,
880 $m->[8] % 60; 1249 $uptime % 60;
881 1250
882 $m = [$users, $host, $uptime, $version, $desc]; 1251 $m = [$users, $host, $uptime, $version, $desc];
883 1252
884 $y++; 1253 $y++;
885 1254
886 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1255 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
887 (new CFPlus::UI::Button 1256 (new CFPlus::UI::Button
888 text => "Use", 1257 text => "Use",
889 tooltip => "Put this server into the <b>Host:Port</b> field", 1258 tooltip => "Put this server into the <b>Host:Port</b> field",
890 on_activate => sub { 1259 on_activate => sub {
891 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1260 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
894 }, 1263 },
895 ), 1264 ),
896 (new CFPlus::UI::Empty expand => 1), 1265 (new CFPlus::UI::Empty expand => 1),
897 ]); 1266 ]);
898 1267
899 $table->add ($_, $y, new CFPlus::UI::Label 1268 $table->add_at ($_, $y, new CFPlus::UI::Label
1269 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 1270 ellipsise => 0,
901 align => $align[$_], 1271 align => $align[$_],
902 text => $m->[$_], 1272 text => $m->[$_],
903 tooltip => $tip[$_], 1273 tooltip => $tip[$_],
1274 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 1275 can_hover => 1,
905 can_events => 1, 1276 can_events => 1,
906 fontsize => 0.8) 1277 fontsize => 0.8)
907 for 0 .. $#$m; 1278 for 0 .. $#$m;
908 } 1279 }
1280 } else {
1281 $ok or $label->set_text ("error while contacting metaserver");
909 } 1282 }
910 }); 1283 };
1284
911} 1285}
912 1286
913sub metaserver_dialog { 1287sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 1288 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 1289 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1290 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 1291
918 my $dialog = new CFPlus::UI::FancyFrame 1292 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 1293 title => "Server List",
920 name => 'metaserver_dialog', 1294 name => 'metaserver_dialog',
921 x => 'center', 1295 x => 'center',
922 y => 'center', 1296 y => 'center',
923 z => 3, 1297 z => 3,
1298 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 1299 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 1300 child => $vbox,
926 has_close_button => 1, 1301 has_close_button => 1,
927 table => $table, 1302 table => $table,
928 on_visibility_change => sub { 1303 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 1304 update_metaserver ($_[0]) if $_[1];
935} 1310}
936 1311
937sub server_setup { 1312sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 1313 my $vbox = new CFPlus::UI::VBox;
939 1314
1315 $vbox->add (new CFPlus::UI::FancyFrame
1316 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1317 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1318 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1319 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 1320
943 { 1321 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1322 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
945 1323
946 $vbox->add ( 1324 $vbox->add (
947 $HOST_ENTRY = new CFPlus::UI::Entry 1325 $HOST_ENTRY = new CFPlus::UI::Entry
948 expand => 1, 1326 expand => 1,
949 text => $CFG->{profile}{default}{host}, 1327 text => $CFG->{profile}{default}{host},
950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1328 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
951 on_changed => sub { 1329 on_changed => sub {
952 my ($self, $value) = @_; 1330 my ($self, $value) = @_;
953 $CFG->{profile}{default}{host} = $value; 1331 $CFG->{profile}{default}{host} = $value;
954 0 1332 1
955 } 1333 }
956 ); 1334 );
957 1335
958 $vbox->add (new CFPlus::UI::Button 1336 $vbox->add (new CFPlus::UI::Button
959 expand => 1, 1337 expand => 1,
960 text => "Server List", 1338 text => "Server List",
961 other => $METASERVER, 1339 other => $METASERVER,
962 tooltip => "Show a list of available crossfire servers", 1340 tooltip => "Show a list of available crossfire servers",
963 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1341 on_activate => sub { $METASERVER->toggle_visibility; 0 },
964 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1342 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
965 ); 1343 );
966 } 1344 }
967 1345
968 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1346 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
969 $table->add (1, 4, new CFPlus::UI::Entry 1347 $table->add_at (1, 4, new CFPlus::UI::Entry
970 text => $CFG->{profile}{default}{user}, 1348 text => $CFG->{profile}{default}{user},
971 tooltip => "The name of your character on the server", 1349 tooltip => "The name of your character on the server",
972 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1350 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
973 ); 1351 );
974 1352
975 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1353 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
976 $table->add (1, 5, new CFPlus::UI::Entry 1354 $table->add_at (1, 5, new CFPlus::UI::Entry
977 text => $CFG->{profile}{default}{password}, 1355 text => $CFG->{profile}{default}{password},
978 hidden => 1, 1356 hidden => 1,
979 tooltip => "The password for your character", 1357 tooltip => "The password for your character",
980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1358 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
981 ); 1359 );
982 1360
983 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1361 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
984 $table->add (1, 7, new CFPlus::UI::Slider 1362 $table->add_at (1, 7, new CFPlus::UI::Slider
985 force_w => 100, 1363 force_w => 100,
986 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1364 range => [$CFG->{mapsize}, 10, 100, 0, 1],
987 tooltip => "This is the size of the portion of the map update the server sends you. " 1365 tooltip => "This is the size of the portion of the map update the server sends you. "
988 . "If you set this to a high value you will be able to see further, " 1366 . "If you set this to a high value you will be able to see further, "
989 . "but you also increase bandwidth requirements and latency. " 1367 . "but you also increase bandwidth requirements and latency. "
990 . "This option is only used once at log-in.", 1368 . "This option is only used once at log-in.",
991 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1369 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
992 ); 1370 );
993 1371
994 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1372 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
995 $table->add (1, 8, new CFPlus::UI::CheckBox 1373 $table->add_at (1, 8, new CFPlus::UI::Entry
996 state => $CFG->{face_prefetch}, 1374 text => $CFG->{output_rate},
997 tooltip => "<b>Background Image Prefetch</b>\n\n" 1375 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
998 . "If enabled, the client automatically pre-fetches images from the server. " 1376 . "when sending data. When 0 or unset, the server "
999 . "This might increase or create lag, but increases the chances " 1377 . "default will be used, which is usually around 100kb/s. Most servers will "
1000 . "of faces being ready for display when you encounter them. " 1378 . "dynamically find an optimal rate, so adjust this only when necessary.",
1001 . "It also uses up server bandwidth on every connect, "
1002 . "so only set it if you really need to prefetch images. "
1003 . "This option can be set and unset any time.",
1004 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1379 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1005 ); 1380 );
1006 1381
1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1382 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1008 $table->add (1, 9, new CFPlus::UI::Entry 1383 $table->add_at (1, 9, new CFPlus::UI::Entry
1009 text => $CFG->{output_count}, 1384 text => $CFG->{output_count},
1010 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1385 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1011 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1386 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1012 ); 1387 );
1013 1388
1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1389 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1015 $table->add (1, 10, new CFPlus::UI::Entry 1390 $table->add_at (1, 10, new CFPlus::UI::Entry
1016 text => $CFG->{output_sync}, 1391 text => $CFG->{output_sync},
1017 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1392 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1018 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1393 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1019 ); 1394 );
1020 1395
1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1396 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1022 expand => 1, 1397 expand => 1,
1023 align => 0, 1398 align => 0,
1024 text => "Login", 1399 text => "Login",
1025 on_activate => sub { 1400 on_activate => sub {
1026 $CONN ? stop_game 1401 $CONN ? stop_game
1027 : start_game; 1402 : start_game;
1403 1
1404 },
1405 );
1406
1407 $vbox->add (new CFPlus::UI::FancyFrame
1408 label => "Server Info",
1409 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1410 );
1411
1412 $vbox
1413}
1414
1415sub client_setup {
1416 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1417
1418 my $row = 0;
1419
1420 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1421 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1422 state => $CFG->{show_tips},
1423 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1424 on_changed => sub {
1425 my ($self, $value) = @_;
1426 $CFG->{show_tips} = $value;
1427 0
1428 }
1429 );
1430
1431 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1432 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1433 text => $CFG->{logview_max_par},
1434 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1435 . "sends more messages than this number, older messages get removed to save memory and "
1436 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1437 on_changed => sub {
1438 my ($self, $value) = @_;
1439 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1028 0 1440 0
1029 }, 1441 },
1030 ); 1442 );
1031 1443
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1444 $table
1033 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1034 text => $CFG->{say_command},
1035 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. "
1036 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1037 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1038 on_changed => sub {
1039 my ($self, $value) = @_;
1040 $CFG->{say_command} = $value;
1041 0
1042 }
1043 );
1044
1045 $vbox->add (new CFPlus::UI::Label
1046 text => "Server Info",
1047 fontsize => 1.2,
1048 padding_y => 8,
1049 fg => [1, 1, 0, 1],
1050 );
1051
1052 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
1053
1054 $vbox
1055}
1056
1057sub message_window {
1058 my $window = new CFPlus::UI::FancyFrame
1059 name => "message_window",
1060 title => "Messages",
1061 border_bg => [1, 1, 1, 1],
1062 x => "max",
1063 y => 0,
1064 force_w => $::WIDTH * 0.4,
1065 force_h => $::HEIGHT * 0.5,
1066 child => (my $vbox = new CFPlus::UI::VBox),
1067 has_close_button => 1;
1068
1069 $vbox->add ($LOGVIEW);
1070
1071 $vbox->add (my $input = new CFPlus::UI::Entry
1072 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1073 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1074 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1075 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1076 on_focus_in => sub {
1077 my ($input, $prev_focus) = @_;
1078
1079 delete $input->{refocus_map};
1080
1081 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1082 $input->{refocus_map} = 1;
1083 }
1084 delete $input->{auto_activated};
1085
1086 0
1087 },
1088 on_activate => sub {
1089 my ($input, $text) = @_;
1090 $input->set_text ('');
1091
1092 if ($text =~ /^\/(.*)/) {
1093 $::CONN->user_send ($1);
1094 } else {
1095 my $say_cmd = $::CFG->{say_command} || 'say';
1096 $::CONN->user_send ("$say_cmd $text");
1097 }
1098 if ($input->{refocus_map}) {
1099 delete $input->{refocus_map};
1100 $MAPWIDGET->focus_in
1101 }
1102
1103 0
1104 },
1105 on_escape => sub {
1106 $MAPWIDGET->grab_focus;
1107
1108 0
1109 },
1110 );
1111
1112 $CONSOLE = {
1113 window => $window,
1114 input => $input,
1115 };
1116
1117 $window
1118}
1119
1120sub open_string_query {
1121 my $cb = $_[1];
1122 my $dialog = new CFPlus::UI::FancyFrame
1123 x => "center",
1124 y => "center",
1125 z => 50,
1126 force_w => $WIDTH * 4/5,
1127 title => $_[0];
1128
1129 $dialog->add (
1130 my $e = new CFPlus::UI::Entry
1131 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1132 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1133 );
1134
1135 $e->grab_focus;
1136 $dialog->show;
1137}
1138
1139sub open_quit_dialog {
1140 unless ($QUIT_DIALOG) {
1141 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1142 x => "center",
1143 y => "center",
1144 z => 50,
1145 title => "Really Quit?",
1146 on_key_down => sub {
1147 my ($dialog, $ev) = @_;
1148 $ev->{sym} == 27 and $dialog->hide;
1149 }
1150 ;
1151
1152 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1153
1154 $vb->add (new CFPlus::UI::Label
1155 text => "You should find a savebed and apply it first!",
1156 max_w => $WIDTH * 0.25,
1157 ellipsize => 0,
1158 );
1159 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1160 $hb->add (new CFPlus::UI::Button
1161 text => "Ok",
1162 expand => 1,
1163 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1164 );
1165 $hb->add (new CFPlus::UI::Button
1166 text => "Quit anyway",
1167 expand => 1,
1168 on_activate => sub { exit },
1169 );
1170 }
1171
1172 $QUIT_DIALOG->show;
1173 $QUIT_DIALOG->grab_focus;
1174} 1445}
1175 1446
1176sub autopickup_setup { 1447sub autopickup_setup {
1448 my $r = new CFPlus::UI::ScrolledWindow (
1449 expand => 1,
1450 scroll_y => 1
1451 );
1177 my $table = new CFPlus::UI::Table; 1452 $r->add (my $table = new CFPlus::UI::Table
1453 row_expand => [0],
1454 col_expand => [0, 1, 0, 1],
1455 );
1178 1456
1179 for ( 1457 for (
1180 ["General", 0, 0, 1458 ["General", 0, 0,
1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1459 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1182 ["Inhibit autopickup" => PICKUP_INHIBIT], 1460 ["Inhibit autopickup" => PICKUP_INHIBIT],
1196 ["Boots" => PICKUP_BOOTS], 1474 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1475 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1476 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1477 ],
1200 1478
1201 ["Readables", 2, 2, 1479 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1480 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1481 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1482 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1483 ],
1206 ["Misc", 2, 7, 1484 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1485 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1486 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1487 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1488 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1489 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1490 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1491 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1492 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1493 ["Jewelery" => PICKUP_JEWELS],
1494 ["Flesh" => PICKUP_FLESH],
1216 ], 1495 ],
1217 ["Weight/Value ratio", 2, 17] 1496 ["Weight/Value ratio", 2, 17]
1218 ) 1497 )
1219 { 1498 {
1220 my ($title, $x, $y, @bits) = @$_; 1499 my ($title, $x, $y, @bits) = @$_;
1221 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1500 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1222 1501
1223 for (@bits) { 1502 for (@bits) {
1224 ++$y; 1503 ++$y;
1225 1504
1226 my $mask = $_->[1]; 1505 my $mask = $_->[1];
1227 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1506 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1228 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1507 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1229 state => $::CFG->{pickup} & $mask, 1508 state => $::CFG->{pickup} & $mask,
1230 on_changed => sub { 1509 on_changed => sub {
1231 my ($box, $value) = @_; 1510 my ($box, $value) = @_;
1232 1511
1233 if ($value) { 1512 if ($value) {
1244 1523
1245 ${$_->[2]} = $checkbox if $_->[2]; 1524 ${$_->[2]} = $checkbox if $_->[2];
1246 } 1525 }
1247 } 1526 }
1248 1527
1249 $table->add (2, 18, new CFPlus::UI::ValSlider 1528 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1250 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1529 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1251 template => ">= 99", 1530 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1531 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1532 on_changed => sub {
1254 my ($slider, $value) = @_; 1533 my ($slider, $value) = @_;
1257 $::CFG->{pickup} |= int $value 1536 $::CFG->{pickup} |= int $value
1258 if $value; 1537 if $value;
1259 1; 1538 1;
1260 }); 1539 });
1261 1540
1262 $table->add (3, 18, new CFPlus::UI::Button 1541 $table->add_at (3, 18, new CFPlus::UI::Button
1263 text => "set", 1542 text => "set",
1264 on_activate => sub { 1543 on_activate => sub {
1265 $::CONN->send_command ("pickup $::CFG->{pickup}") 1544 $::CONN->send_command ("pickup $::CFG->{pickup}")
1266 if defined $::CONN; 1545 if defined $::CONN;
1267 0 1546 0
1268 }); 1547 });
1269 1548
1270 $table 1549 $r
1271} 1550}
1272 1551
1273my %SORT_ORDER = ( 1552my %SORT_ORDER = (
1274 type => undef, 1553 type => undef,
1275 mtime => sub { sort { 1554 mtime => sub {
1555 my $NOW = time;
1556 sort {
1557 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1558 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1559
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1560 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1561 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1562 or $a->{type} <=> $b->{type}
1563 } @_
1279 } @_ }, 1564 },
1280 weight => sub { sort { 1565 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1566 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1567 or $a->{type} <=> $b->{type}
1283 } @_ }, 1568 } @_ },
1284); 1569);
1309 #TODO# update to weigh/maxweight 1594 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1595 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1596
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1597 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1598 $sw1->add ($INV = new CFPlus::UI::Inventory);
1599 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1600
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1601 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1602
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1603 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1604
1321 1607
1322 # XXX: Call after $INVR = ... because set_opencont sets the items 1608 # XXX: Call after $INVR = ... because set_opencont sets the items
1323 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1609 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1324 1610
1325 $hb 1611 $hb
1612}
1613
1614sub media_window {
1615 my $vb = new CFPlus::UI::VBox;
1616
1617 $vb->add (new CFPlus::UI::FancyFrame
1618 label => "Currently playing music",
1619 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1620 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1621 );
1622
1623 $vb->add (new CFPlus::UI::FancyFrame
1624 label => "Other media used in this session",
1625 expand => 1,
1626 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1627 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1628 );
1629
1630 $vb
1631}
1632
1633sub add_license {
1634 my ($meta) = @_;
1635
1636 $meta = $meta->{meta}
1637 or return;
1638
1639 $meta->{license} || $meta->{author} || $meta->{source}
1640 or return;
1641
1642 $LICENSE_WIDGET->add_paragraph ({
1643 fg => [1, 1, 1, 1],
1644 markup => "<small>"
1645 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1646 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1647 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1648 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1649 . "</small>",
1650 });
1651 $LICENSE_WIDGET->scroll_to_bottom;
1326} 1652}
1327 1653
1328sub toggle_player_page { 1654sub toggle_player_page {
1329 my ($widget) = @_; 1655 my ($widget) = @_;
1330 1656
1335 $PL_WINDOW->show; 1661 $PL_WINDOW->show;
1336 } 1662 }
1337} 1663}
1338 1664
1339sub player_window { 1665sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1666 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1667 x => "center",
1342 y => "center", 1668 y => "center",
1343 force_w => $WIDTH * 9/10, 1669 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1670 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1671 title => "Player",
1347 has_close_button => 1 1673 has_close_button => 1
1348 ; 1674 ;
1349 1675
1350 my $ntb = 1676 my $ntb =
1351 $PL_NOTEBOOK = 1677 $PL_NOTEBOOK =
1352 new CFPlus::UI::Notebook expand => 1, debug => 1; 1678 new CFPlus::UI::Notebook expand => 1;
1353 1679
1354 $ntb->add ( 1680 $ntb->add_tab (
1355 "Statistics (F2)" => $STATS_PAGE = stats_window, 1681 "Statistics (F2)" => $STATS_PAGE = stats_window,
1356 "Shows statistics, where all your Stats and Resistances are shown." 1682 "Shows statistics, where all your Stats and Resistances are shown."
1357 ); 1683 );
1358 $ntb->add ( 1684 $ntb->add_tab (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1685 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1686 "Shows all your Skills."
1361 ); 1687 );
1362 1688
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1689 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1690 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1691 $ntb->add_tab (
1366 "Spellbook (F4)" => $spellsw, 1692 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1693 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1694 );
1369 $ntb->add ( 1695 $ntb->add_tab (
1370 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1696 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1371 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1697 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1372 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1698 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1373 ); 1699 );
1700 $ntb->add_tab (Pickup => autopickup_setup,
1701 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1702
1703 $ntb->add_tab (Media => media_window,
1704 "License, Author and Source info for media sent by the server.");
1374 1705
1375 $ntb->set_current_page ($INVENTORY_PAGE); 1706 $ntb->set_current_page ($INVENTORY_PAGE);
1376 1707
1377 $plwin->add ($ntb); 1708 $plwin->add ($ntb);
1378 $plwin 1709 $plwin
1379} 1710}
1380 1711
1381sub update_bindings {
1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1383}
1384
1385sub keyboard_setup { 1712sub keyboard_setup {
1386 my $binding_list = new CFPlus::UI::VBox; 1713 CFPlus::Macro::keyboard_setup
1387
1388 my $refresh;
1389 $refresh = $BIND_UPD_CB = sub {
1390 $binding_list->clear ();
1391
1392 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1393 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1394 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1395 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1396
1397 my $lbl = join "; ", @$cmds;
1398 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1399 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1400 $hb->add (new CFPlus::UI::Button
1401 text => "delete",
1402 tooltip => "Deletes the binding",
1403 on_activate => sub {
1404 $binding_list->remove ($hb);
1405 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1406 0
1407 });
1408
1409 $hb->add (new CFPlus::UI::Button
1410 text => "edit",
1411 tooltip => "Edits the binding",
1412 on_activate => sub {
1413 $::BIND_EDITOR->set_binding (
1414 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1415 sub {
1416 my ($nmod, $nsym, $ncmds) = @_;
1417 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1418 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1419 $refresh->();
1420 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1421 $SETUP_DIALOG->show;
1422 },
1423 sub {
1424 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1425 $SETUP_DIALOG->show;
1426 });
1427 $::BIND_EDITOR->show;
1428 $SETUP_DIALOG->hide;
1429 0
1430 });
1431
1432 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1433 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1434 }
1435 }
1436 };
1437
1438 my $vb = new CFPlus::UI::VBox;
1439 $vb->add (my $hb = new CFPlus::UI::HBox);
1440 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1441 $hb->add (new CFPlus::UI::CheckBox
1442 expand => 1,
1443 state => $CFG->{shift_fire_stop},
1444 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1445 on_changed => sub {
1446 my ($cbox, $value) = @_;
1447 $CFG->{shift_fire_stop} = $value;
1448 0
1449 });
1450
1451 $vb->add ($binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1453
1454 $hb->add (new CFPlus::UI::Button
1455 text => "record new",
1456 expand => 1,
1457 tooltip => "This button opens the binding editor with an empty binding.",
1458 on_activate => sub {
1459 $::BIND_EDITOR->set_binding (undef, undef, [],
1460 sub {
1461 my ($mod, $sym, $cmds) = @_;
1462 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1463 $refresh->();
1464 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1465 $SETUP_DIALOG->show;
1466 },
1467 sub {
1468 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1469 $SETUP_DIALOG->show;
1470 },
1471 );
1472 $SETUP_DIALOG->hide;
1473 $::BIND_EDITOR->show;
1474 0
1475 },
1476 );
1477
1478 $hb->add (new CFPlus::UI::Button
1479 text => "close",
1480 tooltip => "Closes the binding window",
1481 expand => 1,
1482 on_activate => sub {
1483 $SETUP_DIALOG->hide;
1484 0
1485 }
1486 );
1487
1488 $refresh->();
1489
1490 $vb
1491} 1714}
1492 1715
1493sub help_window { 1716sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1717 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1718 x => 'center',
1496 y => 'center', 1719 y => 'center',
1497 z => 2, 1720 z => 4,
1498 name => 'doc_browser', 1721 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1722 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1723 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1724 title => "Help Browser",
1502 has_close_button => 1; 1725 has_close_button => 1;
1503 1726
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1727 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1728
1729 $vbox->add (new CFPlus::UI::FancyFrame
1730 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1731 child => (my $buttons = new CFPlus::UI::HBox),
1732 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1733 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1734 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1735
1510 my @history; 1736 my @history;
1511 my @future; 1737 my @future;
1512 my $curnode; 1738 my $curnode;
1513 1739
1514 my $load_node; $load_node = sub { 1740 my $load_node; $load_node = sub {
1515 my ($node) = @_; 1741 my ($node, $para) = @_;
1516 1742
1517 $buttons->clear; 1743 $buttons->clear;
1744
1745 $buttons->add (new CFPlus::UI::Button
1746 text => "⇤",
1747 tooltip => "back to the starting page",
1748 on_activate => sub {
1749 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1750 unshift @future, @history;
1751 @history = ();
1752 $load_node->(@{shift @future});
1753 },
1754 );
1518 1755
1519 if (@history) { 1756 if (@history) {
1520 $buttons->add (new CFPlus::UI::Button 1757 $buttons->add (new CFPlus::UI::Button
1521 text => "<", 1758 text => "⋘",
1522 tooltip => "back to " . CFPlus::Pod::full_path_of $history[-1], 1759 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1523 on_activate => sub { 1760 on_activate => sub {
1524 unshift @future, $curnode if $curnode; 1761 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1525 $load_node->(pop @history); 1762 $load_node->(@{pop @history});
1763 },
1526 }); 1764 );
1527 } 1765 }
1528 1766
1529 if (@future) { 1767 if (@future) {
1530 $buttons->add (new CFPlus::UI::Button 1768 $buttons->add (new CFPlus::UI::Button
1531 text => ">", 1769 text => "â‹™",
1532 tooltip => "forward to " . CFPlus::Pod::full_path_of $future[0], 1770 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1533 on_activate => sub { 1771 on_activate => sub {
1534 push @history, $curnode; 1772 push @history, [$curnode, $viewer->current_paragraph];
1535 $load_node->(shift @future); 1773 $load_node->(@{shift @future});
1774 },
1536 }); 1775 );
1537 } 1776 }
1777
1778 $buttons->add (new CFPlus::UI::Label text => " ");
1779
1780 my @path = CFPlus::Pod::full_path_of $node;
1781 pop @path; # drop current node
1782
1783 for my $node (@path) {
1784 $buttons->add (new CFPlus::UI::Button
1785 text => $node->{kw}[0],
1786 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1787 on_activate => sub {
1788 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1789 $load_node->($node);
1790 },
1791 );
1792 $buttons->add (new CFPlus::UI::Label text => "/");
1793 }
1794
1795 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1538 1796
1539 $curnode = $node; 1797 $curnode = $node;
1540 1798
1541 $viewer->clear; 1799 $viewer->clear;
1542 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1800 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1543 $viewer->set_offset (0); 1801 $viewer->scroll_to ($para);
1544 }; 1802 };
1545 1803
1546 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1804 $load_node->(CFPlus::Pod::find pod => "mainpage");
1547 1805
1548 $CFPlus::Pod::on_link = sub { 1806 $CFPlus::Pod::goto_document = sub {
1549 my (@path) = @_; 1807 my (@path) = @_;
1550 1808
1551 push @history, $curnode if $curnode; 1809 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1552 @future = ();
1553 1810
1554 $load_node->(CFPlus::Pod::find @path); 1811 $load_node->((CFPlus::Pod::find @path)[0]);
1555 $win->show; 1812 $win->show;
1556 }; 1813 };
1557 1814
1558 $win 1815 $win
1816}
1817
1818sub open_string_query {
1819 my ($title, $cb, $txt, $tooltip) = @_;
1820 my $dialog = new CFPlus::UI::Toplevel
1821 x => "center",
1822 y => "center",
1823 z => 50,
1824 force_w => $WIDTH * 4/5,
1825 title => $title;
1826
1827 $dialog->add (
1828 my $e = new CFPlus::UI::Entry
1829 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1830 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1831 tooltip => $tooltip
1832 );
1833
1834 $e->grab_focus;
1835 $e->set_text ($txt) if $txt;
1836 $dialog->show;
1837}
1838
1839sub open_quit_dialog {
1840 unless ($QUIT_DIALOG) {
1841 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1842 x => "center",
1843 y => "center",
1844 z => 50,
1845 title => "Really Quit?",
1846 on_key_down => sub {
1847 my ($dialog, $ev) = @_;
1848 $ev->{sym} == 27 and $dialog->hide;
1849 }
1850 ;
1851
1852 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1853
1854 $vb->add (new CFPlus::UI::Label
1855 text => "You should find a savebed and apply it first!",
1856 max_w => $WIDTH * 0.25,
1857 ellipsize => 0,
1858 );
1859 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1860 $hb->add (new CFPlus::UI::Button
1861 text => "Ok",
1862 expand => 1,
1863 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1864 );
1865 $hb->add (new CFPlus::UI::Button
1866 text => "Quit anyway",
1867 expand => 1,
1868 on_activate => sub { exit },
1869 );
1870 }
1871
1872 $QUIT_DIALOG->show;
1873 $QUIT_DIALOG->grab_focus;
1874}
1875
1876sub show_tip_of_the_day {
1877 # find all tips
1878 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1879
1880 CFPlus::DB::get state => "tip_of_the_day", sub {
1881 my ($todindex) = @_;
1882 $todindex = 0 if $todindex >= @tod;
1883 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1884
1885 # create dialog
1886 my $dialog;
1887
1888 my $close = sub {
1889 $dialog->destroy;
1890 };
1891
1892 $dialog = new CFPlus::UI::Toplevel
1893 x => "center",
1894 y => "center",
1895 z => 3,
1896 name => 'tip_of_the_day',
1897 force_w => int $WIDTH * 4/9,
1898 force_h => int $WIDTH * 2/9,
1899 title => "Tip of the day #" . (1 + $todindex),
1900 child => my $vbox = new CFPlus::UI::VBox,
1901 has_close_button => 1,
1902 on_delete => $close,
1903 ;
1904
1905 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1906 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1907 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1908
1909 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1910
1911 $table->add_at (0, 0, new CFPlus::UI::Button
1912 text => "Close",
1913 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>.",
1914 on_activate => $close,
1915 );
1916
1917 $table->add_at (2, 0, new CFPlus::UI::Button
1918 text => "Next",
1919 tooltip => "Show the next <b>Tip of the day</b>.",
1920 on_activate => sub {
1921 $close->();
1922 &show_tip_of_the_day;
1923 },
1924 );
1925
1926 $dialog->show;
1927 };
1559} 1928}
1560 1929
1561sub sdl_init { 1930sub sdl_init {
1562 CFPlus::SDL_Init 1931 CFPlus::SDL_Init
1563 and die "SDL::Init failed!\n"; 1932 and die "SDL::Init failed!\n";
1564} 1933}
1565 1934
1566sub video_init { 1935sub video_init {
1567 sdl_init;
1568
1569 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1936 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1570 1937
1571 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1938 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1572 1939
1573 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1940 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1574 $FULLSCREEN = $CFG->{fullscreen}; 1941 $FULLSCREEN = $CFG->{fullscreen};
1575 $FAST = $CFG->{fast}; 1942 $FAST = $CFG->{fast};
1576 1943
1577 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1944 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1578 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1945 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1579 1946
1580 $SDL_ACTIVE = 1; 1947 $SDL_ACTIVE = 1;
1581 $LAST_REFRESH = time - 0.01; 1948 $LAST_REFRESH = time - 0.01;
1582 1949
1598 z => 100, 1965 z => 100,
1599 force_x => "max", 1966 force_x => "max",
1600 force_y => 0; 1967 force_y => 0;
1601 $DEBUG_STATUS->show; 1968 $DEBUG_STATUS->show;
1602 1969
1603 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1604
1605 $STATUSBOX = new CFPlus::UI::Statusbox; 1970 $STATUSBOX = new CFPlus::UI::Statusbox;
1606 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1971 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1607 1972
1608 (new CFPlus::UI::Frame 1973 (new CFPlus::UI::Frame
1609 bg => [0, 0, 0, 0.4], 1974 bg => [0, 0, 0, 0.4],
1610 force_x => 0, 1975 force_x => 0,
1611 force_y => "max", 1976 force_y => "max",
1612 child => $STATUSBOX, 1977 child => $STATUSBOX,
1613 )->show; 1978 )->show;
1614 1979
1615 CFPlus::UI::FancyFrame->new ( 1980 CFPlus::UI::Toplevel->new (
1616 title => "Map", 1981 title => "Map",
1617 name => "mapmap", 1982 name => "mapmap",
1618 x => 0, 1983 x => 0,
1619 y => $FONTSIZE + 8, 1984 y => $FONTSIZE + 8,
1620 border_bg => [1, 1, 1, 192/255], 1985 border_bg => [1, 1, 1, 192/255],
1626 1991
1627 $MAPWIDGET = new CFPlus::MapWidget; 1992 $MAPWIDGET = new CFPlus::MapWidget;
1628 $MAPWIDGET->connect (activate_console => sub { 1993 $MAPWIDGET->connect (activate_console => sub {
1629 my ($mapwidget, $preset) = @_; 1994 my ($mapwidget, $preset) = @_;
1630 1995
1631 if ($CONSOLE) { 1996 $MESSAGE_WINDOW->activate_console ($preset)
1632 $CONSOLE->{input}->{auto_activated} = 1; 1997 if $MESSAGE_WINDOW;
1633 $CONSOLE->{input}->grab_focus;
1634
1635 if ($preset && $CONSOLE->{input}->get_text eq '') {
1636 $CONSOLE->{input}->set_text ($preset);
1637 }
1638 }
1639 }); 1998 });
1640 $MAPWIDGET->show; 1999 $MAPWIDGET->show;
1641 $MAPWIDGET->grab_focus; 2000 $MAPWIDGET->grab_focus;
1642 2001
1643 $LOGVIEW = new CFPlus::UI::TextScroller
1644 expand => 1,
1645 font => $FONT_FIXED,
1646 fontsize => $::CFG->{log_fontsize},
1647 indent => -4,
1648 can_hover => 1,
1649 can_events => 1,
1650 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1651 ;
1652
1653 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 2002 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1654 title => "Setup", 2003 title => "Setup",
1655 name => "setup_dialog", 2004 name => "setup_dialog",
1656 x => 'center', 2005 x => 'center',
1657 y => 'center', 2006 y => 'center',
1658 z => 2, 2007 z => 2,
1660 force_h => $::HEIGHT * 0.6, 2009 force_h => $::HEIGHT * 0.6,
1661 has_close_button => 1, 2010 has_close_button => 1,
1662 ; 2011 ;
1663 2012
1664 $METASERVER = metaserver_dialog; 2013 $METASERVER = metaserver_dialog;
2014 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1665 2015
1666 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2016 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1667 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2017 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1668 2018
1669 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2019 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1670 "Configure the server to play on, your username, password and other server-related options."); 2020 "Configure the server to play on, your username, password and other server-related options.");
1671 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2021 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1672 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2022 "Configure various client-specific settings.");
1673 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2023 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1674 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2024 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1675 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2025 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1676 "Configure the use of audio, sound effects and background music."); 2026 "Configure the use of audio, sound effects and background music.");
1677 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2027 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1678 "Lets you define, edit and delete key bindings." 2028 "Lets you define, edit and delete key bindings."
1679 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2029 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1680 . "with nothing set and the recording started. After doing the actions you " 2030 . "with nothing set and the recording started. After doing the actions you "
1681 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2031 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1682 . "After pressing the combo the binding will be saved automatically and the " 2032 . "After pressing the combo the binding will be saved automatically and the "
1683 . "binding editor closes"); 2033 . "binding editor closes");
1684 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2034 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1685 "Some debuggin' options. Do not ask."); 2035 "Some debuggin' options. Do not ask.");
1686 2036
1687 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2037 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1688 2038
1689 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2039 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1690 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2040 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1691 2041
1692 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2042 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1693 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2043 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1694 2044
1695 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 2045 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
1696 2046
1697 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2047 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1708 }, 2058 },
1709 ); 2059 );
1710 2060
1711 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2061 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1712 tooltip => "View Documentation"); 2062 tooltip => "View Documentation");
2063
1713 2064
1714 $BUTTONBAR->add (new CFPlus::UI::Button 2065 $BUTTONBAR->add (new CFPlus::UI::Button
1715 text => "Quit", 2066 text => "Quit",
1716 tooltip => "Terminates the program", 2067 tooltip => "Terminates the program",
1717 on_activate => sub { 2068 on_activate => sub {
1735 CFPlus::OpenGL::shutdown; 2086 CFPlus::OpenGL::shutdown;
1736 2087
1737 undef $SDL_ACTIVE; 2088 undef $SDL_ACTIVE;
1738} 2089}
1739 2090
1740my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1741my $bgmusic;#TODO#hack#d#
1742
1743sub audio_channel_finished {
1744 my ($channel) = @_;
1745
1746 #warn "channel $channel finished\n";#d#
1747}
1748
1749sub audio_music_finished {
1750 return unless $CFG->{bgm_enable};
1751
1752 # TODO: hack, do play loop and mood music
1753 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1754 $bgmusic->play (0);
1755
1756 push @bgmusic, shift @bgmusic;
1757}
1758
1759sub audio_init {
1760 if ($CFG->{audio_enable}) {
1761 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1762 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1763
1764 unless ($SDL_MIXER) {
1765 status "Unable to open sound device: there will be no sound";
1766 return;
1767 }
1768
1769 CFPlus::Mix_AllocateChannels 8;
1770 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1771
1772 audio_music_finished;
1773
1774 while (<$fh>) {
1775 next if /^\s*#/;
1776 next if /^\s*$/;
1777
1778 my ($file, $volume, $event) = split /\s+/, $_, 3;
1779
1780 push @SOUNDS, "$volume,$file";
1781
1782 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1783 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1784 $chunk->volume ($volume * 128 / 100);
1785 $chunk
1786 };
1787 }
1788 } else {
1789 status "unable to open sound config: $!";
1790 }
1791 }
1792}
1793
1794sub audio_shutdown {
1795 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1796 undef $SDL_MIXER;
1797 @SOUNDS = ();
1798 %AUDIO_CHUNKS = ();
1799}
1800
1801my %animate_object; 2091my %animate_object;
1802my $animate_timer; 2092my $animate_timer;
1803 2093
1804my $fps = 9; 2094my $fps = 9;
1805
1806my %demo;#d#
1807 2095
1808sub force_refresh { 2096sub force_refresh {
1809 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2097 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1810 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2098 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1811 2099
1812 $CFPlus::UI::ROOT->draw; 2100 $CFPlus::UI::ROOT->draw;
1813 2101
1814 $WANT_REFRESH = 0; 2102 $WANT_REFRESH = 0;
1815 $CAN_REFRESH = 0; 2103 $CAN_REFRESH = 0;
1816 $LAST_REFRESH = $NOW; 2104 $LAST_REFRESH = $NOW;
1817 2105
1818 CFPlus::SDL_GL_SwapBuffers; 2106 CFPlus::SDL_GL_SwapBuffers;
1819} 2107}
1820 2108
1821my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2109my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1822 $NOW = time; 2110 $NOW = time;
1823 2111
1824 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2112 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1825 for CFPlus::SDL_PollEvent; 2113 for CFPlus::poll_events;
1826 2114
1827 if (%animate_object) { 2115 if (%animate_object) {
1828 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2116 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1829 $WANT_REFRESH++; 2117 ++$WANT_REFRESH;
1830 } 2118 }
1831 2119
1832 if ($WANT_REFRESH) { 2120 if ($WANT_REFRESH) {
1833 force_refresh; 2121 force_refresh;
1834 } else { 2122 } else {
1844sub animation_stop { 2132sub animation_stop {
1845 my ($widget) = @_; 2133 my ($widget) = @_;
1846 delete $animate_object{$widget}; 2134 delete $animate_object{$widget};
1847} 2135}
1848 2136
1849# check once/second for faces that need to be prefetched
1850# this should, of course, only run on demand, but
1851# SDL forces worse things on us....
1852
1853Event->timer (after => 1, interval => 0.25, cb => sub {
1854 $CONN->face_prefetch
1855 if $CONN;
1856});
1857
1858%SDL_CB = ( 2137%SDL_CB = (
1859 CFPlus::SDL_QUIT => sub { 2138 CFPlus::SDL_QUIT => sub {
1860 Event::unloop -1; 2139 exit;
1861 }, 2140 },
1862 CFPlus::SDL_VIDEORESIZE => sub { 2141 CFPlus::SDL_VIDEORESIZE => sub {
1863 }, 2142 },
1864 CFPlus::SDL_VIDEOEXPOSE => sub { 2143 CFPlus::SDL_VIDEOEXPOSE => sub {
1865 CFPlus::UI::full_refresh; 2144 CFPlus::UI::full_refresh;
1866 }, 2145 },
1867 CFPlus::SDL_ACTIVEEVENT => sub { 2146 CFPlus::SDL_ACTIVEEVENT => sub {
1868# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2147# not useful, as APPACTIVE include sonly iconified state, not unmapped
2148# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2149# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2150# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2151# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2152# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1869 }, 2153 },
1870 CFPlus::SDL_KEYDOWN => sub { 2154 CFPlus::SDL_KEYDOWN => sub {
1871 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2155 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1872 # alt-enter 2156 # alt-enter
1873 $FULLSCREEN_ENABLE->toggle; 2157 $FULLSCREEN_ENABLE->toggle;
1894 2178
1895$SIG{INT} = $SIG{TERM} = sub { exit }; 2179$SIG{INT} = $SIG{TERM} = sub { exit };
1896 2180
1897{ 2181{
1898 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2182 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2183 CFPlus::DB::Server::run;
2184
1899 CFPlus::UI::set_layout ($::CFG->{layout}); 2185 CFPlus::UI::set_layout ($::CFG->{layout});
1900 2186
1901 my %DEF_CFG = ( 2187 my %DEF_CFG = (
1902 sdl_mode => 0, 2188 sdl_mode => 0,
1903 width => 640,
1904 height => 480,
1905 fullscreen => 0, 2189 fullscreen => 0,
1906 fast => 0, 2190 fast => 0,
1907 map_scale => 1, 2191 map_scale => 1,
1908 fow_enable => 1, 2192 fow_enable => 1,
1909 fow_intensity => 0.45, 2193 fow_intensity => 0,
1910 fow_smooth => 0, 2194 map_smoothing => 1,
1911 gui_fontsize => 1, 2195 gui_fontsize => 1,
1912 log_fontsize => 0.7, 2196 log_fontsize => 0.7,
1913 gauge_fontsize => 1, 2197 gauge_fontsize => 1,
1914 gauge_size => 0.35, 2198 gauge_size => 0.35,
1915 stat_fontsize => 0.7, 2199 stat_fontsize => 0.7,
1916 mapsize => 100, 2200 mapsize => 100,
1917 say_command => 'say',
1918 audio_enable => 1, 2201 audio_enable => 1,
2202 effects_enable => 1,
2203 effects_volume => 1,
1919 bgm_enable => 1, 2204 bgm_enable => 1,
1920 bgm_volume => 0.25, 2205 bgm_volume => 0.5,
1921 face_prefetch => 0,
1922 output_sync => 1, 2206 output_sync => 1,
1923 output_count => 1, 2207 output_count => 1,
2208 output_rate => "",
1924 pickup => 0, 2209 pickup => 0,
1925 inv_sort => "mtime", 2210 inv_sort => "mtime",
1926 default => "profile", # default profile 2211 default => "profile", # default profile
2212 show_tips => 1,
2213 logview_max_par => 1000,
1927 ); 2214 );
1928 2215
1929 while (my ($k, $v) = each %DEF_CFG) { 2216 while (my ($k, $v) = each %DEF_CFG) {
1930 $CFG->{$k} = $v unless exists $CFG->{$k}; 2217 $CFG->{$k} = $v unless exists $CFG->{$k};
1931 } 2218 }
1932 2219
1933 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2220 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2221 $PROFILE = $CFG->{profile}{default};
2222
2223 # convert old bindings (only default profile matters)
2224 if (my $bindings = delete $PROFILE->{bindings}) {
2225 while (my ($mod, $syms) = each %$bindings) {
2226 while (my ($sym, $cmds) = each %$syms) {
2227 push @{ $PROFILE->{macro} }, {
2228 accelkey => [$mod*1, $sym*1],
2229 action => $cmds,
2230 };
2231 }
2232 }
2233 }
1934 2234
1935 sdl_init; 2235 sdl_init;
1936 2236
1937 @SDL_MODES = reverse 2237 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1938 grep $_->[0] >= 640 && $_->[1] >= 480, 2238 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1939 CFPlus::SDL_ListModes;
1940
1941 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2239 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2240
2241 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1942 2242
1943 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2243 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1944 2244
1945 { 2245 {
1946 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2246 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1975# } 2275# }
1976# my $t2 = Time::HiRes::time; 2276# my $t2 = Time::HiRes::time;
1977# warn $t2-$t1; 2277# warn $t2-$t1;
1978# } 2278# }
1979 2279
2280 $startup_done->();
2281
1980 video_init; 2282 video_init;
1981 audio_init; 2283 audio_init;
1982} 2284}
2285
2286show_tip_of_the_day if $CFG->{show_tips};
1983 2287
1984Event::loop; 2288Event::loop;
1985#CFPlus::SDL_Quit; 2289#CFPlus::SDL_Quit;
1986#CFPlus::_exit 0; 2290#CFPlus::_exit 0;
1987 2291
2292END {
2293 video_shutdown;
2294 audio_shutdown;
1988END { CFPlus::SDL_Quit } 2295 CFPlus::SDL_Quit;
2296 CFPlus::DB::Server::stop;
2297}
1989 2298
1990=head1 NAME 2299=head1 NAME
1991 2300
1992cfplus - A Crossfire+ and Crossfire game client 2301cfplus - A Crossfire TRT and Crossfire game client
1993 2302
1994=head1 SYNOPSIS 2303=head1 SYNOPSIS
1995 2304
1996Just run it - no commandline arguments are supported. 2305Just run it - no commandline arguments are supported.
1997 2306
1998=head1 USAGE 2307=head1 USAGE
1999 2308
2000cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2309cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2001fullscreen and interactively. 2310be used in fullscreen mode and interactively.
2002 2311
2003=head1 DEBUGGING 2312=head1 DEBUGGING
2004 2313
2005 2314
2006CFPLUS_DEBUG - environment variable 2315CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines