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.135 by elmex, Tue Dec 5 16:53:29 2006 UTC vs.
Revision 1.200 by root, Thu Aug 2 14:35:21 2007 UTC

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

Diff Legend

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