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.120 by root, Sun Oct 1 14:48:51 2006 UTC vs.
Revision 1.191 by root, Sun Jul 29 21:31:48 2007 UTC

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

Diff Legend

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