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.136 by root, Fri Dec 8 14:59:54 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 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) {
… …
29# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
30BEGIN { 31BEGIN {
31 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
32 @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
33 34
35 my $tmp = $ENV{PAR_TEMP};
36
34 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 38 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
39 } 42 }
40 } 43 }
41 44
42 # 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
43 54
44 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;
45 } 67 }
46} 68}
47 69
48# 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
49unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
58use Compress::LZF; 80use Compress::LZF;
59 81
60use CFPlus; 82use CFPlus;
61use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
62use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
63use CFPlus::UI; 86use CFPlus::UI;
87use CFPlus::UI::Canvas;
88use CFPlus::UI::Inventory;
89use CFPlus::UI::SpellList;
90use CFPlus::UI::MessageWindow;
64use CFPlus::Pod; 91use CFPlus::Pod;
65use CFPlus::BindingEditor;
66use CFPlus::MapWidget; 92use CFPlus::MapWidget;
93use CFPlus::Macro;
67 94
68$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 95$SIG{QUIT} = sub { Carp::cluck "QUIT" };
69$SIG{PIPE} = 'IGNORE'; 96$SIG{PIPE} = 'IGNORE';
70 97
71$Event::Eval = 0; 98$Event::Eval = 1;
72$Event::DIED = sub { 99$Event::DIED = sub {
73 CFPlus::fatal Carp::longmess $_[1] 100 CFPlus::fatal Carp::longmess $_[1]
74}; 101};
75 102
76my $MAX_FPS = 60; 103my $MAX_FPS = 60;
… …
100 127
101our $MAP; 128our $MAP;
102our $MAPMAP; 129our $MAPMAP;
103our $MAPWIDGET; 130our $MAPWIDGET;
104our $BUTTONBAR; 131our $BUTTONBAR;
105our $LOGVIEW;
106our $CONSOLE;
107our $METASERVER; 132our $METASERVER;
108our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
109our $QUIT_DIALOG; 134our $QUIT_DIALOG;
110our $HOST_ENTRY; 135our $HOST_ENTRY;
111our $FULLSCREEN_ENABLE; 136our $FULLSCREEN_ENABLE;
… …
134 159
135our $SDL_ACTIVE; 160our $SDL_ACTIVE;
136our %SDL_CB; 161our %SDL_CB;
137 162
138our $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
139our @SOUNDS; # event => file mapping 171our @SOUNDS; # event => file mapping
140our %AUDIO_CHUNKS; # audio files 172our %AUDIO_CHUNKS; # audio files
141 173
142our $ALT_ENTER_MESSAGE; 174our $ALT_ENTER_MESSAGE;
143our $STATUSBOX; 175our $STATUSBOX;
… …
145 177
146our $INV; 178our $INV;
147our $INVR; 179our $INVR;
148our $INV_RIGHT_HB; 180our $INV_RIGHT_HB;
149 181
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 182our $PICKUP_CFG;
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157 183
158sub status { 184sub status {
159 $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]);
160} 186}
161 187
… …
163 $DEBUG_STATUS->set_text ($_[0]); 189 $DEBUG_STATUS->set_text ($_[0]);
164} 190}
165 191
166sub message { 192sub message {
167 my ($para) = @_; 193 my ($para) = @_;
168 194 $MESSAGE_WINDOW->message ($para);
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
175} 195}
176 196
177sub destroy_query_dialog { 197sub destroy_query_dialog {
178 (delete $_[0]{query_dialog})->destroy 198 (delete $_[0]{query_dialog})->destroy
179 if $_[0]{query_dialog}; 199 if $_[0]{query_dialog};
180} 200}
181 201
202# FIXME: a very ugly hack to wait for stat update look below! #d#
203our $QUERY_TIMER; #d#
204
182# server query dialog 205# server query dialog
183sub server_query { 206sub server_query {
184 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 }
185 223
186 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 224 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
187 x => "center", 225 x => "center",
188 y => "center", 226 y => "center",
189 title => "Server Query", 227 title => "Server Query",
190 child => my $vbox = new CFPlus::UI::VBox, 228 child => my $vbox = new CFPlus::UI::VBox,
191 ; 229 ;
192 230
193 my @dialog = my $label = new CFPlus::UI::Label 231 my @dialog = my $label = new CFPlus::UI::Label
194 max_w => $::WIDTH * 0.4, 232 max_w => $::WIDTH * 0.8,
195 ellipsise => 0, 233 ellipsise => 0,
196 text => $prompt; 234 text => $prompt;
197 235
198 if ($flags & CS_QUERY_YESNO) { 236 if ($flags & CS_QUERY_YESNO) {
199 push @dialog, my $hbox = new CFPlus::UI::HBox; 237 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
216 ); 254 );
217 255
218 $dialog->grab_focus; 256 $dialog->grab_focus;
219 257
220 } elsif ($flags & CS_QUERY_SINGLECHAR) { 258 } elsif ($flags & CS_QUERY_SINGLECHAR) {
221 $dialog->{tooltip} = "#charcreation_focus";
222
223 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) {
224 $MESSAGE_WINDOW->show; 260 $dialog->{tooltip} = "#charcreation_focus";
225 261
226 unshift @dialog, new CFPlus::UI::Label 262 unshift @dialog, new CFPlus::UI::Label
227 max_w => $::WIDTH * 0.4, 263 max_w => $::WIDTH * 0.8,
228 ellipsise => 0, 264 ellipsise => 0,
229 markup => "\nOr use your keyboard and the text entry below:\n"; 265 markup => "\nOr use your keyboard and the text entry below:\n";
230 266
231 unshift @dialog, my $table = new CFPlus::UI::Table; 267 unshift @dialog, my $table = new CFPlus::UI::Table;
232 268
233 $table->add (0, 0, new CFPlus::UI::Button 269 $table->add_at (0, 0, new CFPlus::UI::Button
234 text => "Next Race", 270 text => "Next Race",
235 on_activate => sub { 271 on_activate => sub {
236 $conn->send ("reply n"); 272 $conn->send ("reply n");
237 destroy_query_dialog $conn; 273 destroy_query_dialog $conn;
238 0 274 0
239 }, 275 },
240 ); 276 );
241 $table->add (2, 0, new CFPlus::UI::Button 277 $table->add_at (2, 0, new CFPlus::UI::Button
242 text => "Accept", 278 text => "Accept",
243 on_activate => sub { 279 on_activate => sub {
244 $conn->send ("reply d"); 280 $conn->send ("reply d");
245 destroy_query_dialog $conn; 281 destroy_query_dialog $conn;
246 0 282 0
247 }, 283 },
248 ); 284 );
249 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
250 unshift @dialog, new CFPlus::UI::Label 309 unshift @dialog, new CFPlus::UI::Label
251 max_w => $::WIDTH * 0.4, 310 max_w => $::WIDTH * 0.4,
252 ellipsise => 0, 311 ellipsise => 0,
253 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 312 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
254 ; 313 ;
… …
258 $conn->send ("reply $stat"); 317 $conn->send ("reply $stat");
259 destroy_query_dialog $conn; 318 destroy_query_dialog $conn;
260 return; 319 return;
261 } 320 }
262 321
263 $STATS_PAGE->show;
264 $MESSAGE_WINDOW->hide;
265
266 unshift @dialog, new CFPlus::UI::Label 322 unshift @dialog, new CFPlus::UI::Label
267 max_w => $::WIDTH * 0.4, 323 max_w => $::WIDTH * 0.4,
268 ellipsise => 0, 324 ellipsise => 0,
269 markup => "\nOr use your keyboard and the text entry below:\n"; 325 markup => "\nOr use your keyboard and the text entry below:\n";
270 326
271 unshift @dialog, my $table = new CFPlus::UI::Table; 327 unshift @dialog, my $table = new CFPlus::UI::Table;
272 328
273 # left: re-roll 329 # left: re-roll
274 $table->add (0, 0, new CFPlus::UI::Button 330 $table->add_at (0, 0, new CFPlus::UI::Button
275 text => "Roll Again", 331 text => "Roll Again",
276 on_activate => sub { 332 on_activate => sub {
277 $conn->send ("reply y"); 333 $conn->send ("reply y");
278 destroy_query_dialog $conn; 334 destroy_query_dialog $conn;
279 0 335 0
… …
293 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 349 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
294 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 350 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
295 ], 351 ],
296 ), 1 .. 2; 352 ), 1 .. 2;
297 353
298 $table->add (2, 0, new CFPlus::UI::Button 354 $table->add_at (2, 0, new CFPlus::UI::Button
299 text => "Swap Stats", 355 text => "Swap Stats",
300 on_activate => sub { 356 on_activate => sub {
301 $conn->{stat_change_with} = $sw2->{value}; 357 $conn->{stat_change_with} = $sw2->{value};
302 $conn->send ("reply $sw1->{value}"); 358 $conn->send ("reply $sw1->{value}");
303 destroy_query_dialog $conn; 359 destroy_query_dialog $conn;
304 0 360 0
305 }, 361 },
306 ); 362 );
307 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 363 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
308 364
309 # right: accept 365 # right: accept
310 $table->add (4, 0, new CFPlus::UI::Button 366 $table->add_at (4, 0, new CFPlus::UI::Button
311 text => "Accept", 367 text => "Accept",
312 on_activate => sub { 368 on_activate => sub {
313 $conn->send ("reply n"); 369 $conn->send ("reply n");
314 $STATS_PAGE->hide; 370 $STATS_PAGE->hide;
315 destroy_query_dialog $conn; 371 destroy_query_dialog $conn;
… …
378 status "logging in..."; 434 status "logging in...";
379 435
380 $LOGIN_BUTTON->set_text ("Logout"); 436 $LOGIN_BUTTON->set_text ("Logout");
381 $SETUP_DIALOG->hide; 437 $SETUP_DIALOG->hide;
382 438
383 $PROFILE = $CFG->{profile}{default};
384
385 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;
386 440
387 my ($host, $port) = split /:/, $PROFILE->{host}; 441 my ($host, $port) = split /:/, $PROFILE->{host};
388 442
389 $MAP = new CFPlus::Map; 443 $MAP = new CFPlus::Map;
… …
398 maph => $mapsize, 452 maph => $mapsize,
399 453
400 client => "cfplus $CFPlus::VERSION $] $^O", 454 client => "cfplus $CFPlus::VERSION $] $^O",
401 455
402 map_widget => $MAPWIDGET, 456 map_widget => $MAPWIDGET,
403 logview => $LOGVIEW,
404 statusbox => $STATUSBOX, 457 statusbox => $STATUSBOX,
405 map => $MAP, 458 map => $MAP,
406 mapmap => $MAPMAP, 459 mapmap => $MAPMAP,
407 query => \&server_query, 460 query => \&server_query,
461
462 setup_req => {
463 smoothing => $CFG->{map_smoothing}*1,
464 },
408 465
409 sound_play => sub { 466 sound_play => sub {
410 my ($x, $y, $soundnum, $type) = @_; 467 my ($x, $y, $soundnum, $type) = @_;
411 468
412 $SDL_MIXER 469 $SDL_MIXER
… …
433 $LOGIN_BUTTON->set_text ("Login"); 490 $LOGIN_BUTTON->set_text ("Login");
434 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 491 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
435 $SETUP_DIALOG->show; 492 $SETUP_DIALOG->show;
436 $PL_WINDOW->hide; 493 $PL_WINDOW->hide;
437 $SPELL_LIST->clear_spells; 494 $SPELL_LIST->clear_spells;
495 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
496
497 &audio_music_set ([]);
438 498
439 return unless $CONN; 499 return unless $CONN;
440 500
441 status "connection closed"; 501 status "connection closed";
442 502
… …
450sub graphics_setup { 510sub graphics_setup {
451 my $vbox = new CFPlus::UI::VBox; 511 my $vbox = new CFPlus::UI::VBox;
452 512
453 $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]);
454 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
455 $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");
456 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 527 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
457 528
529 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
458 $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],
459 $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);
460 535
461 $mode_slider->connect (changed => sub { 536 $mode_slider->connect (changed => sub {
462 my ($self, $value) = @_; 537 my ($self, $value) = @_;
463 538
464 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 539 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
465 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 540 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
466 }); 541 });
467 $mode_slider->emit (changed => $mode_slider->{range}[0]); 542 $mode_slider->emit (changed => $mode_slider->{range}[0]);
468 543
469 my $row = 1;
470
471 $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");
472 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 545 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
473 state => $CFG->{fullscreen}, 546 state => $CFG->{fullscreen},
474 tooltip => "Bring the client into fullscreen mode.", 547 tooltip => "Bring the client into fullscreen mode.",
475 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 548 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
476 ); 549 );
477 550
478 $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");
479 $table->add (1, $row++, new CFPlus::UI::CheckBox 552 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
480 state => $CFG->{fast}, 553 state => $CFG->{fast},
481 tooltip => "Lower the visual quality considerably to speed up rendering.", 554 tooltip => "Lower the visual quality considerably to speed up rendering.",
482 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 555 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
483 ); 556 );
484 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
485 $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");
486 $table->add (1, $row++, new CFPlus::UI::Slider 576 $table->add_at (1, $row++, new CFPlus::UI::Slider
487 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 577 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
488 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 578 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
489 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 }
490 ); 580 );
491 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
492 $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");
493 $table->add (1, $row++, new CFPlus::UI::CheckBox 592 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
494 state => $CFG->{fow_enable}, 593 state => $CFG->{fow_enable},
495 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.",
496 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 595 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
497 ); 596 );
498 597
499 $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");
500 $table->add (1, $row++, new CFPlus::UI::Slider 599 $table->add_at (1, $row++, new CFPlus::UI::Slider
501 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 600 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
502 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.",
503 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 602 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
504 ); 603 );
505 604
506 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
507 $table->add (1, $row++, new CFPlus::UI::CheckBox
508 state => $CFG->{fow_smooth},
509 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
510 on_changed => sub {
511 my ($self, $value) = @_;
512 $CFG->{fow_smooth} = $value;
513 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
514 0
515 }
516 );
517
518 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
519 $table->add (1, $row++, new CFPlus::UI::Slider
520 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
521 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
522 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
523 );
524
525 $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");
526 $table->add (1, $row++, new CFPlus::UI::Slider 606 $table->add_at (1, $row++, new CFPlus::UI::Slider
527 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 607 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
528 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.",
529 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 609 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
530 ); 610 );
531 611
532 $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");
533 $table->add (1, $row++, new CFPlus::UI::Slider 613 $table->add_at (1, $row++, new CFPlus::UI::Slider
534 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 614 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
535 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.",
536 on_changed => sub { 616 on_changed => sub {
537 $CFG->{gauge_fontsize} = $_[1]; 617 $CFG->{gauge_fontsize} = $_[1];
538 &set_gauge_window_fontsize; 618 &set_gauge_window_fontsize;
539 0 619 0
540 } 620 }
541 ); 621 );
542 622
543 $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");
544 $table->add (1, $row++, new CFPlus::UI::Slider 624 $table->add_at (1, $row++, new CFPlus::UI::Slider
545 range => [$CFG->{gauge_size}, 0.2, 0.8], 625 range => [$CFG->{gauge_size}, 0.2, 0.8],
546 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.",
547 on_changed => sub { 627 on_changed => sub {
548 $CFG->{gauge_size} = $_[1]; 628 $CFG->{gauge_size} = $_[1];
549 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 629 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
550 0 630 0
551 } 631 }
552 ); 632 );
553 633
554 $table->add (1, $row++, new CFPlus::UI::Button
555 expand => 1, align => 0, text => "Apply",
556 tooltip => "Apply the video settings",
557 on_activate => sub {
558 video_shutdown ();
559 video_init ();
560 0
561 }
562 );
563
564 $vbox 634 $vbox
565} 635}
566 636
567sub audio_setup { 637sub audio_setup {
568 my $vbox = new CFPlus::UI::VBox; 638 my $vbox = new CFPlus::UI::VBox;
569 639
570 $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]);
571 641
572 my $row = 0; 642 my $row = 0;
573 643
574 $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");
575 $table->add (1, $row++, new CFPlus::UI::CheckBox 645 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
576 state => $CFG->{audio_enable}, 646 state => $CFG->{audio_enable},
577 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.",
578 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 648 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
579 ); 649 );
580# $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");
581# $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 {
582# $CFG->{effects_volume} = $_[1]; 652# $CFG->{effects_volume} = $_[1];
583# }); 653# });
584 $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");
585 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 655 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
586 $hbox->add (new CFPlus::UI::CheckBox 656 $hbox->add (new CFPlus::UI::CheckBox
587 expand => 1, state => $CFG->{bgm_enable}, 657 expand => 1, state => $CFG->{bgm_enable},
588 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.",
589 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 659 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
590 ); 660 );
… …
592 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 662 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
593 tooltip => "The volume of the background music. Changes are instant.", 663 tooltip => "The volume of the background music. Changes are instant.",
594 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 }
595 ); 665 );
596 666
597 $table->add (1, $row++, new CFPlus::UI::Button 667 $table->add_at (1, $row++, new CFPlus::UI::Button
598 expand => 1, align => 0, text => "Apply", 668 expand => 1, align => 0, text => "Apply",
599 tooltip => "Apply the audio settings", 669 tooltip => "Apply the audio settings",
600 on_activate => sub { 670 on_activate => sub {
601 audio_shutdown (); 671 audio_shutdown ();
602 audio_init (); 672 audio_init ();
… …
661} 731}
662 732
663sub debug_setup { 733sub debug_setup {
664 my $table = new CFPlus::UI::Table; 734 my $table = new CFPlus::UI::Table;
665 735
666 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 736 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
667 $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 });
668 $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");
669 $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 });
670 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 740 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
671 $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 });
672 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 742 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
673 $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 });
674 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 744 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
675 745
676 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
677
678 for my $x (0..2) {
679 for my $y (0 .. 2) {
680 $table->add ($x + 3, $y,
681 new CFPlus::UI::Entry
682 text => $default_smooth[$x * 3 + $y],
683 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
684 );
685 }
686 }
687
688 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 746 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
747
748 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
749 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
750 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
751 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
752 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
753 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
754
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]],
763 });
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 });
689 780
690 $table 781 $table
691} 782}
692 783
693sub stats_window { 784sub stats_window {
… …
741 [2, 4, st_spd => "Spd", 10.54], 832 [2, 4, st_spd => "Spd", 10.54],
742 [2, 5, st_wspd => "WSp", 10.54], 833 [2, 5, st_wspd => "WSp", 10.54],
743 ) { 834 ) {
744 my ($col, $row, $id, $label, $template) = @$_; 835 my ($col, $row, $id, $label, $template) = @$_;
745 836
746 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 837 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
747 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 838 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
748 align => +1, template => $template, tooltip => "#stat_$label"); 839 align => +1, template => $template, tooltip => "#stat_$label");
749 $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
750 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,
751 align => -1, text => $label, tooltip => "#stat_$label"); 842 align => -1, text => $label, tooltip => "#stat_$label");
752 } 843 }
753 844
754 $vb->add (new CFPlus::UI::FancyFrame 845 $vb->add (new CFPlus::UI::FancyFrame
… …
795 cold => ["Cold", 886 cold => ["Cold",
796 "<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, ...)"],
797 ghit => ["Ghost hit", 888 ghit => ["Ghost hit",
798 "<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)"],
799 ); 890 );
891
800 for (qw/slow holyw conf fire depl magic 892 for (qw/slow holyw conf fire depl magic
801 drain acid pois para deat phys 893 drain acid pois para deat phys
802 blind fear tund elec cold ghit/) 894 blind fear tund elec cold ghit/)
803 { 895 {
804 $tbl2->add ($col, $row, 896 $tbl2->add_at ($col, $row,
805 $STATWIDS->{"res_$_"} = 897 $STATWIDS->{"res_$_"} =
806 new CFPlus::UI::Label 898 new CFPlus::UI::Label
807 font => $FONT_FIXED, 899 font => $FONT_FIXED,
808 template => "-100%", 900 template => "-100%",
809 align => +1, 901 align => +1,
810 valign => 0, 902 valign => 0,
811 can_events => 1, 903 can_events => 1,
812 can_hover => 1, 904 can_hover => 1,
813 tooltip => $resist_names{$_}->[1], 905 tooltip => $resist_names{$_}->[1],
814 ); 906 );
815 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 907 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
816 font => $FONT_FIXED, 908 font => $FONT_FIXED,
817 can_hover => 1, 909 can_hover => 1,
818 can_events => 1, 910 can_events => 1,
819 path => "ui/resist/resist_$_.png", 911 path => "ui/resist/resist_$_.png",
820 tooltip => $resist_names{$_}->[1], 912 tooltip => $resist_names{$_}->[1],
821 ); 913 );
822 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 914 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
823 text => $resist_names{$_}->[0], 915 text => $resist_names{$_}->[0],
824 font => $FONT_FIXED, 916 font => $FONT_FIXED,
825 can_hover => 1, 917 can_hover => 1,
826 can_events => 1, 918 can_events => 1,
827 tooltip => $resist_names{$_}->[1], 919 tooltip => $resist_names{$_}->[1],
… …
860 return if $METASERVER_ATIME > time; 952 return if $METASERVER_ATIME > time;
861 $METASERVER_ATIME = time + 60; 953 $METASERVER_ATIME = time + 60;
862 954
863 my $table = $METASERVER->{table}; 955 my $table = $METASERVER->{table};
864 $table->clear; 956 $table->clear;
865 $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...");
866 958
867 my $ok = 0; 959 my $ok = 0;
868 960
869 CFPlus::background { 961 CFPlus::background {
870 my $ua = CFPlus::lwp_useragent; 962 my $ua = CFPlus::lwp_useragent;
… …
881 "The time this server has been running without being restarted.", 973 "The time this server has been running without being restarted.",
882 "The server software version - a '+' indicates a Crossfire+ server.", 974 "The server software version - a '+' indicates a Crossfire+ server.",
883 "Short information about this server provided by its admins.", 975 "Short information about this server provided by its admins.",
884 ); 976 );
885 my @col = qw(#Users Host Uptime Version Description); 977 my @col = qw(#Users Host Uptime Version Description);
886 $table->add ($_, 0, new CFPlus::UI::Label 978 $table->add_at ($_, 0, new CFPlus::UI::Label
887 can_hover => 1, can_events => 1, 979 can_hover => 1, can_events => 1,
888 align => 0, fg => [1, 1, 0], 980 align => 0, fg => [1, 1, 0],
889 text => $col[$_], tooltip => $tip[$_]) 981 text => $col[$_], tooltip => $tip[$_])
890 for 0 .. $#col; 982 for 0 .. $#col;
891 983
892 my @align = qw(1 0 1 1 -1); 984 my @align = qw(1 0 1 1 -1);
893 985
894 my $y = 0; 986 my $y = 0;
895 for my $m (
896 sort {
897 $b->{version} <=> $a->{version}
898 or $b->{users} <=> $a->{users}
899 }
900 @{ $msg->{servers} } 987 for my $m (@{ $msg->{servers} }) {
901 ) {
902 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 988 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
903 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 989 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
904 990
905 for ($desc) { 991 for ($desc) {
906 s/<br>/\n/gi; 992 s/<br>/\n/gi;
907 s/<li>/\n· /gi; 993 s/<li>/\n· /gi;
908 s/<.*?>//sgi; 994 s/<.*?>//sgi;
… …
919 1005
920 $m = [$users, $host, $uptime, $version, $desc]; 1006 $m = [$users, $host, $uptime, $version, $desc];
921 1007
922 $y++; 1008 $y++;
923 1009
924 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1010 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
925 (new CFPlus::UI::Button 1011 (new CFPlus::UI::Button
926 text => "Use", 1012 text => "Use",
927 tooltip => "Put this server into the <b>Host:Port</b> field", 1013 tooltip => "Put this server into the <b>Host:Port</b> field",
928 on_activate => sub { 1014 on_activate => sub {
929 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1015 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
932 }, 1018 },
933 ), 1019 ),
934 (new CFPlus::UI::Empty expand => 1), 1020 (new CFPlus::UI::Empty expand => 1),
935 ]); 1021 ]);
936 1022
937 $table->add ($_, $y, new CFPlus::UI::Label 1023 $table->add_at ($_, $y, new CFPlus::UI::Label
938 max_w => $::WIDTH * 0.4, 1024 max_w => $::WIDTH * 0.4,
939 ellipsise => 0, 1025 ellipsise => 0,
940 align => $align[$_], 1026 align => $align[$_],
941 text => $m->[$_], 1027 text => $m->[$_],
942 tooltip => $tip[$_], 1028 tooltip => $tip[$_],
943 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1029 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
944 can_hover => 1, 1030 can_hover => 1,
945 can_events => 1, 1031 can_events => 1,
946 fontsize => 0.8) 1032 fontsize => 0.8)
947 for 0 .. $#$m; 1033 for 0 .. $#$m;
948 } 1034 }
… …
983 1069
984 $vbox->add (new CFPlus::UI::FancyFrame 1070 $vbox->add (new CFPlus::UI::FancyFrame
985 label => "Connection Settings", 1071 label => "Connection Settings",
986 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]),
987 ); 1073 );
988 $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");
989 1075
990 { 1076 {
991 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1077 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
992 1078
993 $vbox->add ( 1079 $vbox->add (
994 $HOST_ENTRY = new CFPlus::UI::Entry 1080 $HOST_ENTRY = new CFPlus::UI::Entry
995 expand => 1, 1081 expand => 1,
996 text => $CFG->{profile}{default}{host}, 1082 text => $CFG->{profile}{default}{host},
… …
1010 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1096 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1011 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1097 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1012 ); 1098 );
1013 } 1099 }
1014 1100
1015 $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");
1016 $table->add (1, 4, new CFPlus::UI::Entry 1102 $table->add_at (1, 4, new CFPlus::UI::Entry
1017 text => $CFG->{profile}{default}{user}, 1103 text => $CFG->{profile}{default}{user},
1018 tooltip => "The name of your character on the server", 1104 tooltip => "The name of your character on the server",
1019 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1105 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1020 ); 1106 );
1021 1107
1022 $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");
1023 $table->add (1, 5, new CFPlus::UI::Entry 1109 $table->add_at (1, 5, new CFPlus::UI::Entry
1024 text => $CFG->{profile}{default}{password}, 1110 text => $CFG->{profile}{default}{password},
1025 hidden => 1, 1111 hidden => 1,
1026 tooltip => "The password for your character", 1112 tooltip => "The password for your character",
1027 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1113 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1028 ); 1114 );
1029 1115
1030 $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");
1031 $table->add (1, 7, new CFPlus::UI::Slider 1117 $table->add_at (1, 7, new CFPlus::UI::Slider
1032 force_w => 100, 1118 force_w => 100,
1033 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1119 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1034 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. "
1035 . "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, "
1036 . "but you also increase bandwidth requirements and latency. " 1122 . "but you also increase bandwidth requirements and latency. "
1037 . "This option is only used once at log-in.", 1123 . "This option is only used once at log-in.",
1038 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 },
1039 ); 1125 );
1040 1126
1041 $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");
1042 $table->add (1, 8, new CFPlus::UI::CheckBox 1128 $table->add_at (1, 8, new CFPlus::UI::Entry
1043 state => $CFG->{face_prefetch}, 1129 text => $CFG->{output_rate},
1044 tooltip => "<b>Background Image Prefetch</b>\n\n" 1130 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1045 . "If enabled, the client automatically pre-fetches images from the server. " 1131 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1046 . "This might increase or create lag, but increases the chances " 1132 . "default will be used, which is usually around 100kb/s.",
1047 . "of faces being ready for display when you encounter them. "
1048 . "It also uses up server bandwidth on every connect, "
1049 . "so only set it if you really need to prefetch images. "
1050 . "This option can be set and unset any time.",
1051 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1133 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1052 ); 1134 );
1053 1135
1054 $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");
1055 $table->add (1, 9, new CFPlus::UI::Entry 1137 $table->add_at (1, 9, new CFPlus::UI::Entry
1056 text => $CFG->{output_count}, 1138 text => $CFG->{output_count},
1057 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.",
1058 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1140 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1059 ); 1141 );
1060 1142
1061 $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");
1062 $table->add (1, 10, new CFPlus::UI::Entry 1144 $table->add_at (1, 10, new CFPlus::UI::Entry
1063 text => $CFG->{output_sync}, 1145 text => $CFG->{output_sync},
1064 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.",
1065 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1147 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1066 ); 1148 );
1067 1149
1068 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1150 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1069 expand => 1, 1151 expand => 1,
1070 align => 0, 1152 align => 0,
1071 text => "Login", 1153 text => "Login",
1072 on_activate => sub { 1154 on_activate => sub {
1073 $CONN ? stop_game 1155 $CONN ? stop_game
1074 : start_game; 1156 : start_game;
1075 0 1157 0
1076 }, 1158 },
1077 ); 1159 );
1078 1160
1079 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1161 $vbox->add (new CFPlus::UI::FancyFrame
1080 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1162 label => "Server Info",
1081 text => $CFG->{say_command}, 1163 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1082 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. "
1083 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1084 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1085 on_changed => sub {
1086 my ($self, $value) = @_;
1087 $CFG->{say_command} = $value;
1088 0
1089 }
1090 ); 1164 );
1091 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
1092 $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");
1093 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1175 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1094 state => $CFG->{show_tips}, 1176 state => $CFG->{show_tips},
1095 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?",
1096 on_changed => sub { 1178 on_changed => sub {
1097 my ($self, $value) = @_; 1179 my ($self, $value) = @_;
1098 $CFG->{show_tips} = $value; 1180 $CFG->{show_tips} = $value;
1099 0 1181 0
1100 } 1182 }
1101 ); 1183 );
1102 1184
1103 $vbox->add (new CFPlus::UI::FancyFrame 1185 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1104 label => "Server Info", 1186 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1105 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1187 text => $CFG->{logview_max_par},
1106 ); 1188 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1107 1189 . "sends more messages than this number, older messages get removed to save memory and "
1108 $vbox 1190 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1109}
1110
1111sub message_window {
1112 my $window = new CFPlus::UI::Toplevel
1113 name => "message_window",
1114 title => "Messages",
1115 border_bg => [1, 1, 1, 1],
1116 x => "max",
1117 y => 0,
1118 force_w => $::WIDTH * 0.4,
1119 force_h => $::HEIGHT * 0.5,
1120 child => (my $vbox = new CFPlus::UI::VBox),
1121 has_close_button => 1;
1122
1123 $vbox->add ($LOGVIEW);
1124
1125 $vbox->add (my $input = new CFPlus::UI::Entry
1126 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1127 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1128 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1129 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1130 on_focus_in => sub { 1191 on_changed => sub {
1131 my ($input, $prev_focus) = @_; 1192 my ($self, $value) = @_;
1132 1193 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1133 delete $input->{refocus_map};
1134
1135 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1136 $input->{refocus_map} = 1;
1137 }
1138 delete $input->{auto_activated};
1139
1140 0 1194 0
1141 }, 1195 },
1142 on_activate => sub {
1143 my ($input, $text) = @_;
1144 $input->set_text ('');
1145
1146 if ($text =~ /^\/(.*)/) {
1147 $::CONN->user_send ($1);
1148 } else {
1149 my $say_cmd = $::CFG->{say_command} || 'say';
1150 $::CONN->user_send ("$say_cmd $text");
1151 }
1152 if ($input->{refocus_map}) {
1153 delete $input->{refocus_map};
1154 $MAPWIDGET->focus_in
1155 }
1156
1157 0
1158 },
1159 on_escape => sub {
1160 $MAPWIDGET->grab_focus;
1161
1162 0
1163 },
1164 );
1165
1166 $CONSOLE = {
1167 window => $window,
1168 input => $input,
1169 }; 1196 );
1170 1197
1171 $window 1198 $table
1172} 1199}
1173 1200
1174sub autopickup_setup { 1201sub autopickup_setup {
1202 my $r = new CFPlus::UI::ScrolledWindow (
1203 expand => 1,
1204 scroll_y => 1
1205 );
1175 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 );
1176 1210
1177 for ( 1211 for (
1178 ["General", 0, 0, 1212 ["General", 0, 0,
1179 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1213 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1180 ["Inhibit autopickup" => PICKUP_INHIBIT], 1214 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1215 ], 1249 ],
1216 ["Weight/Value ratio", 2, 17] 1250 ["Weight/Value ratio", 2, 17]
1217 ) 1251 )
1218 { 1252 {
1219 my ($title, $x, $y, @bits) = @$_; 1253 my ($title, $x, $y, @bits) = @$_;
1220 $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]);
1221 1255
1222 for (@bits) { 1256 for (@bits) {
1223 ++$y; 1257 ++$y;
1224 1258
1225 my $mask = $_->[1]; 1259 my $mask = $_->[1];
1226 $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);
1227 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1261 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1228 state => $::CFG->{pickup} & $mask, 1262 state => $::CFG->{pickup} & $mask,
1229 on_changed => sub { 1263 on_changed => sub {
1230 my ($box, $value) = @_; 1264 my ($box, $value) = @_;
1231 1265
1232 if ($value) { 1266 if ($value) {
… …
1243 1277
1244 ${$_->[2]} = $checkbox if $_->[2]; 1278 ${$_->[2]} = $checkbox if $_->[2];
1245 } 1279 }
1246 } 1280 }
1247 1281
1248 $table->add (2, 18, new CFPlus::UI::ValSlider 1282 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1249 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1283 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1250 template => ">= 99", 1284 template => ">= 99",
1251 to_value => sub { ">= " . 5 * $_[0] }, 1285 to_value => sub { ">= " . 5 * $_[0] },
1252 on_changed => sub { 1286 on_changed => sub {
1253 my ($slider, $value) = @_; 1287 my ($slider, $value) = @_;
… …
1256 $::CFG->{pickup} |= int $value 1290 $::CFG->{pickup} |= int $value
1257 if $value; 1291 if $value;
1258 1; 1292 1;
1259 }); 1293 });
1260 1294
1261 $table->add (3, 18, new CFPlus::UI::Button 1295 $table->add_at (3, 18, new CFPlus::UI::Button
1262 text => "set", 1296 text => "set",
1263 on_activate => sub { 1297 on_activate => sub {
1264 $::CONN->send_command ("pickup $::CFG->{pickup}") 1298 $::CONN->send_command ("pickup $::CFG->{pickup}")
1265 if defined $::CONN; 1299 if defined $::CONN;
1266 0 1300 0
1267 }); 1301 });
1268 1302
1269 $table 1303 $r
1270} 1304}
1271 1305
1272my %SORT_ORDER = ( 1306my %SORT_ORDER = (
1273 type => undef, 1307 type => undef,
1274 mtime => sub { 1308 mtime => sub {
… …
1353 has_close_button => 1 1387 has_close_button => 1
1354 ; 1388 ;
1355 1389
1356 my $ntb = 1390 my $ntb =
1357 $PL_NOTEBOOK = 1391 $PL_NOTEBOOK =
1358 new CFPlus::UI::Notebook expand => 1, debug => 1; 1392 new CFPlus::UI::Notebook expand => 1;
1359 1393
1360 $ntb->add ( 1394 $ntb->add_tab (
1361 "Statistics (F2)" => $STATS_PAGE = stats_window, 1395 "Statistics (F2)" => $STATS_PAGE = stats_window,
1362 "Shows statistics, where all your Stats and Resistances are shown." 1396 "Shows statistics, where all your Stats and Resistances are shown."
1363 ); 1397 );
1364 $ntb->add ( 1398 $ntb->add_tab (
1365 "Skills (F3)" => $SKILL_PAGE = skill_window, 1399 "Skills (F3)" => $SKILL_PAGE = skill_window,
1366 "Shows all your Skills." 1400 "Shows all your Skills."
1367 ); 1401 );
1368 1402
1369 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1403 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1370 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1404 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1371 $ntb->add ( 1405 $ntb->add_tab (
1372 "Spellbook (F4)" => $spellsw, 1406 "Spellbook (F4)" => $spellsw,
1373 "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."
1374 ); 1408 );
1375 $ntb->add ( 1409 $ntb->add_tab (
1376 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1410 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1377 "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 :). "
1378 . "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."
1379 ); 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.");
1380 1416
1381 $ntb->set_current_page ($INVENTORY_PAGE); 1417 $ntb->set_current_page ($INVENTORY_PAGE);
1382 1418
1383 $plwin->add ($ntb); 1419 $plwin->add ($ntb);
1384 $plwin 1420 $plwin
1385} 1421}
1386 1422
1387sub update_bindings {
1388 $BIND_UPD_CB->() if $BIND_UPD_CB;
1389}
1390
1391sub keyboard_setup { 1423sub keyboard_setup {
1392 my $binding_list = new CFPlus::UI::VBox; 1424 CFPlus::Macro::keyboard_setup
1393
1394 my $refresh;
1395 $refresh = $BIND_UPD_CB = sub {
1396 $binding_list->clear ();
1397
1398 return unless $PROFILE;
1399
1400 for my $mod (keys %{$PROFILE->{bindings}}) {
1401 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1402 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1403 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1404
1405 my $lbl = join "; ", @$cmds;
1406 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1407 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1408 $hb->add (new CFPlus::UI::Button
1409 text => "delete",
1410 tooltip => "Deletes the binding",
1411 on_activate => sub {
1412 $binding_list->remove ($hb);
1413 delete $PROFILE->{bindings}{$mod}{$sym};
1414 0
1415 });
1416
1417 $hb->add (new CFPlus::UI::Button
1418 text => "edit",
1419 tooltip => "Edits the binding",
1420 on_activate => sub {
1421 $::BIND_EDITOR->set_binding (
1422 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1423 sub {
1424 my ($nmod, $nsym, $ncmds) = @_;
1425 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1426 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1427 $refresh->();
1428 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1429 $SETUP_DIALOG->show;
1430 },
1431 sub {
1432 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1433 $SETUP_DIALOG->show;
1434 });
1435 $::BIND_EDITOR->show;
1436 $SETUP_DIALOG->hide;
1437 0
1438 });
1439
1440 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1441 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1442 }
1443 }
1444 };
1445
1446 my $vb = new CFPlus::UI::VBox;
1447 $vb->add (new CFPlus::UI::FancyFrame
1448 label => "Options",
1449 child => (my $hb = new CFPlus::UI::HBox),
1450 );
1451 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1452 $hb->add (new CFPlus::UI::CheckBox
1453 expand => 1,
1454 state => $CFG->{shift_fire_stop},
1455 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1456 on_changed => sub {
1457 my ($cbox, $value) = @_;
1458 $CFG->{shift_fire_stop} = $value;
1459 0
1460 });
1461
1462 $vb->add (new CFPlus::UI::FancyFrame
1463 label => "Bindings",
1464 child => $binding_list);
1465 $vb->add (my $hb = new CFPlus::UI::HBox);
1466
1467 $hb->add (new CFPlus::UI::Button
1468 text => "record new",
1469 expand => 1,
1470 tooltip => "This button opens the binding editor with an empty binding.",
1471 on_activate => sub {
1472 $::BIND_EDITOR->set_binding (undef, undef, [],
1473 sub {
1474 my ($mod, $sym, $cmds) = @_;
1475 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1476 $refresh->();
1477 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1478 $SETUP_DIALOG->show;
1479 },
1480 sub {
1481 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1482 $SETUP_DIALOG->show;
1483 },
1484 );
1485 $SETUP_DIALOG->hide;
1486 $::BIND_EDITOR->show;
1487 0
1488 },
1489 );
1490
1491 $hb->add (new CFPlus::UI::Button
1492 text => "close",
1493 tooltip => "Closes the binding window",
1494 expand => 1,
1495 on_activate => sub {
1496 $SETUP_DIALOG->hide;
1497 0
1498 }
1499 );
1500
1501 $refresh->();
1502
1503 $vb
1504} 1425}
1505 1426
1506sub help_window { 1427sub help_window {
1507 my $win = new CFPlus::UI::Toplevel 1428 my $win = new CFPlus::UI::Toplevel
1508 x => 'center', 1429 x => 'center',
… …
1665 1586
1666sub show_tip_of_the_day { 1587sub show_tip_of_the_day {
1667 # find all tips 1588 # find all tips
1668 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1589 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1669 1590
1670 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1591 CFPlus::DB::get state => "tip_of_the_day", sub {
1592 my ($todindex) = @_;
1671 $todindex = 0 if $todindex >= @tod; 1593 $todindex = 0 if $todindex >= @tod;
1672 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1594 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1673 1595
1674 # create dialog 1596 # create dialog
1675 my $dialog; 1597 my $dialog;
1676 1598
1677 my $close = sub { 1599 my $close = sub {
1678 $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;
1679 }; 1638 };
1680
1681 $dialog = new CFPlus::UI::Toplevel
1682 x => "center",
1683 y => "center",
1684 z => 3,
1685 name => 'tip_of_the_day',
1686 force_w => int $WIDTH * 4/9,
1687 force_h => int $WIDTH * 2/9,
1688 title => "Tip of the day #" . (1 + $todindex),
1689 child => my $vbox = new CFPlus::UI::VBox,
1690 has_close_button => 1,
1691 on_delete => $close,
1692 ;
1693
1694 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1696 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697
1698 $vbox->add (my $table = new CFPlus::UI::Table);
1699
1700 $table->add (0, 0, new CFPlus::UI::Button
1701 text => "Close",
1702 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>.",
1703 on_activate => $close,
1704 );
1705
1706 $table->add (2, 0, new CFPlus::UI::Button
1707 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub {
1710 $close->();
1711 &show_tip_of_the_day;
1712 },
1713 );
1714
1715 $dialog->show;
1716} 1639}
1717 1640
1718sub sdl_init { 1641sub sdl_init {
1719 CFPlus::SDL_Init 1642 CFPlus::SDL_Init
1720 and die "SDL::Init failed!\n"; 1643 and die "SDL::Init failed!\n";
1721} 1644}
1722 1645
1723sub video_init { 1646sub video_init {
1724 sdl_init;
1725
1726 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1647 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1727 1648
1728 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1649 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1729 1650
1730 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1651 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1731 $FULLSCREEN = $CFG->{fullscreen}; 1652 $FULLSCREEN = $CFG->{fullscreen};
1732 $FAST = $CFG->{fast}; 1653 $FAST = $CFG->{fast};
1733 1654
1734 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1655 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1735 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1656 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1736 1657
1737 $SDL_ACTIVE = 1; 1658 $SDL_ACTIVE = 1;
1738 $LAST_REFRESH = time - 0.01; 1659 $LAST_REFRESH = time - 0.01;
1739 1660
… …
1754 padding => 0, 1675 padding => 0,
1755 z => 100, 1676 z => 100,
1756 force_x => "max", 1677 force_x => "max",
1757 force_y => 0; 1678 force_y => 0;
1758 $DEBUG_STATUS->show; 1679 $DEBUG_STATUS->show;
1759
1760 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1761 1680
1762 $STATUSBOX = new CFPlus::UI::Statusbox; 1681 $STATUSBOX = new CFPlus::UI::Statusbox;
1763 $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]);
1764 1683
1765 (new CFPlus::UI::Frame 1684 (new CFPlus::UI::Frame
… …
1783 1702
1784 $MAPWIDGET = new CFPlus::MapWidget; 1703 $MAPWIDGET = new CFPlus::MapWidget;
1785 $MAPWIDGET->connect (activate_console => sub { 1704 $MAPWIDGET->connect (activate_console => sub {
1786 my ($mapwidget, $preset) = @_; 1705 my ($mapwidget, $preset) = @_;
1787 1706
1788 if ($CONSOLE) { 1707 $MESSAGE_WINDOW->activate_console ($preset)
1789 $CONSOLE->{input}->{auto_activated} = 1; 1708 if $MESSAGE_WINDOW;
1790 $CONSOLE->{input}->grab_focus;
1791
1792 if ($preset && $CONSOLE->{input}->get_text eq '') {
1793 $CONSOLE->{input}->set_text ($preset);
1794 }
1795 }
1796 }); 1709 });
1797 $MAPWIDGET->show; 1710 $MAPWIDGET->show;
1798 $MAPWIDGET->grab_focus; 1711 $MAPWIDGET->grab_focus;
1799
1800 $LOGVIEW = new CFPlus::UI::TextScroller
1801 expand => 1,
1802 font => $FONT_FIXED,
1803 fontsize => $::CFG->{log_fontsize},
1804 indent => -4,
1805 can_hover => 1,
1806 can_events => 1,
1807 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1808 ;
1809 1712
1810 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1713 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1811 title => "Setup", 1714 title => "Setup",
1812 name => "setup_dialog", 1715 name => "setup_dialog",
1813 x => 'center', 1716 x => 'center',
… …
1817 force_h => $::HEIGHT * 0.6, 1720 force_h => $::HEIGHT * 0.6,
1818 has_close_button => 1, 1721 has_close_button => 1,
1819 ; 1722 ;
1820 1723
1821 $METASERVER = metaserver_dialog; 1724 $METASERVER = metaserver_dialog;
1725 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1822 1726
1823 $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,
1824 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1728 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1825 1729
1826 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1730 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1827 "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.");
1828 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1732 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1829 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1733 "Configure various client-specific settings.");
1830 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1734 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1831 "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.");
1832 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1736 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1833 "Configure the use of audio, sound effects and background music."); 1737 "Configure the use of audio, sound effects and background music.");
1834 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1738 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1835 "Lets you define, edit and delete key bindings." 1739 "Lets you define, edit and delete key bindings."
1836 . "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 "
1837 . "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 "
1838 . "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. "
1839 . "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 "
1840 . "binding editor closes"); 1744 . "binding editor closes");
1841 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1745 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1842 "Some debuggin' options. Do not ask."); 1746 "Some debuggin' options. Do not ask.");
1843 1747
1844 $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
1845 1749
1846 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1750 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1847 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.");
1848 1752
1849 $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,
1850 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.");
1851 1755
1852 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
1853 1757
1854 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1758 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1887 } 1791 }
1888 1792
1889 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1793 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1890} 1794}
1891 1795
1892sub setup_build_button {
1893 my ($enabled) = @_;
1894 if ($enabled) {
1895 $BUILD_BUTTON ||= new CFPlus::UI::Button
1896 text => "Build",
1897 tooltip => "Opens the ingame builder",
1898 on_activate => sub {
1899 if ($CONN) {
1900 $CONN->send_ext_req (builder_player_items => sub {
1901 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1902 });
1903 }
1904 0
1905 };
1906 $BUTTONBAR->add ($BUILD_BUTTON);
1907 } else {
1908 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1909 }
1910}
1911
1912sub open_ingame_editor {
1913 my ($msg) = @_;
1914
1915 my $win = new CFPlus::UI::Toplevel
1916 x => 0,
1917 y => 'center',
1918 z => 4,
1919 name => 'builder_window',
1920 force_w => int $WIDTH * 1/4,
1921 force_h => int $HEIGHT * 3/4,
1922 title => "In game builder",
1923 has_close_button => 1;
1924
1925 my $r = new CFPlus::UI::ScrolledWindow (
1926 expand => 1,
1927 scroll_y => 1
1928 );
1929 $r->add (my $vb = new CFPlus::UI::VBox);
1930 $win->add ($r);
1931
1932
1933 $vb->add (
1934 new CFPlus::UI::Button
1935 text => "Disable build mode",
1936 on_activate => sub { $::IN_BUILD_MODE = undef }
1937 );
1938 $vb->add (
1939 new CFPlus::UI::Button
1940 text => "ERASE",
1941 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1942 );
1943
1944 for my $itemarchname (
1945 sort {
1946 $msg->{items}->{$a}->{build_arch_name}
1947 cmp $msg->{items}->{$b}->{build_arch_name}
1948 } keys %{$msg->{items}}
1949 ) {
1950 my $info = $msg->{items}->{$itemarchname};
1951 $vb->add (
1952 new CFPlus::UI::Button text => $info->{build_arch_name},
1953 on_activate => sub {
1954 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1955
1956 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1957 build_mode_query_arch_info ();
1958 }
1959 }
1960 );
1961 }
1962
1963 $win->show;
1964}
1965
1966sub build_mode_query_arch_info {
1967 my ($iteminfo) = $::IN_BUILD_MODE;
1968 my $itemarchname = $iteminfo->{item};
1969 my $info = $iteminfo->{info};
1970
1971 my $dialog = new CFPlus::UI::Toplevel
1972 x => "center",
1973 y => "center",
1974 z => 50,
1975 force_w => int $WIDTH * 1/2,
1976 title => "Enter information for placement of '$itemarchname'",
1977 has_close_button => 1;
1978
1979 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1980
1981 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1982 my $row = 0;
1983 if ($info->{has_name}) {
1984 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1985 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1986 }
1987 if ($info->{has_text}) {
1988 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1989 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1990 }
1991 if ($info->{has_connection}) {
1992 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1993 $table->add (1, $row++,
1994 new CFPlus::UI::Entry
1995 expand => 1,
1996 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1997 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1998 );
1999 }
2000
2001 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2002 $hb->add (new CFPlus::UI::Button
2003 text => "Close",
2004 expand => 1,
2005 on_activate => sub { $dialog->hide; 0 },
2006 );
2007 $dialog->show;
2008}
2009
2010sub video_shutdown { 1796sub video_shutdown {
2011 CFPlus::OpenGL::shutdown; 1797 CFPlus::OpenGL::shutdown;
2012 1798
2013 undef $SDL_ACTIVE; 1799 undef $SDL_ACTIVE;
2014} 1800}
2015 1801
2016my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
2017my $bgmusic;#TODO#hack#d#
2018
2019sub audio_channel_finished { 1802sub audio_channel_finished {
2020 my ($channel) = @_; 1803 my ($channel) = @_;
2021 1804
2022 #warn "channel $channel finished\n";#d# 1805 #warn "channel $channel finished\n";#d#
2023} 1806}
2024 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
2025sub audio_music_finished { 1889sub audio_music_finished {
2026 return unless $CFG->{bgm_enable}; 1890 undef $MUSIC_PLAYER;
1891 undef $MUSIC_PLAYING_META;
1892 undef $MUSIC_PLAYING_DATA;
2027 1893
2028 # TODO: hack, do play loop and mood music 1894 audio_music_changed;
2029 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
2030 $bgmusic->play (0);
2031
2032 push @bgmusic, shift @bgmusic;
2033} 1895}
2034 1896
2035sub audio_init { 1897sub audio_init {
2036 if ($CFG->{audio_enable}) { 1898 if ($CFG->{audio_enable}) {
2037 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1899 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1900 $ENV{MIX_EFFECTSMAXSPEED} = 1;
2038 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1901 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2039 1902
2040 unless ($SDL_MIXER) { 1903 unless ($SDL_MIXER) {
2041 status "Unable to open sound device: there will be no sound"; 1904 status "Unable to open sound device: there will be no sound";
2042 return; 1905 return;
… …
2055 my ($file, $volume, $event) = split /\s+/, $_, 3; 1918 my ($file, $volume, $event) = split /\s+/, $_, 3;
2056 1919
2057 push @SOUNDS, "$volume,$file"; 1920 push @SOUNDS, "$volume,$file";
2058 1921
2059 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 1922 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2060 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;
2061 $chunk->volume ($volume * 128 / 100); 1925 $chunk->volume ($volume * 128 / 100);
2062 $chunk 1926 $chunk
2063 }; 1927 };
2064 } 1928 }
2065 } else { 1929 } else {
2066 status "unable to open sound config: $!"; 1930 status "unable to open sound config: $!";
2067 } 1931 }
1932 } else {
1933 undef $SDL_MIXER;
2068 } 1934 }
2069} 1935}
2070 1936
2071sub audio_shutdown { 1937sub audio_shutdown {
2072 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1938 CFPlus::Mix_CloseAudio if $SDL_MIXER;
… …
2087 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1953 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2088 1954
2089 $CFPlus::UI::ROOT->draw; 1955 $CFPlus::UI::ROOT->draw;
2090 1956
2091 $WANT_REFRESH = 0; 1957 $WANT_REFRESH = 0;
2092 $CAN_REFRESH = 0; 1958 $CAN_REFRESH = 0;
2093 $LAST_REFRESH = $NOW; 1959 $LAST_REFRESH = $NOW;
2094 1960
2095 CFPlus::SDL_GL_SwapBuffers; 1961 CFPlus::SDL_GL_SwapBuffers;
2096} 1962}
2097 1963
2098my $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 {
2099 $NOW = time; 1965 $NOW = time;
2100 1966
2101 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1967 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2102 for CFPlus::SDL_PollEvent; 1968 for CFPlus::poll_events;
2103 1969
2104 if (%animate_object) { 1970 if (%animate_object) {
2105 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1971 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2106 $WANT_REFRESH++; 1972 ++$WANT_REFRESH;
2107 } 1973 }
2108 1974
2109 if ($WANT_REFRESH) { 1975 if ($WANT_REFRESH) {
2110 force_refresh; 1976 force_refresh;
2111 } else { 1977 } else {
… …
2121sub animation_stop { 1987sub animation_stop {
2122 my ($widget) = @_; 1988 my ($widget) = @_;
2123 delete $animate_object{$widget}; 1989 delete $animate_object{$widget};
2124} 1990}
2125 1991
2126# check once/second for faces that need to be prefetched
2127# this should, of course, only run on demand, but
2128# SDL forces worse things on us....
2129
2130Event->timer (after => 1, interval => 0.25, cb => sub {
2131 $CONN->face_prefetch
2132 if $CONN;
2133});
2134
2135%SDL_CB = ( 1992%SDL_CB = (
2136 CFPlus::SDL_QUIT => sub { 1993 CFPlus::SDL_QUIT => sub {
2137 Event::unloop -1; 1994 exit;
2138 }, 1995 },
2139 CFPlus::SDL_VIDEORESIZE => sub { 1996 CFPlus::SDL_VIDEORESIZE => sub {
2140 }, 1997 },
2141 CFPlus::SDL_VIDEOEXPOSE => sub { 1998 CFPlus::SDL_VIDEOEXPOSE => sub {
2142 CFPlus::UI::full_refresh; 1999 CFPlus::UI::full_refresh;
2143 }, 2000 },
2144 CFPlus::SDL_ACTIVEEVENT => sub { 2001 CFPlus::SDL_ACTIVEEVENT => sub {
2145# 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;
2146 }, 2008 },
2147 CFPlus::SDL_KEYDOWN => sub { 2009 CFPlus::SDL_KEYDOWN => sub {
2148 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2010 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2149 # alt-enter 2011 # alt-enter
2150 $FULLSCREEN_ENABLE->toggle; 2012 $FULLSCREEN_ENABLE->toggle;
… …
2171 2033
2172$SIG{INT} = $SIG{TERM} = sub { exit }; 2034$SIG{INT} = $SIG{TERM} = sub { exit };
2173 2035
2174{ 2036{
2175 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2037 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2038 CFPlus::DB::Server::run;
2039
2176 CFPlus::UI::set_layout ($::CFG->{layout}); 2040 CFPlus::UI::set_layout ($::CFG->{layout});
2177 2041
2178 my %DEF_CFG = ( 2042 my %DEF_CFG = (
2179 sdl_mode => 0, 2043 sdl_mode => 0,
2180 width => 640, 2044 width => 640,
2181 height => 480, 2045 height => 480,
2182 fullscreen => 0, 2046 fullscreen => 0,
2183 fast => 0, 2047 fast => 0,
2184 map_scale => 1, 2048 map_scale => 1,
2185 fow_enable => 1, 2049 fow_enable => 1,
2186 fow_intensity => 0.45, 2050 fow_intensity => 0,
2187 fow_smooth => 0, 2051 map_smoothing => 1,
2188 gui_fontsize => 1, 2052 gui_fontsize => 1,
2189 log_fontsize => 0.7, 2053 log_fontsize => 0.7,
2190 gauge_fontsize => 1, 2054 gauge_fontsize => 1,
2191 gauge_size => 0.35, 2055 gauge_size => 0.35,
2192 stat_fontsize => 0.7, 2056 stat_fontsize => 0.7,
2193 mapsize => 100, 2057 mapsize => 100,
2194 say_command => 'chat',
2195 audio_enable => 1, 2058 audio_enable => 1,
2196 bgm_enable => 1, 2059 bgm_enable => 1,
2197 bgm_volume => 0.25, 2060 bgm_volume => 0.25,
2198 face_prefetch => 0,
2199 output_sync => 1, 2061 output_sync => 1,
2200 output_count => 1, 2062 output_count => 1,
2063 output_rate => "",
2201 pickup => 0, 2064 pickup => 0,
2202 inv_sort => "mtime", 2065 inv_sort => "mtime",
2203 default => "profile", # default profile 2066 default => "profile", # default profile
2204 show_tips => 1, 2067 show_tips => 1,
2068 logview_max_par => 1000,
2205 ); 2069 );
2206 2070
2207 while (my ($k, $v) = each %DEF_CFG) { 2071 while (my ($k, $v) = each %DEF_CFG) {
2208 $CFG->{$k} = $v unless exists $CFG->{$k}; 2072 $CFG->{$k} = $v unless exists $CFG->{$k};
2209 } 2073 }
2210 2074
2211 $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 }
2212 2089
2213 sdl_init; 2090 sdl_init;
2214 2091
2215 @SDL_MODES = reverse 2092 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2216 grep $_->[0] >= 640 && $_->[1] >= 480, 2093 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2217 CFPlus::SDL_ListModes;
2218
2219 @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;
2220 2097
2221 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2098 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2222 2099
2223 { 2100 {
2224 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2101 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2265 2142
2266Event::loop; 2143Event::loop;
2267#CFPlus::SDL_Quit; 2144#CFPlus::SDL_Quit;
2268#CFPlus::_exit 0; 2145#CFPlus::_exit 0;
2269 2146
2147END {
2270END { CFPlus::SDL_Quit } 2148 CFPlus::SDL_Quit;
2149 CFPlus::DB::Server::stop;
2150}
2271 2151
2272=head1 NAME 2152=head1 NAME
2273 2153
2274cfplus - A Crossfire+ and Crossfire game client 2154cfplus - A Crossfire+ and Crossfire game client
2275 2155

Diff Legend

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