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.129 by root, Sun Nov 19 00:07:51 2006 UTC vs.
Revision 1.153 by root, Tue Apr 24 01:13:54 2007 UTC

… …
21 } 21 }
22} 22}
23 23
24use strict; 24use strict;
25use utf8; 25use utf8;
26
27use Carp 'verbose';
26 28
27# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
28BEGIN { 30BEGIN {
29 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
30 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
… …
56use Compress::LZF; 58use Compress::LZF;
57 59
58use CFPlus; 60use CFPlus;
59use CFPlus::OpenGL (); 61use CFPlus::OpenGL ();
60use CFPlus::Protocol; 62use CFPlus::Protocol;
63use CFPlus::DB;
61use CFPlus::UI; 64use CFPlus::UI;
65use CFPlus::UI::Inventory;
66use CFPlus::UI::SpellList;
62use CFPlus::Pod; 67use CFPlus::Pod;
63use CFPlus::BindingEditor;
64use CFPlus::MapWidget; 68use CFPlus::MapWidget;
69use CFPlus::Macro;
65 70
66$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 71$SIG{QUIT} = sub { Carp::cluck "QUIT" };
67$SIG{PIPE} = 'IGNORE'; 72$SIG{PIPE} = 'IGNORE';
68 73
69$Event::Eval = 0; 74$Event::Eval = 1;
70$Event::DIED = sub { 75$Event::DIED = sub {
71 # TODO: display dialog box or so 76 CFPlus::fatal Carp::longmess $_[1]
72 Carp::cluck $_[1];#d#TODO: remove when stable
73 return;#d#
74 CFPlus::fatal ($_[1]);
75}; 77};
76 78
77my $MAX_FPS = 60; 79my $MAX_FPS = 60;
78my $MIN_FPS = 5; # unused as of yet 80my $MIN_FPS = 5; # unused as of yet
79 81
… …
123 125
124our $INVENTORY_PAGE; 126our $INVENTORY_PAGE;
125our $STATS_PAGE; 127our $STATS_PAGE;
126our $SKILL_PAGE; 128our $SKILL_PAGE;
127our $SPELL_PAGE; 129our $SPELL_PAGE;
130our $SPELL_LIST;
128 131
129our $HELP_WINDOW; 132our $HELP_WINDOW;
130our $MESSAGE_WINDOW; 133our $MESSAGE_WINDOW;
131our $FLOORBOX; 134our $FLOORBOX;
132our $GAUGES; 135our $GAUGES;
… …
145 148
146our $INV; 149our $INV;
147our $INVR; 150our $INVR;
148our $INV_RIGHT_HB; 151our $INV_RIGHT_HB;
149 152
150our $BIND_EDITOR;
151our $BIND_UPD_CB;
152
153our $PICKUP_CFG; 153our $PICKUP_CFG;
154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
154 157
155sub status { 158sub status {
156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
157} 160}
158 161
… …
174sub destroy_query_dialog { 177sub destroy_query_dialog {
175 (delete $_[0]{query_dialog})->destroy 178 (delete $_[0]{query_dialog})->destroy
176 if $_[0]{query_dialog}; 179 if $_[0]{query_dialog};
177} 180}
178 181
182# FIXME: a very ugly hack to wait for stat update look below! #d#
183our $QUERY_TIMER; #d#
184
179# server query dialog 185# server query dialog
180sub server_query { 186sub server_query {
181 my ($conn, $flags, $prompt) = @_; 187 my ($conn, $flags, $prompt) = @_;
188
189 # FIXME: a very ugly hack to wait for stat update #d#
190 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
191 unless ($QUERY_TIMER) {
192 $QUERY_TIMER =
193 Event->timer (
194 after => 1,
195 cb => sub {
196 server_query ($conn, $flags, $prompt, 1);
197 $QUERY_TIMER = undef
198 }
199 );
200 return;
201 }
202 }
182 203
183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 204 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
184 x => "center", 205 x => "center",
185 y => "center", 206 y => "center",
186 title => "Server Query", 207 title => "Server Query",
187 child => my $vbox = new CFPlus::UI::VBox, 208 child => my $vbox = new CFPlus::UI::VBox,
188 ; 209 ;
189 210
190 my @dialog = my $label = new CFPlus::UI::Label 211 my @dialog = my $label = new CFPlus::UI::Label
191 max_w => $::WIDTH * 0.4, 212 max_w => $::WIDTH * 0.8,
192 ellipsise => 0, 213 ellipsise => 0,
193 text => $prompt; 214 text => $prompt;
194 215
195 if ($flags & CS_QUERY_YESNO) { 216 if ($flags & CS_QUERY_YESNO) {
196 push @dialog, my $hbox = new CFPlus::UI::HBox; 217 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
213 ); 234 );
214 235
215 $dialog->grab_focus; 236 $dialog->grab_focus;
216 237
217 } elsif ($flags & CS_QUERY_SINGLECHAR) { 238 } 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) { 239 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
221 $MESSAGE_WINDOW->show; 240 $dialog->{tooltip} = "#charcreation_focus";
222 241
223 unshift @dialog, new CFPlus::UI::Label 242 unshift @dialog, new CFPlus::UI::Label
224 max_w => $::WIDTH * 0.4, 243 max_w => $::WIDTH * 0.8,
225 ellipsise => 0, 244 ellipsise => 0,
226 markup => "\nOr use your keyboard and the text entry below:\n"; 245 markup => "\nOr use your keyboard and the text entry below:\n";
227 246
228 unshift @dialog, my $table = new CFPlus::UI::Table; 247 unshift @dialog, my $table = new CFPlus::UI::Table;
229 248
… …
241 $conn->send ("reply d"); 260 $conn->send ("reply d");
242 destroy_query_dialog $conn; 261 destroy_query_dialog $conn;
243 0 262 0
244 }, 263 },
245 ); 264 );
265
266 if ($conn->{chargen_race_description}) {
267 unshift @dialog, new CFPlus::UI::Label
268 max_w => $::WIDTH * 0.8,
269 ellipsise => 0,
270 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
271 ;
272 }
273
274 unshift @dialog, new CFPlus::UI::Face
275 face => $conn->{player}{face},
276 bg => [.2, .2, .2, 1],
277 min_w => 64,
278 min_h => 64,
279 ;
280
281 if ($conn->{chargen_race_title}) {
282 unshift @dialog, new CFPlus::UI::Label
283 allign => 1,
284 ellipsise => 0,
285 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
286 ;
287 }
246 288
247 unshift @dialog, new CFPlus::UI::Label 289 unshift @dialog, new CFPlus::UI::Label
248 max_w => $::WIDTH * 0.4, 290 max_w => $::WIDTH * 0.4,
249 ellipsise => 0, 291 ellipsise => 0,
250 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 292 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
375 status "logging in..."; 417 status "logging in...";
376 418
377 $LOGIN_BUTTON->set_text ("Logout"); 419 $LOGIN_BUTTON->set_text ("Logout");
378 $SETUP_DIALOG->hide; 420 $SETUP_DIALOG->hide;
379 421
380 $PROFILE = $CFG->{profile}{default};
381
382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 422 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
383 423
384 my ($host, $port) = split /:/, $PROFILE->{host}; 424 my ($host, $port) = split /:/, $PROFILE->{host};
385 425
386 $MAP = new CFPlus::Map; 426 $MAP = new CFPlus::Map;
… …
401 statusbox => $STATUSBOX, 441 statusbox => $STATUSBOX,
402 map => $MAP, 442 map => $MAP,
403 mapmap => $MAPMAP, 443 mapmap => $MAPMAP,
404 query => \&server_query, 444 query => \&server_query,
405 445
446 setup_req => {
447 smoothing => $CFG->{map_smoothing}*1,
448 },
449
406 sound_play => sub { 450 sound_play => sub {
407 my ($x, $y, $soundnum, $type) = @_; 451 my ($x, $y, $soundnum, $type) = @_;
408 452
409 $SDL_MIXER 453 $SDL_MIXER
410 or return; 454 or return;
… …
429sub stop_game { 473sub stop_game {
430 $LOGIN_BUTTON->set_text ("Login"); 474 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 475 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 476 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 477 $PL_WINDOW->hide;
434 $SPELL_PAGE->clear_spells; 478 $SPELL_LIST->clear_spells;
435 479
436 return unless $CONN; 480 return unless $CONN;
437 481
438 status "connection closed"; 482 status "connection closed";
439 483
… …
447sub graphics_setup { 491sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 492 my $vbox = new CFPlus::UI::VBox;
449 493
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 494 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 495
496 my $row = 0;
497
498 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
499 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
500 can_events => 1,
501 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
502
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 503 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
453 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 504 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 505
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]); 506 $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]);
456 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 507 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
457 508
458 $mode_slider->connect (changed => sub { 509 $mode_slider->connect (changed => sub {
… …
460 511
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 512 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 513 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
463 }); 514 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 515 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465
466 my $row = 1;
467 516
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 517 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
469 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 518 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 519 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 520 tooltip => "Bring the client into fullscreen mode.",
… …
477 state => $CFG->{fast}, 526 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 527 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 528 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 529 );
481 530
531 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
532 $table->add (1, $row++, new CFPlus::UI::Slider
533 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
534 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
535 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
536 );
537
538 $table->add (1, $row++, new CFPlus::UI::Button
539 expand => 1, align => 0, text => "Apply",
540 tooltip => "Apply the video settings above.",
541 on_activate => sub {
542 video_shutdown ();
543 video_init ();
544 0
545 }
546 );
547
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 548 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
483 $table->add (1, $row++, new CFPlus::UI::Slider 549 $table->add (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 550 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 551 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 552 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
553 );
554
555 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
556 $table->add (1, $row++, new CFPlus::UI::CheckBox
557 state => $CFG->{map_smoothing},
558 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
559 . "This increases load on the graphics subsystem and works only with 2.x servers. "
560 . "Changes take effect at next connection only.",
561 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
487 ); 562 );
488 563
489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 564 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
490 $table->add (1, $row++, new CFPlus::UI::CheckBox 565 $table->add (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 566 state => $CFG->{fow_enable},
… …
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 585 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0 586 0
512 } 587 }
513 ); 588 );
514 589
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"); 590 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
523 $table->add (1, $row++, new CFPlus::UI::Slider 591 $table->add (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 592 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.", 593 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 }, 594 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 610 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 611 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
544 on_changed => sub { 612 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 613 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 614 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
547 0
548 }
549 );
550
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 615 0
558 } 616 }
559 ); 617 );
560 618
561 $vbox 619 $vbox
… …
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 724 $table->add (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"); 725 $table->add (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 }); 726 $table->add (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"); 727 $table->add (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 }); 728 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
729 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
671 730
672 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 731 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
673 732
674 for my $x (0..2) { 733 for my $x (0..2) {
675 for my $y (0 .. 2) { 734 for my $y (0 .. 2) {
… …
679 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 738 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
680 ); 739 );
681 } 740 }
682 } 741 }
683 742
743 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
684 744
685 $table 745 $table
686} 746}
687 747
688sub stats_window { 748sub stats_window {
… …
885 for 0 .. $#col; 945 for 0 .. $#col;
886 946
887 my @align = qw(1 0 1 1 -1); 947 my @align = qw(1 0 1 1 -1);
888 948
889 my $y = 0; 949 my $y = 0;
890 for my $m (
891 sort {
892 $b->{version} <=> $a->{version}
893 or $b->{users} <=> $a->{users}
894 }
895 @{ $msg->{servers} } 950 for my $m (@{ $msg->{servers} }) {
896 ) {
897 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 951 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
898 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 952 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
899 953
900 for ($desc) { 954 for ($desc) {
901 s/<br>/\n/gi; 955 s/<br>/\n/gi;
902 s/<li>/\n· /gi; 956 s/<li>/\n· /gi;
903 s/<.*?>//sgi; 957 s/<.*?>//sgi;
… …
933 max_w => $::WIDTH * 0.4, 987 max_w => $::WIDTH * 0.4,
934 ellipsise => 0, 988 ellipsise => 0,
935 align => $align[$_], 989 align => $align[$_],
936 text => $m->[$_], 990 text => $m->[$_],
937 tooltip => $tip[$_], 991 tooltip => $tip[$_],
938 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 992 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
939 can_hover => 1, 993 can_hover => 1,
940 can_events => 1, 994 can_events => 1,
941 fontsize => 0.8) 995 fontsize => 0.8)
942 for 0 .. $#$m; 996 for 0 .. $#$m;
943 } 997 }
… …
1044 . "so only set it if you really need to prefetch images. " 1098 . "so only set it if you really need to prefetch images. "
1045 . "This option can be set and unset any time.", 1099 . "This option can be set and unset any time.",
1046 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1100 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1047 ); 1101 );
1048 1102
1049 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1103 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1050 $table->add (1, 9, new CFPlus::UI::Entry 1104 $table->add (1, 9, new CFPlus::UI::Entry
1105 text => $CFG->{output_rate},
1106 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1107 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1108 . "default will be used, which is usually around 100kb/s.",
1109 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1110 );
1111
1112 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1113 $table->add (1, 10, new CFPlus::UI::Entry
1051 text => $CFG->{output_count}, 1114 text => $CFG->{output_count},
1052 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1115 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1053 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1116 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1054 ); 1117 );
1055 1118
1056 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1119 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1057 $table->add (1, 10, new CFPlus::UI::Entry 1120 $table->add (1, 11, new CFPlus::UI::Entry
1058 text => $CFG->{output_sync}, 1121 text => $CFG->{output_sync},
1059 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1122 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1060 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1123 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1061 ); 1124 );
1062 1125
1063 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1126 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1064 expand => 1, 1127 expand => 1,
1065 align => 0, 1128 align => 0,
1066 text => "Login", 1129 text => "Login",
1067 on_activate => sub { 1130 on_activate => sub {
1068 $CONN ? stop_game 1131 $CONN ? stop_game
1069 : start_game; 1132 : start_game;
1070 0 1133 0
1071 }, 1134 },
1072 ); 1135 );
1073 1136
1137 $vbox->add (new CFPlus::UI::FancyFrame
1138 label => "Server Info",
1139 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1140 );
1141
1142 $vbox
1143}
1144
1145sub client_setup {
1146 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1147
1148 my $row = 0;
1149
1074 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1150 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1075 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1151 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1076 text => $CFG->{say_command}, 1152 text => $CFG->{say_command},
1077 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. " 1153 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. "
1078 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1154 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1079 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1155 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1080 on_changed => sub { 1156 on_changed => sub {
1081 my ($self, $value) = @_; 1157 my ($self, $value) = @_;
1082 $CFG->{say_command} = $value; 1158 $CFG->{say_command} = $value;
1083 0 1159 0
1084 } 1160 }
1085 ); 1161 );
1086 1162
1087 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1163 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1088 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1164 $table->add (1, $row++, new CFPlus::UI::CheckBox
1089 state => $CFG->{show_tips}, 1165 state => $CFG->{show_tips},
1090 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1166 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1091 on_changed => sub { 1167 on_changed => sub {
1092 my ($self, $value) = @_; 1168 my ($self, $value) = @_;
1093 $CFG->{show_tips} = $value; 1169 $CFG->{show_tips} = $value;
1094 0 1170 0
1095 } 1171 }
1096 ); 1172 );
1097 1173
1098 $vbox->add (new CFPlus::UI::FancyFrame 1174 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1099 label => "Server Info", 1175 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1100 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1176 text => $CFG->{logview_max_par},
1177 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1178 . "sends more messages than this number, older messages get removed to save memory and "
1179 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1180 on_changed => sub {
1181 my ($self, $value) = @_;
1182 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1183 0
1184 },
1101 ); 1185 );
1102 1186
1103 $vbox 1187 $table
1104} 1188}
1105 1189
1106sub message_window { 1190sub message_window {
1107 my $window = new CFPlus::UI::Toplevel 1191 my $window = new CFPlus::UI::Toplevel
1108 name => "message_window", 1192 name => "message_window",
… …
1189 ["Boots" => PICKUP_BOOTS], 1273 ["Boots" => PICKUP_BOOTS],
1190 ["Gloves" => PICKUP_GLOVES], 1274 ["Gloves" => PICKUP_GLOVES],
1191 ["Cloaks" => PICKUP_CLOAK], 1275 ["Cloaks" => PICKUP_CLOAK],
1192 ], 1276 ],
1193 1277
1194 ["Readables", 2, 2, 1278 ["Readables", 2, 0,
1195 ["Spellbooks" => PICKUP_SPELLBOOK], 1279 ["Spellbooks" => PICKUP_SPELLBOOK],
1196 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1280 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1197 ["Normal Books/Scrolls" => PICKUP_READABLES], 1281 ["Normal Books/Scrolls" => PICKUP_READABLES],
1198 ], 1282 ],
1199 ["Misc", 2, 7, 1283 ["Misc", 2, 5,
1200 ["Food" => PICKUP_FOOD], 1284 ["Food" => PICKUP_FOOD],
1201 ["Drinks" => PICKUP_DRINK], 1285 ["Drinks" => PICKUP_DRINK],
1202 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1286 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1203 ["Keys" => PICKUP_KEY], 1287 ["Keys" => PICKUP_KEY],
1204 ["Magical Items" => PICKUP_MAGICAL], 1288 ["Magical Items" => PICKUP_MAGICAL],
1205 ["Potions" => PICKUP_POTION], 1289 ["Potions" => PICKUP_POTION],
1206 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1290 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1207 ["Ignore cursed" => PICKUP_NOT_CURSED], 1291 ["Ignore cursed" => PICKUP_NOT_CURSED],
1208 ["Jewelery" => PICKUP_JEWELS], 1292 ["Jewelery" => PICKUP_JEWELS],
1293 ["Flesh" => PICKUP_FLESH],
1209 ], 1294 ],
1210 ["Weight/Value ratio", 2, 17] 1295 ["Weight/Value ratio", 2, 17]
1211 ) 1296 )
1212 { 1297 {
1213 my ($title, $x, $y, @bits) = @$_; 1298 my ($title, $x, $y, @bits) = @$_;
… …
1263 $table 1348 $table
1264} 1349}
1265 1350
1266my %SORT_ORDER = ( 1351my %SORT_ORDER = (
1267 type => undef, 1352 type => undef,
1268 mtime => sub { sort { 1353 mtime => sub {
1354 my $NOW = time;
1355 sort {
1356 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1357 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1358
1269 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1359 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1270 or $b->{mtime} <=> $a->{mtime} 1360 or $btime <=> $atime
1271 or $a->{type} <=> $b->{type} 1361 or $a->{type} <=> $b->{type}
1362 } @_
1272 } @_ }, 1363 },
1273 weight => sub { sort { 1364 weight => sub { sort {
1274 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1365 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1275 or $a->{type} <=> $b->{type} 1366 or $a->{type} <=> $b->{type}
1276 } @_ }, 1367 } @_ },
1277); 1368);
… …
1352 $ntb->add ( 1443 $ntb->add (
1353 "Skills (F3)" => $SKILL_PAGE = skill_window, 1444 "Skills (F3)" => $SKILL_PAGE = skill_window,
1354 "Shows all your Skills." 1445 "Shows all your Skills."
1355 ); 1446 );
1356 1447
1357 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1448 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1358 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1449 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1359 $ntb->add ( 1450 $ntb->add (
1360 "Spellbook (F4)" => $spellsw, 1451 "Spellbook (F4)" => $spellsw,
1361 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1452 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1362 ); 1453 );
1363 $ntb->add ( 1454 $ntb->add (
… …
1370 1461
1371 $plwin->add ($ntb); 1462 $plwin->add ($ntb);
1372 $plwin 1463 $plwin
1373} 1464}
1374 1465
1375sub update_bindings {
1376 $BIND_UPD_CB->() if $BIND_UPD_CB;
1377}
1378
1379sub keyboard_setup { 1466sub keyboard_setup {
1380 my $binding_list = new CFPlus::UI::VBox; 1467 CFPlus::Macro::keyboard_setup
1381
1382 my $refresh;
1383 $refresh = $BIND_UPD_CB = sub {
1384 $binding_list->clear ();
1385
1386 return unless $PROFILE;
1387
1388 for my $mod (keys %{$PROFILE->{bindings}}) {
1389 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1390 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1391 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1392
1393 my $lbl = join "; ", @$cmds;
1394 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1395 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1396 $hb->add (new CFPlus::UI::Button
1397 text => "delete",
1398 tooltip => "Deletes the binding",
1399 on_activate => sub {
1400 $binding_list->remove ($hb);
1401 delete $PROFILE->{bindings}{$mod}{$sym};
1402 0
1403 });
1404
1405 $hb->add (new CFPlus::UI::Button
1406 text => "edit",
1407 tooltip => "Edits the binding",
1408 on_activate => sub {
1409 $::BIND_EDITOR->set_binding (
1410 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1411 sub {
1412 my ($nmod, $nsym, $ncmds) = @_;
1413 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1414 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1415 $refresh->();
1416 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1417 $SETUP_DIALOG->show;
1418 },
1419 sub {
1420 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1421 $SETUP_DIALOG->show;
1422 });
1423 $::BIND_EDITOR->show;
1424 $SETUP_DIALOG->hide;
1425 0
1426 });
1427
1428 $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1429 $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1430 }
1431 }
1432 };
1433
1434 my $vb = new CFPlus::UI::VBox;
1435 $vb->add (new CFPlus::UI::FancyFrame
1436 label => "Options",
1437 child => (my $hb = new CFPlus::UI::HBox),
1438 );
1439 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1440 $hb->add (new CFPlus::UI::CheckBox
1441 expand => 1,
1442 state => $CFG->{shift_fire_stop},
1443 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1444 on_changed => sub {
1445 my ($cbox, $value) = @_;
1446 $CFG->{shift_fire_stop} = $value;
1447 0
1448 });
1449
1450 $vb->add (new CFPlus::UI::FancyFrame
1451 label => "Bindings",
1452 child => $binding_list);
1453 $vb->add (my $hb = new CFPlus::UI::HBox);
1454
1455 $hb->add (new CFPlus::UI::Button
1456 text => "record new",
1457 expand => 1,
1458 tooltip => "This button opens the binding editor with an empty binding.",
1459 on_activate => sub {
1460 $::BIND_EDITOR->set_binding (undef, undef, [],
1461 sub {
1462 my ($mod, $sym, $cmds) = @_;
1463 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1464 $refresh->();
1465 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1466 $SETUP_DIALOG->show;
1467 },
1468 sub {
1469 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1470 $SETUP_DIALOG->show;
1471 },
1472 );
1473 $SETUP_DIALOG->hide;
1474 $::BIND_EDITOR->show;
1475 0
1476 },
1477 );
1478
1479 $hb->add (new CFPlus::UI::Button
1480 text => "close",
1481 tooltip => "Closes the binding window",
1482 expand => 1,
1483 on_activate => sub {
1484 $SETUP_DIALOG->hide;
1485 0
1486 }
1487 );
1488
1489 $refresh->();
1490
1491 $vb
1492} 1468}
1493 1469
1494sub help_window { 1470sub help_window {
1495 my $win = new CFPlus::UI::Toplevel 1471 my $win = new CFPlus::UI::Toplevel
1496 x => 'center', 1472 x => 'center',
… …
1653 1629
1654sub show_tip_of_the_day { 1630sub show_tip_of_the_day {
1655 # find all tips 1631 # find all tips
1656 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1632 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1657 1633
1658 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1634 CFPlus::DB::get state => "tip_of_the_day", sub {
1635 my ($todindex) = @_;
1659 $todindex = 0 if $todindex >= @tod; 1636 $todindex = 0 if $todindex >= @tod;
1660 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1637 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1661 1638
1662 # create dialog 1639 # create dialog
1663 my $dialog; 1640 my $dialog;
1664 1641
1665 my $close = sub { 1642 my $close = sub {
1666 $dialog->destroy; 1643 $dialog->destroy;
1644 };
1645
1646 $dialog = new CFPlus::UI::Toplevel
1647 x => "center",
1648 y => "center",
1649 z => 3,
1650 name => 'tip_of_the_day',
1651 force_w => int $WIDTH * 4/9,
1652 force_h => int $WIDTH * 2/9,
1653 title => "Tip of the day #" . (1 + $todindex),
1654 child => my $vbox = new CFPlus::UI::VBox,
1655 has_close_button => 1,
1656 on_delete => $close,
1657 ;
1658
1659 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1660 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1661 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1662
1663 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1664
1665 $table->add (0, 0, new CFPlus::UI::Button
1666 text => "Close",
1667 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>.",
1668 on_activate => $close,
1669 );
1670
1671 $table->add (2, 0, new CFPlus::UI::Button
1672 text => "Next",
1673 tooltip => "Show the next <b>Tip of the day</b>.",
1674 on_activate => sub {
1675 $close->();
1676 &show_tip_of_the_day;
1677 },
1678 );
1679
1680 $dialog->show;
1667 }; 1681 };
1668
1669 $dialog = new CFPlus::UI::Toplevel
1670 x => "center",
1671 y => "center",
1672 z => 3,
1673 name => 'tip_of_the_day',
1674 force_w => int $WIDTH * 4/9,
1675 force_h => int $WIDTH * 2/9,
1676 title => "Tip of the day #" . (1 + $todindex),
1677 child => my $vbox = new CFPlus::UI::VBox,
1678 has_close_button => 1,
1679 on_delete => $close,
1680 ;
1681
1682 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1683 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1684 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1685
1686 $vbox->add (my $table = new CFPlus::UI::Table);
1687
1688 $table->add (0, 0, new CFPlus::UI::Button
1689 text => "Close",
1690 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>.",
1691 on_activate => $close,
1692 );
1693
1694 $table->add (2, 0, new CFPlus::UI::Button
1695 text => "Next",
1696 tooltip => "Show the next <b>Tip of the day</b>.",
1697 on_activate => sub {
1698 $close->();
1699 &show_tip_of_the_day;
1700 },
1701 );
1702
1703 $dialog->show;
1704} 1682}
1705 1683
1706sub sdl_init { 1684sub sdl_init {
1707 CFPlus::SDL_Init 1685 CFPlus::SDL_Init
1708 and die "SDL::Init failed!\n"; 1686 and die "SDL::Init failed!\n";
… …
1742 padding => 0, 1720 padding => 0,
1743 z => 100, 1721 z => 100,
1744 force_x => "max", 1722 force_x => "max",
1745 force_y => 0; 1723 force_y => 0;
1746 $DEBUG_STATUS->show; 1724 $DEBUG_STATUS->show;
1747
1748 $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1749 1725
1750 $STATUSBOX = new CFPlus::UI::Statusbox; 1726 $STATUSBOX = new CFPlus::UI::Statusbox;
1751 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1727 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1752 1728
1753 (new CFPlus::UI::Frame 1729 (new CFPlus::UI::Frame
… …
1790 font => $FONT_FIXED, 1766 font => $FONT_FIXED,
1791 fontsize => $::CFG->{log_fontsize}, 1767 fontsize => $::CFG->{log_fontsize},
1792 indent => -4, 1768 indent => -4,
1793 can_hover => 1, 1769 can_hover => 1,
1794 can_events => 1, 1770 can_events => 1,
1771 max_par => $CFG->{logview_max_par},
1795 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1772 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1796 ; 1773 ;
1797 1774
1798 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1775 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1799 title => "Setup", 1776 title => "Setup",
1800 name => "setup_dialog", 1777 name => "setup_dialog",
… …
1811 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1788 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1812 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1789 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1813 1790
1814 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1791 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1815 "Configure the server to play on, your username, password and other server-related options."); 1792 "Configure the server to play on, your username, password and other server-related options.");
1793 $SETUP_NOTEBOOK->add (Client => client_setup,
1794 "Configure various client-specific settings.");
1816 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1795 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1817 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1796 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1818 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1797 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1819 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1798 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1820 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1799 $SETUP_NOTEBOOK->add (Audio => audio_setup,
… …
1854 ); 1833 );
1855 1834
1856 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1835 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1857 tooltip => "View Documentation"); 1836 tooltip => "View Documentation");
1858 1837
1838
1859 $BUTTONBAR->add (new CFPlus::UI::Button 1839 $BUTTONBAR->add (new CFPlus::UI::Button
1860 text => "Quit", 1840 text => "Quit",
1861 tooltip => "Terminates the program", 1841 tooltip => "Terminates the program",
1862 on_activate => sub { 1842 on_activate => sub {
1863 if ($CONN) { 1843 if ($CONN) {
… …
1874 } 1854 }
1875 1855
1876 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1856 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1877} 1857}
1878 1858
1859sub setup_build_button {
1860 my ($enabled) = @_;
1861 if ($enabled) {
1862 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1863 $BUILD_BUTTON ||= new CFPlus::UI::Button
1864 text => "Build",
1865 tooltip => "Opens the ingame builder",
1866 on_activate => sub {
1867 if ($CONN) {
1868 $CONN->send_ext_req (builder_player_items => sub {
1869 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1870 });
1871 }
1872 0
1873 };
1874 $BUTTONBAR->add ($BUILD_BUTTON);
1875 } else {
1876 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1877 }
1878}
1879
1880sub open_ingame_editor {
1881 my ($msg) = @_;
1882
1883 my $win = new CFPlus::UI::Toplevel
1884 x => 0,
1885 y => 'center',
1886 z => 4,
1887 name => 'builder_window',
1888 force_w => int $WIDTH * 1/4,
1889 force_h => int $HEIGHT * 3/4,
1890 title => "In game builder",
1891 has_close_button => 1;
1892
1893 my $r = new CFPlus::UI::ScrolledWindow (
1894 expand => 1,
1895 scroll_y => 1
1896 );
1897 $r->add (my $vb = new CFPlus::UI::VBox);
1898 $win->add ($r);
1899
1900
1901 $vb->add (
1902 new CFPlus::UI::Button
1903 text => "Disable build mode",
1904 on_activate => sub { $::IN_BUILD_MODE = undef }
1905 );
1906 $vb->add (
1907 new CFPlus::UI::Button
1908 text => "ERASE",
1909 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1910 );
1911
1912 for my $itemarchname (
1913 sort {
1914 $msg->{items}->{$a}->{build_arch_name}
1915 cmp $msg->{items}->{$b}->{build_arch_name}
1916 } keys %{$msg->{items}}
1917 ) {
1918 my $info = $msg->{items}->{$itemarchname};
1919 $vb->add (
1920 new CFPlus::UI::Button text => $info->{build_arch_name},
1921 on_activate => sub {
1922 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1923
1924 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1925 build_mode_query_arch_info ();
1926 }
1927 }
1928 );
1929 }
1930
1931 $win->show;
1932}
1933
1934sub build_mode_query_arch_info {
1935 my ($iteminfo) = $::IN_BUILD_MODE;
1936 my $itemarchname = $iteminfo->{item};
1937 my $info = $iteminfo->{info};
1938
1939 my $dialog = new CFPlus::UI::Toplevel
1940 x => "center",
1941 y => "center",
1942 z => 50,
1943 force_w => int $WIDTH * 1/2,
1944 title => "Enter information for placement of '$itemarchname'",
1945 has_close_button => 1;
1946
1947 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1948
1949 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1950 my $row = 0;
1951 if ($info->{has_name}) {
1952 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1953 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1954 }
1955 if ($info->{has_text}) {
1956 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1957 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1958 }
1959 if ($info->{has_connection}) {
1960 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1961 $table->add (1, $row++,
1962 new CFPlus::UI::Entry
1963 expand => 1,
1964 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1965 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1966 );
1967 }
1968
1969 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1970 $hb->add (new CFPlus::UI::Button
1971 text => "Close",
1972 expand => 1,
1973 on_activate => sub { $dialog->hide; 0 },
1974 );
1975 $dialog->show;
1976}
1977
1879sub video_shutdown { 1978sub video_shutdown {
1880 CFPlus::OpenGL::shutdown; 1979 CFPlus::OpenGL::shutdown;
1881 1980
1882 undef $SDL_ACTIVE; 1981 undef $SDL_ACTIVE;
1883} 1982}
… …
1916 2015
1917 audio_music_finished; 2016 audio_music_finished;
1918 2017
1919 local $_; 2018 local $_;
1920 while (<$fh>) { 2019 while (<$fh>) {
1921 last;
1922 next if /^\s*#/; 2020 next if /^\s*#/;
1923 next if /^\s*$/; 2021 next if /^\s*$/;
1924 2022
1925 my ($file, $volume, $event) = split /\s+/, $_, 3; 2023 my ($file, $volume, $event) = split /\s+/, $_, 3;
1926 2024
… …
2002 if $CONN; 2100 if $CONN;
2003}); 2101});
2004 2102
2005%SDL_CB = ( 2103%SDL_CB = (
2006 CFPlus::SDL_QUIT => sub { 2104 CFPlus::SDL_QUIT => sub {
2007 Event::unloop -1; 2105 exit;
2008 }, 2106 },
2009 CFPlus::SDL_VIDEORESIZE => sub { 2107 CFPlus::SDL_VIDEORESIZE => sub {
2010 }, 2108 },
2011 CFPlus::SDL_VIDEOEXPOSE => sub { 2109 CFPlus::SDL_VIDEOEXPOSE => sub {
2012 CFPlus::UI::full_refresh; 2110 CFPlus::UI::full_refresh;
2013 }, 2111 },
2014 CFPlus::SDL_ACTIVEEVENT => sub { 2112 CFPlus::SDL_ACTIVEEVENT => sub {
2015# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2113# not useful, as APPACTIVE include sonly iconified state, not unmapped
2114# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
2115# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2116# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2117# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2016 }, 2118 },
2017 CFPlus::SDL_KEYDOWN => sub { 2119 CFPlus::SDL_KEYDOWN => sub {
2018 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { 2120 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
2019 # alt-enter 2121 # alt-enter
2020 $FULLSCREEN_ENABLE->toggle; 2122 $FULLSCREEN_ENABLE->toggle;
… …
2041 2143
2042$SIG{INT} = $SIG{TERM} = sub { exit }; 2144$SIG{INT} = $SIG{TERM} = sub { exit };
2043 2145
2044{ 2146{
2045 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2147 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2148 CFPlus::DB::Server::run;
2149
2046 CFPlus::UI::set_layout ($::CFG->{layout}); 2150 CFPlus::UI::set_layout ($::CFG->{layout});
2047 2151
2048 my %DEF_CFG = ( 2152 my %DEF_CFG = (
2049 sdl_mode => 0, 2153 sdl_mode => 0,
2050 width => 640, 2154 width => 640,
2051 height => 480, 2155 height => 480,
2052 fullscreen => 0, 2156 fullscreen => 0,
2053 fast => 0, 2157 fast => 0,
2054 map_scale => 1, 2158 map_scale => 1,
2055 fow_enable => 1, 2159 fow_enable => 1,
2056 fow_intensity => 0.45, 2160 fow_intensity => 0.45,
2057 fow_smooth => 0, 2161 fow_smooth => 0,
2162 map_smoothing => 1,
2058 gui_fontsize => 1, 2163 gui_fontsize => 1,
2059 log_fontsize => 0.7, 2164 log_fontsize => 0.7,
2060 gauge_fontsize => 1, 2165 gauge_fontsize => 1,
2061 gauge_size => 0.35, 2166 gauge_size => 0.35,
2062 stat_fontsize => 0.7, 2167 stat_fontsize => 0.7,
2063 mapsize => 100, 2168 mapsize => 100,
2064 say_command => 'chat', 2169 say_command => 'chat',
2065 audio_enable => 1, 2170 audio_enable => 1,
2066 bgm_enable => 1, 2171 bgm_enable => 1,
2067 bgm_volume => 0.25, 2172 bgm_volume => 0.25,
2068 face_prefetch => 0, 2173 face_prefetch => 0,
2069 output_sync => 1, 2174 output_sync => 1,
2070 output_count => 1, 2175 output_count => 1,
2176 output_rate => "",
2071 pickup => 0, 2177 pickup => 0,
2072 inv_sort => "mtime", 2178 inv_sort => "mtime",
2073 default => "profile", # default profile 2179 default => "profile", # default profile
2074 show_tips => 1, 2180 show_tips => 1,
2181 logview_max_par => 1000,
2075 ); 2182 );
2076 2183
2077 while (my ($k, $v) = each %DEF_CFG) { 2184 while (my ($k, $v) = each %DEF_CFG) {
2078 $CFG->{$k} = $v unless exists $CFG->{$k}; 2185 $CFG->{$k} = $v unless exists $CFG->{$k};
2079 } 2186 }
2080 2187
2081 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2188 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2189 $PROFILE = $CFG->{profile}{default};
2190
2191 # convert old bindings (only default profile matters)
2192 if (my $bindings = delete $PROFILE->{bindings}) {
2193 while (my ($mod, $syms) = each %$bindings) {
2194 while (my ($sym, $cmds) = each %$syms) {
2195 push @{ $PROFILE->{macro} }, {
2196 accelkey => [$mod*1, $sym*1],
2197 action => $cmds,
2198 };
2199 }
2200 }
2201 }
2082 2202
2083 sdl_init; 2203 sdl_init;
2084 2204
2085 @SDL_MODES = reverse 2205 @SDL_MODES = reverse
2086 grep $_->[0] >= 640 && $_->[1] >= 480, 2206 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
2135 2255
2136Event::loop; 2256Event::loop;
2137#CFPlus::SDL_Quit; 2257#CFPlus::SDL_Quit;
2138#CFPlus::_exit 0; 2258#CFPlus::_exit 0;
2139 2259
2260END {
2140END { CFPlus::SDL_Quit } 2261 CFPlus::SDL_Quit;
2262 CFPlus::DB::Server::stop;
2263}
2141 2264
2142=head1 NAME 2265=head1 NAME
2143 2266
2144cfplus - A Crossfire+ and Crossfire game client 2267cfplus - A Crossfire+ and Crossfire game client
2145 2268

Diff Legend

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