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

Diff Legend

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