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.121 by root, Sun Oct 1 18:17:38 2006 UTC vs.
Revision 1.199 by root, Wed Aug 1 14:27:21 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines