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

Diff Legend

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