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.124 by root, Tue Nov 7 22:41:27 2006 UTC vs.
Revision 1.217 by root, Sun Aug 19 14:09:28 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines