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.110 by root, Sun Aug 13 18:48:57 2006 UTC vs.
Revision 1.221 by root, Wed Aug 22 21:14:06 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
… …
615 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 984 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
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);
991 $vbox->add (my $sklprg = 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"); 992 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
622 993
623 $GAUGES = { 994 $GAUGES = {
995 exp => $exp, prg => $prg, sklprg => $sklprg,
624 exp => $exp, win => $win, range => $rng, 996 win => $win, range => $rng,
625 food => $fg, mana => $mg, hp => $hg, grace => $gg 997 hp => $hg, mana => $mg, grace => $gg, food => $fg,
626 }; 998 };
627 999
628 &set_gauge_window_fontsize; 1000 &set_gauge_window_fontsize;
629 1001
630 $win 1002 $win
631} 1003}
632 1004
633sub debug_setup { 1005sub debug_setup {
634 my $table = new CFPlus::UI::Table; 1006 my $table = new CFPlus::UI::Table;
635 1007
636 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 1008 $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 }); 1009 $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"); 1010 $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 }); 1011 $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"); 1012 $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 }); 1013 $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"); 1014 $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 }); 1015 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
1016 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
644 1017
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 1018 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
646 1019
647 for my $x (0..2) { 1020 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
648 for my $y (0 .. 2) { 1021 $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, 1022 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
650 new CFPlus::UI::Entry 1023 $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], 1024 $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 }, 1025 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
653 ); 1026
654 } 1027 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
1028
1029 $c->add_items ({
1030 type => "line_loop",
1031 color => [0, 1, 0],
1032 width => 9,
1033 coord_mode => "abs",
1034 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
655 } 1035 });
656 1036
1037 $c->add_items ({
1038 type => "lines",
1039 color => [1, 1, 0],
1040 width => 2,
1041 coord_mode => "rel",
1042 coord => [[0,0], [1,1], [1,0], [0,1]],
1043 });
1044
1045 $c->add_items ({
1046 type => "polygon",
1047 color => [0, 0.43, 0],
1048 width => 2,
1049 coord_mode => "rel",
1050 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
1051 });
657 1052
658 $table 1053 $table
659} 1054}
660 1055
661sub stats_window { 1056sub stats_window {
… …
663 expand => 1, 1058 expand => 1,
664 scroll_y => 1 1059 scroll_y => 1
665 ); 1060 );
666 $r->add (my $vb = new CFPlus::UI::VBox); 1061 $r->add (my $vb = new CFPlus::UI::VBox);
667 1062
1063 $vb->add (new CFPlus::UI::FancyFrame
1064 label => "Player",
1065 child => (my $pi = new CFPlus::UI::VBox),
1066 );
1067
668 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 1068 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 1069 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."); 1070 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, 1071 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 1072 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 1073 tooltip => "The map you are currently on (if supported by the server).");
674 1074
675 $vb->add (my $hb0 = new CFPlus::UI::HBox); 1075 $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, 1076 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 1077 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 1078 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, 1079 $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, 1080 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 1081 tooltip => "The weight limit: you cannot carry more than this.");
682 1082
1083 $vb->add (new CFPlus::UI::FancyFrame
1084 label => "Primary/Secondary Statistics",
683 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 1085 child => (my $hb = new CFPlus::UI::HBox expand => 1),
1086 );
684 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 1087 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
685 1088
686 my $color2 = [1, 1, 0]; 1089 my $color2 = [1, 1, 0];
687 1090
688 for ( 1091 for (
… …
701 [2, 4, st_spd => "Spd", 10.54], 1104 [2, 4, st_spd => "Spd", 10.54],
702 [2, 5, st_wspd => "WSp", 10.54], 1105 [2, 5, st_wspd => "WSp", 10.54],
703 ) { 1106 ) {
704 my ($col, $row, $id, $label, $template) = @$_; 1107 my ($col, $row, $id, $label, $template) = @$_;
705 1108
706 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1109 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
707 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1110 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
708 align => +1, template => $template, tooltip => "#stat_$label"); 1111 align => +1, template => $template, tooltip => "#stat_$label");
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1112 $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, 1113 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
711 align => -1, text => $label, tooltip => "#stat_$label"); 1114 align => -1, text => $label, tooltip => "#stat_$label");
712 } 1115 }
713 1116
1117 $vb->add (new CFPlus::UI::FancyFrame
1118 label => "Resistancies",
714 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 1119 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
1120 );
715 1121
716 my $row = 0; 1122 my $row = 0;
717 my $col = 0; 1123 my $col = 0;
718 1124
719 my %resist_names = ( 1125 my %resist_names = (
… …
752 cold => ["Cold", 1158 cold => ["Cold",
753 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1159 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
754 ghit => ["Ghost hit", 1160 ghit => ["Ghost hit",
755 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1161 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
756 ); 1162 );
1163
757 for (qw/slow holyw conf fire depl magic 1164 for (qw/slow holyw conf fire depl magic
758 drain acid pois para deat phys 1165 drain acid pois para deat phys
759 blind fear tund elec cold ghit/) 1166 blind fear tund elec cold ghit/)
760 { 1167 {
761 $tbl2->add ($col, $row, 1168 $tbl2->add_at ($col, $row,
762 $STATWIDS->{"res_$_"} = 1169 $STATWIDS->{"res_$_"} =
763 new CFPlus::UI::Label 1170 new CFPlus::UI::Label
764 font => $FONT_FIXED, 1171 font => $FONT_FIXED,
765 template => "-100%", 1172 template => "-100%",
766 align => +1, 1173 align => +1,
767 valign => 0, 1174 valign => 0,
768 can_events => 1, 1175 can_events => 1,
769 can_hover => 1, 1176 can_hover => 1,
770 tooltip => $resist_names{$_}->[1], 1177 tooltip => $resist_names{$_}->[1],
771 ); 1178 );
772 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1179 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
773 font => $FONT_FIXED, 1180 font => $FONT_FIXED,
774 can_hover => 1, 1181 can_hover => 1,
775 can_events => 1, 1182 can_events => 1,
776 path => "ui/resist/resist_$_.png", 1183 path => "ui/resist/resist_$_.png",
777 tooltip => $resist_names{$_}->[1], 1184 tooltip => $resist_names{$_}->[1],
778 ); 1185 );
779 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1186 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
780 text => $resist_names{$_}->[0], 1187 text => $resist_names{$_}->[0],
781 font => $FONT_FIXED, 1188 font => $FONT_FIXED,
782 can_hover => 1, 1189 can_hover => 1,
783 can_events => 1, 1190 can_events => 1,
784 tooltip => $resist_names{$_}->[1], 1191 tooltip => $resist_names{$_}->[1],
… …
796 $r 1203 $r
797} 1204}
798 1205
799sub skill_window { 1206sub skill_window {
800 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1207 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1208
801 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1209 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1210
802 $sw 1211 $sw
803} 1212}
804 1213
805sub formsep($) { 1214sub formsep($) {
806 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1215 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
817 return if $METASERVER_ATIME > time; 1226 return if $METASERVER_ATIME > time;
818 $METASERVER_ATIME = time + 60; 1227 $METASERVER_ATIME = time + 60;
819 1228
820 my $table = $METASERVER->{table}; 1229 my $table = $METASERVER->{table};
821 $table->clear; 1230 $table->clear;
822 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1231 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
823 1232
824 my $buf; 1233 my $ok = 0;
825 1234
826 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 1235 CFPlus::background {
1236 my $ua = CFPlus::lwp_useragent;
827 1237
828 unless ($fh) { 1238 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
829 $label->set_text ("unable to contact metaserver: $!"); 1239 } sub {
830 return; 1240 my ($msg) = @_;
831 } 1241 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; 1242 $table->clear;
846 1243
847 my @tip = ( 1244 my @tip = (
848 "The current number of users logged in on the server.", 1245 "The current number of users logged in on the server.",
849 "The hostname of the server.", 1246 "The hostname of the server.",
850 "The time this server has been running without being restarted.", 1247 "The time this server has been running without being restarted.",
851 "The server software version - a '+' indicates a Crossfire+ server.", 1248 "The server software version - a '+' indicates a Crossfire+ server.",
852 "Short information about this server provided by its admins.", 1249 "Short information about this server provided by its admins.",
853 ); 1250 );
854 my @col = qw(#Users Host Uptime Version Description); 1251 my @col = qw(#Users Host Uptime Version Description);
855 $table->add ($_, 0, new CFPlus::UI::Label 1252 $table->add_at ($_, 0, new CFPlus::UI::Label
856 can_hover => 1, can_events => 1, 1253 can_hover => 1, can_events => 1,
857 align => 0, fg => [1, 1, 0], 1254 align => 0, fg => [1, 1, 0],
858 text => $col[$_], tooltip => $tip[$_]) 1255 text => $col[$_], tooltip => $tip[$_])
859 for 0 .. $#col; 1256 for 0 .. $#col;
860 1257
861 my @align = qw(1 0 1 1 -1); 1258 my @align = qw(1 0 1 1 -1);
862 1259
863 my $y = 0; 1260 my $y = 0;
864 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 1261 for my $m (@{ $msg->{servers} }) {
865 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 1262 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
1263 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
866 1264
867 for ($desc) { 1265 for ($desc) {
868 s/<br>/\n/gi; 1266 s/<br>/\n/gi;
869 s/<li>/\n· /gi; 1267 s/<li>/\n· /gi;
870 s/<.*?>//sgi; 1268 s/<.*?>//sgi;
871 s/&/&amp;/g; 1269 s/&amp;/&/g;
872 s/</&lt;/g; 1270 s/&lt;/</g;
873 s/>/&gt;/g; 1271 s/&gt;/>/g;
874 } 1272 }
875 1273
876 $uptime = sprintf "%dd %02d:%02d:%02d", 1274 $uptime = sprintf "%dd %02d:%02d:%02d",
877 (int $m->[8] / 86400), 1275 (int $uptime / 86400),
878 (int $m->[8] / 3600) % 24, 1276 (int $uptime / 3600) % 24,
879 (int $m->[8] / 60) % 60, 1277 (int $uptime / 60) % 60,
880 $m->[8] % 60; 1278 $uptime % 60;
881 1279
882 $m = [$users, $host, $uptime, $version, $desc]; 1280 $m = [$users, $host, $uptime, $version, $desc];
883 1281
884 $y++; 1282 $y++;
885 1283
886 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1284 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
887 (new CFPlus::UI::Button 1285 (new CFPlus::UI::Button
888 text => "Use", 1286 text => "Use",
889 tooltip => "Put this server into the <b>Host:Port</b> field", 1287 tooltip => "Put this server into the <b>Host:Port</b> field",
890 on_activate => sub { 1288 on_activate => sub {
891 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1289 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
894 }, 1292 },
895 ), 1293 ),
896 (new CFPlus::UI::Empty expand => 1), 1294 (new CFPlus::UI::Empty expand => 1),
897 ]); 1295 ]);
898 1296
899 $table->add ($_, $y, new CFPlus::UI::Label 1297 $table->add_at ($_, $y, new CFPlus::UI::Label
1298 max_w => $::WIDTH * 0.4,
900 ellipsise => 0, 1299 ellipsise => 0,
901 align => $align[$_], 1300 align => $align[$_],
902 text => $m->[$_], 1301 text => $m->[$_],
903 tooltip => $tip[$_], 1302 tooltip => $tip[$_],
1303 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
904 can_hover => 1, 1304 can_hover => 1,
905 can_events => 1, 1305 can_events => 1,
906 fontsize => 0.8) 1306 fontsize => 0.8)
907 for 0 .. $#$m; 1307 for 0 .. $#$m;
908 } 1308 }
1309 } else {
1310 $ok or $label->set_text ("error while contacting metaserver");
909 } 1311 }
910 }); 1312 };
1313
911} 1314}
912 1315
913sub metaserver_dialog { 1316sub metaserver_dialog {
914 my $vbox = new CFPlus::UI::VBox; 1317 my $vbox = new CFPlus::UI::VBox;
915 my $table = new CFPlus::UI::Table; 1318 my $table = new CFPlus::UI::Table;
916 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 1319 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
917 1320
918 my $dialog = new CFPlus::UI::FancyFrame 1321 my $dialog = new CFPlus::UI::Toplevel
919 title => "Server List", 1322 title => "Server List",
920 name => 'metaserver_dialog', 1323 name => 'metaserver_dialog',
921 x => 'center', 1324 x => 'center',
922 y => 'center', 1325 y => 'center',
923 z => 3, 1326 z => 3,
1327 force_w => $::WIDTH * 0.9,
924 force_h => $::HEIGHT * 0.4, 1328 force_h => $::HEIGHT * 0.7,
925 child => $vbox, 1329 child => $vbox,
926 has_close_button => 1, 1330 has_close_button => 1,
927 table => $table, 1331 table => $table,
928 on_visibility_change => sub { 1332 on_visibility_change => sub {
929 update_metaserver ($_[0]) if $_[1]; 1333 update_metaserver ($_[0]) if $_[1];
… …
935} 1339}
936 1340
937sub server_setup { 1341sub server_setup {
938 my $vbox = new CFPlus::UI::VBox; 1342 my $vbox = new CFPlus::UI::VBox;
939 1343
1344 $vbox->add (new CFPlus::UI::FancyFrame
1345 label => "Connection Settings",
940 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 1346 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1347 );
941 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1348 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
942 1349
943 { 1350 {
944 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1351 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
945 1352
946 $vbox->add ( 1353 $vbox->add (
947 $HOST_ENTRY = new CFPlus::UI::Entry 1354 $HOST_ENTRY = new CFPlus::UI::Entry
948 expand => 1, 1355 expand => 1,
949 text => $CFG->{profile}{default}{host}, 1356 text => $CFG->{profile}{default}{host},
950 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1357 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
951 on_changed => sub { 1358 on_changed => sub {
952 my ($self, $value) = @_; 1359 my ($self, $value) = @_;
953 $CFG->{profile}{default}{host} = $value; 1360 $CFG->{profile}{default}{host} = $value;
954 0 1361 1
955 } 1362 }
956 ); 1363 );
957 1364
958 $vbox->add (new CFPlus::UI::Button 1365 $vbox->add (new CFPlus::UI::Button
959 expand => 1, 1366 expand => 1,
960 text => "Server List", 1367 text => "Server List",
961 other => $METASERVER, 1368 other => $METASERVER,
962 tooltip => "Show a list of available crossfire servers", 1369 tooltip => "Show a list of available crossfire servers",
963 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1370 on_activate => sub { $METASERVER->toggle_visibility; 0 },
964 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1371 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
965 ); 1372 );
966 } 1373 }
967 1374
968 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1375 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
969 $table->add (1, 4, new CFPlus::UI::Entry 1376 $table->add_at (1, 4, new CFPlus::UI::Entry
970 text => $CFG->{profile}{default}{user}, 1377 text => $CFG->{profile}{default}{user},
971 tooltip => "The name of your character on the server", 1378 tooltip => "The name of your character on the server",
972 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1379 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
973 ); 1380 );
974 1381
975 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1382 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
976 $table->add (1, 5, new CFPlus::UI::Entry 1383 $table->add_at (1, 5, new CFPlus::UI::Entry
977 text => $CFG->{profile}{default}{password}, 1384 text => $CFG->{profile}{default}{password},
978 hidden => 1, 1385 hidden => 1,
979 tooltip => "The password for your character", 1386 tooltip => "The password for your character",
980 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1387 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
981 ); 1388 );
982 1389
983 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1390 $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 1391 $table->add_at (1, 7, new CFPlus::UI::Slider
985 force_w => 100, 1392 force_w => 100,
986 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1393 range => [$CFG->{mapsize}, 10, 100, 0, 1],
987 tooltip => "This is the size of the portion of the map update the server sends you. " 1394 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, " 1395 . "If you set this to a high value you will be able to see further, "
989 . "but you also increase bandwidth requirements and latency. " 1396 . "but you also increase bandwidth requirements and latency. "
990 . "This option is only used once at log-in.", 1397 . "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 }, 1398 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
992 ); 1399 );
993 1400
994 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1401 $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 1402 $table->add_at (1, 8, new CFPlus::UI::Entry
996 state => $CFG->{face_prefetch}, 1403 text => $CFG->{output_rate},
997 tooltip => "<b>Background Image Prefetch</b>\n\n" 1404 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. " 1405 . "when sending data. When 0 or unset, the server "
999 . "This might increase or create lag, but increases the chances " 1406 . "default will be used, which is usually around 100kb/s. Most servers will "
1000 . "of faces being ready for display when you encounter them. " 1407 . "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 }, 1408 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1005 ); 1409 );
1006 1410
1007 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1411 $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 1412 $table->add_at (1, 9, new CFPlus::UI::Entry
1009 text => $CFG->{output_count}, 1413 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.", 1414 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 }, 1415 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1012 ); 1416 );
1013 1417
1014 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1418 $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 1419 $table->add_at (1, 10, new CFPlus::UI::Entry
1016 text => $CFG->{output_sync}, 1420 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.", 1421 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 }, 1422 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1019 ); 1423 );
1020 1424
1021 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1425 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1022 expand => 1, 1426 expand => 1,
1023 align => 0, 1427 align => 0,
1024 text => "Login", 1428 text => "Login",
1025 on_activate => sub { 1429 on_activate => sub {
1026 $CONN ? stop_game 1430 $CONN ? stop_game
1027 : start_game; 1431 : start_game;
1432 1
1433 },
1434 );
1435
1436 $vbox->add (new CFPlus::UI::FancyFrame
1437 label => "Server Info",
1438 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1439 );
1440
1441 $vbox
1442}
1443
1444sub client_setup {
1445 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1446
1447 my $row = 0;
1448
1449 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1450 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1451 state => $CFG->{show_tips},
1452 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1453 on_changed => sub {
1454 my ($self, $value) = @_;
1455 $CFG->{show_tips} = $value;
1456 0
1457 }
1458 );
1459
1460 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1461 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1462 text => $CFG->{logview_max_par},
1463 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1464 . "sends more messages than this number, older messages get removed to save memory and "
1465 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1466 on_changed => sub {
1467 my ($self, $value) = @_;
1468 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1028 0 1469 0
1029 }, 1470 },
1030 ); 1471 );
1031 1472
1032 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1473 $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} 1474}
1175 1475
1176sub autopickup_setup { 1476sub autopickup_setup {
1477 my $r = new CFPlus::UI::ScrolledWindow (
1478 expand => 1,
1479 scroll_y => 1
1480 );
1177 my $table = new CFPlus::UI::Table; 1481 $r->add (my $table = new CFPlus::UI::Table
1482 row_expand => [0],
1483 col_expand => [0, 1, 0, 1],
1484 );
1178 1485
1179 for ( 1486 for (
1180 ["General", 0, 0, 1487 ["General", 0, 0,
1181 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1488 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1182 ["Inhibit autopickup" => PICKUP_INHIBIT], 1489 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1196 ["Boots" => PICKUP_BOOTS], 1503 ["Boots" => PICKUP_BOOTS],
1197 ["Gloves" => PICKUP_GLOVES], 1504 ["Gloves" => PICKUP_GLOVES],
1198 ["Cloaks" => PICKUP_CLOAK], 1505 ["Cloaks" => PICKUP_CLOAK],
1199 ], 1506 ],
1200 1507
1201 ["Readables", 2, 2, 1508 ["Readables", 2, 0,
1202 ["Spellbooks" => PICKUP_SPELLBOOK], 1509 ["Spellbooks" => PICKUP_SPELLBOOK],
1203 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1510 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1204 ["Normal Books/Scrolls" => PICKUP_READABLES], 1511 ["Normal Books/Scrolls" => PICKUP_READABLES],
1205 ], 1512 ],
1206 ["Misc", 2, 7, 1513 ["Misc", 2, 5,
1207 ["Food" => PICKUP_FOOD], 1514 ["Food" => PICKUP_FOOD],
1208 ["Drinks" => PICKUP_DRINK], 1515 ["Drinks" => PICKUP_DRINK],
1209 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1516 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1210 ["Keys" => PICKUP_KEY], 1517 ["Keys" => PICKUP_KEY],
1211 ["Magical Items" => PICKUP_MAGICAL], 1518 ["Magical Items" => PICKUP_MAGICAL],
1212 ["Potions" => PICKUP_POTION], 1519 ["Potions" => PICKUP_POTION],
1213 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1520 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1214 ["Ignore cursed" => PICKUP_NOT_CURSED], 1521 ["Ignore cursed" => PICKUP_NOT_CURSED],
1215 ["Jewelery" => PICKUP_JEWELS], 1522 ["Jewelery" => PICKUP_JEWELS],
1523 ["Flesh" => PICKUP_FLESH],
1216 ], 1524 ],
1217 ["Weight/Value ratio", 2, 17] 1525 ["Weight/Value ratio", 2, 17]
1218 ) 1526 )
1219 { 1527 {
1220 my ($title, $x, $y, @bits) = @$_; 1528 my ($title, $x, $y, @bits) = @$_;
1221 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1529 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1222 1530
1223 for (@bits) { 1531 for (@bits) {
1224 ++$y; 1532 ++$y;
1225 1533
1226 my $mask = $_->[1]; 1534 my $mask = $_->[1];
1227 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1535 $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 1536 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1229 state => $::CFG->{pickup} & $mask, 1537 state => $::CFG->{pickup} & $mask,
1230 on_changed => sub { 1538 on_changed => sub {
1231 my ($box, $value) = @_; 1539 my ($box, $value) = @_;
1232 1540
1233 if ($value) { 1541 if ($value) {
… …
1244 1552
1245 ${$_->[2]} = $checkbox if $_->[2]; 1553 ${$_->[2]} = $checkbox if $_->[2];
1246 } 1554 }
1247 } 1555 }
1248 1556
1249 $table->add (2, 18, new CFPlus::UI::ValSlider 1557 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1250 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1558 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1251 template => ">= 99", 1559 template => ">= 99",
1252 to_value => sub { ">= " . 5 * $_[0] }, 1560 to_value => sub { ">= " . 5 * $_[0] },
1253 on_changed => sub { 1561 on_changed => sub {
1254 my ($slider, $value) = @_; 1562 my ($slider, $value) = @_;
… …
1257 $::CFG->{pickup} |= int $value 1565 $::CFG->{pickup} |= int $value
1258 if $value; 1566 if $value;
1259 1; 1567 1;
1260 }); 1568 });
1261 1569
1262 $table->add (3, 18, new CFPlus::UI::Button 1570 $table->add_at (3, 18, new CFPlus::UI::Button
1263 text => "set", 1571 text => "set",
1264 on_activate => sub { 1572 on_activate => sub {
1265 $::CONN->send_command ("pickup $::CFG->{pickup}") 1573 $::CONN->send_command ("pickup $::CFG->{pickup}")
1266 if defined $::CONN; 1574 if defined $::CONN;
1267 0 1575 0
1268 }); 1576 });
1269 1577
1270 $table 1578 $r
1271} 1579}
1272 1580
1273my %SORT_ORDER = ( 1581my %SORT_ORDER = (
1274 type => undef, 1582 type => undef,
1275 mtime => sub { sort { 1583 mtime => sub {
1584 my $NOW = time;
1585 sort {
1586 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1587 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1588
1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1589 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1277 or $b->{mtime} <=> $a->{mtime} 1590 or $btime <=> $atime
1278 or $a->{type} <=> $b->{type} 1591 or $a->{type} <=> $b->{type}
1592 } @_
1279 } @_ }, 1593 },
1280 weight => sub { sort { 1594 weight => sub { sort {
1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1595 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1282 or $a->{type} <=> $b->{type} 1596 or $a->{type} <=> $b->{type}
1283 } @_ }, 1597 } @_ },
1284); 1598);
… …
1309 #TODO# update to weigh/maxweight 1623 #TODO# update to weigh/maxweight
1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1624 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1311 1625
1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1626 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1313 $sw1->add ($INV = new CFPlus::UI::Inventory); 1627 $sw1->add ($INV = new CFPlus::UI::Inventory);
1628 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1314 1629
1315 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1630 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1316 1631
1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1632 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1318 1633
1319 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1634 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1320 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1635 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1321 1636
1322 # XXX: Call after $INVR = ... because set_opencont sets the items 1637 # XXX: Call after $INVR = ... because set_opencont sets the items
1323 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1638 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1324 1639
1325 $hb 1640 $hb
1641}
1642
1643sub media_window {
1644 my $vb = new CFPlus::UI::VBox;
1645
1646 $vb->add (new CFPlus::UI::FancyFrame
1647 label => "Currently playing music",
1648 child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
1649 child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
1650 );
1651
1652 $vb->add (new CFPlus::UI::FancyFrame
1653 label => "Other media used in this session",
1654 expand => 1,
1655 child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
1656 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
1657 );
1658
1659 $vb
1660}
1661
1662sub add_license {
1663 my ($meta) = @_;
1664
1665 $meta = $meta->{data}
1666 or return;
1667
1668 $meta->{license} || $meta->{author} || $meta->{source}
1669 or return;
1670
1671 $LICENSE_WIDGET->add_paragraph ({
1672 fg => [1, 1, 1, 1],
1673 markup => "<small>"
1674 . "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
1675 . "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
1676 . "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
1677 . "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
1678 . "</small>",
1679 });
1680 $LICENSE_WIDGET->scroll_to_bottom;
1326} 1681}
1327 1682
1328sub toggle_player_page { 1683sub toggle_player_page {
1329 my ($widget) = @_; 1684 my ($widget) = @_;
1330 1685
… …
1335 $PL_WINDOW->show; 1690 $PL_WINDOW->show;
1336 } 1691 }
1337} 1692}
1338 1693
1339sub player_window { 1694sub player_window {
1340 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1695 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1341 x => "center", 1696 x => "center",
1342 y => "center", 1697 y => "center",
1343 force_w => $WIDTH * 9/10, 1698 force_w => $WIDTH * 9/10,
1344 force_h => $HEIGHT * 9/10, 1699 force_h => $HEIGHT * 9/10,
1345 title => "Player", 1700 title => "Player",
… …
1347 has_close_button => 1 1702 has_close_button => 1
1348 ; 1703 ;
1349 1704
1350 my $ntb = 1705 my $ntb =
1351 $PL_NOTEBOOK = 1706 $PL_NOTEBOOK =
1352 new CFPlus::UI::Notebook expand => 1, debug => 1; 1707 new CFPlus::UI::Notebook expand => 1;
1353 1708
1354 $ntb->add ( 1709 $ntb->add_tab (
1355 "Statistics (F2)" => $STATS_PAGE = stats_window, 1710 "Statistics (F2)" => $STATS_PAGE = stats_window,
1356 "Shows statistics, where all your Stats and Resistances are shown." 1711 "Shows statistics, where all your Stats and Resistances are shown."
1357 ); 1712 );
1358 $ntb->add ( 1713 $ntb->add_tab (
1359 "Skills (F3)" => $SKILL_PAGE = skill_window, 1714 "Skills (F3)" => $SKILL_PAGE = skill_window,
1360 "Shows all your Skills." 1715 "Shows all your Skills."
1361 ); 1716 );
1362 1717
1363 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1718 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1364 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1719 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1365 $ntb->add ( 1720 $ntb->add_tab (
1366 "Spellbook (F4)" => $spellsw, 1721 "Spellbook (F4)" => $spellsw,
1367 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1722 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1368 ); 1723 );
1369 $ntb->add ( 1724 $ntb->add_tab (
1370 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1725 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1371 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1726 "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." 1727 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1373 ); 1728 );
1729 $ntb->add_tab (Pickup => autopickup_setup,
1730 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1731
1732 $ntb->add_tab (Media => media_window,
1733 "License, Author and Source info for media sent by the server.");
1374 1734
1375 $ntb->set_current_page ($INVENTORY_PAGE); 1735 $ntb->set_current_page ($INVENTORY_PAGE);
1376 1736
1377 $plwin->add ($ntb); 1737 $plwin->add ($ntb);
1378 $plwin 1738 $plwin
1379} 1739}
1380 1740
1381sub update_bindings {
1382 $BIND_UPD_CB->() if $BIND_UPD_CB;
1383}
1384
1385sub keyboard_setup { 1741sub keyboard_setup {
1386 my $binding_list = new CFPlus::UI::VBox; 1742 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} 1743}
1492 1744
1493sub help_window { 1745sub help_window {
1494 my $win = new CFPlus::UI::FancyFrame 1746 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1747 x => 'center',
1496 y => 'center', 1748 y => 'center',
1497 z => 2, 1749 z => 4,
1498 name => 'doc_browser', 1750 name => 'doc_browser',
1499 force_w => int $WIDTH * 7/8, 1751 force_w => int $WIDTH * 7/8,
1500 force_h => int $HEIGHT * 7/8, 1752 force_h => int $HEIGHT * 7/8,
1501 title => "Help Browser", 1753 title => "Help Browser",
1502 has_close_button => 1; 1754 has_close_button => 1;
1503 1755
1504 $win->add (my $vbox = new CFPlus::UI::VBox); 1756 $win->add (my $vbox = new CFPlus::UI::VBox);
1505 1757
1758 $vbox->add (new CFPlus::UI::FancyFrame
1759 label => "Navigation",
1506 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1760 child => (my $buttons = new CFPlus::UI::HBox),
1761 );
1507 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1762 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1508 expand => 1, fontsize => 0.8, padding_x => 4); 1763 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1509 1764
1510 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1765 my @history;
1511 $buttons->add (my $combo = new CFPlus::UI::Selector 1766 my @future;
1512 value => undef, 1767 my $curnode;
1513 options => [ 1768
1514 [intro => "Introduction"], 1769 my $load_node; $load_node = sub {
1515 [manual => "Main Manual"], 1770 my ($node, $para) = @_;
1516 [skill_help => "Skill Reference"], 1771
1517 [command_help => "Command Reference"], 1772 $buttons->clear;
1518 [dmcommand_help => "DM Commands"], 1773
1519 [COPYING => "License Terms"], 1774 $buttons->add (new CFPlus::UI::Button
1520 ], 1775 text => "⇤",
1776 tooltip => "back to the starting page",
1521 on_changed => sub { 1777 on_activate => sub {
1522 my ($self, $pod) = @_; 1778 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1523 1779 unshift @future, @history;
1524 $viewer->clear; 1780 @history = ();
1525 $viewer->add_paragraph (CFPlus::Pod::section_paragraphs pod => $pod); 1781 $load_node->(@{shift @future});
1526 $viewer->set_offset (0);
1527
1528 0 1782 },
1783 );
1784
1785 if (@history) {
1786 $buttons->add (new CFPlus::UI::Button
1787 text => "⋘",
1788 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1789 on_activate => sub {
1790 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1791 $load_node->(@{pop @history});
1792 },
1793 );
1529 }, 1794 }
1530 on_visibility_change => sub { 1795
1531 my ($self, $visible) = @_; 1796 if (@future) {
1532 return unless $visible; 1797 $buttons->add (new CFPlus::UI::Button
1533 return if $self->{value}; 1798 text => "⋙",
1534 $self->set_value ("intro"); 1799 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1800 on_activate => sub {
1801 push @history, [$curnode, $viewer->current_paragraph];
1802 $load_node->(@{shift @future});
1803 },
1535 0 1804 );
1536 }, 1805 }
1806
1807 $buttons->add (new CFPlus::UI::Label text => " ");
1808
1809 my @path = CFPlus::Pod::full_path_of $node;
1810 pop @path; # drop current node
1811
1812 for my $node (@path) {
1813 $buttons->add (new CFPlus::UI::Button
1814 text => $node->{kw}[0],
1815 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1816 on_activate => sub {
1817 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1818 $load_node->($node);
1819 },
1820 );
1821 $buttons->add (new CFPlus::UI::Label text => "/");
1822 }
1823
1824 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1825
1826 $curnode = $node;
1827
1828 $viewer->clear;
1829 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1830 $viewer->scroll_to ($para);
1537 ); 1831 };
1832
1833 $load_node->(CFPlus::Pod::find pod => "mainpage");
1834
1835 $CFPlus::Pod::goto_document = sub {
1836 my (@path) = @_;
1837
1838 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1839
1840 $load_node->((CFPlus::Pod::find @path)[0]);
1841 $win->show;
1842 };
1538 1843
1539 $win 1844 $win
1845}
1846
1847sub open_string_query {
1848 my ($title, $cb, $txt, $tooltip) = @_;
1849 my $dialog = new CFPlus::UI::Toplevel
1850 x => "center",
1851 y => "center",
1852 z => 50,
1853 force_w => $WIDTH * 4/5,
1854 title => $title;
1855
1856 $dialog->add (
1857 my $e = new CFPlus::UI::Entry
1858 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1859 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1860 tooltip => $tooltip
1861 );
1862
1863 $e->grab_focus;
1864 $e->set_text ($txt) if $txt;
1865 $dialog->show;
1866}
1867
1868sub open_quit_dialog {
1869 unless ($QUIT_DIALOG) {
1870 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1871 x => "center",
1872 y => "center",
1873 z => 50,
1874 title => "Really Quit?",
1875 on_key_down => sub {
1876 my ($dialog, $ev) = @_;
1877 $ev->{sym} == 27 and $dialog->hide;
1878 }
1879 ;
1880
1881 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1882
1883 $vb->add (new CFPlus::UI::Label
1884 text => "You should find a savebed and apply it first!",
1885 max_w => $WIDTH * 0.25,
1886 ellipsize => 0,
1887 );
1888 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1889 $hb->add (new CFPlus::UI::Button
1890 text => "Ok",
1891 expand => 1,
1892 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1893 );
1894 $hb->add (new CFPlus::UI::Button
1895 text => "Quit anyway",
1896 expand => 1,
1897 on_activate => sub { Event::unloop_all },
1898 );
1899 }
1900
1901 $QUIT_DIALOG->show;
1902 $QUIT_DIALOG->grab_focus;
1903}
1904
1905sub show_tip_of_the_day {
1906 # find all tips
1907 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1908
1909 CFPlus::DB::get state => "tip_of_the_day", sub {
1910 my ($todindex) = @_;
1911 $todindex = 0 if $todindex >= @tod;
1912 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1913
1914 # create dialog
1915 my $dialog;
1916
1917 my $close = sub {
1918 $dialog->destroy;
1919 };
1920
1921 $dialog = new CFPlus::UI::Toplevel
1922 x => "center",
1923 y => "center",
1924 z => 3,
1925 name => 'tip_of_the_day',
1926 force_w => int $WIDTH * 4/9,
1927 force_h => int $WIDTH * 2/9,
1928 title => "Tip of the day #" . (1 + $todindex),
1929 child => my $vbox = new CFPlus::UI::VBox,
1930 has_close_button => 1,
1931 on_delete => $close,
1932 ;
1933
1934 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1935 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1936 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1937
1938 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1939
1940 $table->add_at (0, 0, new CFPlus::UI::Button
1941 text => "Close",
1942 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>.",
1943 on_activate => $close,
1944 );
1945
1946 $table->add_at (2, 0, new CFPlus::UI::Button
1947 text => "Next",
1948 tooltip => "Show the next <b>Tip of the day</b>.",
1949 on_activate => sub {
1950 $close->();
1951 &show_tip_of_the_day;
1952 },
1953 );
1954
1955 $dialog->show;
1956 };
1540} 1957}
1541 1958
1542sub sdl_init { 1959sub sdl_init {
1543 CFPlus::SDL_Init 1960 CFPlus::SDL_Init
1544 and die "SDL::Init failed!\n"; 1961 and die "SDL::Init failed!\n";
1545} 1962}
1546 1963
1547sub video_init { 1964sub video_init {
1548 sdl_init;
1549
1550 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1965 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1551 1966
1552 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1967 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1553 1968
1554 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1969 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1555 $FULLSCREEN = $CFG->{fullscreen}; 1970 $FULLSCREEN = $CFG->{fullscreen};
1556 $FAST = $CFG->{fast}; 1971 $FAST = $CFG->{fast};
1557 1972
1558 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1973 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1559 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1974 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1560 1975
1561 $SDL_ACTIVE = 1; 1976 $SDL_ACTIVE = 1;
1562 $LAST_REFRESH = time - 0.01; 1977 $LAST_REFRESH = time - 0.01;
1563 1978
… …
1579 z => 100, 1994 z => 100,
1580 force_x => "max", 1995 force_x => "max",
1581 force_y => 0; 1996 force_y => 0;
1582 $DEBUG_STATUS->show; 1997 $DEBUG_STATUS->show;
1583 1998
1584 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1585
1586 $STATUSBOX = new CFPlus::UI::Statusbox; 1999 $STATUSBOX = new CFPlus::UI::Statusbox;
1587 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 2000 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1588 2001
1589 (new CFPlus::UI::Frame 2002 (new CFPlus::UI::Frame
1590 bg => [0, 0, 0, 0.4], 2003 bg => [0, 0, 0, 0.4],
1591 force_x => 0, 2004 force_x => 0,
1592 force_y => "max", 2005 force_y => "max",
1593 child => $STATUSBOX, 2006 child => $STATUSBOX,
1594 )->show; 2007 )->show;
1595 2008
1596 CFPlus::UI::FancyFrame->new ( 2009 CFPlus::UI::Toplevel->new (
1597 title => "Map", 2010 title => "Map",
1598 name => "mapmap", 2011 name => "mapmap",
1599 x => 0, 2012 x => 0,
1600 y => $FONTSIZE + 8, 2013 y => $FONTSIZE + 8,
1601 border_bg => [1, 1, 1, 192/255], 2014 border_bg => [1, 1, 1, 192/255],
… …
1607 2020
1608 $MAPWIDGET = new CFPlus::MapWidget; 2021 $MAPWIDGET = new CFPlus::MapWidget;
1609 $MAPWIDGET->connect (activate_console => sub { 2022 $MAPWIDGET->connect (activate_console => sub {
1610 my ($mapwidget, $preset) = @_; 2023 my ($mapwidget, $preset) = @_;
1611 2024
1612 if ($CONSOLE) { 2025 $MESSAGE_WINDOW->activate_console ($preset)
1613 $CONSOLE->{input}->{auto_activated} = 1; 2026 if $MESSAGE_WINDOW;
1614 $CONSOLE->{input}->grab_focus;
1615
1616 if ($preset && $CONSOLE->{input}->get_text eq '') {
1617 $CONSOLE->{input}->set_text ($preset);
1618 }
1619 }
1620 }); 2027 });
1621 $MAPWIDGET->show; 2028 $MAPWIDGET->show;
1622 $MAPWIDGET->grab_focus; 2029 $MAPWIDGET->grab_focus;
1623 2030
1624 $LOGVIEW = new CFPlus::UI::TextScroller
1625 expand => 1,
1626 font => $FONT_FIXED,
1627 fontsize => $::CFG->{log_fontsize},
1628 indent => -4,
1629 can_hover => 1,
1630 can_events => 1,
1631 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1632 ;
1633
1634 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 2031 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1635 title => "Setup", 2032 title => "Setup",
1636 name => "setup_dialog", 2033 name => "setup_dialog",
1637 x => 'center', 2034 x => 'center',
1638 y => 'center', 2035 y => 'center',
1639 z => 2, 2036 z => 2,
… …
1641 force_h => $::HEIGHT * 0.6, 2038 force_h => $::HEIGHT * 0.6,
1642 has_close_button => 1, 2039 has_close_button => 1,
1643 ; 2040 ;
1644 2041
1645 $METASERVER = metaserver_dialog; 2042 $METASERVER = metaserver_dialog;
2043 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1646 2044
1647 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 2045 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1648 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2046 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1649 2047
1650 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2048 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1651 "Configure the server to play on, your username, password and other server-related options."); 2049 "Configure the server to play on, your username, password and other server-related options.");
1652 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2050 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1653 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2051 "Configure various client-specific settings.");
1654 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2052 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1655 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 2053 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1656 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2054 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1657 "Configure the use of audio, sound effects and background music."); 2055 "Configure the use of audio, sound effects and background music.");
1658 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2056 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1659 "Lets you define, edit and delete key bindings." 2057 "Lets you define, edit and delete key bindings."
1660 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 2058 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1661 . "with nothing set and the recording started. After doing the actions you " 2059 . "with nothing set and the recording started. After doing the actions you "
1662 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 2060 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1663 . "After pressing the combo the binding will be saved automatically and the " 2061 . "After pressing the combo the binding will be saved automatically and the "
1664 . "binding editor closes"); 2062 . "binding editor closes");
1665 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2063 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1666 "Some debuggin' options. Do not ask."); 2064 "Some debuggin' options. Do not ask.");
1667 2065
1668 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2066 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1669 2067
1670 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2068 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1671 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 2069 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1672 2070
1673 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 2071 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1674 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 2072 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1675 2073
1676 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 2074 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1677 2075
1678 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2076 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1690 ); 2088 );
1691 2089
1692 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2090 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1693 tooltip => "View Documentation"); 2091 tooltip => "View Documentation");
1694 2092
2093
1695 $BUTTONBAR->add (new CFPlus::UI::Button 2094 $BUTTONBAR->add (new CFPlus::UI::Button
1696 text => "Quit", 2095 text => "Quit",
1697 tooltip => "Terminates the program", 2096 tooltip => "Terminates the program",
1698 on_activate => sub { 2097 on_activate => sub {
1699 if ($CONN) { 2098 if ($CONN) {
1700 open_quit_dialog; 2099 open_quit_dialog;
1701 } else { 2100 } else {
1702 exit; 2101 Event::unloop_all;
1703 } 2102 }
1704 0 2103 0
1705 }, 2104 },
1706 ); 2105 );
1707 2106
1708 $BUTTONBAR->show; 2107 $BUTTONBAR->show;
1709 $SETUP_DIALOG->show; 2108 $SETUP_DIALOG->show;
2109 $MESSAGE_WINDOW->show;
1710 } 2110 }
1711 2111
1712 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2112 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1713} 2113}
1714 2114
… …
1716 CFPlus::OpenGL::shutdown; 2116 CFPlus::OpenGL::shutdown;
1717 2117
1718 undef $SDL_ACTIVE; 2118 undef $SDL_ACTIVE;
1719} 2119}
1720 2120
1721my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1722my $bgmusic;#TODO#hack#d#
1723
1724sub audio_channel_finished {
1725 my ($channel) = @_;
1726
1727 #warn "channel $channel finished\n";#d#
1728}
1729
1730sub audio_music_finished {
1731 return unless $CFG->{bgm_enable};
1732
1733 # TODO: hack, do play loop and mood music
1734 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1735 $bgmusic->play (0);
1736
1737 push @bgmusic, shift @bgmusic;
1738}
1739
1740sub audio_init {
1741 if ($CFG->{audio_enable}) {
1742 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1743 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1744
1745 unless ($SDL_MIXER) {
1746 status "Unable to open sound device: there will be no sound";
1747 return;
1748 }
1749
1750 CFPlus::Mix_AllocateChannels 8;
1751 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1752
1753 audio_music_finished;
1754
1755 while (<$fh>) {
1756 next if /^\s*#/;
1757 next if /^\s*$/;
1758
1759 my ($file, $volume, $event) = split /\s+/, $_, 3;
1760
1761 push @SOUNDS, "$volume,$file";
1762
1763 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1764 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1765 $chunk->volume ($volume * 128 / 100);
1766 $chunk
1767 };
1768 }
1769 } else {
1770 status "unable to open sound config: $!";
1771 }
1772 }
1773}
1774
1775sub audio_shutdown {
1776 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1777 undef $SDL_MIXER;
1778 @SOUNDS = ();
1779 %AUDIO_CHUNKS = ();
1780}
1781
1782my %animate_object; 2121my %animate_object;
1783my $animate_timer; 2122my $animate_timer;
1784 2123
1785my $fps = 9; 2124my $fps = 9;
1786 2125
1787my %demo;#d#
1788
1789sub force_refresh { 2126sub force_refresh {
2127 if ($ENV{CFPLUS_DEBUG} & 4) {
1790 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2128 $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
1791 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2129 debug sprintf "%3.2f", $fps;
2130 }
1792 2131
1793 $CFPlus::UI::ROOT->draw; 2132 $CFPlus::UI::ROOT->draw;
1794 2133 CFPlus::SDL_GL_SwapBuffers;
1795 $WANT_REFRESH = 0;
1796 $CAN_REFRESH = 0;
1797 $LAST_REFRESH = $NOW; 2134 $LAST_REFRESH = $NOW;
1798 2135 $WANT_REFRESH->stop;
1799 CFPlus::SDL_GL_SwapBuffers;
1800} 2136}
1801 2137
2138$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh);
2139
1802my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2140my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub {
1803 $NOW = time; 2141 $NOW = time;
1804 2142
1805 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2143 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1806 for CFPlus::SDL_PollEvent; 2144 for CFPlus::poll_events;
1807 2145
1808 if (%animate_object) { 2146 if (%animate_object) {
1809 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2147 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1810 $WANT_REFRESH++; 2148 $WANT_REFRESH->start;
1811 }
1812
1813 if ($WANT_REFRESH) {
1814 force_refresh;
1815 } else {
1816 $CAN_REFRESH = 1;
1817 } 2149 }
1818}); 2150});
1819 2151
1820sub animation_start { 2152sub animation_start {
1821 my ($widget) = @_; 2153 my ($widget) = @_;
… …
1825sub animation_stop { 2157sub animation_stop {
1826 my ($widget) = @_; 2158 my ($widget) = @_;
1827 delete $animate_object{$widget}; 2159 delete $animate_object{$widget};
1828} 2160}
1829 2161
1830# check once/second for faces that need to be prefetched
1831# this should, of course, only run on demand, but
1832# SDL forces worse things on us....
1833
1834Event->timer (after => 1, interval => 0.25, cb => sub {
1835 $CONN->face_prefetch
1836 if $CONN;
1837});
1838
1839%SDL_CB = ( 2162%SDL_CB = (
1840 CFPlus::SDL_QUIT => sub { 2163 CFPlus::SDL_QUIT => sub {
1841 Event::unloop -1; 2164 exit;
1842 }, 2165 },
1843 CFPlus::SDL_VIDEORESIZE => sub { 2166 CFPlus::SDL_VIDEORESIZE => sub {
1844 }, 2167 },
1845 CFPlus::SDL_VIDEOEXPOSE => sub { 2168 CFPlus::SDL_VIDEOEXPOSE => sub {
1846 CFPlus::UI::full_refresh; 2169 CFPlus::UI::full_refresh;
1847 }, 2170 },
1848 CFPlus::SDL_ACTIVEEVENT => sub { 2171 CFPlus::SDL_ACTIVEEVENT => sub {
1849# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2172# not useful, as APPACTIVE include sonly iconified state, not unmapped
2173# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2174# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2175# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2176# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2177# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1850 }, 2178 },
1851 CFPlus::SDL_KEYDOWN => sub { 2179 CFPlus::SDL_KEYDOWN => sub {
1852 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2180 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1853 # alt-enter 2181 # alt-enter
1854 $FULLSCREEN_ENABLE->toggle; 2182 $FULLSCREEN_ENABLE->toggle;
… …
1875 2203
1876$SIG{INT} = $SIG{TERM} = sub { exit }; 2204$SIG{INT} = $SIG{TERM} = sub { exit };
1877 2205
1878{ 2206{
1879 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2207 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2208 CFPlus::DB::Server::run;
2209
1880 CFPlus::UI::set_layout ($::CFG->{layout}); 2210 CFPlus::UI::set_layout ($::CFG->{layout});
1881 2211
1882 my %DEF_CFG = ( 2212 my %DEF_CFG = (
1883 sdl_mode => 0, 2213 sdl_mode => 0,
1884 width => 640,
1885 height => 480,
1886 fullscreen => 0, 2214 fullscreen => 0,
1887 fast => 0, 2215 fast => 0,
2216 force_opengl11 => undef,
2217 texture_compression => 1,
1888 map_scale => 1, 2218 map_scale => 1,
1889 fow_enable => 1, 2219 fow_enable => 1,
1890 fow_intensity => 0.45, 2220 fow_intensity => 0,
1891 fow_smooth => 0, 2221 map_smoothing => 1,
1892 gui_fontsize => 1, 2222 gui_fontsize => 1,
1893 log_fontsize => 0.7, 2223 log_fontsize => 0.7,
1894 gauge_fontsize => 1, 2224 gauge_fontsize => 1,
1895 gauge_size => 0.35, 2225 gauge_size => 0.35,
1896 stat_fontsize => 0.7, 2226 stat_fontsize => 0.7,
1897 mapsize => 100, 2227 mapsize => 100,
1898 say_command => 'say',
1899 audio_enable => 1, 2228 audio_enable => 1,
2229 effects_enable => 1,
2230 effects_volume => 1,
1900 bgm_enable => 1, 2231 bgm_enable => 1,
1901 bgm_volume => 0.25, 2232 bgm_volume => 0.5,
1902 face_prefetch => 0,
1903 output_sync => 1, 2233 output_sync => 1,
1904 output_count => 1, 2234 output_count => 1,
2235 output_rate => "",
1905 pickup => 0, 2236 pickup => 0,
1906 inv_sort => "mtime", 2237 inv_sort => "mtime",
1907 default => "profile", # default profile 2238 default => "profile", # default profile
2239 show_tips => 1,
2240 logview_max_par => 1000,
1908 ); 2241 );
1909 2242
1910 while (my ($k, $v) = each %DEF_CFG) { 2243 while (my ($k, $v) = each %DEF_CFG) {
1911 $CFG->{$k} = $v unless exists $CFG->{$k}; 2244 $CFG->{$k} = $v unless exists $CFG->{$k};
1912 } 2245 }
1913 2246
1914 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2247 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2248 $PROFILE = $CFG->{profile}{default};
2249
2250 # convert old bindings (only default profile matters)
2251 if (my $bindings = delete $PROFILE->{bindings}) {
2252 while (my ($mod, $syms) = each %$bindings) {
2253 while (my ($sym, $cmds) = each %$syms) {
2254 push @{ $PROFILE->{macro} }, {
2255 accelkey => [$mod*1, $sym*1],
2256 action => $cmds,
2257 };
2258 }
2259 }
2260 }
1915 2261
1916 sdl_init; 2262 sdl_init;
1917 2263
1918 @SDL_MODES = reverse 2264 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1919 grep $_->[0] >= 640 && $_->[1] >= 480, 2265 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1920 CFPlus::SDL_ListModes;
1921
1922 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2266 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2267
2268 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1923 2269
1924 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2270 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1925 2271
1926 { 2272 {
1927 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2273 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
1956# } 2302# }
1957# my $t2 = Time::HiRes::time; 2303# my $t2 = Time::HiRes::time;
1958# warn $t2-$t1; 2304# warn $t2-$t1;
1959# } 2305# }
1960 2306
2307 $startup_done->();
2308
1961 video_init; 2309 video_init;
1962 audio_init; 2310 audio_init;
1963} 2311}
1964 2312
2313show_tip_of_the_day if $CFG->{show_tips};
2314
1965Event::loop; 2315Event::loop;
2316
2317#video_shutdown;
2318#audio_shutdown;
1966#CFPlus::SDL_Quit; 2319CFPlus::SDL_Quit;
1967#CFPlus::_exit 0; 2320CFPlus::DB::Server::stop;
1968
1969END { CFPlus::SDL_Quit }
1970 2321
1971=head1 NAME 2322=head1 NAME
1972 2323
1973cfplus - A Crossfire+ and Crossfire game client 2324cfplus - A Crossfire TRT and Crossfire game client
1974 2325
1975=head1 SYNOPSIS 2326=head1 SYNOPSIS
1976 2327
1977Just run it - no commandline arguments are supported. 2328Just run it - no commandline arguments are supported.
1978 2329
1979=head1 USAGE 2330=head1 USAGE
1980 2331
1981cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2332cfplus utilises OpenGL for all UI elements and the game. It is supposed to
1982fullscreen and interactively. 2333be used in fullscreen mode and interactively.
1983 2334
1984=head1 DEBUGGING 2335=head1 DEBUGGING
1985 2336
1986 2337
1987CFPLUS_DEBUG - environment variable 2338CFPLUS_DEBUG - environment variable

Diff Legend

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