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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.112 by root, Sun Aug 13 20:01:14 2006 UTC vs.
Revision 1.185 by elmex, Tue Jul 24 18:39:39 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines