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.220 by root, Tue Aug 21 02:39:17 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines