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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines