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.124 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.199 by root, Wed Aug 1 14:27:21 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines