ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

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

Diff Legend

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