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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines