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

Diff Legend

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