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

Diff Legend

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