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.123 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.192 by root, Mon Jul 30 02:16:16 2007 UTC

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

Diff Legend

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