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.126 by root, Sat Nov 18 18:19:05 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;
156our $SPELL_LIST;
128 157
129our $HELP_WINDOW; 158our $HELP_WINDOW;
130our $MESSAGE_WINDOW; 159our $MESSAGE_WINDOW;
131our $FLOORBOX; 160our $FLOORBOX;
132our $GAUGES; 161our $GAUGES;
133our $STATWIDS; 162our $STATWIDS;
134 163
135our $SDL_ACTIVE; 164our $SDL_ACTIVE;
136our %SDL_CB; 165our %SDL_CB;
137 166
138our $SDL_MIXER;
139our @SOUNDS; # event => file mapping
140our %AUDIO_CHUNKS; # audio files
141
142our $ALT_ENTER_MESSAGE; 167our $ALT_ENTER_MESSAGE;
143our $STATUSBOX; 168our $STATUSBOX;
144our $DEBUG_STATUS; 169our $DEBUG_STATUS;
145 170
146our $INV; 171our $INV;
147our $INVR; 172our $INVR;
148our $INV_RIGHT_HB; 173our $INV_RIGHT_HB;
149 174
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 175our $PICKUP_CFG;
176
177#############################################################################
154 178
155sub status { 179sub status {
156 $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]);
157} 181}
158 182
160 $DEBUG_STATUS->set_text ($_[0]); 184 $DEBUG_STATUS->set_text ($_[0]);
161} 185}
162 186
163sub message { 187sub message {
164 my ($para) = @_; 188 my ($para) = @_;
165 189 $MESSAGE_WINDOW->message ($para);
166 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
167
168 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
169
170 $LOGVIEW->add_paragraph ($para);
171 $LOGVIEW->scroll_to_bottom;
172} 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#############################################################################
173 435
174sub destroy_query_dialog { 436sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 437 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 438 if $_[0]{query_dialog};
177} 439}
178 440
441# FIXME: a very ugly hack to wait for stat update look below! #d#
442our $QUERY_TIMER; #d#
443
179# server query dialog 444# server query dialog
180sub server_query { 445sub server_query {
181 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 }
182 462
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 463 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 464 x => "center",
185 y => "center", 465 y => "center",
186 title => "Server Query", 466 title => "Server Query",
187 child => my $vbox = new CFPlus::UI::VBox, 467 child => my $vbox = new CFPlus::UI::VBox,
188 ; 468 ;
189 469
190 my @dialog = my $label = new CFPlus::UI::Label 470 my @dialog = my $label = new CFPlus::UI::Label
191 max_w => $::WIDTH * 0.4, 471 max_w => $::WIDTH * 0.8,
192 ellipsise => 0, 472 ellipsise => 0,
193 text => $prompt; 473 text => $prompt;
194 474
195 if ($flags & CS_QUERY_YESNO) { 475 if ($flags & CS_QUERY_YESNO) {
196 push @dialog, my $hbox = new CFPlus::UI::HBox; 476 push @dialog, my $hbox = new CFPlus::UI::HBox;
213 ); 493 );
214 494
215 $dialog->grab_focus; 495 $dialog->grab_focus;
216 496
217 } elsif ($flags & CS_QUERY_SINGLECHAR) { 497 } elsif ($flags & CS_QUERY_SINGLECHAR) {
218 $dialog->{tooltip} = "#charcreation_focus";
219
220 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 498 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
221 $MESSAGE_WINDOW->show; 499 $dialog->{tooltip} = "#charcreation_focus";
222 500
223 unshift @dialog, new CFPlus::UI::Label 501 unshift @dialog, new CFPlus::UI::Label
224 max_w => $::WIDTH * 0.4, 502 max_w => $::WIDTH * 0.8,
225 ellipsise => 0, 503 ellipsise => 0,
226 markup => "\nOr use your keyboard and the text entry below:\n"; 504 markup => "\nOr use your keyboard and the text entry below:\n";
227 505
228 unshift @dialog, my $table = new CFPlus::UI::Table; 506 unshift @dialog, my $table = new CFPlus::UI::Table;
229 507
230 $table->add (0, 0, new CFPlus::UI::Button 508 $table->add_at (0, 0, new CFPlus::UI::Button
231 text => "Next Race", 509 text => "Next Race",
232 on_activate => sub { 510 on_activate => sub {
233 $conn->send ("reply n"); 511 $conn->send ("reply n");
234 destroy_query_dialog $conn; 512 destroy_query_dialog $conn;
235 0 513 0
236 }, 514 },
237 ); 515 );
238 $table->add (2, 0, new CFPlus::UI::Button 516 $table->add_at (2, 0, new CFPlus::UI::Button
239 text => "Accept", 517 text => "Accept",
240 on_activate => sub { 518 on_activate => sub {
241 $conn->send ("reply d"); 519 $conn->send ("reply d");
242 destroy_query_dialog $conn; 520 destroy_query_dialog $conn;
243 0 521 0
244 }, 522 },
245 ); 523 );
246 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
247 unshift @dialog, new CFPlus::UI::Label 548 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 549 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 550 ellipsise => 0,
250 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 551 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
251 ; 552 ;
255 $conn->send ("reply $stat"); 556 $conn->send ("reply $stat");
256 destroy_query_dialog $conn; 557 destroy_query_dialog $conn;
257 return; 558 return;
258 } 559 }
259 560
260 $STATS_PAGE->show;
261 $MESSAGE_WINDOW->hide;
262
263 unshift @dialog, new CFPlus::UI::Label 561 unshift @dialog, new CFPlus::UI::Label
264 max_w => $::WIDTH * 0.4, 562 max_w => $::WIDTH * 0.4,
265 ellipsise => 0, 563 ellipsise => 0,
266 markup => "\nOr use your keyboard and the text entry below:\n"; 564 markup => "\nOr use your keyboard and the text entry below:\n";
267 565
268 unshift @dialog, my $table = new CFPlus::UI::Table; 566 unshift @dialog, my $table = new CFPlus::UI::Table;
269 567
270 # left: re-roll 568 # left: re-roll
271 $table->add (0, 0, new CFPlus::UI::Button 569 $table->add_at (0, 0, new CFPlus::UI::Button
272 text => "Roll Again", 570 text => "Roll Again",
273 on_activate => sub { 571 on_activate => sub {
274 $conn->send ("reply y"); 572 $conn->send ("reply y");
275 destroy_query_dialog $conn; 573 destroy_query_dialog $conn;
276 0 574 0
290 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 588 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
291 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 589 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
292 ], 590 ],
293 ), 1 .. 2; 591 ), 1 .. 2;
294 592
295 $table->add (2, 0, new CFPlus::UI::Button 593 $table->add_at (2, 0, new CFPlus::UI::Button
296 text => "Swap Stats", 594 text => "Swap Stats",
297 on_activate => sub { 595 on_activate => sub {
298 $conn->{stat_change_with} = $sw2->{value}; 596 $conn->{stat_change_with} = $sw2->{value};
299 $conn->send ("reply $sw1->{value}"); 597 $conn->send ("reply $sw1->{value}");
300 destroy_query_dialog $conn; 598 destroy_query_dialog $conn;
301 0 599 0
302 }, 600 },
303 ); 601 );
304 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 602 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
305 603
306 # right: accept 604 # right: accept
307 $table->add (4, 0, new CFPlus::UI::Button 605 $table->add_at (4, 0, new CFPlus::UI::Button
308 text => "Accept", 606 text => "Accept",
309 on_activate => sub { 607 on_activate => sub {
310 $conn->send ("reply n"); 608 $conn->send ("reply n");
311 $STATS_PAGE->hide; 609 $STATS_PAGE->hide;
312 destroy_query_dialog $conn; 610 destroy_query_dialog $conn;
375 status "logging in..."; 673 status "logging in...";
376 674
377 $LOGIN_BUTTON->set_text ("Logout"); 675 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 676 $SETUP_DIALOG->hide;
379 677
380 $PROFILE = $CFG->{profile}{default};
381
382 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;
383 679
384 my ($host, $port) = split /:/, $PROFILE->{host}; 680 my ($host, $port) = split /:/, $PROFILE->{host};
385 681
386 $MAP = new CFPlus::Map; 682 $MAP = new CFPlus::Map;
395 maph => $mapsize, 691 maph => $mapsize,
396 692
397 client => "cfplus $CFPlus::VERSION $] $^O", 693 client => "cfplus $CFPlus::VERSION $] $^O",
398 694
399 map_widget => $MAPWIDGET, 695 map_widget => $MAPWIDGET,
400 logview => $LOGVIEW,
401 statusbox => $STATUSBOX, 696 statusbox => $STATUSBOX,
402 map => $MAP, 697 map => $MAP,
403 mapmap => $MAPMAP, 698 mapmap => $MAPMAP,
404 query => \&server_query, 699 query => \&server_query,
405 700
406 sound_play => sub { 701 setup_req => {
407 my ($x, $y, $soundnum, $type) = @_; 702 smoothing => $CFG->{map_smoothing}*1,
408
409 $SDL_MIXER
410 or return;
411
412 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
413 or return;
414
415 $chunk->play;
416 }, 703 },
417 }; 704 };
418 705
419 if ($CONN) { 706 if ($CONN) {
420 CFPlus::lowdelay fileno $CONN->{fh}; 707 CFPlus::lowdelay fileno $CONN->{fh};
429sub stop_game { 716sub stop_game {
430 $LOGIN_BUTTON->set_text ("Login"); 717 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 718 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 719 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 720 $PL_WINDOW->hide;
434 $SPELL_PAGE->clear_spells; 721 $SPELL_LIST->clear_spells;
722 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
723
724 &audio_music_set_ambient ([]);
435 725
436 return unless $CONN; 726 return unless $CONN;
437 727
438 status "connection closed"; 728 status "connection closed";
439 729
447sub graphics_setup { 737sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 738 my $vbox = new CFPlus::UI::VBox;
449 739
450 $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]);
451 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
452 $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");
453 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 754 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 755
756 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
455 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 757 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
456 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 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);
457 762
458 $mode_slider->connect (changed => sub { 763 $mode_slider->connect (changed => sub {
459 my ($self, $value) = @_; 764 my ($self, $value) = @_;
460 765
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 766 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 767 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
463 }); 768 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 769 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465 770
466 my $row = 1;
467
468 $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");
469 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 772 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 773 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 774 tooltip => "Bring the client into fullscreen mode.",
472 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 775 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
473 ); 776 );
474 777
475 $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");
476 $table->add (1, $row++, new CFPlus::UI::CheckBox 779 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
477 state => $CFG->{fast}, 780 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 781 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 782 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 783 );
481 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
482 $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");
483 $table->add (1, $row++, new CFPlus::UI::Slider 803 $table->add_at (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 804 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 805 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 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 }
487 ); 807 );
488 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
489 $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");
490 $table->add (1, $row++, new CFPlus::UI::CheckBox 819 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 820 state => $CFG->{fow_enable},
492 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.",
493 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 822 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
494 ); 823 );
495 824
496 $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");
497 $table->add (1, $row++, new CFPlus::UI::Slider 826 $table->add_at (1, $row++, new CFPlus::UI::Slider
498 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 827 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
499 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 828 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
500 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 829 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
501 ); 830 );
502 831
503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
504 $table->add (1, $row++, new CFPlus::UI::CheckBox
505 state => $CFG->{fow_smooth},
506 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
507 on_changed => sub {
508 my ($self, $value) = @_;
509 $CFG->{fow_smooth} = $value;
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0
512 }
513 );
514
515 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
516 $table->add (1, $row++, new CFPlus::UI::Slider
517 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
518 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
519 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
520 );
521
522 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 832 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
523 $table->add (1, $row++, new CFPlus::UI::Slider 833 $table->add_at (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 834 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
525 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 835 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
526 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 836 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
527 ); 837 );
528 838
529 $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");
530 $table->add (1, $row++, new CFPlus::UI::Slider 840 $table->add_at (1, $row++, new CFPlus::UI::Slider
531 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 841 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
532 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 842 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
533 on_changed => sub { 843 on_changed => sub {
534 $CFG->{gauge_fontsize} = $_[1]; 844 $CFG->{gauge_fontsize} = $_[1];
535 &set_gauge_window_fontsize; 845 &set_gauge_window_fontsize;
536 0 846 0
537 } 847 }
538 ); 848 );
539 849
540 $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");
541 $table->add (1, $row++, new CFPlus::UI::Slider 851 $table->add_at (1, $row++, new CFPlus::UI::Slider
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 852 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 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.",
544 on_changed => sub { 854 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 855 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 856 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
547 0 857 0
548 } 858 }
549 ); 859 );
550 860
551 $table->add (1, $row++, new CFPlus::UI::Button
552 expand => 1, align => 0, text => "Apply",
553 tooltip => "Apply the video settings",
554 on_activate => sub {
555 video_shutdown ();
556 video_init ();
557 0
558 }
559 );
560
561 $vbox 861 $vbox
562} 862}
563 863
564sub audio_setup { 864sub audio_setup {
565 my $vbox = new CFPlus::UI::VBox; 865 my $vbox = new CFPlus::UI::VBox;
566 866
567 $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]);
568 868
569 my $row = 0; 869 my $row = 0;
570 870
571 $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");
572 $table->add (1, $row++, new CFPlus::UI::CheckBox 872 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
573 state => $CFG->{audio_enable}, 873 state => $CFG->{audio_enable},
574 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 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.",
575 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 875 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
576 ); 876 );
577# $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");
578# $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 {
579# $CFG->{effects_volume} = $_[1]; 879# $CFG->{effects_volume} = $_[1];
580# }); 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
581 $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");
582 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
583 $hbox->add (new CFPlus::UI::CheckBox 900 $table->add_at (1, $row, new CFPlus::UI::CheckBox
584 expand => 1, state => $CFG->{bgm_enable}, 901 expand => 1, state => $CFG->{bgm_enable},
585 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.",
586 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 }
587 ); 908 );
588 $hbox->add (new CFPlus::UI::Slider 909 $table->add_at (2, $row++, new CFPlus::UI::Slider
589 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 910 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
590 tooltip => "The volume of the background music. Changes are instant.", 911 tooltip => "The volume of the background music. Changes are instant.",
591 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 }
592 ); 913 );
593 914
594 $table->add (1, $row++, new CFPlus::UI::Button 915 $table->add_at (1, $row++, new CFPlus::UI::Button
595 expand => 1, align => 0, text => "Apply", 916 c_colspan => 2, expand => 1, align => 0, text => "Apply",
596 tooltip => "Apply the audio settings", 917 tooltip => "Apply the audio settings",
597 on_activate => sub { 918 on_activate => sub {
598 audio_shutdown (); 919 audio_shutdown ();
599 audio_init (); 920 audio_init ();
600 0 921 0
658} 979}
659 980
660sub debug_setup { 981sub debug_setup {
661 my $table = new CFPlus::UI::Table; 982 my $table = new CFPlus::UI::Table;
662 983
663 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 984 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
664 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 985 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
665 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 986 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 987 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 988 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
668 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 989 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 990 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 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() } );
671 993
672 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#
673 995
674 for my $x (0..2) { 996 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
675 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);
676 $table->add ($x + 3, $y, 998 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
677 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);
678 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);
679 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");
680 ); 1002
681 } 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]],
682 } 1011 });
683 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 });
684 1028
685 $table 1029 $table
686} 1030}
687 1031
688sub stats_window { 1032sub stats_window {
736 [2, 4, st_spd => "Spd", 10.54], 1080 [2, 4, st_spd => "Spd", 10.54],
737 [2, 5, st_wspd => "WSp", 10.54], 1081 [2, 5, st_wspd => "WSp", 10.54],
738 ) { 1082 ) {
739 my ($col, $row, $id, $label, $template) = @$_; 1083 my ($col, $row, $id, $label, $template) = @$_;
740 1084
741 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1085 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
742 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1086 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
743 align => +1, template => $template, tooltip => "#stat_$label"); 1087 align => +1, template => $template, tooltip => "#stat_$label");
744 $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
745 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,
746 align => -1, text => $label, tooltip => "#stat_$label"); 1090 align => -1, text => $label, tooltip => "#stat_$label");
747 } 1091 }
748 1092
749 $vb->add (new CFPlus::UI::FancyFrame 1093 $vb->add (new CFPlus::UI::FancyFrame
790 cold => ["Cold", 1134 cold => ["Cold",
791 "<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, ...)"],
792 ghit => ["Ghost hit", 1136 ghit => ["Ghost hit",
793 "<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)"],
794 ); 1138 );
1139
795 for (qw/slow holyw conf fire depl magic 1140 for (qw/slow holyw conf fire depl magic
796 drain acid pois para deat phys 1141 drain acid pois para deat phys
797 blind fear tund elec cold ghit/) 1142 blind fear tund elec cold ghit/)
798 { 1143 {
799 $tbl2->add ($col, $row, 1144 $tbl2->add_at ($col, $row,
800 $STATWIDS->{"res_$_"} = 1145 $STATWIDS->{"res_$_"} =
801 new CFPlus::UI::Label 1146 new CFPlus::UI::Label
802 font => $FONT_FIXED, 1147 font => $FONT_FIXED,
803 template => "-100%", 1148 template => "-100%",
804 align => +1, 1149 align => +1,
805 valign => 0, 1150 valign => 0,
806 can_events => 1, 1151 can_events => 1,
807 can_hover => 1, 1152 can_hover => 1,
808 tooltip => $resist_names{$_}->[1], 1153 tooltip => $resist_names{$_}->[1],
809 ); 1154 );
810 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1155 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
811 font => $FONT_FIXED, 1156 font => $FONT_FIXED,
812 can_hover => 1, 1157 can_hover => 1,
813 can_events => 1, 1158 can_events => 1,
814 path => "ui/resist/resist_$_.png", 1159 path => "ui/resist/resist_$_.png",
815 tooltip => $resist_names{$_}->[1], 1160 tooltip => $resist_names{$_}->[1],
816 ); 1161 );
817 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1162 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
818 text => $resist_names{$_}->[0], 1163 text => $resist_names{$_}->[0],
819 font => $FONT_FIXED, 1164 font => $FONT_FIXED,
820 can_hover => 1, 1165 can_hover => 1,
821 can_events => 1, 1166 can_events => 1,
822 tooltip => $resist_names{$_}->[1], 1167 tooltip => $resist_names{$_}->[1],
855 return if $METASERVER_ATIME > time; 1200 return if $METASERVER_ATIME > time;
856 $METASERVER_ATIME = time + 60; 1201 $METASERVER_ATIME = time + 60;
857 1202
858 my $table = $METASERVER->{table}; 1203 my $table = $METASERVER->{table};
859 $table->clear; 1204 $table->clear;
860 $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...");
861 1206
862 my $ok = 0; 1207 my $ok = 0;
863 1208
864 CFPlus::background { 1209 CFPlus::background {
865 my $ua = CFPlus::lwp_useragent; 1210 my $ua = CFPlus::lwp_useragent;
876 "The time this server has been running without being restarted.", 1221 "The time this server has been running without being restarted.",
877 "The server software version - a '+' indicates a Crossfire+ server.", 1222 "The server software version - a '+' indicates a Crossfire+ server.",
878 "Short information about this server provided by its admins.", 1223 "Short information about this server provided by its admins.",
879 ); 1224 );
880 my @col = qw(#Users Host Uptime Version Description); 1225 my @col = qw(#Users Host Uptime Version Description);
881 $table->add ($_, 0, new CFPlus::UI::Label 1226 $table->add_at ($_, 0, new CFPlus::UI::Label
882 can_hover => 1, can_events => 1, 1227 can_hover => 1, can_events => 1,
883 align => 0, fg => [1, 1, 0], 1228 align => 0, fg => [1, 1, 0],
884 text => $col[$_], tooltip => $tip[$_]) 1229 text => $col[$_], tooltip => $tip[$_])
885 for 0 .. $#col; 1230 for 0 .. $#col;
886 1231
887 my @align = qw(1 0 1 1 -1); 1232 my @align = qw(1 0 1 1 -1);
888 1233
889 my $y = 0; 1234 my $y = 0;
890 for my $m (
891 sort {
892 $b->{version} <=> $a->{version}
893 or $b->{users} <=> $a->{users}
894 }
895 @{ $msg->{servers} } 1235 for my $m (@{ $msg->{servers} }) {
896 ) {
897 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 1236 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
898 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 1237 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
899 1238
900 for ($desc) { 1239 for ($desc) {
901 s/<br>/\n/gi; 1240 s/<br>/\n/gi;
902 s/<li>/\n· /gi; 1241 s/<li>/\n· /gi;
903 s/<.*?>//sgi; 1242 s/<.*?>//sgi;
914 1253
915 $m = [$users, $host, $uptime, $version, $desc]; 1254 $m = [$users, $host, $uptime, $version, $desc];
916 1255
917 $y++; 1256 $y++;
918 1257
919 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1258 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
920 (new CFPlus::UI::Button 1259 (new CFPlus::UI::Button
921 text => "Use", 1260 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field", 1261 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub { 1262 on_activate => sub {
924 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1263 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
927 }, 1266 },
928 ), 1267 ),
929 (new CFPlus::UI::Empty expand => 1), 1268 (new CFPlus::UI::Empty expand => 1),
930 ]); 1269 ]);
931 1270
932 $table->add ($_, $y, new CFPlus::UI::Label 1271 $table->add_at ($_, $y, new CFPlus::UI::Label
933 max_w => $::WIDTH * 0.4, 1272 max_w => $::WIDTH * 0.4,
934 ellipsise => 0, 1273 ellipsise => 0,
935 align => $align[$_], 1274 align => $align[$_],
936 text => $m->[$_], 1275 text => $m->[$_],
937 tooltip => $tip[$_], 1276 tooltip => $tip[$_],
938 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1277 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
939 can_hover => 1, 1278 can_hover => 1,
940 can_events => 1, 1279 can_events => 1,
941 fontsize => 0.8) 1280 fontsize => 0.8)
942 for 0 .. $#$m; 1281 for 0 .. $#$m;
943 } 1282 }
978 1317
979 $vbox->add (new CFPlus::UI::FancyFrame 1318 $vbox->add (new CFPlus::UI::FancyFrame
980 label => "Connection Settings", 1319 label => "Connection Settings",
981 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]),
982 ); 1321 );
983 $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");
984 1323
985 { 1324 {
986 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1325 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
987 1326
988 $vbox->add ( 1327 $vbox->add (
989 $HOST_ENTRY = new CFPlus::UI::Entry 1328 $HOST_ENTRY = new CFPlus::UI::Entry
990 expand => 1, 1329 expand => 1,
991 text => $CFG->{profile}{default}{host}, 1330 text => $CFG->{profile}{default}{host},
992 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",
993 on_changed => sub { 1332 on_changed => sub {
994 my ($self, $value) = @_; 1333 my ($self, $value) = @_;
995 $CFG->{profile}{default}{host} = $value; 1334 $CFG->{profile}{default}{host} = $value;
996 0 1335 1
997 } 1336 }
998 ); 1337 );
999 1338
1000 $vbox->add (new CFPlus::UI::Button 1339 $vbox->add (new CFPlus::UI::Button
1001 expand => 1, 1340 expand => 1,
1002 text => "Server List", 1341 text => "Server List",
1003 other => $METASERVER, 1342 other => $METASERVER,
1004 tooltip => "Show a list of available crossfire servers", 1343 tooltip => "Show a list of available crossfire servers",
1005 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1344 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1006 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1345 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1007 ); 1346 );
1008 } 1347 }
1009 1348
1010 $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");
1011 $table->add (1, 4, new CFPlus::UI::Entry 1350 $table->add_at (1, 4, new CFPlus::UI::Entry
1012 text => $CFG->{profile}{default}{user}, 1351 text => $CFG->{profile}{default}{user},
1013 tooltip => "The name of your character on the server", 1352 tooltip => "The name of your character on the server",
1014 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1353 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1015 ); 1354 );
1016 1355
1017 $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");
1018 $table->add (1, 5, new CFPlus::UI::Entry 1357 $table->add_at (1, 5, new CFPlus::UI::Entry
1019 text => $CFG->{profile}{default}{password}, 1358 text => $CFG->{profile}{default}{password},
1020 hidden => 1, 1359 hidden => 1,
1021 tooltip => "The password for your character", 1360 tooltip => "The password for your character",
1022 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1361 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1023 ); 1362 );
1024 1363
1025 $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");
1026 $table->add (1, 7, new CFPlus::UI::Slider 1365 $table->add_at (1, 7, new CFPlus::UI::Slider
1027 force_w => 100, 1366 force_w => 100,
1028 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1367 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1029 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. "
1030 . "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, "
1031 . "but you also increase bandwidth requirements and latency. " 1370 . "but you also increase bandwidth requirements and latency. "
1032 . "This option is only used once at log-in.", 1371 . "This option is only used once at log-in.",
1033 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1372 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1034 ); 1373 );
1035 1374
1036 $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");
1037 $table->add (1, 8, new CFPlus::UI::CheckBox 1376 $table->add_at (1, 8, new CFPlus::UI::Entry
1038 state => $CFG->{face_prefetch}, 1377 text => $CFG->{output_rate},
1039 tooltip => "<b>Background Image Prefetch</b>\n\n" 1378 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1040 . "If enabled, the client automatically pre-fetches images from the server. " 1379 . "when sending data. When 0 or unset, the server "
1041 . "This might increase or create lag, but increases the chances " 1380 . "default will be used, which is usually around 100kb/s. Most servers will "
1042 . "of faces being ready for display when you encounter them. " 1381 . "dynamically find an optimal rate, so adjust this only when necessary.",
1043 . "It also uses up server bandwidth on every connect, "
1044 . "so only set it if you really need to prefetch images. "
1045 . "This option can be set and unset any time.",
1046 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1382 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1047 ); 1383 );
1048 1384
1049 $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");
1050 $table->add (1, 9, new CFPlus::UI::Entry 1386 $table->add_at (1, 9, new CFPlus::UI::Entry
1051 text => $CFG->{output_count}, 1387 text => $CFG->{output_count},
1052 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1388 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1053 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1389 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1054 ); 1390 );
1055 1391
1056 $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");
1057 $table->add (1, 10, new CFPlus::UI::Entry 1393 $table->add_at (1, 10, new CFPlus::UI::Entry
1058 text => $CFG->{output_sync}, 1394 text => $CFG->{output_sync},
1059 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1395 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1060 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1396 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1061 ); 1397 );
1062 1398
1063 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1399 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1064 expand => 1, 1400 expand => 1,
1065 align => 0, 1401 align => 0,
1066 text => "Login", 1402 text => "Login",
1067 on_activate => sub { 1403 on_activate => sub {
1068 $CONN ? stop_game 1404 $CONN ? stop_game
1069 : start_game; 1405 : start_game;
1070 0 1406 1
1071 }, 1407 },
1072 ); 1408 );
1073 1409
1074 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1410 $vbox->add (new CFPlus::UI::FancyFrame
1075 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1411 label => "Server Info",
1076 text => $CFG->{say_command}, 1412 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1077 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1078 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1079 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1080 on_changed => sub {
1081 my ($self, $value) = @_;
1082 $CFG->{say_command} = $value;
1083 0
1084 }
1085 ); 1413 );
1086 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
1087 $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");
1088 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1424 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1089 state => $CFG->{show_tips}, 1425 state => $CFG->{show_tips},
1090 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?",
1091 on_changed => sub { 1427 on_changed => sub {
1092 my ($self, $value) = @_; 1428 my ($self, $value) = @_;
1093 $CFG->{show_tips} = $value; 1429 $CFG->{show_tips} = $value;
1094 0 1430 0
1095 } 1431 }
1096 ); 1432 );
1097 1433
1098 $vbox->add (new CFPlus::UI::FancyFrame 1434 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1099 label => "Server Info", 1435 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1100 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1436 text => $CFG->{logview_max_par},
1101 ); 1437 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1102 1438 . "sends more messages than this number, older messages get removed to save memory and "
1103 $vbox 1439 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1104}
1105
1106sub message_window {
1107 my $window = new CFPlus::UI::Toplevel
1108 name => "message_window",
1109 title => "Messages",
1110 border_bg => [1, 1, 1, 1],
1111 x => "max",
1112 y => 0,
1113 force_w => $::WIDTH * 0.4,
1114 force_h => $::HEIGHT * 0.5,
1115 child => (my $vbox = new CFPlus::UI::VBox),
1116 has_close_button => 1;
1117
1118 $vbox->add ($LOGVIEW);
1119
1120 $vbox->add (my $input = new CFPlus::UI::Entry
1121 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1122 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1123 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1124 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1125 on_focus_in => sub { 1440 on_changed => sub {
1126 my ($input, $prev_focus) = @_; 1441 my ($self, $value) = @_;
1127 1442 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1128 delete $input->{refocus_map};
1129
1130 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1131 $input->{refocus_map} = 1;
1132 }
1133 delete $input->{auto_activated};
1134
1135 0 1443 0
1136 }, 1444 },
1137 on_activate => sub {
1138 my ($input, $text) = @_;
1139 $input->set_text ('');
1140
1141 if ($text =~ /^\/(.*)/) {
1142 $::CONN->user_send ($1);
1143 } else {
1144 my $say_cmd = $::CFG->{say_command} || 'say';
1145 $::CONN->user_send ("$say_cmd $text");
1146 }
1147 if ($input->{refocus_map}) {
1148 delete $input->{refocus_map};
1149 $MAPWIDGET->focus_in
1150 }
1151
1152 0
1153 },
1154 on_escape => sub {
1155 $MAPWIDGET->grab_focus;
1156
1157 0
1158 },
1159 );
1160
1161 $CONSOLE = {
1162 window => $window,
1163 input => $input,
1164 }; 1445 );
1165 1446
1166 $window 1447 $table
1167} 1448}
1168 1449
1169sub autopickup_setup { 1450sub autopickup_setup {
1451 my $r = new CFPlus::UI::ScrolledWindow (
1452 expand => 1,
1453 scroll_y => 1
1454 );
1170 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 );
1171 1459
1172 for ( 1460 for (
1173 ["General", 0, 0, 1461 ["General", 0, 0,
1174 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1462 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1175 ["Inhibit autopickup" => PICKUP_INHIBIT], 1463 ["Inhibit autopickup" => PICKUP_INHIBIT],
1189 ["Boots" => PICKUP_BOOTS], 1477 ["Boots" => PICKUP_BOOTS],
1190 ["Gloves" => PICKUP_GLOVES], 1478 ["Gloves" => PICKUP_GLOVES],
1191 ["Cloaks" => PICKUP_CLOAK], 1479 ["Cloaks" => PICKUP_CLOAK],
1192 ], 1480 ],
1193 1481
1194 ["Readables", 2, 2, 1482 ["Readables", 2, 0,
1195 ["Spellbooks" => PICKUP_SPELLBOOK], 1483 ["Spellbooks" => PICKUP_SPELLBOOK],
1196 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1484 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1197 ["Normal Books/Scrolls" => PICKUP_READABLES], 1485 ["Normal Books/Scrolls" => PICKUP_READABLES],
1198 ], 1486 ],
1199 ["Misc", 2, 7, 1487 ["Misc", 2, 5,
1200 ["Food" => PICKUP_FOOD], 1488 ["Food" => PICKUP_FOOD],
1201 ["Drinks" => PICKUP_DRINK], 1489 ["Drinks" => PICKUP_DRINK],
1202 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1490 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1203 ["Keys" => PICKUP_KEY], 1491 ["Keys" => PICKUP_KEY],
1204 ["Magical Items" => PICKUP_MAGICAL], 1492 ["Magical Items" => PICKUP_MAGICAL],
1205 ["Potions" => PICKUP_POTION], 1493 ["Potions" => PICKUP_POTION],
1206 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1494 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1207 ["Ignore cursed" => PICKUP_NOT_CURSED], 1495 ["Ignore cursed" => PICKUP_NOT_CURSED],
1208 ["Jewelery" => PICKUP_JEWELS], 1496 ["Jewelery" => PICKUP_JEWELS],
1497 ["Flesh" => PICKUP_FLESH],
1209 ], 1498 ],
1210 ["Weight/Value ratio", 2, 17] 1499 ["Weight/Value ratio", 2, 17]
1211 ) 1500 )
1212 { 1501 {
1213 my ($title, $x, $y, @bits) = @$_; 1502 my ($title, $x, $y, @bits) = @$_;
1214 $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]);
1215 1504
1216 for (@bits) { 1505 for (@bits) {
1217 ++$y; 1506 ++$y;
1218 1507
1219 my $mask = $_->[1]; 1508 my $mask = $_->[1];
1220 $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);
1221 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1510 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1222 state => $::CFG->{pickup} & $mask, 1511 state => $::CFG->{pickup} & $mask,
1223 on_changed => sub { 1512 on_changed => sub {
1224 my ($box, $value) = @_; 1513 my ($box, $value) = @_;
1225 1514
1226 if ($value) { 1515 if ($value) {
1237 1526
1238 ${$_->[2]} = $checkbox if $_->[2]; 1527 ${$_->[2]} = $checkbox if $_->[2];
1239 } 1528 }
1240 } 1529 }
1241 1530
1242 $table->add (2, 18, new CFPlus::UI::ValSlider 1531 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1243 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1532 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1244 template => ">= 99", 1533 template => ">= 99",
1245 to_value => sub { ">= " . 5 * $_[0] }, 1534 to_value => sub { ">= " . 5 * $_[0] },
1246 on_changed => sub { 1535 on_changed => sub {
1247 my ($slider, $value) = @_; 1536 my ($slider, $value) = @_;
1250 $::CFG->{pickup} |= int $value 1539 $::CFG->{pickup} |= int $value
1251 if $value; 1540 if $value;
1252 1; 1541 1;
1253 }); 1542 });
1254 1543
1255 $table->add (3, 18, new CFPlus::UI::Button 1544 $table->add_at (3, 18, new CFPlus::UI::Button
1256 text => "set", 1545 text => "set",
1257 on_activate => sub { 1546 on_activate => sub {
1258 $::CONN->send_command ("pickup $::CFG->{pickup}") 1547 $::CONN->send_command ("pickup $::CFG->{pickup}")
1259 if defined $::CONN; 1548 if defined $::CONN;
1260 0 1549 0
1261 }); 1550 });
1262 1551
1263 $table 1552 $r
1264} 1553}
1265 1554
1266my %SORT_ORDER = ( 1555my %SORT_ORDER = (
1267 type => undef, 1556 type => undef,
1268 mtime => sub { sort { 1557 mtime => sub {
1558 my $NOW = time;
1559 sort {
1560 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1561 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1562
1269 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1563 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1270 or $b->{mtime} <=> $a->{mtime} 1564 or $btime <=> $atime
1271 or $a->{type} <=> $b->{type} 1565 or $a->{type} <=> $b->{type}
1566 } @_
1272 } @_ }, 1567 },
1273 weight => sub { sort { 1568 weight => sub { sort {
1274 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1569 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1275 or $a->{type} <=> $b->{type} 1570 or $a->{type} <=> $b->{type}
1276 } @_ }, 1571 } @_ },
1277); 1572);
1302 #TODO# update to weigh/maxweight 1597 #TODO# update to weigh/maxweight
1303 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1598 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1304 1599
1305 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1600 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1306 $sw1->add ($INV = new CFPlus::UI::Inventory); 1601 $sw1->add ($INV = new CFPlus::UI::Inventory);
1602 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1307 1603
1308 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1604 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1309 1605
1310 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1606 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1311 1607
1314 1610
1315 # XXX: Call after $INVR = ... because set_opencont sets the items 1611 # XXX: Call after $INVR = ... because set_opencont sets the items
1316 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); 1612 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1317 1613
1318 $hb 1614 $hb
1615}
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;
1319} 1655}
1320 1656
1321sub toggle_player_page { 1657sub toggle_player_page {
1322 my ($widget) = @_; 1658 my ($widget) = @_;
1323 1659
1340 has_close_button => 1 1676 has_close_button => 1
1341 ; 1677 ;
1342 1678
1343 my $ntb = 1679 my $ntb =
1344 $PL_NOTEBOOK = 1680 $PL_NOTEBOOK =
1345 new CFPlus::UI::Notebook expand => 1, debug => 1; 1681 new CFPlus::UI::Notebook expand => 1;
1346 1682
1347 $ntb->add ( 1683 $ntb->add_tab (
1348 "Statistics (F2)" => $STATS_PAGE = stats_window, 1684 "Statistics (F2)" => $STATS_PAGE = stats_window,
1349 "Shows statistics, where all your Stats and Resistances are shown." 1685 "Shows statistics, where all your Stats and Resistances are shown."
1350 ); 1686 );
1351 $ntb->add ( 1687 $ntb->add_tab (
1352 "Skills (F3)" => $SKILL_PAGE = skill_window, 1688 "Skills (F3)" => $SKILL_PAGE = skill_window,
1353 "Shows all your Skills." 1689 "Shows all your Skills."
1354 ); 1690 );
1355 1691
1356 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1692 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1357 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1693 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1358 $ntb->add ( 1694 $ntb->add_tab (
1359 "Spellbook (F4)" => $spellsw, 1695 "Spellbook (F4)" => $spellsw,
1360 "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."
1361 ); 1697 );
1362 $ntb->add ( 1698 $ntb->add_tab (
1363 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1699 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1364 "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 :). "
1365 . "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."
1366 ); 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.");
1367 1708
1368 $ntb->set_current_page ($INVENTORY_PAGE); 1709 $ntb->set_current_page ($INVENTORY_PAGE);
1369 1710
1370 $plwin->add ($ntb); 1711 $plwin->add ($ntb);
1371 $plwin 1712 $plwin
1372} 1713}
1373 1714
1374sub update_bindings {
1375 $BIND_UPD_CB->() if $BIND_UPD_CB;
1376}
1377
1378sub keyboard_setup { 1715sub keyboard_setup {
1379 my $binding_list = new CFPlus::UI::VBox; 1716 CFPlus::Macro::keyboard_setup
1380
1381 my $refresh;
1382 $refresh = $BIND_UPD_CB = sub {
1383 $binding_list->clear ();
1384
1385 return unless $PROFILE;
1386
1387 for my $mod (keys %{$PROFILE->{bindings}}) {
1388 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1389 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1390 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1391
1392 my $lbl = join "; ", @$cmds;
1393 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1394 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1395 $hb->add (new CFPlus::UI::Button
1396 text => "delete",
1397 tooltip => "Deletes the binding",
1398 on_activate => sub {
1399 $binding_list->remove ($hb);
1400 delete $PROFILE->{bindings}{$mod}{$sym};
1401 0
1402 });
1403
1404 $hb->add (new CFPlus::UI::Button
1405 text => "edit",
1406 tooltip => "Edits the binding",
1407 on_activate => sub {
1408 $::BIND_EDITOR->set_binding (
1409 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1410 sub {
1411 my ($nmod, $nsym, $ncmds) = @_;
1412 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1413 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1414 $refresh->();
1415 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1416 $SETUP_DIALOG->show;
1417 },
1418 sub {
1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1420 $SETUP_DIALOG->show;
1421 });
1422 $::BIND_EDITOR->show;
1423 $SETUP_DIALOG->hide;
1424 0
1425 });
1426
1427 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1428 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1429 }
1430 }
1431 };
1432
1433 my $vb = new CFPlus::UI::VBox;
1434 $vb->add (new CFPlus::UI::FancyFrame
1435 label => "Options",
1436 child => (my $hb = new CFPlus::UI::HBox),
1437 );
1438 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1439 $hb->add (new CFPlus::UI::CheckBox
1440 expand => 1,
1441 state => $CFG->{shift_fire_stop},
1442 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1443 on_changed => sub {
1444 my ($cbox, $value) = @_;
1445 $CFG->{shift_fire_stop} = $value;
1446 0
1447 });
1448
1449 $vb->add (new CFPlus::UI::FancyFrame
1450 label => "Bindings",
1451 child => $binding_list);
1452 $vb->add (my $hb = new CFPlus::UI::HBox);
1453
1454 $hb->add (new CFPlus::UI::Button
1455 text => "record new",
1456 expand => 1,
1457 tooltip => "This button opens the binding editor with an empty binding.",
1458 on_activate => sub {
1459 $::BIND_EDITOR->set_binding (undef, undef, [],
1460 sub {
1461 my ($mod, $sym, $cmds) = @_;
1462 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1463 $refresh->();
1464 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1465 $SETUP_DIALOG->show;
1466 },
1467 sub {
1468 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1469 $SETUP_DIALOG->show;
1470 },
1471 );
1472 $SETUP_DIALOG->hide;
1473 $::BIND_EDITOR->show;
1474 0
1475 },
1476 );
1477
1478 $hb->add (new CFPlus::UI::Button
1479 text => "close",
1480 tooltip => "Closes the binding window",
1481 expand => 1,
1482 on_activate => sub {
1483 $SETUP_DIALOG->hide;
1484 0
1485 }
1486 );
1487
1488 $refresh->();
1489
1490 $vb
1491} 1717}
1492 1718
1493sub help_window { 1719sub help_window {
1494 my $win = new CFPlus::UI::Toplevel 1720 my $win = new CFPlus::UI::Toplevel
1495 x => 'center', 1721 x => 'center',
1652 1878
1653sub show_tip_of_the_day { 1879sub show_tip_of_the_day {
1654 # find all tips 1880 # find all tips
1655 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1881 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1656 1882
1657 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1883 CFPlus::DB::get state => "tip_of_the_day", sub {
1884 my ($todindex) = @_;
1658 $todindex = 0 if $todindex >= @tod; 1885 $todindex = 0 if $todindex >= @tod;
1659 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1886 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1660 1887
1661 # create dialog 1888 # create dialog
1662 my $dialog; 1889 my $dialog;
1663 1890
1664 my $close = sub { 1891 my $close = sub {
1665 $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;
1666 }; 1930 };
1667
1668 $dialog = new CFPlus::UI::Toplevel
1669 x => "center",
1670 y => "center",
1671 z => 3,
1672 name => 'tip_of_the_day',
1673 force_w => int $WIDTH * 4/9,
1674 force_h => int $WIDTH * 2/9,
1675 title => "Tip of the day #" . (1 + $todindex),
1676 child => my $vbox = new CFPlus::UI::VBox,
1677 has_close_button => 1,
1678 on_delete => $close,
1679 ;
1680
1681 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1682 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1683 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1684
1685 $vbox->add (my $table = new CFPlus::UI::Table);
1686
1687 $table->add (0, 0, new CFPlus::UI::Button
1688 text => "Close",
1689 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>.",
1690 on_activate => $close,
1691 );
1692
1693 $table->add (2, 0, new CFPlus::UI::Button
1694 text => "Next",
1695 tooltip => "Show the next <b>Tip of the day</b>.",
1696 on_activate => sub {
1697 $close->();
1698 &show_tip_of_the_day;
1699 },
1700 );
1701
1702 $dialog->show;
1703} 1931}
1704 1932
1705sub sdl_init { 1933sub sdl_init {
1706 CFPlus::SDL_Init 1934 CFPlus::SDL_Init
1707 and die "SDL::Init failed!\n"; 1935 and die "SDL::Init failed!\n";
1708} 1936}
1709 1937
1710sub video_init { 1938sub video_init {
1711 sdl_init;
1712
1713 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1939 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1714 1940
1715 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1941 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1716 1942
1717 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1943 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1718 $FULLSCREEN = $CFG->{fullscreen}; 1944 $FULLSCREEN = $CFG->{fullscreen};
1719 $FAST = $CFG->{fast}; 1945 $FAST = $CFG->{fast};
1720 1946
1721 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1947 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1722 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1948 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1723 1949
1724 $SDL_ACTIVE = 1; 1950 $SDL_ACTIVE = 1;
1725 $LAST_REFRESH = time - 0.01; 1951 $LAST_REFRESH = time - 0.01;
1726 1952
1741 padding => 0, 1967 padding => 0,
1742 z => 100, 1968 z => 100,
1743 force_x => "max", 1969 force_x => "max",
1744 force_y => 0; 1970 force_y => 0;
1745 $DEBUG_STATUS->show; 1971 $DEBUG_STATUS->show;
1746
1747 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1748 1972
1749 $STATUSBOX = new CFPlus::UI::Statusbox; 1973 $STATUSBOX = new CFPlus::UI::Statusbox;
1750 $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]);
1751 1975
1752 (new CFPlus::UI::Frame 1976 (new CFPlus::UI::Frame
1770 1994
1771 $MAPWIDGET = new CFPlus::MapWidget; 1995 $MAPWIDGET = new CFPlus::MapWidget;
1772 $MAPWIDGET->connect (activate_console => sub { 1996 $MAPWIDGET->connect (activate_console => sub {
1773 my ($mapwidget, $preset) = @_; 1997 my ($mapwidget, $preset) = @_;
1774 1998
1775 if ($CONSOLE) { 1999 $MESSAGE_WINDOW->activate_console ($preset)
1776 $CONSOLE->{input}->{auto_activated} = 1; 2000 if $MESSAGE_WINDOW;
1777 $CONSOLE->{input}->grab_focus;
1778
1779 if ($preset && $CONSOLE->{input}->get_text eq '') {
1780 $CONSOLE->{input}->set_text ($preset);
1781 }
1782 }
1783 }); 2001 });
1784 $MAPWIDGET->show; 2002 $MAPWIDGET->show;
1785 $MAPWIDGET->grab_focus; 2003 $MAPWIDGET->grab_focus;
1786
1787 $LOGVIEW = new CFPlus::UI::TextScroller
1788 expand => 1,
1789 font => $FONT_FIXED,
1790 fontsize => $::CFG->{log_fontsize},
1791 indent => -4,
1792 can_hover => 1,
1793 can_events => 1,
1794 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1795 ;
1796 2004
1797 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2005 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1798 title => "Setup", 2006 title => "Setup",
1799 name => "setup_dialog", 2007 name => "setup_dialog",
1800 x => 'center', 2008 x => 'center',
1804 force_h => $::HEIGHT * 0.6, 2012 force_h => $::HEIGHT * 0.6,
1805 has_close_button => 1, 2013 has_close_button => 1,
1806 ; 2014 ;
1807 2015
1808 $METASERVER = metaserver_dialog; 2016 $METASERVER = metaserver_dialog;
2017 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1809 2018
1810 $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,
1811 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 2020 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1812 2021
1813 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 2022 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1814 "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.");
1815 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 2024 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1816 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 2025 "Configure various client-specific settings.");
1817 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 2026 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1818 "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.");
1819 $SETUP_NOTEBOOK->add (Audio => audio_setup, 2028 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1820 "Configure the use of audio, sound effects and background music."); 2029 "Configure the use of audio, sound effects and background music.");
1821 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 2030 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1822 "Lets you define, edit and delete key bindings." 2031 "Lets you define, edit and delete key bindings."
1823 . "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 "
1824 . "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 "
1825 . "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. "
1826 . "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 "
1827 . "binding editor closes"); 2036 . "binding editor closes");
1828 $SETUP_NOTEBOOK->add (Debug => debug_setup, 2037 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1829 "Some debuggin' options. Do not ask."); 2038 "Some debuggin' options. Do not ask.");
1830 2039
1831 $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
1832 2041
1833 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 2042 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1834 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.");
1835 2044
1836 $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,
1837 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.");
1838 2047
1839 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
1840 2049
1841 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 2050 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1852 }, 2061 },
1853 ); 2062 );
1854 2063
1855 $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,
1856 tooltip => "View Documentation"); 2065 tooltip => "View Documentation");
2066
1857 2067
1858 $BUTTONBAR->add (new CFPlus::UI::Button 2068 $BUTTONBAR->add (new CFPlus::UI::Button
1859 text => "Quit", 2069 text => "Quit",
1860 tooltip => "Terminates the program", 2070 tooltip => "Terminates the program",
1861 on_activate => sub { 2071 on_activate => sub {
1879 CFPlus::OpenGL::shutdown; 2089 CFPlus::OpenGL::shutdown;
1880 2090
1881 undef $SDL_ACTIVE; 2091 undef $SDL_ACTIVE;
1882} 2092}
1883 2093
1884my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1885my $bgmusic;#TODO#hack#d#
1886
1887sub audio_channel_finished {
1888 my ($channel) = @_;
1889
1890 #warn "channel $channel finished\n";#d#
1891}
1892
1893sub audio_music_finished {
1894 return unless $CFG->{bgm_enable};
1895
1896 # TODO: hack, do play loop and mood music
1897 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1898 $bgmusic->play (0);
1899
1900 push @bgmusic, shift @bgmusic;
1901}
1902
1903sub audio_init {
1904 if ($CFG->{audio_enable}) {
1905 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1906 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1907
1908 unless ($SDL_MIXER) {
1909 status "Unable to open sound device: there will be no sound";
1910 return;
1911 }
1912
1913 CFPlus::Mix_AllocateChannels 8;
1914 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1915
1916 audio_music_finished;
1917
1918 while (<$fh>) {
1919 next if /^\s*#/;
1920 next if /^\s*$/;
1921
1922 my ($file, $volume, $event) = split /\s+/, $_, 3;
1923
1924 push @SOUNDS, "$volume,$file";
1925
1926 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1927 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1928 $chunk->volume ($volume * 128 / 100);
1929 $chunk
1930 };
1931 }
1932 } else {
1933 status "unable to open sound config: $!";
1934 }
1935 }
1936}
1937
1938sub audio_shutdown {
1939 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1940 undef $SDL_MIXER;
1941 @SOUNDS = ();
1942 %AUDIO_CHUNKS = ();
1943}
1944
1945my %animate_object; 2094my %animate_object;
1946my $animate_timer; 2095my $animate_timer;
1947 2096
1948my $fps = 9; 2097my $fps = 9;
1949
1950my %demo;#d#
1951 2098
1952sub force_refresh { 2099sub force_refresh {
1953 $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;
1954 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2101 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1955 2102
1956 $CFPlus::UI::ROOT->draw; 2103 $CFPlus::UI::ROOT->draw;
1957 2104
1958 $WANT_REFRESH = 0; 2105 $WANT_REFRESH = 0;
1959 $CAN_REFRESH = 0; 2106 $CAN_REFRESH = 0;
1960 $LAST_REFRESH = $NOW; 2107 $LAST_REFRESH = $NOW;
1961 2108
1962 CFPlus::SDL_GL_SwapBuffers; 2109 CFPlus::SDL_GL_SwapBuffers;
1963} 2110}
1964 2111
1965my $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 {
1966 $NOW = time; 2113 $NOW = time;
1967 2114
1968 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2115 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1969 for CFPlus::SDL_PollEvent; 2116 for CFPlus::poll_events;
1970 2117
1971 if (%animate_object) { 2118 if (%animate_object) {
1972 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2119 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1973 $WANT_REFRESH++; 2120 ++$WANT_REFRESH;
1974 } 2121 }
1975 2122
1976 if ($WANT_REFRESH) { 2123 if ($WANT_REFRESH) {
1977 force_refresh; 2124 force_refresh;
1978 } else { 2125 } else {
1988sub animation_stop { 2135sub animation_stop {
1989 my ($widget) = @_; 2136 my ($widget) = @_;
1990 delete $animate_object{$widget}; 2137 delete $animate_object{$widget};
1991} 2138}
1992 2139
1993# check once/second for faces that need to be prefetched
1994# this should, of course, only run on demand, but
1995# SDL forces worse things on us....
1996
1997Event->timer (after => 1, interval => 0.25, cb => sub {
1998 $CONN->face_prefetch
1999 if $CONN;
2000});
2001
2002%SDL_CB = ( 2140%SDL_CB = (
2003 CFPlus::SDL_QUIT => sub { 2141 CFPlus::SDL_QUIT => sub {
2004 Event::unloop -1; 2142 exit;
2005 }, 2143 },
2006 CFPlus::SDL_VIDEORESIZE => sub { 2144 CFPlus::SDL_VIDEORESIZE => sub {
2007 }, 2145 },
2008 CFPlus::SDL_VIDEOEXPOSE => sub { 2146 CFPlus::SDL_VIDEOEXPOSE => sub {
2009 CFPlus::UI::full_refresh; 2147 CFPlus::UI::full_refresh;
2010 }, 2148 },
2011 CFPlus::SDL_ACTIVEEVENT => sub { 2149 CFPlus::SDL_ACTIVEEVENT => sub {
2012# 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;
2013 }, 2156 },
2014 CFPlus::SDL_KEYDOWN => sub { 2157 CFPlus::SDL_KEYDOWN => sub {
2015 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2158 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2016 # alt-enter 2159 # alt-enter
2017 $FULLSCREEN_ENABLE->toggle; 2160 $FULLSCREEN_ENABLE->toggle;
2038 2181
2039$SIG{INT} = $SIG{TERM} = sub { exit }; 2182$SIG{INT} = $SIG{TERM} = sub { exit };
2040 2183
2041{ 2184{
2042 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2185 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2186 CFPlus::DB::Server::run;
2187
2043 CFPlus::UI::set_layout ($::CFG->{layout}); 2188 CFPlus::UI::set_layout ($::CFG->{layout});
2044 2189
2045 my %DEF_CFG = ( 2190 my %DEF_CFG = (
2046 sdl_mode => 0, 2191 sdl_mode => 0,
2047 width => 640,
2048 height => 480,
2049 fullscreen => 0, 2192 fullscreen => 0,
2050 fast => 0, 2193 fast => 0,
2051 map_scale => 1, 2194 map_scale => 1,
2052 fow_enable => 1, 2195 fow_enable => 1,
2053 fow_intensity => 0.45, 2196 fow_intensity => 0,
2054 fow_smooth => 0, 2197 map_smoothing => 1,
2055 gui_fontsize => 1, 2198 gui_fontsize => 1,
2056 log_fontsize => 0.7, 2199 log_fontsize => 0.7,
2057 gauge_fontsize => 1, 2200 gauge_fontsize => 1,
2058 gauge_size => 0.35, 2201 gauge_size => 0.35,
2059 stat_fontsize => 0.7, 2202 stat_fontsize => 0.7,
2060 mapsize => 100, 2203 mapsize => 100,
2061 say_command => 'chat',
2062 audio_enable => 1, 2204 audio_enable => 1,
2205 effects_enable => 1,
2206 effects_volume => 1,
2063 bgm_enable => 1, 2207 bgm_enable => 1,
2064 bgm_volume => 0.25, 2208 bgm_volume => 0.5,
2065 face_prefetch => 0,
2066 output_sync => 1, 2209 output_sync => 1,
2067 output_count => 1, 2210 output_count => 1,
2211 output_rate => "",
2068 pickup => 0, 2212 pickup => 0,
2069 inv_sort => "mtime", 2213 inv_sort => "mtime",
2070 default => "profile", # default profile 2214 default => "profile", # default profile
2071 show_tips => 1, 2215 show_tips => 1,
2216 logview_max_par => 1000,
2072 ); 2217 );
2073 2218
2074 while (my ($k, $v) = each %DEF_CFG) { 2219 while (my ($k, $v) = each %DEF_CFG) {
2075 $CFG->{$k} = $v unless exists $CFG->{$k}; 2220 $CFG->{$k} = $v unless exists $CFG->{$k};
2076 } 2221 }
2077 2222
2078 $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 }
2079 2237
2080 sdl_init; 2238 sdl_init;
2081 2239
2082 @SDL_MODES = reverse 2240 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2083 grep $_->[0] >= 640 && $_->[1] >= 480, 2241 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2084 CFPlus::SDL_ListModes;
2085
2086 @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;
2087 2245
2088 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2246 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2089 2247
2090 { 2248 {
2091 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2249 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2132 2290
2133Event::loop; 2291Event::loop;
2134#CFPlus::SDL_Quit; 2292#CFPlus::SDL_Quit;
2135#CFPlus::_exit 0; 2293#CFPlus::_exit 0;
2136 2294
2295END {
2296 video_shutdown;
2297 audio_shutdown;
2137END { CFPlus::SDL_Quit } 2298 CFPlus::SDL_Quit;
2299 CFPlus::DB::Server::stop;
2300}
2138 2301
2139=head1 NAME 2302=head1 NAME
2140 2303
2141cfplus - A Crossfire+ and Crossfire game client 2304cfplus - A Crossfire TRT and Crossfire game client
2142 2305
2143=head1 SYNOPSIS 2306=head1 SYNOPSIS
2144 2307
2145Just run it - no commandline arguments are supported. 2308Just run it - no commandline arguments are supported.
2146 2309
2147=head1 USAGE 2310=head1 USAGE
2148 2311
2149cfplus 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
2150fullscreen and interactively. 2313be used in fullscreen mode and interactively.
2151 2314
2152=head1 DEBUGGING 2315=head1 DEBUGGING
2153 2316
2154 2317
2155CFPLUS_DEBUG - environment variable 2318CFPLUS_DEBUG - environment variable

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines