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.131 by root, Sun Nov 19 20:31:29 2006 UTC vs.
Revision 1.205 by root, Thu Aug 9 03:40:02 2007 UTC

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

Diff Legend

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