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.104 by root, Sun Jul 30 13:14:15 2006 UTC vs.
Revision 1.188 by root, Sun Jul 29 03:58:26 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines