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.112 by root, Sun Aug 13 20:01:14 2006 UTC vs.
Revision 1.194 by root, Tue Jul 31 00:50:04 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines