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.132 by root, Mon Nov 20 16:41:46 2006 UTC vs.
Revision 1.184 by root, Mon Jul 23 15:30:46 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;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
139our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
140our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
141 172
142our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
143our $STATUSBOX; 174our $STATUSBOX;
… …
145 176
146our $INV; 177our $INV;
147our $INVR; 178our $INVR;
148our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
149 180
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 181our $PICKUP_CFG;
182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
154 185
155sub status { 186sub status {
156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
157} 188}
158 189
… …
160 $DEBUG_STATUS->set_text ($_[0]); 191 $DEBUG_STATUS->set_text ($_[0]);
161} 192}
162 193
163sub message { 194sub message {
164 my ($para) = @_; 195 my ($para) = @_;
165 196 $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} 197}
173 198
174sub destroy_query_dialog { 199sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 200 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 201 if $_[0]{query_dialog};
177} 202}
178 203
204# FIXME: a very ugly hack to wait for stat update look below! #d#
205our $QUERY_TIMER; #d#
206
179# server query dialog 207# server query dialog
180sub server_query { 208sub server_query {
181 my ($conn, $flags, $prompt) = @_; 209 my ($conn, $flags, $prompt) = @_;
210
211 # FIXME: a very ugly hack to wait for stat update #d#
212 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
213 unless ($QUERY_TIMER) {
214 $QUERY_TIMER =
215 Event->timer (
216 after => 1,
217 cb => sub {
218 server_query ($conn, $flags, $prompt, 1);
219 $QUERY_TIMER = undef
220 }
221 );
222 return;
223 }
224 }
182 225
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 226 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 227 x => "center",
185 y => "center", 228 y => "center",
186 title => "Server Query", 229 title => "Server Query",
187 child => my $vbox = new CFPlus::UI::VBox, 230 child => my $vbox = new CFPlus::UI::VBox,
188 ; 231 ;
189 232
190 my @dialog = my $label = new CFPlus::UI::Label 233 my @dialog = my $label = new CFPlus::UI::Label
191 max_w => $::WIDTH * 0.4, 234 max_w => $::WIDTH * 0.8,
192 ellipsise => 0, 235 ellipsise => 0,
193 text => $prompt; 236 text => $prompt;
194 237
195 if ($flags & CS_QUERY_YESNO) { 238 if ($flags & CS_QUERY_YESNO) {
196 push @dialog, my $hbox = new CFPlus::UI::HBox; 239 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
213 ); 256 );
214 257
215 $dialog->grab_focus; 258 $dialog->grab_focus;
216 259
217 } elsif ($flags & CS_QUERY_SINGLECHAR) { 260 } 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) { 261 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
221 $MESSAGE_WINDOW->show; 262 $dialog->{tooltip} = "#charcreation_focus";
222 263
223 unshift @dialog, new CFPlus::UI::Label 264 unshift @dialog, new CFPlus::UI::Label
224 max_w => $::WIDTH * 0.4, 265 max_w => $::WIDTH * 0.8,
225 ellipsise => 0, 266 ellipsise => 0,
226 markup => "\nOr use your keyboard and the text entry below:\n"; 267 markup => "\nOr use your keyboard and the text entry below:\n";
227 268
228 unshift @dialog, my $table = new CFPlus::UI::Table; 269 unshift @dialog, my $table = new CFPlus::UI::Table;
229 270
230 $table->add (0, 0, new CFPlus::UI::Button 271 $table->add_at (0, 0, new CFPlus::UI::Button
231 text => "Next Race", 272 text => "Next Race",
232 on_activate => sub { 273 on_activate => sub {
233 $conn->send ("reply n"); 274 $conn->send ("reply n");
234 destroy_query_dialog $conn; 275 destroy_query_dialog $conn;
235 0 276 0
236 }, 277 },
237 ); 278 );
238 $table->add (2, 0, new CFPlus::UI::Button 279 $table->add_at (2, 0, new CFPlus::UI::Button
239 text => "Accept", 280 text => "Accept",
240 on_activate => sub { 281 on_activate => sub {
241 $conn->send ("reply d"); 282 $conn->send ("reply d");
242 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
243 0 284 0
244 }, 285 },
245 ); 286 );
246 287
288 if ($conn->{chargen_race_description}) {
289 unshift @dialog, new CFPlus::UI::Label
290 max_w => $::WIDTH * 0.8,
291 ellipsise => 0,
292 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
293 ;
294 }
295
296 unshift @dialog, new CFPlus::UI::Face
297 face => $conn->{player}{face},
298 bg => [.2, .2, .2, 1],
299 min_w => 64,
300 min_h => 64,
301 ;
302
303 if ($conn->{chargen_race_title}) {
304 unshift @dialog, new CFPlus::UI::Label
305 allign => 1,
306 ellipsise => 0,
307 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
308 ;
309 }
310
247 unshift @dialog, new CFPlus::UI::Label 311 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 312 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 313 ellipsise => 0,
250 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 314 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
251 ; 315 ;
… …
255 $conn->send ("reply $stat"); 319 $conn->send ("reply $stat");
256 destroy_query_dialog $conn; 320 destroy_query_dialog $conn;
257 return; 321 return;
258 } 322 }
259 323
260 $STATS_PAGE->show;
261 $MESSAGE_WINDOW->hide;
262
263 unshift @dialog, new CFPlus::UI::Label 324 unshift @dialog, new CFPlus::UI::Label
264 max_w => $::WIDTH * 0.4, 325 max_w => $::WIDTH * 0.4,
265 ellipsise => 0, 326 ellipsise => 0,
266 markup => "\nOr use your keyboard and the text entry below:\n"; 327 markup => "\nOr use your keyboard and the text entry below:\n";
267 328
268 unshift @dialog, my $table = new CFPlus::UI::Table; 329 unshift @dialog, my $table = new CFPlus::UI::Table;
269 330
270 # left: re-roll 331 # left: re-roll
271 $table->add (0, 0, new CFPlus::UI::Button 332 $table->add_at (0, 0, new CFPlus::UI::Button
272 text => "Roll Again", 333 text => "Roll Again",
273 on_activate => sub { 334 on_activate => sub {
274 $conn->send ("reply y"); 335 $conn->send ("reply y");
275 destroy_query_dialog $conn; 336 destroy_query_dialog $conn;
276 0 337 0
… …
290 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 351 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
291 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 352 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
292 ], 353 ],
293 ), 1 .. 2; 354 ), 1 .. 2;
294 355
295 $table->add (2, 0, new CFPlus::UI::Button 356 $table->add_at (2, 0, new CFPlus::UI::Button
296 text => "Swap Stats", 357 text => "Swap Stats",
297 on_activate => sub { 358 on_activate => sub {
298 $conn->{stat_change_with} = $sw2->{value}; 359 $conn->{stat_change_with} = $sw2->{value};
299 $conn->send ("reply $sw1->{value}"); 360 $conn->send ("reply $sw1->{value}");
300 destroy_query_dialog $conn; 361 destroy_query_dialog $conn;
301 0 362 0
302 }, 363 },
303 ); 364 );
304 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 365 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
305 366
306 # right: accept 367 # right: accept
307 $table->add (4, 0, new CFPlus::UI::Button 368 $table->add_at (4, 0, new CFPlus::UI::Button
308 text => "Accept", 369 text => "Accept",
309 on_activate => sub { 370 on_activate => sub {
310 $conn->send ("reply n"); 371 $conn->send ("reply n");
311 $STATS_PAGE->hide; 372 $STATS_PAGE->hide;
312 destroy_query_dialog $conn; 373 destroy_query_dialog $conn;
… …
375 status "logging in..."; 436 status "logging in...";
376 437
377 $LOGIN_BUTTON->set_text ("Logout"); 438 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 439 $SETUP_DIALOG->hide;
379 440
380 $PROFILE = $CFG->{profile}{default};
381
382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 441 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
383 442
384 my ($host, $port) = split /:/, $PROFILE->{host}; 443 my ($host, $port) = split /:/, $PROFILE->{host};
385 444
386 $MAP = new CFPlus::Map; 445 $MAP = new CFPlus::Map;
… …
395 maph => $mapsize, 454 maph => $mapsize,
396 455
397 client => "cfplus $CFPlus::VERSION $] $^O", 456 client => "cfplus $CFPlus::VERSION $] $^O",
398 457
399 map_widget => $MAPWIDGET, 458 map_widget => $MAPWIDGET,
400 logview => $LOGVIEW,
401 statusbox => $STATUSBOX, 459 statusbox => $STATUSBOX,
402 map => $MAP, 460 map => $MAP,
403 mapmap => $MAPMAP, 461 mapmap => $MAPMAP,
404 query => \&server_query, 462 query => \&server_query,
463
464 setup_req => {
465 smoothing => $CFG->{map_smoothing}*1,
466 },
405 467
406 sound_play => sub { 468 sound_play => sub {
407 my ($x, $y, $soundnum, $type) = @_; 469 my ($x, $y, $soundnum, $type) = @_;
408 470
409 $SDL_MIXER 471 $SDL_MIXER
… …
430 $LOGIN_BUTTON->set_text ("Login"); 492 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 493 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 494 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 495 $PL_WINDOW->hide;
434 $SPELL_LIST->clear_spells; 496 $SPELL_LIST->clear_spells;
497 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
498
499 &audio_music_set ([]);
435 500
436 return unless $CONN; 501 return unless $CONN;
437 502
438 status "connection closed"; 503 status "connection closed";
439 504
… …
447sub graphics_setup { 512sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 513 my $vbox = new CFPlus::UI::VBox;
449 514
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 515 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 516
517 my $row = 0;
518
519 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
520 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
521 can_events => 1,
522 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
523
524 my $vidmode_tooltip =
525 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
526 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
527
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 528 $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); 529 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 530
531 $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]); 532 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"); 533 tooltip => $vidmode_tooltip);
534 $hbox->add (my $mode_label = new CFPlus::UI::Label
535 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
536 can_events => 1, tooltip => $vidmode_tooltip);
457 537
458 $mode_slider->connect (changed => sub { 538 $mode_slider->connect (changed => sub {
459 my ($self, $value) = @_; 539 my ($self, $value) = @_;
460 540
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 541 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 542 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
463 }); 543 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 544 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465 545
466 my $row = 1;
467
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 546 $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 547 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 548 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 549 tooltip => "Bring the client into fullscreen mode.",
472 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 550 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
473 ); 551 );
474 552
475 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 553 $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 554 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
477 state => $CFG->{fast}, 555 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 556 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 557 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 558 );
481 559
560 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
561 $table->add_at (1, $row++, new CFPlus::UI::Slider
562 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
563 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
564 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
565 );
566
567 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the video settings above.",
570 on_activate => sub {
571 video_shutdown ();
572 video_init ();
573 0
574 }
575 );
576
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 577 $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 578 $table->add_at (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 579 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 580 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 581 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
487 ); 582 );
488 583
584 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
585 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
586 state => $CFG->{map_smoothing},
587 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
588 . "This increases load on the graphics subsystem and works only with 2.x servers. "
589 . "Changes take effect at next connection only.",
590 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
591 );
592
489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 593 $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 594 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 595 state => $CFG->{fow_enable},
492 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 596 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 } 597 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
494 ); 598 );
495 599
496 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 600 $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 601 $table->add_at (1, $row++, new CFPlus::UI::Slider
498 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 602 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.", 603 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 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
501 ); 605 );
502 606
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"); 607 $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 608 $table->add_at (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 609 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.", 610 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 }, 611 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
527 ); 612 );
528 613
529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 614 $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 615 $table->add_at (1, $row++, new CFPlus::UI::Slider
531 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 616 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.", 617 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
533 on_changed => sub { 618 on_changed => sub {
534 $CFG->{gauge_fontsize} = $_[1]; 619 $CFG->{gauge_fontsize} = $_[1];
535 &set_gauge_window_fontsize; 620 &set_gauge_window_fontsize;
536 0 621 0
537 } 622 }
538 ); 623 );
539 624
540 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 625 $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 626 $table->add_at (1, $row++, new CFPlus::UI::Slider
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 627 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 628 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
544 on_changed => sub { 629 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 630 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 631 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
547 0 632 0
548 } 633 }
549 ); 634 );
550 635
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 636 $vbox
562} 637}
563 638
564sub audio_setup { 639sub audio_setup {
565 my $vbox = new CFPlus::UI::VBox; 640 my $vbox = new CFPlus::UI::VBox;
566 641
567 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 642 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
568 643
569 my $row = 0; 644 my $row = 0;
570 645
571 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 646 $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 647 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
573 state => $CFG->{audio_enable}, 648 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.", 649 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 } 650 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
576 ); 651 );
577# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 652# $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 { 653# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
579# $CFG->{effects_volume} = $_[1]; 654# $CFG->{effects_volume} = $_[1];
580# }); 655# });
581 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 656 $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); 657 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
583 $hbox->add (new CFPlus::UI::CheckBox 658 $hbox->add (new CFPlus::UI::CheckBox
584 expand => 1, state => $CFG->{bgm_enable}, 659 expand => 1, state => $CFG->{bgm_enable},
585 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 660 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 } 661 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
587 ); 662 );
… …
589 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 664 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
590 tooltip => "The volume of the background music. Changes are instant.", 665 tooltip => "The volume of the background music. Changes are instant.",
591 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 666 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
592 ); 667 );
593 668
594 $table->add (1, $row++, new CFPlus::UI::Button 669 $table->add_at (1, $row++, new CFPlus::UI::Button
595 expand => 1, align => 0, text => "Apply", 670 expand => 1, align => 0, text => "Apply",
596 tooltip => "Apply the audio settings", 671 tooltip => "Apply the audio settings",
597 on_activate => sub { 672 on_activate => sub {
598 audio_shutdown (); 673 audio_shutdown ();
599 audio_init (); 674 audio_init ();
… …
658} 733}
659 734
660sub debug_setup { 735sub debug_setup {
661 my $table = new CFPlus::UI::Table; 736 my $table = new CFPlus::UI::Table;
662 737
663 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 738 $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 }); 739 $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"); 740 $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 }); 741 $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"); 742 $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 }); 743 $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"); 744 $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 }); 745 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
671 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 746 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
672 747
673 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 748 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
674 749
675 for my $x (0..2) { 750 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
676 for my $y (0 .. 2) { 751 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
677 $table->add ($x + 3, $y, 752 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
678 new CFPlus::UI::Entry 753 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
679 text => $default_smooth[$x * 3 + $y], 754 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
680 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 755 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
681 ); 756
682 } 757 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
758
759 $c->add_items ({
760 type => "line_loop",
761 color => [0, 1, 0],
762 width => 9,
763 coord_mode => "abs",
764 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
683 } 765 });
684 766
767 $c->add_items ({
768 type => "lines",
769 color => [1, 1, 0],
770 width => 2,
771 coord_mode => "rel",
772 coord => [[0,0], [1,1], [1,0], [0,1]],
773 });
774
775 $c->add_items ({
776 type => "polygon",
777 color => [0, 0.43, 0],
778 width => 2,
779 coord_mode => "rel",
780 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
781 });
685 782
686 $table 783 $table
687} 784}
688 785
689sub stats_window { 786sub stats_window {
… …
737 [2, 4, st_spd => "Spd", 10.54], 834 [2, 4, st_spd => "Spd", 10.54],
738 [2, 5, st_wspd => "WSp", 10.54], 835 [2, 5, st_wspd => "WSp", 10.54],
739 ) { 836 ) {
740 my ($col, $row, $id, $label, $template) = @$_; 837 my ($col, $row, $id, $label, $template) = @$_;
741 838
742 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 839 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
743 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 840 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
744 align => +1, template => $template, tooltip => "#stat_$label"); 841 align => +1, template => $template, tooltip => "#stat_$label");
745 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 842 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
746 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 843 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
747 align => -1, text => $label, tooltip => "#stat_$label"); 844 align => -1, text => $label, tooltip => "#stat_$label");
748 } 845 }
749 846
750 $vb->add (new CFPlus::UI::FancyFrame 847 $vb->add (new CFPlus::UI::FancyFrame
… …
791 cold => ["Cold", 888 cold => ["Cold",
792 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 889 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
793 ghit => ["Ghost hit", 890 ghit => ["Ghost hit",
794 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 891 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
795 ); 892 );
893
796 for (qw/slow holyw conf fire depl magic 894 for (qw/slow holyw conf fire depl magic
797 drain acid pois para deat phys 895 drain acid pois para deat phys
798 blind fear tund elec cold ghit/) 896 blind fear tund elec cold ghit/)
799 { 897 {
800 $tbl2->add ($col, $row, 898 $tbl2->add_at ($col, $row,
801 $STATWIDS->{"res_$_"} = 899 $STATWIDS->{"res_$_"} =
802 new CFPlus::UI::Label 900 new CFPlus::UI::Label
803 font => $FONT_FIXED, 901 font => $FONT_FIXED,
804 template => "-100%", 902 template => "-100%",
805 align => +1, 903 align => +1,
806 valign => 0, 904 valign => 0,
807 can_events => 1, 905 can_events => 1,
808 can_hover => 1, 906 can_hover => 1,
809 tooltip => $resist_names{$_}->[1], 907 tooltip => $resist_names{$_}->[1],
810 ); 908 );
811 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 909 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
812 font => $FONT_FIXED, 910 font => $FONT_FIXED,
813 can_hover => 1, 911 can_hover => 1,
814 can_events => 1, 912 can_events => 1,
815 path => "ui/resist/resist_$_.png", 913 path => "ui/resist/resist_$_.png",
816 tooltip => $resist_names{$_}->[1], 914 tooltip => $resist_names{$_}->[1],
817 ); 915 );
818 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 916 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
819 text => $resist_names{$_}->[0], 917 text => $resist_names{$_}->[0],
820 font => $FONT_FIXED, 918 font => $FONT_FIXED,
821 can_hover => 1, 919 can_hover => 1,
822 can_events => 1, 920 can_events => 1,
823 tooltip => $resist_names{$_}->[1], 921 tooltip => $resist_names{$_}->[1],
… …
856 return if $METASERVER_ATIME > time; 954 return if $METASERVER_ATIME > time;
857 $METASERVER_ATIME = time + 60; 955 $METASERVER_ATIME = time + 60;
858 956
859 my $table = $METASERVER->{table}; 957 my $table = $METASERVER->{table};
860 $table->clear; 958 $table->clear;
861 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 959 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
862 960
863 my $ok = 0; 961 my $ok = 0;
864 962
865 CFPlus::background { 963 CFPlus::background {
866 my $ua = CFPlus::lwp_useragent; 964 my $ua = CFPlus::lwp_useragent;
… …
877 "The time this server has been running without being restarted.", 975 "The time this server has been running without being restarted.",
878 "The server software version - a '+' indicates a Crossfire+ server.", 976 "The server software version - a '+' indicates a Crossfire+ server.",
879 "Short information about this server provided by its admins.", 977 "Short information about this server provided by its admins.",
880 ); 978 );
881 my @col = qw(#Users Host Uptime Version Description); 979 my @col = qw(#Users Host Uptime Version Description);
882 $table->add ($_, 0, new CFPlus::UI::Label 980 $table->add_at ($_, 0, new CFPlus::UI::Label
883 can_hover => 1, can_events => 1, 981 can_hover => 1, can_events => 1,
884 align => 0, fg => [1, 1, 0], 982 align => 0, fg => [1, 1, 0],
885 text => $col[$_], tooltip => $tip[$_]) 983 text => $col[$_], tooltip => $tip[$_])
886 for 0 .. $#col; 984 for 0 .. $#col;
887 985
888 my @align = qw(1 0 1 1 -1); 986 my @align = qw(1 0 1 1 -1);
889 987
890 my $y = 0; 988 my $y = 0;
891 for my $m (
892 sort {
893 $b->{version} <=> $a->{version}
894 or $b->{users} <=> $a->{users}
895 }
896 @{ $msg->{servers} } 989 for my $m (@{ $msg->{servers} }) {
897 ) {
898 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 990 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
899 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 991 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
900 992
901 for ($desc) { 993 for ($desc) {
902 s/<br>/\n/gi; 994 s/<br>/\n/gi;
903 s/<li>/\n· /gi; 995 s/<li>/\n· /gi;
904 s/<.*?>//sgi; 996 s/<.*?>//sgi;
… …
915 1007
916 $m = [$users, $host, $uptime, $version, $desc]; 1008 $m = [$users, $host, $uptime, $version, $desc];
917 1009
918 $y++; 1010 $y++;
919 1011
920 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1012 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
921 (new CFPlus::UI::Button 1013 (new CFPlus::UI::Button
922 text => "Use", 1014 text => "Use",
923 tooltip => "Put this server into the <b>Host:Port</b> field", 1015 tooltip => "Put this server into the <b>Host:Port</b> field",
924 on_activate => sub { 1016 on_activate => sub {
925 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1017 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
928 }, 1020 },
929 ), 1021 ),
930 (new CFPlus::UI::Empty expand => 1), 1022 (new CFPlus::UI::Empty expand => 1),
931 ]); 1023 ]);
932 1024
933 $table->add ($_, $y, new CFPlus::UI::Label 1025 $table->add_at ($_, $y, new CFPlus::UI::Label
934 max_w => $::WIDTH * 0.4, 1026 max_w => $::WIDTH * 0.4,
935 ellipsise => 0, 1027 ellipsise => 0,
936 align => $align[$_], 1028 align => $align[$_],
937 text => $m->[$_], 1029 text => $m->[$_],
938 tooltip => $tip[$_], 1030 tooltip => $tip[$_],
939 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1031 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
940 can_hover => 1, 1032 can_hover => 1,
941 can_events => 1, 1033 can_events => 1,
942 fontsize => 0.8) 1034 fontsize => 0.8)
943 for 0 .. $#$m; 1035 for 0 .. $#$m;
944 } 1036 }
… …
979 1071
980 $vbox->add (new CFPlus::UI::FancyFrame 1072 $vbox->add (new CFPlus::UI::FancyFrame
981 label => "Connection Settings", 1073 label => "Connection Settings",
982 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1074 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
983 ); 1075 );
984 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1076 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
985 1077
986 { 1078 {
987 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1079 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
988 1080
989 $vbox->add ( 1081 $vbox->add (
990 $HOST_ENTRY = new CFPlus::UI::Entry 1082 $HOST_ENTRY = new CFPlus::UI::Entry
991 expand => 1, 1083 expand => 1,
992 text => $CFG->{profile}{default}{host}, 1084 text => $CFG->{profile}{default}{host},
… …
1006 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1098 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1007 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1099 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1008 ); 1100 );
1009 } 1101 }
1010 1102
1011 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1103 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1012 $table->add (1, 4, new CFPlus::UI::Entry 1104 $table->add_at (1, 4, new CFPlus::UI::Entry
1013 text => $CFG->{profile}{default}{user}, 1105 text => $CFG->{profile}{default}{user},
1014 tooltip => "The name of your character on the server", 1106 tooltip => "The name of your character on the server",
1015 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1016 ); 1108 );
1017 1109
1018 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1110 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1019 $table->add (1, 5, new CFPlus::UI::Entry 1111 $table->add_at (1, 5, new CFPlus::UI::Entry
1020 text => $CFG->{profile}{default}{password}, 1112 text => $CFG->{profile}{default}{password},
1021 hidden => 1, 1113 hidden => 1,
1022 tooltip => "The password for your character", 1114 tooltip => "The password for your character",
1023 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1115 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1024 ); 1116 );
1025 1117
1026 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1118 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1027 $table->add (1, 7, new CFPlus::UI::Slider 1119 $table->add_at (1, 7, new CFPlus::UI::Slider
1028 force_w => 100, 1120 force_w => 100,
1029 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1121 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1030 tooltip => "This is the size of the portion of the map update the server sends you. " 1122 tooltip => "This is the size of the portion of the map update the server sends you. "
1031 . "If you set this to a high value you will be able to see further, " 1123 . "If you set this to a high value you will be able to see further, "
1032 . "but you also increase bandwidth requirements and latency. " 1124 . "but you also increase bandwidth requirements and latency. "
1033 . "This option is only used once at log-in.", 1125 . "This option is only used once at log-in.",
1034 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1126 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1035 ); 1127 );
1036 1128
1037 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1129 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1038 $table->add (1, 8, new CFPlus::UI::CheckBox 1130 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1039 state => $CFG->{face_prefetch}, 1131 state => $CFG->{face_prefetch},
1040 tooltip => "<b>Background Image Prefetch</b>\n\n" 1132 tooltip => "<b>Background Image Prefetch</b>\n\n"
1041 . "If enabled, the client automatically pre-fetches images from the server. " 1133 . "If enabled, the client automatically pre-fetches images from the server. "
1042 . "This might increase or create lag, but increases the chances " 1134 . "This might increase or create lag, but increases the chances "
1043 . "of faces being ready for display when you encounter them. " 1135 . "of faces being ready for display when you encounter them. "
… …
1045 . "so only set it if you really need to prefetch images. " 1137 . "so only set it if you really need to prefetch images. "
1046 . "This option can be set and unset any time.", 1138 . "This option can be set and unset any time.",
1047 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1139 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1048 ); 1140 );
1049 1141
1142 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1143 $table->add_at (1, 9, new CFPlus::UI::Entry
1144 text => $CFG->{output_rate},
1145 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1146 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1147 . "default will be used, which is usually around 100kb/s.",
1148 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1149 );
1150
1050 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1151 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1051 $table->add (1, 9, new CFPlus::UI::Entry 1152 $table->add_at (1, 10, new CFPlus::UI::Entry
1052 text => $CFG->{output_count}, 1153 text => $CFG->{output_count},
1053 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1154 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1054 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1155 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1055 ); 1156 );
1056 1157
1057 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1158 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1058 $table->add (1, 10, new CFPlus::UI::Entry 1159 $table->add_at (1, 11, new CFPlus::UI::Entry
1059 text => $CFG->{output_sync}, 1160 text => $CFG->{output_sync},
1060 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1161 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1061 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1162 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1062 ); 1163 );
1063 1164
1064 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1165 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1065 expand => 1, 1166 expand => 1,
1066 align => 0, 1167 align => 0,
1067 text => "Login", 1168 text => "Login",
1068 on_activate => sub { 1169 on_activate => sub {
1069 $CONN ? stop_game 1170 $CONN ? stop_game
1070 : start_game; 1171 : start_game;
1071 0 1172 0
1072 }, 1173 },
1073 ); 1174 );
1074 1175
1176 $vbox->add (new CFPlus::UI::FancyFrame
1177 label => "Server Info",
1178 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1179 );
1180
1181 $vbox
1182}
1183
1184sub client_setup {
1185 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1186
1187 my $row = 0;
1188
1075 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1189 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1076 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1190 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1077 text => $CFG->{say_command}, 1191 text => $CFG->{say_command},
1078 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. " 1192 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. "
1079 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1193 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1080 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1194 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1081 on_changed => sub { 1195 on_changed => sub {
1082 my ($self, $value) = @_; 1196 my ($self, $value) = @_;
1083 $CFG->{say_command} = $value; 1197 $CFG->{say_command} = $value;
1084 0 1198 0
1085 } 1199 }
1086 ); 1200 );
1087 1201
1088 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1202 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1089 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1203 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1090 state => $CFG->{show_tips}, 1204 state => $CFG->{show_tips},
1091 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1205 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1092 on_changed => sub { 1206 on_changed => sub {
1093 my ($self, $value) = @_; 1207 my ($self, $value) = @_;
1094 $CFG->{show_tips} = $value; 1208 $CFG->{show_tips} = $value;
1095 0 1209 0
1096 } 1210 }
1097 ); 1211 );
1098 1212
1099 $vbox->add (new CFPlus::UI::FancyFrame 1213 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1100 label => "Server Info", 1214 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1101 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1215 text => $CFG->{logview_max_par},
1102 ); 1216 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1103 1217 . "sends more messages than this number, older messages get removed to save memory and "
1104 $vbox 1218 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1105}
1106
1107sub message_window {
1108 my $window = new CFPlus::UI::Toplevel
1109 name => "message_window",
1110 title => "Messages",
1111 border_bg => [1, 1, 1, 1],
1112 x => "max",
1113 y => 0,
1114 force_w => $::WIDTH * 0.4,
1115 force_h => $::HEIGHT * 0.5,
1116 child => (my $vbox = new CFPlus::UI::VBox),
1117 has_close_button => 1;
1118
1119 $vbox->add ($LOGVIEW);
1120
1121 $vbox->add (my $input = new CFPlus::UI::Entry
1122 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1123 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1124 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1125 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1126 on_focus_in => sub { 1219 on_changed => sub {
1127 my ($input, $prev_focus) = @_; 1220 my ($self, $value) = @_;
1128 1221 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1129 delete $input->{refocus_map};
1130
1131 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1132 $input->{refocus_map} = 1;
1133 }
1134 delete $input->{auto_activated};
1135
1136 0 1222 0
1137 }, 1223 },
1138 on_activate => sub {
1139 my ($input, $text) = @_;
1140 $input->set_text ('');
1141
1142 if ($text =~ /^\/(.*)/) {
1143 $::CONN->user_send ($1);
1144 } else {
1145 my $say_cmd = $::CFG->{say_command} || 'say';
1146 $::CONN->user_send ("$say_cmd $text");
1147 }
1148 if ($input->{refocus_map}) {
1149 delete $input->{refocus_map};
1150 $MAPWIDGET->focus_in
1151 }
1152
1153 0
1154 },
1155 on_escape => sub {
1156 $MAPWIDGET->grab_focus;
1157
1158 0
1159 },
1160 );
1161
1162 $CONSOLE = {
1163 window => $window,
1164 input => $input,
1165 }; 1224 );
1166 1225
1167 $window 1226 $table
1168} 1227}
1169 1228
1170sub autopickup_setup { 1229sub autopickup_setup {
1230 my $r = new CFPlus::UI::ScrolledWindow (
1231 expand => 1,
1232 scroll_y => 1
1233 );
1171 my $table = new CFPlus::UI::Table; 1234 $r->add (my $table = new CFPlus::UI::Table
1235 row_expand => [0],
1236 col_expand => [0, 1, 0, 1],
1237 );
1172 1238
1173 for ( 1239 for (
1174 ["General", 0, 0, 1240 ["General", 0, 0,
1175 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1241 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1176 ["Inhibit autopickup" => PICKUP_INHIBIT], 1242 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1190 ["Boots" => PICKUP_BOOTS], 1256 ["Boots" => PICKUP_BOOTS],
1191 ["Gloves" => PICKUP_GLOVES], 1257 ["Gloves" => PICKUP_GLOVES],
1192 ["Cloaks" => PICKUP_CLOAK], 1258 ["Cloaks" => PICKUP_CLOAK],
1193 ], 1259 ],
1194 1260
1195 ["Readables", 2, 2, 1261 ["Readables", 2, 0,
1196 ["Spellbooks" => PICKUP_SPELLBOOK], 1262 ["Spellbooks" => PICKUP_SPELLBOOK],
1197 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1263 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1198 ["Normal Books/Scrolls" => PICKUP_READABLES], 1264 ["Normal Books/Scrolls" => PICKUP_READABLES],
1199 ], 1265 ],
1200 ["Misc", 2, 7, 1266 ["Misc", 2, 5,
1201 ["Food" => PICKUP_FOOD], 1267 ["Food" => PICKUP_FOOD],
1202 ["Drinks" => PICKUP_DRINK], 1268 ["Drinks" => PICKUP_DRINK],
1203 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1269 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1204 ["Keys" => PICKUP_KEY], 1270 ["Keys" => PICKUP_KEY],
1205 ["Magical Items" => PICKUP_MAGICAL], 1271 ["Magical Items" => PICKUP_MAGICAL],
1206 ["Potions" => PICKUP_POTION], 1272 ["Potions" => PICKUP_POTION],
1207 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1273 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1208 ["Ignore cursed" => PICKUP_NOT_CURSED], 1274 ["Ignore cursed" => PICKUP_NOT_CURSED],
1209 ["Jewelery" => PICKUP_JEWELS], 1275 ["Jewelery" => PICKUP_JEWELS],
1276 ["Flesh" => PICKUP_FLESH],
1210 ], 1277 ],
1211 ["Weight/Value ratio", 2, 17] 1278 ["Weight/Value ratio", 2, 17]
1212 ) 1279 )
1213 { 1280 {
1214 my ($title, $x, $y, @bits) = @$_; 1281 my ($title, $x, $y, @bits) = @$_;
1215 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1282 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1216 1283
1217 for (@bits) { 1284 for (@bits) {
1218 ++$y; 1285 ++$y;
1219 1286
1220 my $mask = $_->[1]; 1287 my $mask = $_->[1];
1221 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1288 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1222 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1289 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1223 state => $::CFG->{pickup} & $mask, 1290 state => $::CFG->{pickup} & $mask,
1224 on_changed => sub { 1291 on_changed => sub {
1225 my ($box, $value) = @_; 1292 my ($box, $value) = @_;
1226 1293
1227 if ($value) { 1294 if ($value) {
… …
1238 1305
1239 ${$_->[2]} = $checkbox if $_->[2]; 1306 ${$_->[2]} = $checkbox if $_->[2];
1240 } 1307 }
1241 } 1308 }
1242 1309
1243 $table->add (2, 18, new CFPlus::UI::ValSlider 1310 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1244 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1311 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1245 template => ">= 99", 1312 template => ">= 99",
1246 to_value => sub { ">= " . 5 * $_[0] }, 1313 to_value => sub { ">= " . 5 * $_[0] },
1247 on_changed => sub { 1314 on_changed => sub {
1248 my ($slider, $value) = @_; 1315 my ($slider, $value) = @_;
… …
1251 $::CFG->{pickup} |= int $value 1318 $::CFG->{pickup} |= int $value
1252 if $value; 1319 if $value;
1253 1; 1320 1;
1254 }); 1321 });
1255 1322
1256 $table->add (3, 18, new CFPlus::UI::Button 1323 $table->add_at (3, 18, new CFPlus::UI::Button
1257 text => "set", 1324 text => "set",
1258 on_activate => sub { 1325 on_activate => sub {
1259 $::CONN->send_command ("pickup $::CFG->{pickup}") 1326 $::CONN->send_command ("pickup $::CFG->{pickup}")
1260 if defined $::CONN; 1327 if defined $::CONN;
1261 0 1328 0
1262 }); 1329 });
1263 1330
1264 $table 1331 $r
1265} 1332}
1266 1333
1267my %SORT_ORDER = ( 1334my %SORT_ORDER = (
1268 type => undef, 1335 type => undef,
1269 mtime => sub { 1336 mtime => sub {
… …
1348 has_close_button => 1 1415 has_close_button => 1
1349 ; 1416 ;
1350 1417
1351 my $ntb = 1418 my $ntb =
1352 $PL_NOTEBOOK = 1419 $PL_NOTEBOOK =
1353 new CFPlus::UI::Notebook expand => 1, debug => 1; 1420 new CFPlus::UI::Notebook expand => 1;
1354 1421
1355 $ntb->add ( 1422 $ntb->add_tab (
1356 "Statistics (F2)" => $STATS_PAGE = stats_window, 1423 "Statistics (F2)" => $STATS_PAGE = stats_window,
1357 "Shows statistics, where all your Stats and Resistances are shown." 1424 "Shows statistics, where all your Stats and Resistances are shown."
1358 ); 1425 );
1359 $ntb->add ( 1426 $ntb->add_tab (
1360 "Skills (F3)" => $SKILL_PAGE = skill_window, 1427 "Skills (F3)" => $SKILL_PAGE = skill_window,
1361 "Shows all your Skills." 1428 "Shows all your Skills."
1362 ); 1429 );
1363 1430
1364 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1431 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1365 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1432 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1366 $ntb->add ( 1433 $ntb->add_tab (
1367 "Spellbook (F4)" => $spellsw, 1434 "Spellbook (F4)" => $spellsw,
1368 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1435 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1369 ); 1436 );
1370 $ntb->add ( 1437 $ntb->add_tab (
1371 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1438 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1372 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1439 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1373 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1440 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1374 ); 1441 );
1442 $ntb->add_tab (Pickup => autopickup_setup,
1443 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1375 1444
1376 $ntb->set_current_page ($INVENTORY_PAGE); 1445 $ntb->set_current_page ($INVENTORY_PAGE);
1377 1446
1378 $plwin->add ($ntb); 1447 $plwin->add ($ntb);
1379 $plwin 1448 $plwin
1380} 1449}
1381 1450
1382sub update_bindings {
1383 $BIND_UPD_CB->() if $BIND_UPD_CB;
1384}
1385
1386sub keyboard_setup { 1451sub keyboard_setup {
1387 my $binding_list = new CFPlus::UI::VBox; 1452 CFPlus::Macro::keyboard_setup
1388
1389 my $refresh;
1390 $refresh = $BIND_UPD_CB = sub {
1391 $binding_list->clear ();
1392
1393 return unless $PROFILE;
1394
1395 for my $mod (keys %{$PROFILE->{bindings}}) {
1396 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1397 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1398 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1399
1400 my $lbl = join "; ", @$cmds;
1401 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1402 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1403 $hb->add (new CFPlus::UI::Button
1404 text => "delete",
1405 tooltip => "Deletes the binding",
1406 on_activate => sub {
1407 $binding_list->remove ($hb);
1408 delete $PROFILE->{bindings}{$mod}{$sym};
1409 0
1410 });
1411
1412 $hb->add (new CFPlus::UI::Button
1413 text => "edit",
1414 tooltip => "Edits the binding",
1415 on_activate => sub {
1416 $::BIND_EDITOR->set_binding (
1417 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1418 sub {
1419 my ($nmod, $nsym, $ncmds) = @_;
1420 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1421 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1422 $refresh->();
1423 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1424 $SETUP_DIALOG->show;
1425 },
1426 sub {
1427 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1428 $SETUP_DIALOG->show;
1429 });
1430 $::BIND_EDITOR->show;
1431 $SETUP_DIALOG->hide;
1432 0
1433 });
1434
1435 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1436 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1437 }
1438 }
1439 };
1440
1441 my $vb = new CFPlus::UI::VBox;
1442 $vb->add (new CFPlus::UI::FancyFrame
1443 label => "Options",
1444 child => (my $hb = new CFPlus::UI::HBox),
1445 );
1446 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1447 $hb->add (new CFPlus::UI::CheckBox
1448 expand => 1,
1449 state => $CFG->{shift_fire_stop},
1450 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1451 on_changed => sub {
1452 my ($cbox, $value) = @_;
1453 $CFG->{shift_fire_stop} = $value;
1454 0
1455 });
1456
1457 $vb->add (new CFPlus::UI::FancyFrame
1458 label => "Bindings",
1459 child => $binding_list);
1460 $vb->add (my $hb = new CFPlus::UI::HBox);
1461
1462 $hb->add (new CFPlus::UI::Button
1463 text => "record new",
1464 expand => 1,
1465 tooltip => "This button opens the binding editor with an empty binding.",
1466 on_activate => sub {
1467 $::BIND_EDITOR->set_binding (undef, undef, [],
1468 sub {
1469 my ($mod, $sym, $cmds) = @_;
1470 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1471 $refresh->();
1472 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1473 $SETUP_DIALOG->show;
1474 },
1475 sub {
1476 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1477 $SETUP_DIALOG->show;
1478 },
1479 );
1480 $SETUP_DIALOG->hide;
1481 $::BIND_EDITOR->show;
1482 0
1483 },
1484 );
1485
1486 $hb->add (new CFPlus::UI::Button
1487 text => "close",
1488 tooltip => "Closes the binding window",
1489 expand => 1,
1490 on_activate => sub {
1491 $SETUP_DIALOG->hide;
1492 0
1493 }
1494 );
1495
1496 $refresh->();
1497
1498 $vb
1499} 1453}
1500 1454
1501sub help_window { 1455sub help_window {
1502 my $win = new CFPlus::UI::Toplevel 1456 my $win = new CFPlus::UI::Toplevel
1503 x => 'center', 1457 x => 'center',
… …
1660 1614
1661sub show_tip_of_the_day { 1615sub show_tip_of_the_day {
1662 # find all tips 1616 # find all tips
1663 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1617 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1664 1618
1665 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1619 CFPlus::DB::get state => "tip_of_the_day", sub {
1620 my ($todindex) = @_;
1666 $todindex = 0 if $todindex >= @tod; 1621 $todindex = 0 if $todindex >= @tod;
1667 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1622 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1668 1623
1669 # create dialog 1624 # create dialog
1670 my $dialog; 1625 my $dialog;
1671 1626
1672 my $close = sub { 1627 my $close = sub {
1673 $dialog->destroy; 1628 $dialog->destroy;
1629 };
1630
1631 $dialog = new CFPlus::UI::Toplevel
1632 x => "center",
1633 y => "center",
1634 z => 3,
1635 name => 'tip_of_the_day',
1636 force_w => int $WIDTH * 4/9,
1637 force_h => int $WIDTH * 2/9,
1638 title => "Tip of the day #" . (1 + $todindex),
1639 child => my $vbox = new CFPlus::UI::VBox,
1640 has_close_button => 1,
1641 on_delete => $close,
1642 ;
1643
1644 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1645 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1646 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1647
1648 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1649
1650 $table->add_at (0, 0, new CFPlus::UI::Button
1651 text => "Close",
1652 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>.",
1653 on_activate => $close,
1654 );
1655
1656 $table->add_at (2, 0, new CFPlus::UI::Button
1657 text => "Next",
1658 tooltip => "Show the next <b>Tip of the day</b>.",
1659 on_activate => sub {
1660 $close->();
1661 &show_tip_of_the_day;
1662 },
1663 );
1664
1665 $dialog->show;
1674 }; 1666 };
1675
1676 $dialog = new CFPlus::UI::Toplevel
1677 x => "center",
1678 y => "center",
1679 z => 3,
1680 name => 'tip_of_the_day',
1681 force_w => int $WIDTH * 4/9,
1682 force_h => int $WIDTH * 2/9,
1683 title => "Tip of the day #" . (1 + $todindex),
1684 child => my $vbox = new CFPlus::UI::VBox,
1685 has_close_button => 1,
1686 on_delete => $close,
1687 ;
1688
1689 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1690 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1691 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1692
1693 $vbox->add (my $table = new CFPlus::UI::Table);
1694
1695 $table->add (0, 0, new CFPlus::UI::Button
1696 text => "Close",
1697 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>.",
1698 on_activate => $close,
1699 );
1700
1701 $table->add (2, 0, new CFPlus::UI::Button
1702 text => "Next",
1703 tooltip => "Show the next <b>Tip of the day</b>.",
1704 on_activate => sub {
1705 $close->();
1706 &show_tip_of_the_day;
1707 },
1708 );
1709
1710 $dialog->show;
1711} 1667}
1712 1668
1713sub sdl_init { 1669sub sdl_init {
1714 CFPlus::SDL_Init 1670 CFPlus::SDL_Init
1715 and die "SDL::Init failed!\n"; 1671 and die "SDL::Init failed!\n";
1716} 1672}
1717 1673
1718sub video_init { 1674sub video_init {
1719 sdl_init;
1720
1721 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1675 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1722 1676
1723 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1677 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1724 1678
1725 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1679 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1726 $FULLSCREEN = $CFG->{fullscreen}; 1680 $FULLSCREEN = $CFG->{fullscreen};
1727 $FAST = $CFG->{fast}; 1681 $FAST = $CFG->{fast};
1728 1682
1729 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1683 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1730 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1684 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1731 1685
1732 $SDL_ACTIVE = 1; 1686 $SDL_ACTIVE = 1;
1733 $LAST_REFRESH = time - 0.01; 1687 $LAST_REFRESH = time - 0.01;
1734 1688
… …
1749 padding => 0, 1703 padding => 0,
1750 z => 100, 1704 z => 100,
1751 force_x => "max", 1705 force_x => "max",
1752 force_y => 0; 1706 force_y => 0;
1753 $DEBUG_STATUS->show; 1707 $DEBUG_STATUS->show;
1754
1755 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1756 1708
1757 $STATUSBOX = new CFPlus::UI::Statusbox; 1709 $STATUSBOX = new CFPlus::UI::Statusbox;
1758 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1710 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1759 1711
1760 (new CFPlus::UI::Frame 1712 (new CFPlus::UI::Frame
… …
1778 1730
1779 $MAPWIDGET = new CFPlus::MapWidget; 1731 $MAPWIDGET = new CFPlus::MapWidget;
1780 $MAPWIDGET->connect (activate_console => sub { 1732 $MAPWIDGET->connect (activate_console => sub {
1781 my ($mapwidget, $preset) = @_; 1733 my ($mapwidget, $preset) = @_;
1782 1734
1783 if ($CONSOLE) { 1735 $MESSAGE_WINDOW->activate_console ($preset)
1784 $CONSOLE->{input}->{auto_activated} = 1; 1736 if $MESSAGE_WINDOW;
1785 $CONSOLE->{input}->grab_focus;
1786
1787 if ($preset && $CONSOLE->{input}->get_text eq '') {
1788 $CONSOLE->{input}->set_text ($preset);
1789 }
1790 }
1791 }); 1737 });
1792 $MAPWIDGET->show; 1738 $MAPWIDGET->show;
1793 $MAPWIDGET->grab_focus; 1739 $MAPWIDGET->grab_focus;
1794
1795 $LOGVIEW = new CFPlus::UI::TextScroller
1796 expand => 1,
1797 font => $FONT_FIXED,
1798 fontsize => $::CFG->{log_fontsize},
1799 indent => -4,
1800 can_hover => 1,
1801 can_events => 1,
1802 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1803 ;
1804 1740
1805 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1741 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1806 title => "Setup", 1742 title => "Setup",
1807 name => "setup_dialog", 1743 name => "setup_dialog",
1808 x => 'center', 1744 x => 'center',
… …
1812 force_h => $::HEIGHT * 0.6, 1748 force_h => $::HEIGHT * 0.6,
1813 has_close_button => 1, 1749 has_close_button => 1,
1814 ; 1750 ;
1815 1751
1816 $METASERVER = metaserver_dialog; 1752 $METASERVER = metaserver_dialog;
1753 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1817 1754
1818 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1755 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1819 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1756 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1820 1757
1821 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1758 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1822 "Configure the server to play on, your username, password and other server-related options."); 1759 "Configure the server to play on, your username, password and other server-related options.");
1823 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1760 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1824 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1761 "Configure various client-specific settings.");
1825 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1762 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1826 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1763 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1827 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1764 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1828 "Configure the use of audio, sound effects and background music."); 1765 "Configure the use of audio, sound effects and background music.");
1829 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1766 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1830 "Lets you define, edit and delete key bindings." 1767 "Lets you define, edit and delete key bindings."
1831 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1768 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1832 . "with nothing set and the recording started. After doing the actions you " 1769 . "with nothing set and the recording started. After doing the actions you "
1833 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1770 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1834 . "After pressing the combo the binding will be saved automatically and the " 1771 . "After pressing the combo the binding will be saved automatically and the "
1835 . "binding editor closes"); 1772 . "binding editor closes");
1836 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1773 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1837 "Some debuggin' options. Do not ask."); 1774 "Some debuggin' options. Do not ask.");
1838 1775
1839 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1776 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1840 1777
1841 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1778 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1842 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1779 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1843 1780
1844 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1781 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1845 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1782 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1846 1783
1847 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 1784 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
1848 1785
1849 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1786 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1860 }, 1797 },
1861 ); 1798 );
1862 1799
1863 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1800 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1864 tooltip => "View Documentation"); 1801 tooltip => "View Documentation");
1802
1865 1803
1866 $BUTTONBAR->add (new CFPlus::UI::Button 1804 $BUTTONBAR->add (new CFPlus::UI::Button
1867 text => "Quit", 1805 text => "Quit",
1868 tooltip => "Terminates the program", 1806 tooltip => "Terminates the program",
1869 on_activate => sub { 1807 on_activate => sub {
… …
1881 } 1819 }
1882 1820
1883 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1821 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1884} 1822}
1885 1823
1824sub setup_build_button {
1825 my ($enabled) = @_;
1826 if ($enabled) {
1827 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1828 $BUILD_BUTTON ||= new CFPlus::UI::Button
1829 text => "Build",
1830 tooltip => "Opens the ingame builder",
1831 on_activate => sub {
1832 if ($CONN) {
1833 $CONN->send_ext_req (builder_player_items => sub {
1834 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1835 });
1836 }
1837 0
1838 };
1839 $BUTTONBAR->add ($BUILD_BUTTON);
1840 } else {
1841 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1842 }
1843}
1844
1845sub open_ingame_editor {
1846 my ($msg) = @_;
1847
1848 my $win = new CFPlus::UI::Toplevel
1849 x => 0,
1850 y => 'center',
1851 z => 4,
1852 name => 'builder_window',
1853 force_w => int $WIDTH * 1/4,
1854 force_h => int $HEIGHT * 3/4,
1855 title => "In game builder",
1856 has_close_button => 1;
1857
1858 my $r = new CFPlus::UI::ScrolledWindow (
1859 expand => 1,
1860 scroll_y => 1
1861 );
1862 $r->add (my $vb = new CFPlus::UI::VBox);
1863 $win->add ($r);
1864
1865
1866 $vb->add (
1867 new CFPlus::UI::Button
1868 text => "Disable build mode",
1869 on_activate => sub { $::IN_BUILD_MODE = undef }
1870 );
1871 $vb->add (
1872 new CFPlus::UI::Button
1873 text => "ERASE",
1874 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1875 );
1876
1877 for my $itemarchname (
1878 sort {
1879 $msg->{items}->{$a}->{build_arch_name}
1880 cmp $msg->{items}->{$b}->{build_arch_name}
1881 } keys %{$msg->{items}}
1882 ) {
1883 my $info = $msg->{items}->{$itemarchname};
1884 $vb->add (
1885 new CFPlus::UI::Button text => $info->{build_arch_name},
1886 on_activate => sub {
1887 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1888
1889 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1890 build_mode_query_arch_info ();
1891 }
1892 }
1893 );
1894 }
1895
1896 $win->show;
1897}
1898
1899sub build_mode_query_arch_info {
1900 my ($iteminfo) = $::IN_BUILD_MODE;
1901 my $itemarchname = $iteminfo->{item};
1902 my $info = $iteminfo->{info};
1903
1904 my $dialog = new CFPlus::UI::Toplevel
1905 x => "center",
1906 y => "center",
1907 z => 50,
1908 force_w => int $WIDTH * 1/2,
1909 title => "Enter information for placement of '$itemarchname'",
1910 has_close_button => 1;
1911
1912 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1913
1914 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1915 my $row = 0;
1916 if ($info->{has_name}) {
1917 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1918 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1919 }
1920 if ($info->{has_text}) {
1921 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1922 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1923 }
1924 if ($info->{has_connection}) {
1925 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1926 $table->add_at (1, $row++,
1927 new CFPlus::UI::Entry
1928 expand => 1,
1929 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1930 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1931 );
1932 }
1933
1934 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1935 $hb->add (new CFPlus::UI::Button
1936 text => "Close",
1937 expand => 1,
1938 on_activate => sub { $dialog->hide; 0 },
1939 );
1940 $dialog->show;
1941}
1942
1886sub video_shutdown { 1943sub video_shutdown {
1887 CFPlus::OpenGL::shutdown; 1944 CFPlus::OpenGL::shutdown;
1888 1945
1889 undef $SDL_ACTIVE; 1946 undef $SDL_ACTIVE;
1890} 1947}
1891 1948
1892my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1893my $bgmusic;#TODO#hack#d#
1894
1895sub audio_channel_finished { 1949sub audio_channel_finished {
1896 my ($channel) = @_; 1950 my ($channel) = @_;
1897 1951
1898 #warn "channel $channel finished\n";#d# 1952 #warn "channel $channel finished\n";#d#
1899} 1953}
1900 1954
1955sub audio_music_set {
1956 my ($songs) = @_;
1957
1958 my @want =
1959 grep $_,
1960 map $CONN->{music_meta}{$_},
1961 @$songs;
1962
1963 if (@want) {
1964 @MUSIC_WANT = @want;
1965 &audio_music_changed ();
1966 }
1967}
1968
1969sub audio_music_start {
1970 my $path = $MUSIC_PLAYING->{path}
1971 or return;
1972
1973 CFPlus::DB::prefetch_file $path, 1024_000, sub {
1974 return unless $SDL_MIXER;
1975
1976 # music might have changed...
1977 $path eq $MUSIC_PLAYING->{path}
1978 or return &audio_music_start ();
1979
1980 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
1981
1982 my $NOW = time;
1983
1984 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1985 my $pos = $MUSIC_PLAYING->{stop_pos};
1986 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1987 $MUSIC_START = time - $pos;
1988 } else {
1989 $MUSIC_PLAYER->play (0);
1990 $MUSIC_START = time;
1991 }
1992
1993 delete $MUSIC_PLAYING->{stop_time};
1994 delete $MUSIC_PLAYING->{stop_pos};
1995 }
1996}
1997
1998sub audio_music_changed {
1999 return unless $CFG->{bgm_enable};
2000 return unless $SDL_MIXER;
2001
2002 # default MUSIC_WANT == MUSIC_DEFAULT
2003 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2004
2005 # if the currently playing song is acceptable, let it continue
2006 return if $MUSIC_PLAYING
2007 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2008
2009 my $NOW = time;
2010
2011 if ($MUSIC_PLAYING) {
2012 $MUSIC_PLAYING->{stop_time} = $NOW;
2013 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2014 CFPlus::MixMusic::fade_out 1000;
2015 } else {
2016 # sort by stop time, oldest first
2017 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2018
2019 # if the most recently-played piece played very recently,
2020 # resume it, else choose the oldest piece for rotation.
2021 $MUSIC_PLAYING =
2022 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2023 ? $MUSIC_WANT[-1]
2024 : $MUSIC_WANT[0];
2025
2026 audio_music_start;
2027 }
2028}
2029
1901sub audio_music_finished { 2030sub audio_music_finished {
1902 return unless $CFG->{bgm_enable}; 2031 $MUSIC_PLAYING = undef;
2032 undef $MUSIC_PLAYER;
1903 2033
1904 # TODO: hack, do play loop and mood music 2034 audio_music_changed;
1905 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1906 $bgmusic->play (0);
1907
1908 push @bgmusic, shift @bgmusic;
1909} 2035}
1910 2036
1911sub audio_init { 2037sub audio_init {
1912 if ($CFG->{audio_enable}) { 2038 if ($CFG->{audio_enable}) {
1913 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2039 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1939 }; 2065 };
1940 } 2066 }
1941 } else { 2067 } else {
1942 status "unable to open sound config: $!"; 2068 status "unable to open sound config: $!";
1943 } 2069 }
2070 } else {
2071 undef $SDL_MIXER;
1944 } 2072 }
1945} 2073}
1946 2074
1947sub audio_shutdown { 2075sub audio_shutdown {
1948 CFPlus::Mix_CloseAudio if $SDL_MIXER; 2076 CFPlus::Mix_CloseAudio if $SDL_MIXER;
… …
1963 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2091 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1964 2092
1965 $CFPlus::UI::ROOT->draw; 2093 $CFPlus::UI::ROOT->draw;
1966 2094
1967 $WANT_REFRESH = 0; 2095 $WANT_REFRESH = 0;
1968 $CAN_REFRESH = 0; 2096 $CAN_REFRESH = 0;
1969 $LAST_REFRESH = $NOW; 2097 $LAST_REFRESH = $NOW;
1970 2098
1971 CFPlus::SDL_GL_SwapBuffers; 2099 CFPlus::SDL_GL_SwapBuffers;
1972} 2100}
1973 2101
1974my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2102my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1975 $NOW = time; 2103 $NOW = time;
1976 2104
1977 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2105 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1978 for CFPlus::SDL_PollEvent; 2106 for CFPlus::poll_events;
1979 2107
1980 if (%animate_object) { 2108 if (%animate_object) {
1981 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2109 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1982 $WANT_REFRESH++; 2110 ++$WANT_REFRESH;
1983 } 2111 }
1984 2112
1985 if ($WANT_REFRESH) { 2113 if ($WANT_REFRESH) {
1986 force_refresh; 2114 force_refresh;
1987 } else { 2115 } else {
… …
2008 if $CONN; 2136 if $CONN;
2009}); 2137});
2010 2138
2011%SDL_CB = ( 2139%SDL_CB = (
2012 CFPlus::SDL_QUIT => sub { 2140 CFPlus::SDL_QUIT => sub {
2013 Event::unloop -1; 2141 exit;
2014 }, 2142 },
2015 CFPlus::SDL_VIDEORESIZE => sub { 2143 CFPlus::SDL_VIDEORESIZE => sub {
2016 }, 2144 },
2017 CFPlus::SDL_VIDEOEXPOSE => sub { 2145 CFPlus::SDL_VIDEOEXPOSE => sub {
2018 CFPlus::UI::full_refresh; 2146 CFPlus::UI::full_refresh;
2019 }, 2147 },
2020 CFPlus::SDL_ACTIVEEVENT => sub { 2148 CFPlus::SDL_ACTIVEEVENT => sub {
2021# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2149# not useful, as APPACTIVE include sonly iconified state, not unmapped
2150# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2151# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2152# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2153# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2154# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2022 }, 2155 },
2023 CFPlus::SDL_KEYDOWN => sub { 2156 CFPlus::SDL_KEYDOWN => sub {
2024 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2157 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2025 # alt-enter 2158 # alt-enter
2026 $FULLSCREEN_ENABLE->toggle; 2159 $FULLSCREEN_ENABLE->toggle;
… …
2047 2180
2048$SIG{INT} = $SIG{TERM} = sub { exit }; 2181$SIG{INT} = $SIG{TERM} = sub { exit };
2049 2182
2050{ 2183{
2051 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2184 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2185 CFPlus::DB::Server::run;
2186
2052 CFPlus::UI::set_layout ($::CFG->{layout}); 2187 CFPlus::UI::set_layout ($::CFG->{layout});
2053 2188
2054 my %DEF_CFG = ( 2189 my %DEF_CFG = (
2055 sdl_mode => 0, 2190 sdl_mode => 0,
2056 width => 640, 2191 width => 640,
2057 height => 480, 2192 height => 480,
2058 fullscreen => 0, 2193 fullscreen => 0,
2059 fast => 0, 2194 fast => 0,
2060 map_scale => 1, 2195 map_scale => 1,
2061 fow_enable => 1, 2196 fow_enable => 1,
2062 fow_intensity => 0.45, 2197 fow_intensity => 0,
2063 fow_smooth => 0, 2198 map_smoothing => 1,
2064 gui_fontsize => 1, 2199 gui_fontsize => 1,
2065 log_fontsize => 0.7, 2200 log_fontsize => 0.7,
2066 gauge_fontsize => 1, 2201 gauge_fontsize => 1,
2067 gauge_size => 0.35, 2202 gauge_size => 0.35,
2068 stat_fontsize => 0.7, 2203 stat_fontsize => 0.7,
2069 mapsize => 100, 2204 mapsize => 100,
2070 say_command => 'chat', 2205 say_command => 'chat',
2071 audio_enable => 1, 2206 audio_enable => 1,
2072 bgm_enable => 1, 2207 bgm_enable => 1,
2073 bgm_volume => 0.25, 2208 bgm_volume => 0.25,
2074 face_prefetch => 0, 2209 face_prefetch => 0,
2075 output_sync => 1, 2210 output_sync => 1,
2076 output_count => 1, 2211 output_count => 1,
2212 output_rate => "",
2077 pickup => 0, 2213 pickup => 0,
2078 inv_sort => "mtime", 2214 inv_sort => "mtime",
2079 default => "profile", # default profile 2215 default => "profile", # default profile
2080 show_tips => 1, 2216 show_tips => 1,
2217 logview_max_par => 1000,
2081 ); 2218 );
2082 2219
2083 while (my ($k, $v) = each %DEF_CFG) { 2220 while (my ($k, $v) = each %DEF_CFG) {
2084 $CFG->{$k} = $v unless exists $CFG->{$k}; 2221 $CFG->{$k} = $v unless exists $CFG->{$k};
2085 } 2222 }
2086 2223
2087 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2224 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2225 $PROFILE = $CFG->{profile}{default};
2226
2227 # convert old bindings (only default profile matters)
2228 if (my $bindings = delete $PROFILE->{bindings}) {
2229 while (my ($mod, $syms) = each %$bindings) {
2230 while (my ($sym, $cmds) = each %$syms) {
2231 push @{ $PROFILE->{macro} }, {
2232 accelkey => [$mod*1, $sym*1],
2233 action => $cmds,
2234 };
2235 }
2236 }
2237 }
2088 2238
2089 sdl_init; 2239 sdl_init;
2090 2240
2091 @SDL_MODES = reverse 2241 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2092 grep $_->[0] >= 640 && $_->[1] >= 480, 2242 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2093 CFPlus::SDL_ListModes;
2094
2095 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2243 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2244
2245 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2096 2246
2097 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2247 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2098 2248
2099 { 2249 {
2100 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2250 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2141 2291
2142Event::loop; 2292Event::loop;
2143#CFPlus::SDL_Quit; 2293#CFPlus::SDL_Quit;
2144#CFPlus::_exit 0; 2294#CFPlus::_exit 0;
2145 2295
2296END {
2146END { CFPlus::SDL_Quit } 2297 CFPlus::SDL_Quit;
2298 CFPlus::DB::Server::stop;
2299}
2147 2300
2148=head1 NAME 2301=head1 NAME
2149 2302
2150cfplus - A Crossfire+ and Crossfire game client 2303cfplus - A Crossfire+ and Crossfire game client
2151 2304

Diff Legend

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