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.109 by root, Sun Aug 13 14:30:07 2006 UTC vs.
Revision 1.203 by root, Mon Aug 6 02:11:45 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 if (my $chunk = $AUDIO_CHUNK{$face}) {
223 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
224 my (undef, $dx, $dy, $vol) = @$_;
225
226 my $channel = CFPlus::Channel::find;
227 $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
228 $dx = $dx / 10 * 255;
229 $channel->set_panning (255 - $dx, 255 + $dx);
230
231# my $angle = $dx ? : $dx < 0 ?
232# my $distance = -$vol;
233# $channel->set_position ($angle, $distance);
234
235 $chunk->play ($channel);
236 }
237 } else {
238 # sound_meta not set means data is in flight either way
239 my $meta = $CONN->{sound_meta}{$face}
240 or return;
241
242 # if its a jingle, play it as ambient music
243 if ($meta->{meta}{jingle}) {
244 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
245 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
246 &audio_music_push ($face);
247 }
248 } else {
249 # fetch from database
250 CFPlus::DB::get res_data => $meta->{name}, sub {
251 my $rwops = new CFPlus::RW $_[0];
252 my $chunk = new CFPlus::MixChunk $rwops
253 or Carp::confess "sound face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
254 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
255 $AUDIO_CHUNK{$face} = $chunk;
256
257 audio_sound_push ($face);
258 };
259 }
260 }
261}
262
263sub audio_sound_play {
264 my ($face, $dx, $dy, $vol) = @_;
265
266 $SDL_MIXER
267 or return;
268 $CFG->{effects_enable}
269 or return;
270
271 my $queue = $AUDIO_PLAY{$face} ||= [];
272 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
273 audio_sound_push $face
274 unless @$queue > 1;
275}
276
277sub audio_music_set_meta {
278 my ($meta) = @_;
279
280 $MUSIC_PLAYING_META = $meta;
281 $MUSIC_PLAYING_WIDGET->set_markup (
282 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
283 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
284 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
285 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
286 );
287}
288
289sub audio_music_update_volume {
290 return unless $MUSIC_PLAYING_META;
291 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
292 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
293 CFPlus::MixMusic::volume $base * $volume * 128;
294}
295
296sub audio_music_start {
297 my $meta = $MUSIC_PLAYING_META;
298
299 CFPlus::DB::get res_data => $meta->{name}, sub {
300 return unless $SDL_MIXER;
301
302 # music might have changed...
303 $meta eq $MUSIC_PLAYING_META
304 or return &audio_music_start ();
305
306 audio_music_update_volume;
307
308 $MUSIC_PLAYING_DATA = \$_[0];
309
310 my $rwops = $meta->{path}
311 ? new_from_file CFPlus::RW $meta->{path}
312 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
313
314 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
315 or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
316
317 my $NOW = time;
318
319 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
320 my $pos = $MUSIC_PLAYING_META->{stop_pos};
321 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
322 $MUSIC_START = time - $pos;
323 } else {
324 $MUSIC_PLAYER->play (0);
325 $MUSIC_START = time;
326 }
327
328 delete $meta->{stop_time};
329 delete $meta->{stop_pos};
330 }
331}
332
333sub audio_music_push {
334 return unless $SDL_MIXER;
335
336 my $fade_out;
337
338 if (@MUSIC_JINGLE) {
339 @MUSIC_HAVE = $MUSIC_JINGLE[0];
340 $fade_out = 333;
341 } else {
342 return unless $CFG->{bgm_enable};
343
344 my @have =
345 grep $_,
346 map $CONN->{music_meta}{$_},
347 @$MUSIC_WANT;
348
349 @MUSIC_HAVE = @have
350 if @have;
351
352 # default MUSIC_HAVE == MUSIC_DEFAULT
353 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
354 $fade_out = 1000;
355 }
356
357 # if the currently playing song is acceptable, let it continue
358 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
359
360 my $NOW = time;
361
362 if ($MUSIC_PLAYING_META) {
363 $MUSIC_PLAYING_META->{stop_time} = $NOW;
364 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
365 CFPlus::MixMusic::fade_out $fade_out;
366 } else {
367 # sort by stop time, oldest first
368 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
369
370 # if the most recently-played piece played very recently,
371 # resume it, else choose the oldest piece for rotation.
372 audio_music_set_meta
373 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
374 ? $MUSIC_HAVE[-1]
375 : $MUSIC_HAVE[0];
376
377 audio_music_start;
378 }
379}
380
381sub audio_music_set_ambient {
382 my ($songs) = @_;
383
384 $MUSIC_WANT = $songs;
385 audio_music_push;
386}
387
388sub audio_music_finished {
389 # we compress multiple jingles of the same type
390 shift @MUSIC_JINGLE
391 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
392
393 $MUSIC_PLAYING_WIDGET->clear;
394
395 undef $MUSIC_PLAYER;
396 undef $MUSIC_PLAYING_META;
397 undef $MUSIC_PLAYING_DATA;
398
399 audio_music_push;
400}
401
402sub audio_init {
403 if ($CFG->{audio_enable}) {
404 $ENV{MIX_EFFECTSMAXSPEED} = 1;
405 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
406
407 unless ($SDL_MIXER) {
408 status "Unable to open sound device: there will be no sound";
409 return;
410 }
411
412 CFPlus::Mix_AllocateChannels 16;
413
414 audio_music_finished;
415 } else {
416 undef $SDL_MIXER;
417 }
418}
419
420sub audio_shutdown {
421 undef $MUSIC_PLAYER;
422 undef $MUSIC_PLAYING_META;
423 undef $MUSIC_PLAYING_DATA;
424
425 audio_music_set_meta { };
426
427 $MUSIC_WANT = [];
428 @MUSIC_JINGLE = ();
429 %AUDIO_PLAY = ();
430 %AUDIO_CHUNK = ();
431
432 CFPlus::Mix_CloseAudio if $SDL_MIXER;
433 undef $SDL_MIXER;
434}
435
436#############################################################################
150 437
151sub destroy_query_dialog { 438sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 439 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 440 if $_[0]{query_dialog};
154} 441}
155 442
443# FIXME: a very ugly hack to wait for stat update look below! #d#
444our $QUERY_TIMER; #d#
445
156# server query dialog 446# server query dialog
157sub server_query { 447sub server_query {
158 my ($conn, $flags, $prompt) = @_; 448 my ($conn, $flags, $prompt) = @_;
159 449
450 # FIXME: a very ugly hack to wait for stat update #d#
451 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
452 unless ($QUERY_TIMER) {
453 $QUERY_TIMER =
454 Event->timer (
455 after => 1,
456 cb => sub {
457 server_query ($conn, $flags, $prompt, 1);
458 $QUERY_TIMER = undef
459 }
460 );
461 return;
462 }
463 }
464
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 465 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 466 x => "center",
162 y => "center", 467 y => "center",
163 title => "Server Query", 468 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 469 child => my $vbox = new CFPlus::UI::VBox,
165 ; 470 ;
166 471
167 my @dialog = my $label = new CFPlus::UI::Label 472 my @dialog = my $label = new CFPlus::UI::Label
168 max_w => $::WIDTH * 0.4, 473 max_w => $::WIDTH * 0.8,
169 ellipsise => 0, 474 ellipsise => 0,
170 text => $prompt; 475 text => $prompt;
171 476
172 if ($flags & CS_QUERY_YESNO) { 477 if ($flags & CS_QUERY_YESNO) {
173 push @dialog, my $hbox = new CFPlus::UI::HBox; 478 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
190 ); 495 );
191 496
192 $dialog->grab_focus; 497 $dialog->grab_focus;
193 498
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 499 } 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) { 500 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 501 $dialog->{tooltip} = "#charcreation_focus";
199 502
200 unshift @dialog, new CFPlus::UI::Label 503 unshift @dialog, new CFPlus::UI::Label
201 max_w => $::WIDTH * 0.4, 504 max_w => $::WIDTH * 0.8,
202 ellipsise => 0, 505 ellipsise => 0,
203 markup => "\nOr use your keyboard and the text entry below:\n"; 506 markup => "\nOr use your keyboard and the text entry below:\n";
204 507
205 unshift @dialog, my $table = new CFPlus::UI::Table; 508 unshift @dialog, my $table = new CFPlus::UI::Table;
206 509
207 $table->add (0, 0, new CFPlus::UI::Button 510 $table->add_at (0, 0, new CFPlus::UI::Button
208 text => "Next Race", 511 text => "Next Race",
209 on_activate => sub { 512 on_activate => sub {
210 $conn->send ("reply n"); 513 $conn->send ("reply n");
211 destroy_query_dialog $conn; 514 destroy_query_dialog $conn;
212 0 515 0
213 }, 516 },
214 ); 517 );
215 $table->add (2, 0, new CFPlus::UI::Button 518 $table->add_at (2, 0, new CFPlus::UI::Button
216 text => "Accept", 519 text => "Accept",
217 on_activate => sub { 520 on_activate => sub {
218 $conn->send ("reply d"); 521 $conn->send ("reply d");
219 destroy_query_dialog $conn; 522 destroy_query_dialog $conn;
220 0 523 0
221 }, 524 },
222 ); 525 );
223 526
527 if ($conn->{chargen_race_description}) {
528 unshift @dialog, new CFPlus::UI::Label
529 max_w => $::WIDTH * 0.8,
530 ellipsise => 0,
531 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
532 ;
533 }
534
535 unshift @dialog, new CFPlus::UI::Face
536 face => $conn->{player}{face},
537 bg => [.2, .2, .2, 1],
538 min_w => 64,
539 min_h => 64,
540 ;
541
542 if ($conn->{chargen_race_title}) {
543 unshift @dialog, new CFPlus::UI::Label
544 allign => 1,
545 ellipsise => 0,
546 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
547 ;
548 }
549
224 unshift @dialog, new CFPlus::UI::Label 550 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 551 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 552 ellipsise => 0,
227 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 553 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 ; 554 ;
… …
232 $conn->send ("reply $stat"); 558 $conn->send ("reply $stat");
233 destroy_query_dialog $conn; 559 destroy_query_dialog $conn;
234 return; 560 return;
235 } 561 }
236 562
237 $STATS_PAGE->show;
238 $MESSAGE_WINDOW->hide;
239
240 unshift @dialog, new CFPlus::UI::Label 563 unshift @dialog, new CFPlus::UI::Label
241 max_w => $::WIDTH * 0.4, 564 max_w => $::WIDTH * 0.4,
242 ellipsise => 0, 565 ellipsise => 0,
243 markup => "\nOr use your keyboard and the text entry below:\n"; 566 markup => "\nOr use your keyboard and the text entry below:\n";
244 567
245 unshift @dialog, my $table = new CFPlus::UI::Table; 568 unshift @dialog, my $table = new CFPlus::UI::Table;
246 569
247 # left: re-roll 570 # left: re-roll
248 $table->add (0, 0, new CFPlus::UI::Button 571 $table->add_at (0, 0, new CFPlus::UI::Button
249 text => "Roll Again", 572 text => "Roll Again",
250 on_activate => sub { 573 on_activate => sub {
251 $conn->send ("reply y"); 574 $conn->send ("reply y");
252 destroy_query_dialog $conn; 575 destroy_query_dialog $conn;
253 0 576 0
… …
267 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 590 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
268 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 591 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
269 ], 592 ],
270 ), 1 .. 2; 593 ), 1 .. 2;
271 594
272 $table->add (2, 0, new CFPlus::UI::Button 595 $table->add_at (2, 0, new CFPlus::UI::Button
273 text => "Swap Stats", 596 text => "Swap Stats",
274 on_activate => sub { 597 on_activate => sub {
275 $conn->{stat_change_with} = $sw2->{value}; 598 $conn->{stat_change_with} = $sw2->{value};
276 $conn->send ("reply $sw1->{value}"); 599 $conn->send ("reply $sw1->{value}");
277 destroy_query_dialog $conn; 600 destroy_query_dialog $conn;
278 0 601 0
279 }, 602 },
280 ); 603 );
281 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 604 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
282 605
283 # right: accept 606 # right: accept
284 $table->add (4, 0, new CFPlus::UI::Button 607 $table->add_at (4, 0, new CFPlus::UI::Button
285 text => "Accept", 608 text => "Accept",
286 on_activate => sub { 609 on_activate => sub {
287 $conn->send ("reply n"); 610 $conn->send ("reply n");
288 $STATS_PAGE->hide; 611 $STATS_PAGE->hide;
289 destroy_query_dialog $conn; 612 destroy_query_dialog $conn;
… …
354 $LOGIN_BUTTON->set_text ("Logout"); 677 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 678 $SETUP_DIALOG->hide;
356 679
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 680 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 681
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 682 my ($host, $port) = split /:/, $PROFILE->{host};
360 683
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 684 $MAP = new CFPlus::Map;
362 685
363 $CONN = eval { 686 $CONN = eval {
364 new CFPlus::Protocol 687 new CFPlus::Protocol
365 host => $host, 688 host => $host,
366 port => $port || 13327, 689 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 690 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 691 pass => $PROFILE->{password},
369 mapw => $mapsize, 692 mapw => $mapsize,
370 maph => $mapsize, 693 maph => $mapsize,
371 694
695 client => "cfplus $CFPlus::VERSION $] $^O",
696
372 map_widget => $MAPWIDGET, 697 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 698 statusbox => $STATUSBOX,
375 map => $MAP, 699 map => $MAP,
376 mapmap => $MAPMAP, 700 mapmap => $MAPMAP,
377 query => \&server_query, 701 query => \&server_query,
378 702
379 sound_play => sub { 703 setup_req => {
380 my ($x, $y, $soundnum, $type) = @_; 704 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 }, 705 },
390 }; 706 };
391 707
392 if ($CONN) { 708 if ($CONN) {
393 CFPlus::lowdelay fileno $CONN->{fh}; 709 CFPlus::lowdelay fileno $CONN->{fh};
… …
402sub stop_game { 718sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 719 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 720 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 721 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 722 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 723 $SPELL_LIST->clear_spells;
724 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
725
726 &audio_music_set_ambient ([]);
408 727
409 return unless $CONN; 728 return unless $CONN;
410 729
411 status "connection closed"; 730 status "connection closed";
412 731
… …
420sub graphics_setup { 739sub graphics_setup {
421 my $vbox = new CFPlus::UI::VBox; 740 my $vbox = new CFPlus::UI::VBox;
422 741
423 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 742 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
424 743
744 my $row = 0;
745
746 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
747 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
748 can_events => 1,
749 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
750
751 my $vidmode_tooltip =
752 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
753 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
754
425 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 755 $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); 756 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
427 757
758 $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]); 759 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"); 760 tooltip => $vidmode_tooltip);
761 $hbox->add (my $mode_label = new CFPlus::UI::Label
762 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
763 can_events => 1, tooltip => $vidmode_tooltip);
430 764
431 $mode_slider->connect (changed => sub { 765 $mode_slider->connect (changed => sub {
432 my ($self, $value) = @_; 766 my ($self, $value) = @_;
433 767
434 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 768 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
435 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 769 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
436 }); 770 });
437 $mode_slider->emit (changed => $mode_slider->{range}[0]); 771 $mode_slider->emit (changed => $mode_slider->{range}[0]);
438 772
439 my $row = 1;
440
441 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 773 $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 774 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
443 state => $CFG->{fullscreen}, 775 state => $CFG->{fullscreen},
444 tooltip => "Bring the client into fullscreen mode.", 776 tooltip => "Bring the client into fullscreen mode.",
445 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 777 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
446 ); 778 );
447 779
448 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 780 $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 781 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
450 state => $CFG->{fast}, 782 state => $CFG->{fast},
451 tooltip => "Lower the visual quality considerably to speed up rendering.", 783 tooltip => "Lower the visual quality considerably to speed up rendering.",
452 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 784 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
453 ); 785 );
454 786
787 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
788 $table->add_at (1, $row++, new CFPlus::UI::Slider
789 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
790 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
791 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
792 );
793
794 $table->add_at (1, $row++, new CFPlus::UI::Button
795 expand => 1, align => 0, text => "Apply",
796 tooltip => "Apply the video settings above.",
797 on_activate => sub {
798 video_shutdown ();
799 video_init ();
800 0
801 }
802 );
803
455 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 804 $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 805 $table->add_at (1, $row++, new CFPlus::UI::Slider
457 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 806 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
458 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 807 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
459 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 808 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
460 ); 809 );
461 810
811 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
812 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
813 state => $CFG->{map_smoothing},
814 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
815 . "This increases load on the graphics subsystem and works only with 2.x servers. "
816 . "Changes take effect at next connection only.",
817 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
818 );
819
462 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 820 $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 821 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
464 state => $CFG->{fow_enable}, 822 state => $CFG->{fow_enable},
465 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 823 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 } 824 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
467 ); 825 );
468 826
469 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 827 $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 828 $table->add_at (1, $row++, new CFPlus::UI::Slider
471 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 829 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.", 830 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 } 831 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
474 ); 832 );
475 833
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"); 834 $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 835 $table->add_at (1, $row++, new CFPlus::UI::Slider
497 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 836 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.", 837 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 }, 838 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
500 ); 839 );
501 840
502 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 841 $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 842 $table->add_at (1, $row++, new CFPlus::UI::Slider
504 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 843 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.", 844 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
506 on_changed => sub { 845 on_changed => sub {
507 $CFG->{gauge_fontsize} = $_[1]; 846 $CFG->{gauge_fontsize} = $_[1];
508 &set_gauge_window_fontsize; 847 &set_gauge_window_fontsize;
509 0 848 0
510 } 849 }
511 ); 850 );
512 851
513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 852 $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 853 $table->add_at (1, $row++, new CFPlus::UI::Slider
515 range => [$CFG->{gauge_size}, 0.2, 0.8], 854 range => [$CFG->{gauge_size}, 0.2, 0.8],
516 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 855 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
517 on_changed => sub { 856 on_changed => sub {
518 $CFG->{gauge_size} = $_[1]; 857 $CFG->{gauge_size} = $_[1];
519 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 858 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
520 0 859 0
521 } 860 }
522 ); 861 );
523 862
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 863 $vbox
535} 864}
536 865
537sub audio_setup { 866sub audio_setup {
538 my $vbox = new CFPlus::UI::VBox; 867 my $vbox = new CFPlus::UI::VBox;
539 868
540 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 869 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
541 870
542 my $row = 0; 871 my $row = 0;
543 872
544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 873 $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 874 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
546 state => $CFG->{audio_enable}, 875 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.", 876 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 } 877 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
549 ); 878 );
550# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 879# $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 { 880# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
552# $CFG->{effects_volume} = $_[1]; 881# $CFG->{effects_volume} = $_[1];
553# }); 882# });
883
884 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
885 $table->add_at (1, $row, new CFPlus::UI::CheckBox
886 expand => 1, state => $CFG->{effects_enable},
887 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
888 on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 }
889 );
890 $table->add_at (2, $row++, new CFPlus::UI::Slider
891 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
892 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
893 . "is set highest and you use your operating system volume setting. Changes are instant.",
894 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
895 );
896
554 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 897 $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 898 $table->add_at (1, $row, new CFPlus::UI::CheckBox
557 expand => 1, state => $CFG->{bgm_enable}, 899 expand => 1, state => $CFG->{bgm_enable},
558 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 900 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 } 901 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
560 ); 902 );
561 $hbox->add (new CFPlus::UI::Slider 903 $table->add_at (2, $row++, new CFPlus::UI::Slider
562 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 904 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
563 tooltip => "The volume of the background music. Changes are instant.", 905 tooltip => "The volume of the background music. Changes are instant.",
564 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 906 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
565 ); 907 );
566 908
567 $table->add (1, $row++, new CFPlus::UI::Button 909 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply", 910 c_colspan => 2, expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the audio settings", 911 tooltip => "Apply the audio settings",
570 on_activate => sub { 912 on_activate => sub {
571 audio_shutdown (); 913 audio_shutdown ();
572 audio_init (); 914 audio_init ();
573 0 915 0
… …
631} 973}
632 974
633sub debug_setup { 975sub debug_setup {
634 my $table = new CFPlus::UI::Table; 976 my $table = new CFPlus::UI::Table;
635 977
636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 978 $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 }); 979 $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"); 980 $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 }); 981 $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"); 982 $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 }); 983 $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"); 984 $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 }); 985 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
986 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644 987
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 988 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
646 989
647 for my $x (0..2) { 990 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
648 for my $y (0 .. 2) { 991 $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, 992 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
650 new CFPlus::UI::Entry 993 $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], 994 $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 }, 995 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
653 ); 996
654 } 997 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
998
999 $c->add_items ({
1000 type => "line_loop",
1001 color => [0, 1, 0],
1002 width => 9,
1003 coord_mode => "abs",
1004 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
655 } 1005 });
656 1006
1007 $c->add_items ({
1008 type => "lines",
1009 color => [1, 1, 0],
1010 width => 2,
1011 coord_mode => "rel",
1012 coord => [[0,0], [1,1], [1,0], [0,1]],
1013 });
1014
1015 $c->add_items ({
1016 type => "polygon",
1017 color => [0, 0.43, 0],
1018 width => 2,
1019 coord_mode => "rel",
1020 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1021 });
657 1022
658 $table 1023 $table
659} 1024}
660 1025
661sub stats_window { 1026sub stats_window {
… …
663 expand => 1, 1028 expand => 1,
664 scroll_y => 1 1029 scroll_y => 1
665 ); 1030 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 1031 $r->add (my $vb = new CFPlus::UI::VBox);
667 1032
1033 $vb->add (new CFPlus::UI::FancyFrame
1034 label => "Player",
1035 child => (my $pi = new CFPlus::UI::VBox),
1036 );
1037
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1038 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 1039 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."); 1040 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, 1041 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 1042 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 1043 tooltip => "The map you are currently on (if supported by the server).");
674 1044
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 1045 $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, 1046 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 1047 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 1048 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, 1049 $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, 1050 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 1051 tooltip => "The weight limit: you cannot carry more than this.");
682 1052
1053 $vb->add (new CFPlus::UI::FancyFrame
1054 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 1055 child => (my $hb = new CFPlus::UI::HBox expand => 1),
1056 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 1057 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 1058
686 my $color2 = [1, 1, 0]; 1059 my $color2 = [1, 1, 0];
687 1060
688 for ( 1061 for (
… …
701 [2, 4, st_spd => "Spd", 10.54], 1074 [2, 4, st_spd => "Spd", 10.54],
702 [2, 5, st_wspd => "WSp", 10.54], 1075 [2, 5, st_wspd => "WSp", 10.54],
703 ) { 1076 ) {
704 my ($col, $row, $id, $label, $template) = @$_; 1077 my ($col, $row, $id, $label, $template) = @$_;
705 1078
706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1079 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
707 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1080 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
708 align => +1, template => $template, tooltip => "#stat_$label"); 1081 align => +1, template => $template, tooltip => "#stat_$label");
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1082 $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, 1083 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 1084 align => -1, text => $label, tooltip => "#stat_$label");
712 } 1085 }
713 1086
1087 $vb->add (new CFPlus::UI::FancyFrame
1088 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 1089 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
1090 );
715 1091
716 my $row = 0; 1092 my $row = 0;
717 my $col = 0; 1093 my $col = 0;
718 1094
719 my %resist_names = ( 1095 my %resist_names = (
… …
752 cold => ["Cold", 1128 cold => ["Cold",
753 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1129 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
754 ghit => ["Ghost hit", 1130 ghit => ["Ghost hit",
755 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1131 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
756 ); 1132 );
1133
757 for (qw/slow holyw conf fire depl magic 1134 for (qw/slow holyw conf fire depl magic
758 drain acid pois para deat phys 1135 drain acid pois para deat phys
759 blind fear tund elec cold ghit/) 1136 blind fear tund elec cold ghit/)
760 { 1137 {
761 $tbl2->add ($col, $row, 1138 $tbl2->add_at ($col, $row,
762 $STATWIDS->{"res_$_"} = 1139 $STATWIDS->{"res_$_"} =
763 new CFPlus::UI::Label 1140 new CFPlus::UI::Label
764 font => $FONT_FIXED, 1141 font => $FONT_FIXED,
765 template => "-100%", 1142 template => "-100%",
766 align => +1, 1143 align => +1,
767 valign => 0, 1144 valign => 0,
768 can_events => 1, 1145 can_events => 1,
769 can_hover => 1, 1146 can_hover => 1,
770 tooltip => $resist_names{$_}->[1], 1147 tooltip => $resist_names{$_}->[1],
771 ); 1148 );
772 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1149 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
773 font => $FONT_FIXED, 1150 font => $FONT_FIXED,
774 can_hover => 1, 1151 can_hover => 1,
775 can_events => 1, 1152 can_events => 1,
776 path => "ui/resist/resist_$_.png", 1153 path => "ui/resist/resist_$_.png",
777 tooltip => $resist_names{$_}->[1], 1154 tooltip => $resist_names{$_}->[1],
778 ); 1155 );
779 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1156 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
780 text => $resist_names{$_}->[0], 1157 text => $resist_names{$_}->[0],
781 font => $FONT_FIXED, 1158 font => $FONT_FIXED,
782 can_hover => 1, 1159 can_hover => 1,
783 can_events => 1, 1160 can_events => 1,
784 tooltip => $resist_names{$_}->[1], 1161 tooltip => $resist_names{$_}->[1],
… …
817 return if $METASERVER_ATIME > time; 1194 return if $METASERVER_ATIME > time;
818 $METASERVER_ATIME = time + 60; 1195 $METASERVER_ATIME = time + 60;
819 1196
820 my $table = $METASERVER->{table}; 1197 my $table = $METASERVER->{table};
821 $table->clear; 1198 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1199 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 1200
824 my $buf; 1201 my $ok = 0;
825 1202
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1203 CFPlus::background {
1204 my $ua = CFPlus::lwp_useragent;
827 1205
828 unless ($fh) { 1206 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 1207 } sub {
830 return; 1208 my ($msg) = @_;
831 } 1209 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; 1210 $table->clear;
846 1211
847 my @tip = ( 1212 my @tip = (
848 "The current number of users logged in on the server.", 1213 "The current number of users logged in on the server.",
849 "The hostname of the server.", 1214 "The hostname of the server.",
850 "The time this server has been running without being restarted.", 1215 "The time this server has been running without being restarted.",
851 "The server software version - a '+' indicates a Crossfire+ server.", 1216 "The server software version - a '+' indicates a Crossfire+ server.",
852 "Short information about this server provided by its admins.", 1217 "Short information about this server provided by its admins.",
853 ); 1218 );
854 my @col = qw(#Users Host Uptime Version Description); 1219 my @col = qw(#Users Host Uptime Version Description);
855 $table->add ($_, 0, new CFPlus::UI::Label 1220 $table->add_at ($_, 0, new CFPlus::UI::Label
856 can_hover => 1, can_events => 1, 1221 can_hover => 1, can_events => 1,
857 align => 0, fg => [1, 1, 0], 1222 align => 0, fg => [1, 1, 0],
858 text => $col[$_], tooltip => $tip[$_]) 1223 text => $col[$_], tooltip => $tip[$_])
859 for 0 .. $#col; 1224 for 0 .. $#col;
860 1225
861 my @align = qw(1 0 1 1 -1); 1226 my @align = qw(1 0 1 1 -1);
862 1227
863 my $y = 0; 1228 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1229 for my $m (@{ $msg->{servers} }) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1230 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1231 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
866 1232
867 for ($desc) { 1233 for ($desc) {
868 s/<br>/\n/gi; 1234 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 1235 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 1236 s/<.*?>//sgi;
871 s/&/&amp;/g; 1237 s/&amp;/&/g;
872 s/</&lt;/g; 1238 s/&lt;/</g;
873 s/>/&gt;/g; 1239 s/&gt;/>/g;
874 } 1240 }
875 1241
876 $uptime = sprintf "%dd %02d:%02d:%02d", 1242 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 1243 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 1244 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 1245 (int $uptime / 60) % 60,
880 $m->[8] % 60; 1246 $uptime % 60;
881 1247
882 $m = [$users, $host, $uptime, $version, $desc]; 1248 $m = [$users, $host, $uptime, $version, $desc];
883 1249
884 $y++; 1250 $y++;
885 1251
886 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1252 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
887 (new CFPlus::UI::Button 1253 (new CFPlus::UI::Button
888 text => "Use", 1254 text => "Use",
889 tooltip => "Put this server into the <b>Host:Port</b> field", 1255 tooltip => "Put this server into the <b>Host:Port</b> field",
890 on_activate => sub { 1256 on_activate => sub {
891 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1257 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
894 }, 1260 },
895 ), 1261 ),
896 (new CFPlus::UI::Empty expand => 1), 1262 (new CFPlus::UI::Empty expand => 1),
897 ]); 1263 ]);
898 1264
899 $table->add ($_, $y, new CFPlus::UI::Label 1265 $table->add_at ($_, $y, new CFPlus::UI::Label
1266 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 1267 ellipsise => 0,
901 align => $align[$_], 1268 align => $align[$_],
902 text => $m->[$_], 1269 text => $m->[$_],
903 tooltip => $tip[$_], 1270 tooltip => $tip[$_],
1271 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 1272 can_hover => 1,
905 can_events => 1, 1273 can_events => 1,
906 fontsize => 0.8) 1274 fontsize => 0.8)
907 for 0 .. $#$m; 1275 for 0 .. $#$m;
908 } 1276 }
1277 } else {
1278 $ok or $label->set_text ("error while contacting metaserver");
909 } 1279 }
910 }); 1280 };
1281
911} 1282}
912 1283
913sub metaserver_dialog { 1284sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 1285 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 1286 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1287 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 1288
918 my $dialog = new CFPlus::UI::FancyFrame 1289 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 1290 title => "Server List",
920 name => 'metaserver_dialog', 1291 name => 'metaserver_dialog',
921 x => 'center', 1292 x => 'center',
922 y => 'center', 1293 y => 'center',
923 z => 3, 1294 z => 3,
1295 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 1296 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 1297 child => $vbox,
926 has_close_button => 1, 1298 has_close_button => 1,
927 table => $table, 1299 table => $table,
928 on_visibility_change => sub { 1300 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 1301 update_metaserver ($_[0]) if $_[1];
… …
935} 1307}
936 1308
937sub server_setup { 1309sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 1310 my $vbox = new CFPlus::UI::VBox;
939 1311
1312 $vbox->add (new CFPlus::UI::FancyFrame
1313 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1314 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1315 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1316 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 1317
943 { 1318 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1319 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
945 1320
946 $vbox->add ( 1321 $vbox->add (
947 $HOST_ENTRY = new CFPlus::UI::Entry 1322 $HOST_ENTRY = new CFPlus::UI::Entry
948 expand => 1, 1323 expand => 1,
949 text => $CFG->{profile}{default}{host}, 1324 text => $CFG->{profile}{default}{host},
950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1325 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
951 on_changed => sub { 1326 on_changed => sub {
952 my ($self, $value) = @_; 1327 my ($self, $value) = @_;
953 $CFG->{profile}{default}{host} = $value; 1328 $CFG->{profile}{default}{host} = $value;
954 0 1329 1
955 } 1330 }
956 ); 1331 );
957 1332
958 $vbox->add (new CFPlus::UI::Button 1333 $vbox->add (new CFPlus::UI::Button
959 expand => 1, 1334 expand => 1,
960 text => "Server List", 1335 text => "Server List",
961 other => $METASERVER, 1336 other => $METASERVER,
962 tooltip => "Show a list of available crossfire servers", 1337 tooltip => "Show a list of available crossfire servers",
963 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1338 on_activate => sub { $METASERVER->toggle_visibility; 0 },
964 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1339 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
965 ); 1340 );
966 } 1341 }
967 1342
968 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1343 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
969 $table->add (1, 4, new CFPlus::UI::Entry 1344 $table->add_at (1, 4, new CFPlus::UI::Entry
970 text => $CFG->{profile}{default}{user}, 1345 text => $CFG->{profile}{default}{user},
971 tooltip => "The name of your character on the server", 1346 tooltip => "The name of your character on the server",
972 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1347 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
973 ); 1348 );
974 1349
975 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1350 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
976 $table->add (1, 5, new CFPlus::UI::Entry 1351 $table->add_at (1, 5, new CFPlus::UI::Entry
977 text => $CFG->{profile}{default}{password}, 1352 text => $CFG->{profile}{default}{password},
978 hidden => 1, 1353 hidden => 1,
979 tooltip => "The password for your character", 1354 tooltip => "The password for your character",
980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1355 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
981 ); 1356 );
982 1357
983 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1358 $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 1359 $table->add_at (1, 7, new CFPlus::UI::Slider
985 force_w => 100, 1360 force_w => 100,
986 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1361 range => [$CFG->{mapsize}, 10, 100, 0, 1],
987 tooltip => "This is the size of the portion of the map update the server sends you. " 1362 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, " 1363 . "If you set this to a high value you will be able to see further, "
989 . "but you also increase bandwidth requirements and latency. " 1364 . "but you also increase bandwidth requirements and latency. "
990 . "This option is only used once at log-in.", 1365 . "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 }, 1366 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
992 ); 1367 );
993 1368
994 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1369 $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 1370 $table->add_at (1, 8, new CFPlus::UI::Entry
996 state => $CFG->{face_prefetch}, 1371 text => $CFG->{output_rate},
997 tooltip => "<b>Background Image Prefetch</b>\n\n" 1372 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. " 1373 . "when sending data. When 0 or unset, the server "
999 . "This might increase or create lag, but increases the chances " 1374 . "default will be used, which is usually around 100kb/s. Most servers will "
1000 . "of faces being ready for display when you encounter them. " 1375 . "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 }, 1376 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1005 ); 1377 );
1006 1378
1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1379 $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 1380 $table->add_at (1, 9, new CFPlus::UI::Entry
1009 text => $CFG->{output_count}, 1381 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.", 1382 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 }, 1383 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1012 ); 1384 );
1013 1385
1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1386 $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 1387 $table->add_at (1, 10, new CFPlus::UI::Entry
1016 text => $CFG->{output_sync}, 1388 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.", 1389 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 }, 1390 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1019 ); 1391 );
1020 1392
1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1393 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1022 expand => 1, 1394 expand => 1,
1023 align => 0, 1395 align => 0,
1024 text => "Login", 1396 text => "Login",
1025 on_activate => sub { 1397 on_activate => sub {
1026 $CONN ? stop_game 1398 $CONN ? stop_game
1027 : start_game; 1399 : start_game;
1400 1
1401 },
1402 );
1403
1404 $vbox->add (new CFPlus::UI::FancyFrame
1405 label => "Server Info",
1406 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1407 );
1408
1409 $vbox
1410}
1411
1412sub client_setup {
1413 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1414
1415 my $row = 0;
1416
1417 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1418 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1419 state => $CFG->{show_tips},
1420 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1421 on_changed => sub {
1422 my ($self, $value) = @_;
1423 $CFG->{show_tips} = $value;
1424 0
1425 }
1426 );
1427
1428 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1429 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1430 text => $CFG->{logview_max_par},
1431 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1432 . "sends more messages than this number, older messages get removed to save memory and "
1433 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1434 on_changed => sub {
1435 my ($self, $value) = @_;
1436 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1028 0 1437 0
1029 }, 1438 },
1030 ); 1439 );
1031 1440
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1441 $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} 1442}
1175 1443
1176sub autopickup_setup { 1444sub autopickup_setup {
1445 my $r = new CFPlus::UI::ScrolledWindow (
1446 expand => 1,
1447 scroll_y => 1
1448 );
1177 my $table = new CFPlus::UI::Table; 1449 $r->add (my $table = new CFPlus::UI::Table
1450 row_expand => [0],
1451 col_expand => [0, 1, 0, 1],
1452 );
1178 1453
1179 for ( 1454 for (
1180 ["General", 0, 0, 1455 ["General", 0, 0,
1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1456 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1182 ["Inhibit autopickup" => PICKUP_INHIBIT], 1457 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1196 ["Boots" => PICKUP_BOOTS], 1471 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1472 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1473 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1474 ],
1200 1475
1201 ["Readables", 2, 2, 1476 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1477 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1478 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1479 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1480 ],
1206 ["Misc", 2, 7, 1481 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1482 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1483 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1484 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1485 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1486 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1487 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1488 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1489 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1490 ["Jewelery" => PICKUP_JEWELS],
1491 ["Flesh" => PICKUP_FLESH],
1216 ], 1492 ],
1217 ["Weight/Value ratio", 2, 17] 1493 ["Weight/Value ratio", 2, 17]
1218 ) 1494 )
1219 { 1495 {
1220 my ($title, $x, $y, @bits) = @$_; 1496 my ($title, $x, $y, @bits) = @$_;
1221 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1497 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1222 1498
1223 for (@bits) { 1499 for (@bits) {
1224 ++$y; 1500 ++$y;
1225 1501
1226 my $mask = $_->[1]; 1502 my $mask = $_->[1];
1227 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1503 $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 1504 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1229 state => $::CFG->{pickup} & $mask, 1505 state => $::CFG->{pickup} & $mask,
1230 on_changed => sub { 1506 on_changed => sub {
1231 my ($box, $value) = @_; 1507 my ($box, $value) = @_;
1232 1508
1233 if ($value) { 1509 if ($value) {
… …
1244 1520
1245 ${$_->[2]} = $checkbox if $_->[2]; 1521 ${$_->[2]} = $checkbox if $_->[2];
1246 } 1522 }
1247 } 1523 }
1248 1524
1249 $table->add (2, 18, new CFPlus::UI::ValSlider 1525 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1250 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1526 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1251 template => ">= 99", 1527 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1528 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1529 on_changed => sub {
1254 my ($slider, $value) = @_; 1530 my ($slider, $value) = @_;
… …
1257 $::CFG->{pickup} |= int $value 1533 $::CFG->{pickup} |= int $value
1258 if $value; 1534 if $value;
1259 1; 1535 1;
1260 }); 1536 });
1261 1537
1262 $table->add (3, 18, new CFPlus::UI::Button 1538 $table->add_at (3, 18, new CFPlus::UI::Button
1263 text => "set", 1539 text => "set",
1264 on_activate => sub { 1540 on_activate => sub {
1265 $::CONN->send_command ("pickup $::CFG->{pickup}") 1541 $::CONN->send_command ("pickup $::CFG->{pickup}")
1266 if defined $::CONN; 1542 if defined $::CONN;
1267 0 1543 0
1268 }); 1544 });
1269 1545
1270 $table 1546 $r
1271} 1547}
1272 1548
1273my %SORT_ORDER = ( 1549my %SORT_ORDER = (
1274 type => undef, 1550 type => undef,
1275 mtime => sub { sort { 1551 mtime => sub {
1552 my $NOW = time;
1553 sort {
1554 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1555 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1556
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1557 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1558 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1559 or $a->{type} <=> $b->{type}
1560 } @_
1279 } @_ }, 1561 },
1280 weight => sub { sort { 1562 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1563 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1564 or $a->{type} <=> $b->{type}
1283 } @_ }, 1565 } @_ },
1284); 1566);
… …
1309 #TODO# update to weigh/maxweight 1591 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1592 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1593
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1594 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1595 $sw1->add ($INV = new CFPlus::UI::Inventory);
1596 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1597
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1598 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1599
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1600 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1318 1601
… …
1321 1604
1322 # XXX: Call after $INVR = ... because set_opencont sets the items 1605 # XXX: Call after $INVR = ... because set_opencont sets the items
1323 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1606 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1324 1607
1325 $hb 1608 $hb
1609}
1610
1611sub media_window {
1612 my $vb = new CFPlus::UI::VBox;
1613
1614 $vb->add (new CFPlus::UI::FancyFrame
1615 label => "Currently playing music",
1616 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1617 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1618 );
1619
1620 $vb->add (new CFPlus::UI::FancyFrame
1621 label => "Other media used in this session",
1622 expand => 1,
1623 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1624 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1625 );
1626
1627 $vb
1628}
1629
1630sub add_license {
1631 my ($meta) = @_;
1632
1633 $meta = $meta->{meta}
1634 or return;
1635
1636 $meta->{license} || $meta->{author} || $meta->{source}
1637 or return;
1638
1639 $LICENSE_WIDGET->add_paragraph ({
1640 fg => [1, 1, 1, 1],
1641 markup => "<small>"
1642 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1643 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1644 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1645 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1646 . "</small>",
1647 });
1648 $LICENSE_WIDGET->scroll_to_bottom;
1326} 1649}
1327 1650
1328sub toggle_player_page { 1651sub toggle_player_page {
1329 my ($widget) = @_; 1652 my ($widget) = @_;
1330 1653
… …
1335 $PL_WINDOW->show; 1658 $PL_WINDOW->show;
1336 } 1659 }
1337} 1660}
1338 1661
1339sub player_window { 1662sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1663 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1664 x => "center",
1342 y => "center", 1665 y => "center",
1343 force_w => $WIDTH * 9/10, 1666 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1667 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1668 title => "Player",
… …
1347 has_close_button => 1 1670 has_close_button => 1
1348 ; 1671 ;
1349 1672
1350 my $ntb = 1673 my $ntb =
1351 $PL_NOTEBOOK = 1674 $PL_NOTEBOOK =
1352 new CFPlus::UI::Notebook expand => 1, debug => 1; 1675 new CFPlus::UI::Notebook expand => 1;
1353 1676
1354 $ntb->add ( 1677 $ntb->add_tab (
1355 "Statistics (F2)" => $STATS_PAGE = stats_window, 1678 "Statistics (F2)" => $STATS_PAGE = stats_window,
1356 "Shows statistics, where all your Stats and Resistances are shown." 1679 "Shows statistics, where all your Stats and Resistances are shown."
1357 ); 1680 );
1358 $ntb->add ( 1681 $ntb->add_tab (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1682 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1683 "Shows all your Skills."
1361 ); 1684 );
1362 1685
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1686 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1687 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1688 $ntb->add_tab (
1366 "Spellbook (F4)" => $spellsw, 1689 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1690 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1691 );
1369 $ntb->add ( 1692 $ntb->add_tab (
1370 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1693 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1371 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1694 "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." 1695 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1373 ); 1696 );
1697 $ntb->add_tab (Pickup => autopickup_setup,
1698 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1699
1700 $ntb->add_tab (Media => media_window,
1701 "License, Author and Source info for media sent by the server.");
1374 1702
1375 $ntb->set_current_page ($INVENTORY_PAGE); 1703 $ntb->set_current_page ($INVENTORY_PAGE);
1376 1704
1377 $plwin->add ($ntb); 1705 $plwin->add ($ntb);
1378 $plwin 1706 $plwin
1379} 1707}
1380 1708
1381sub update_bindings {
1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1383}
1384
1385sub keyboard_setup { 1709sub keyboard_setup {
1386 my $binding_list = new CFPlus::UI::VBox; 1710 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} 1711}
1492 1712
1493sub help_window { 1713sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1714 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1715 x => 'center',
1496 y => 'center', 1716 y => 'center',
1497 z => 2, 1717 z => 4,
1498 name => 'doc_browser', 1718 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1719 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1720 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1721 title => "Help Browser",
1502 has_close_button => 1; 1722 has_close_button => 1;
1503 1723
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1724 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1725
1726 $vbox->add (new CFPlus::UI::FancyFrame
1727 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1728 child => (my $buttons = new CFPlus::UI::HBox),
1729 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1730 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1731 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1732
1510 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1733 my @history;
1511 $buttons->add (my $combo = new CFPlus::UI::Selector 1734 my @future;
1512 value => undef, 1735 my $curnode;
1513 options => [ 1736
1514 [intro => "Introduction"], 1737 my $load_node; $load_node = sub {
1515 [manual => "Main Manual"], 1738 my ($node, $para) = @_;
1516 [skill_help => "Skill Reference"], 1739
1517 [command_help => "Command Reference"], 1740 $buttons->clear;
1518 [dmcommand_help => "DM Commands"], 1741
1519 [COPYING => "License Terms"], 1742 $buttons->add (new CFPlus::UI::Button
1520 ], 1743 text => "⇤",
1744 tooltip => "back to the starting page",
1521 on_changed => sub { 1745 on_activate => sub {
1522 my ($self, $pod) = @_; 1746 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1523 1747 unshift @future, @history;
1524 $viewer->clear; 1748 @history = ();
1525 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod); 1749 $load_node->(@{shift @future});
1526 $viewer->set_offset (0);
1527
1528 0 1750 },
1751 );
1752
1753 if (@history) {
1754 $buttons->add (new CFPlus::UI::Button
1755 text => "⋘",
1756 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1757 on_activate => sub {
1758 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1759 $load_node->(@{pop @history});
1760 },
1761 );
1529 }, 1762 }
1530 on_visibility_change => sub { 1763
1531 my ($self, $visible) = @_; 1764 if (@future) {
1532 return unless $visible; 1765 $buttons->add (new CFPlus::UI::Button
1533 return if $self->{value}; 1766 text => "â‹™",
1534 $self->set_value ("intro"); 1767 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1768 on_activate => sub {
1769 push @history, [$curnode, $viewer->current_paragraph];
1770 $load_node->(@{shift @future});
1771 },
1535 0 1772 );
1536 }, 1773 }
1774
1775 $buttons->add (new CFPlus::UI::Label text => " ");
1776
1777 my @path = CFPlus::Pod::full_path_of $node;
1778 pop @path; # drop current node
1779
1780 for my $node (@path) {
1781 $buttons->add (new CFPlus::UI::Button
1782 text => $node->{kw}[0],
1783 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1784 on_activate => sub {
1785 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1786 $load_node->($node);
1787 },
1788 );
1789 $buttons->add (new CFPlus::UI::Label text => "/");
1790 }
1791
1792 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1793
1794 $curnode = $node;
1795
1796 $viewer->clear;
1797 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1798 $viewer->scroll_to ($para);
1537 ); 1799 };
1800
1801 $load_node->(CFPlus::Pod::find pod => "mainpage");
1802
1803 $CFPlus::Pod::goto_document = sub {
1804 my (@path) = @_;
1805
1806 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1807
1808 $load_node->((CFPlus::Pod::find @path)[0]);
1809 $win->show;
1810 };
1538 1811
1539 $win 1812 $win
1813}
1814
1815sub open_string_query {
1816 my ($title, $cb, $txt, $tooltip) = @_;
1817 my $dialog = new CFPlus::UI::Toplevel
1818 x => "center",
1819 y => "center",
1820 z => 50,
1821 force_w => $WIDTH * 4/5,
1822 title => $title;
1823
1824 $dialog->add (
1825 my $e = new CFPlus::UI::Entry
1826 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1827 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1828 tooltip => $tooltip
1829 );
1830
1831 $e->grab_focus;
1832 $e->set_text ($txt) if $txt;
1833 $dialog->show;
1834}
1835
1836sub open_quit_dialog {
1837 unless ($QUIT_DIALOG) {
1838 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1839 x => "center",
1840 y => "center",
1841 z => 50,
1842 title => "Really Quit?",
1843 on_key_down => sub {
1844 my ($dialog, $ev) = @_;
1845 $ev->{sym} == 27 and $dialog->hide;
1846 }
1847 ;
1848
1849 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1850
1851 $vb->add (new CFPlus::UI::Label
1852 text => "You should find a savebed and apply it first!",
1853 max_w => $WIDTH * 0.25,
1854 ellipsize => 0,
1855 );
1856 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1857 $hb->add (new CFPlus::UI::Button
1858 text => "Ok",
1859 expand => 1,
1860 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1861 );
1862 $hb->add (new CFPlus::UI::Button
1863 text => "Quit anyway",
1864 expand => 1,
1865 on_activate => sub { exit },
1866 );
1867 }
1868
1869 $QUIT_DIALOG->show;
1870 $QUIT_DIALOG->grab_focus;
1871}
1872
1873sub show_tip_of_the_day {
1874 # find all tips
1875 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1876
1877 CFPlus::DB::get state => "tip_of_the_day", sub {
1878 my ($todindex) = @_;
1879 $todindex = 0 if $todindex >= @tod;
1880 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1881
1882 # create dialog
1883 my $dialog;
1884
1885 my $close = sub {
1886 $dialog->destroy;
1887 };
1888
1889 $dialog = new CFPlus::UI::Toplevel
1890 x => "center",
1891 y => "center",
1892 z => 3,
1893 name => 'tip_of_the_day',
1894 force_w => int $WIDTH * 4/9,
1895 force_h => int $WIDTH * 2/9,
1896 title => "Tip of the day #" . (1 + $todindex),
1897 child => my $vbox = new CFPlus::UI::VBox,
1898 has_close_button => 1,
1899 on_delete => $close,
1900 ;
1901
1902 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1903 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1904 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1905
1906 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1907
1908 $table->add_at (0, 0, new CFPlus::UI::Button
1909 text => "Close",
1910 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>.",
1911 on_activate => $close,
1912 );
1913
1914 $table->add_at (2, 0, new CFPlus::UI::Button
1915 text => "Next",
1916 tooltip => "Show the next <b>Tip of the day</b>.",
1917 on_activate => sub {
1918 $close->();
1919 &show_tip_of_the_day;
1920 },
1921 );
1922
1923 $dialog->show;
1924 };
1540} 1925}
1541 1926
1542sub sdl_init { 1927sub sdl_init {
1543 CFPlus::SDL_Init 1928 CFPlus::SDL_Init
1544 and die "SDL::Init failed!\n"; 1929 and die "SDL::Init failed!\n";
1545} 1930}
1546 1931
1547sub video_init { 1932sub video_init {
1548 sdl_init;
1549
1550 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1933 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1551 1934
1552 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1935 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1553 1936
1554 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1937 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1555 $FULLSCREEN = $CFG->{fullscreen}; 1938 $FULLSCREEN = $CFG->{fullscreen};
1556 $FAST = $CFG->{fast}; 1939 $FAST = $CFG->{fast};
1557 1940
1558 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1941 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1559 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1942 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1560 1943
1561 $SDL_ACTIVE = 1; 1944 $SDL_ACTIVE = 1;
1562 $LAST_REFRESH = time - 0.01; 1945 $LAST_REFRESH = time - 0.01;
1563 1946
… …
1579 z => 100, 1962 z => 100,
1580 force_x => "max", 1963 force_x => "max",
1581 force_y => 0; 1964 force_y => 0;
1582 $DEBUG_STATUS->show; 1965 $DEBUG_STATUS->show;
1583 1966
1584 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1585
1586 $STATUSBOX = new CFPlus::UI::Statusbox; 1967 $STATUSBOX = new CFPlus::UI::Statusbox;
1587 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1968 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1588 1969
1589 (new CFPlus::UI::Frame 1970 (new CFPlus::UI::Frame
1590 bg => [0, 0, 0, 0.4], 1971 bg => [0, 0, 0, 0.4],
1591 force_x => 0, 1972 force_x => 0,
1592 force_y => "max", 1973 force_y => "max",
1593 child => $STATUSBOX, 1974 child => $STATUSBOX,
1594 )->show; 1975 )->show;
1595 1976
1596 CFPlus::UI::FancyFrame->new ( 1977 CFPlus::UI::Toplevel->new (
1597 title => "Map", 1978 title => "Map",
1598 name => "mapmap", 1979 name => "mapmap",
1599 x => 0, 1980 x => 0,
1600 y => $FONTSIZE + 8, 1981 y => $FONTSIZE + 8,
1601 border_bg => [1, 1, 1, 192/255], 1982 border_bg => [1, 1, 1, 192/255],
… …
1607 1988
1608 $MAPWIDGET = new CFPlus::MapWidget; 1989 $MAPWIDGET = new CFPlus::MapWidget;
1609 $MAPWIDGET->connect (activate_console => sub { 1990 $MAPWIDGET->connect (activate_console => sub {
1610 my ($mapwidget, $preset) = @_; 1991 my ($mapwidget, $preset) = @_;
1611 1992
1612 if ($CONSOLE) { 1993 $MESSAGE_WINDOW->activate_console ($preset)
1613 $CONSOLE->{input}->{auto_activated} = 1; 1994 if $MESSAGE_WINDOW;
1614 $CONSOLE->{input}->grab_focus;
1615
1616 if ($preset && $CONSOLE->{input}->get_text eq '') {
1617 $CONSOLE->{input}->set_text ($preset);
1618 }
1619 }
1620 }); 1995 });
1621 $MAPWIDGET->show; 1996 $MAPWIDGET->show;
1622 $MAPWIDGET->grab_focus; 1997 $MAPWIDGET->grab_focus;
1623 1998
1624 $LOGVIEW = new CFPlus::UI::TextScroller
1625 expand => 1,
1626 font => $FONT_FIXED,
1627 fontsize => $::CFG->{log_fontsize},
1628 indent => -4,
1629 can_hover => 1,
1630 can_events => 1,
1631 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1632 ;
1633
1634 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1999 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1635 title => "Setup", 2000 title => "Setup",
1636 name => "setup_dialog", 2001 name => "setup_dialog",
1637 x => 'center', 2002 x => 'center',
1638 y => 'center', 2003 y => 'center',
1639 z => 2, 2004 z => 2,
… …
1641 force_h => $::HEIGHT * 0.6, 2006 force_h => $::HEIGHT * 0.6,
1642 has_close_button => 1, 2007 has_close_button => 1,
1643 ; 2008 ;
1644 2009
1645 $METASERVER = metaserver_dialog; 2010 $METASERVER = metaserver_dialog;
2011 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1646 2012
1647 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2013 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1648 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2014 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1649 2015
1650 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2016 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1651 "Configure the server to play on, your username, password and other server-related options."); 2017 "Configure the server to play on, your username, password and other server-related options.");
1652 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2018 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1653 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2019 "Configure various client-specific settings.");
1654 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2020 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1655 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2021 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1656 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2022 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1657 "Configure the use of audio, sound effects and background music."); 2023 "Configure the use of audio, sound effects and background music.");
1658 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2024 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1659 "Lets you define, edit and delete key bindings." 2025 "Lets you define, edit and delete key bindings."
1660 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2026 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1661 . "with nothing set and the recording started. After doing the actions you " 2027 . "with nothing set and the recording started. After doing the actions you "
1662 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2028 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1663 . "After pressing the combo the binding will be saved automatically and the " 2029 . "After pressing the combo the binding will be saved automatically and the "
1664 . "binding editor closes"); 2030 . "binding editor closes");
1665 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2031 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1666 "Some debuggin' options. Do not ask."); 2032 "Some debuggin' options. Do not ask.");
1667 2033
1668 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2034 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1669 2035
1670 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2036 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1671 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2037 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1672 2038
1673 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2039 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1674 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2040 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1675 2041
1676 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 2042 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
1677 2043
1678 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2044 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1689 }, 2055 },
1690 ); 2056 );
1691 2057
1692 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2058 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1693 tooltip => "View Documentation"); 2059 tooltip => "View Documentation");
2060
1694 2061
1695 $BUTTONBAR->add (new CFPlus::UI::Button 2062 $BUTTONBAR->add (new CFPlus::UI::Button
1696 text => "Quit", 2063 text => "Quit",
1697 tooltip => "Terminates the program", 2064 tooltip => "Terminates the program",
1698 on_activate => sub { 2065 on_activate => sub {
… …
1716 CFPlus::OpenGL::shutdown; 2083 CFPlus::OpenGL::shutdown;
1717 2084
1718 undef $SDL_ACTIVE; 2085 undef $SDL_ACTIVE;
1719} 2086}
1720 2087
1721my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1722my $bgmusic;#TODO#hack#d#
1723
1724sub audio_channel_finished {
1725 my ($channel) = @_;
1726
1727 #warn "channel $channel finished\n";#d#
1728}
1729
1730sub audio_music_finished {
1731 return unless $CFG->{bgm_enable};
1732
1733 # TODO: hack, do play loop and mood music
1734 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1735 $bgmusic->play (0);
1736
1737 push @bgmusic, shift @bgmusic;
1738}
1739
1740sub audio_init {
1741 if ($CFG->{audio_enable}) {
1742 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1743 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1744
1745 unless ($SDL_MIXER) {
1746 status "Unable to open sound device: there will be no sound";
1747 return;
1748 }
1749
1750 CFPlus::Mix_AllocateChannels 8;
1751 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1752
1753 audio_music_finished;
1754
1755 while (<$fh>) {
1756 next if /^\s*#/;
1757 next if /^\s*$/;
1758
1759 my ($file, $volume, $event) = split /\s+/, $_, 3;
1760
1761 push @SOUNDS, "$volume,$file";
1762
1763 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1764 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1765 $chunk->volume ($volume * 128 / 100);
1766 $chunk
1767 };
1768 }
1769 } else {
1770 status "unable to open sound config: $!";
1771 }
1772 }
1773}
1774
1775sub audio_shutdown {
1776 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1777 undef $SDL_MIXER;
1778 @SOUNDS = ();
1779 %AUDIO_CHUNKS = ();
1780}
1781
1782my %animate_object; 2088my %animate_object;
1783my $animate_timer; 2089my $animate_timer;
1784 2090
1785my $fps = 9; 2091my $fps = 9;
1786
1787my %demo;#d#
1788 2092
1789sub force_refresh { 2093sub force_refresh {
1790 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2094 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1791 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2095 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1792 2096
1793 $CFPlus::UI::ROOT->draw; 2097 $CFPlus::UI::ROOT->draw;
1794 2098
1795 $WANT_REFRESH = 0; 2099 $WANT_REFRESH = 0;
1796 $CAN_REFRESH = 0; 2100 $CAN_REFRESH = 0;
1797 $LAST_REFRESH = $NOW; 2101 $LAST_REFRESH = $NOW;
1798 2102
1799 CFPlus::SDL_GL_SwapBuffers; 2103 CFPlus::SDL_GL_SwapBuffers;
1800} 2104}
1801 2105
1802my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2106my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1803 $NOW = time; 2107 $NOW = time;
1804 2108
1805 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2109 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1806 for CFPlus::SDL_PollEvent; 2110 for CFPlus::poll_events;
1807 2111
1808 if (%animate_object) { 2112 if (%animate_object) {
1809 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2113 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1810 $WANT_REFRESH++; 2114 ++$WANT_REFRESH;
1811 } 2115 }
1812 2116
1813 if ($WANT_REFRESH) { 2117 if ($WANT_REFRESH) {
1814 force_refresh; 2118 force_refresh;
1815 } else { 2119 } else {
… …
1825sub animation_stop { 2129sub animation_stop {
1826 my ($widget) = @_; 2130 my ($widget) = @_;
1827 delete $animate_object{$widget}; 2131 delete $animate_object{$widget};
1828} 2132}
1829 2133
1830# check once/second for faces that need to be prefetched
1831# this should, of course, only run on demand, but
1832# SDL forces worse things on us....
1833
1834Event->timer (after => 1, interval => 0.25, cb => sub {
1835 $CONN->face_prefetch
1836 if $CONN;
1837});
1838
1839%SDL_CB = ( 2134%SDL_CB = (
1840 CFPlus::SDL_QUIT => sub { 2135 CFPlus::SDL_QUIT => sub {
1841 Event::unloop -1; 2136 exit;
1842 }, 2137 },
1843 CFPlus::SDL_VIDEORESIZE => sub { 2138 CFPlus::SDL_VIDEORESIZE => sub {
1844 }, 2139 },
1845 CFPlus::SDL_VIDEOEXPOSE => sub { 2140 CFPlus::SDL_VIDEOEXPOSE => sub {
1846 CFPlus::UI::full_refresh; 2141 CFPlus::UI::full_refresh;
1847 }, 2142 },
1848 CFPlus::SDL_ACTIVEEVENT => sub { 2143 CFPlus::SDL_ACTIVEEVENT => sub {
1849# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2144# not useful, as APPACTIVE include sonly iconified state, not unmapped
2145# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2146# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2147# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2148# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2149# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1850 }, 2150 },
1851 CFPlus::SDL_KEYDOWN => sub { 2151 CFPlus::SDL_KEYDOWN => sub {
1852 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2152 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1853 # alt-enter 2153 # alt-enter
1854 $FULLSCREEN_ENABLE->toggle; 2154 $FULLSCREEN_ENABLE->toggle;
… …
1875 2175
1876$SIG{INT} = $SIG{TERM} = sub { exit }; 2176$SIG{INT} = $SIG{TERM} = sub { exit };
1877 2177
1878{ 2178{
1879 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2179 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2180 CFPlus::DB::Server::run;
2181
1880 CFPlus::UI::set_layout ($::CFG->{layout}); 2182 CFPlus::UI::set_layout ($::CFG->{layout});
1881 2183
1882 my %DEF_CFG = ( 2184 my %DEF_CFG = (
1883 sdl_mode => 0, 2185 sdl_mode => 0,
1884 width => 640,
1885 height => 480,
1886 fullscreen => 0, 2186 fullscreen => 0,
1887 fast => 0, 2187 fast => 0,
1888 map_scale => 1, 2188 map_scale => 1,
1889 fow_enable => 1, 2189 fow_enable => 1,
1890 fow_intensity => 0.45, 2190 fow_intensity => 0,
1891 fow_smooth => 0, 2191 map_smoothing => 1,
1892 gui_fontsize => 1, 2192 gui_fontsize => 1,
1893 log_fontsize => 0.7, 2193 log_fontsize => 0.7,
1894 gauge_fontsize => 1, 2194 gauge_fontsize => 1,
1895 gauge_size => 0.35, 2195 gauge_size => 0.35,
1896 stat_fontsize => 0.7, 2196 stat_fontsize => 0.7,
1897 mapsize => 100, 2197 mapsize => 100,
1898 say_command => 'say',
1899 audio_enable => 1, 2198 audio_enable => 1,
2199 effects_enable => 1,
2200 effects_volume => 1,
1900 bgm_enable => 1, 2201 bgm_enable => 1,
1901 bgm_volume => 0.25, 2202 bgm_volume => 0.5,
1902 face_prefetch => 0,
1903 output_sync => 1, 2203 output_sync => 1,
1904 output_count => 1, 2204 output_count => 1,
2205 output_rate => "",
1905 pickup => 0, 2206 pickup => 0,
1906 inv_sort => "mtime", 2207 inv_sort => "mtime",
1907 default => "profile", # default profile 2208 default => "profile", # default profile
2209 show_tips => 1,
2210 logview_max_par => 1000,
1908 ); 2211 );
1909 2212
1910 while (my ($k, $v) = each %DEF_CFG) { 2213 while (my ($k, $v) = each %DEF_CFG) {
1911 $CFG->{$k} = $v unless exists $CFG->{$k}; 2214 $CFG->{$k} = $v unless exists $CFG->{$k};
1912 } 2215 }
1913 2216
1914 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2217 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2218 $PROFILE = $CFG->{profile}{default};
2219
2220 # convert old bindings (only default profile matters)
2221 if (my $bindings = delete $PROFILE->{bindings}) {
2222 while (my ($mod, $syms) = each %$bindings) {
2223 while (my ($sym, $cmds) = each %$syms) {
2224 push @{ $PROFILE->{macro} }, {
2225 accelkey => [$mod*1, $sym*1],
2226 action => $cmds,
2227 };
2228 }
2229 }
2230 }
1915 2231
1916 sdl_init; 2232 sdl_init;
1917 2233
1918 @SDL_MODES = reverse 2234 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1919 grep $_->[0] >= 640 && $_->[1] >= 480, 2235 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1920 CFPlus::SDL_ListModes;
1921
1922 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2236 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2237
2238 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1923 2239
1924 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2240 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1925 2241
1926 { 2242 {
1927 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2243 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
1956# } 2272# }
1957# my $t2 = Time::HiRes::time; 2273# my $t2 = Time::HiRes::time;
1958# warn $t2-$t1; 2274# warn $t2-$t1;
1959# } 2275# }
1960 2276
2277 $startup_done->();
2278
1961 video_init; 2279 video_init;
1962 audio_init; 2280 audio_init;
1963} 2281}
2282
2283show_tip_of_the_day if $CFG->{show_tips};
1964 2284
1965Event::loop; 2285Event::loop;
1966#CFPlus::SDL_Quit; 2286#CFPlus::SDL_Quit;
1967#CFPlus::_exit 0; 2287#CFPlus::_exit 0;
1968 2288
2289END {
1969END { CFPlus::SDL_Quit } 2290 CFPlus::SDL_Quit;
2291 CFPlus::DB::Server::stop;
2292}
1970 2293
1971=head1 NAME 2294=head1 NAME
1972 2295
1973cfplus - A Crossfire+ and Crossfire game client 2296cfplus - A Crossfire+ and Crossfire game client
1974 2297

Diff Legend

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