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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.112 by root, Sun Aug 13 20:01:14 2006 UTC vs.
Revision 1.206 by root, Thu Aug 9 03:40:44 2007 UTC

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

Diff Legend

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