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.104 by root, Sun Jul 30 13:14:15 2006 UTC vs.
Revision 1.121 by root, Sun Oct 1 18:17:38 2006 UTC

… …
47 47
48$Event::Eval = 0; 48$Event::Eval = 0;
49$Event::DIED = sub { 49$Event::DIED = sub {
50 # TODO: display dialog box or so 50 # TODO: display dialog box or so
51 Carp::cluck $_[1];#d#TODO: remove when stable 51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1]; 52 return;#d#
53 CFPlus::fatal ($_[1]);
53}; 54};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 55
66my $MAX_FPS = 60; 56my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 57my $MIN_FPS = 5; # unused as of yet
68 58
69our $META_SERVER = "crossfire.real-time.com:13326"; 59our $META_SERVER = "crossfire.real-time.com:13326";
… …
71our $LAST_REFRESH; 61our $LAST_REFRESH;
72our $NOW; 62our $NOW;
73 63
74our $CFG; 64our $CFG;
75our $CONN; 65our $CONN;
66our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 67our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 68
78our $WANT_REFRESH; 69our $WANT_REFRESH;
79our $CAN_REFRESH; 70our $CAN_REFRESH;
80 71
… …
155 146
156# server query dialog 147# server query dialog
157sub server_query { 148sub server_query {
158 my ($conn, $flags, $prompt) = @_; 149 my ($conn, $flags, $prompt) = @_;
159 150
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 151 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 152 x => "center",
162 y => "center", 153 y => "center",
163 title => "Server Query", 154 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 155 child => my $vbox = new CFPlus::UI::VBox,
165 ; 156 ;
… …
190 ); 181 );
191 182
192 $dialog->grab_focus; 183 $dialog->grab_focus;
193 184
194 } elsif ($flags & CS_QUERY_SINGLECHAR) { 185 } elsif ($flags & CS_QUERY_SINGLECHAR) {
195 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 186 $dialog->{tooltip} = "#charcreation_focus";
196 187
197 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 188 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
198 $MESSAGE_WINDOW->show; 189 $MESSAGE_WINDOW->show;
199 190
200 unshift @dialog, new CFPlus::UI::Label 191 unshift @dialog, new CFPlus::UI::Label
… …
222 ); 213 );
223 214
224 unshift @dialog, new CFPlus::UI::Label 215 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 217 ellipsise => 0,
227 markup => 218 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
228 "<big><b>Character Creation: Race</b></big>\n\n"
229 . "Look at the <b>Messages</b> window to see a description of this race "
230 . "and the center of the screen to see how this race looks like "
231 . "(<small>below this dialog window: you may need to move the dialog away and "
232 . "click into the display area to make it visible</small>).\n\n"
233 . "You can look at another race, or accept this race (you will cycle back to "
234 . "this race eventually, so you can take your time making this important choice."
235 ; 219 ;
236 220
237 } elsif ($prompt =~ /roll new stats/) { 221 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 222 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 223 $conn->send ("reply $stat");
… …
313 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>", 297 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314 align => 0, 298 align => 0,
315 expand => 1, 299 expand => 1,
316 can_events => 1, 300 can_events => 1,
317 can_hover => 1, 301 can_hover => 1,
318 tooltip => $CFPlus::STAT_TOOLTIP{$name}, 302 tooltip => "#stat_$name",
319 ); 303 );
320 } 304 }
321 305
322 unshift @dialog, new CFPlus::UI::Label 306 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 307 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 308 ellipsise => 0,
325 markup => 309 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
326 "<big><b>Character Creation: Stats</b></big>\n\n"
327 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
328 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
329 . "They will be modified later by both the race and the class you choose.\n\n"
330 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
331 ; 310 ;
332 } 311 }
333 312
334 push @dialog, my $entry = new CFPlus::UI::Entry 313 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 314 on_changed => sub {
… …
364 status "logging in..."; 343 status "logging in...";
365 344
366 $LOGIN_BUTTON->set_text ("Logout"); 345 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 346 $SETUP_DIALOG->hide;
368 347
348 $PROFILE = $CFG->{profile}{default};
349
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 350 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 351
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 352 my ($host, $port) = split /:/, $PROFILE->{host};
372 353
373 $MAP = new CFPlus::Map $mapsize, $mapsize; 354 $MAP = new CFPlus::Map $mapsize, $mapsize;
374 355
375 $CONN = eval { 356 $CONN = eval {
376 new CFPlus::Protocol 357 new CFPlus::Protocol
377 host => $host, 358 host => $host,
378 port => $port || 13327, 359 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 360 user => $PROFILE->{user},
380 pass => $CFG->{profile}{default}{password}, 361 pass => $PROFILE->{password},
381 mapw => $mapsize, 362 mapw => $mapsize,
382 maph => $mapsize, 363 maph => $mapsize,
364
365 client => "cfplus $CFPlus::VERSION $] $^O",
383 366
384 map_widget => $MAPWIDGET, 367 map_widget => $MAPWIDGET,
385 logview => $LOGVIEW, 368 logview => $LOGVIEW,
386 statusbox => $STATUSBOX, 369 statusbox => $STATUSBOX,
387 map => $MAP, 370 map => $MAP,
… …
622 (new CFPlus::UI::Empty expand => 1), 605 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFPlus::UI::HBox), 606 (my $hb = new CFPlus::UI::HBox),
624 ], 607 ],
625 ); 608 );
626 609
627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', 610 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
628 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
629 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', 611 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
630 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
631 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', 612 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
632 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
633 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', 613 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
634 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
635 614
636 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 615 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
637 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
638 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 616 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
639 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
640 617
641 $GAUGES = { 618 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 619 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 620 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 621 };
… …
681 expand => 1, 658 expand => 1,
682 scroll_y => 1 659 scroll_y => 1
683 ); 660 );
684 $r->add (my $vb = new CFPlus::UI::VBox); 661 $r->add (my $vb = new CFPlus::UI::VBox);
685 662
663 $vb->add (new CFPlus::UI::FancyFrame
664 label => "Player",
665 child => (my $pi = new CFPlus::UI::VBox),
666 );
667
686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 668 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
688 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
689 $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 671 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 672 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 673 tooltip => "The map you are currently on (if supported by the server).");
692 674
693 $vb->add (my $hb0 = new CFPlus::UI::HBox); 675 $pi->add (my $hb0 = new CFPlus::UI::HBox);
694 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 676 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 677 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 678 tooltip => "The weight of the player including all inventory items.");
697 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 679 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
698 can_hover => 1, can_events => 1, 680 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 681 tooltip => "The weight limit: you cannot carry more than this.");
700 682
683 $vb->add (new CFPlus::UI::FancyFrame
684 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 685 child => (my $hb = new CFPlus::UI::HBox expand => 1),
686 );
702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 687 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 688
704 my $color2 = [1, 1, 0]; 689 my $color2 = [1, 1, 0];
705 690
706 for ( 691 for (
… …
721 ) { 706 ) {
722 my ($col, $row, $id, $label, $template) = @$_; 707 my ($col, $row, $id, $label, $template) = @$_;
723 708
724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 709 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
725 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 710 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726 align => +1, template => $template, tooltip => $CFPlus::STAT_TOOLTIP{$label}); 711 align => +1, template => $template, tooltip => "#stat_$label");
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 712 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
728 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 713 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => $CFPlus::STAT_TOOLTIP{$label}); 714 align => -1, text => $label, tooltip => "#stat_$label");
730 } 715 }
731 716
717 $vb->add (new CFPlus::UI::FancyFrame
718 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 719 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
720 );
733 721
734 my $row = 0; 722 my $row = 0;
735 my $col = 0; 723 my $col = 0;
736 724
737 my %resist_names = ( 725 my %resist_names = (
… …
931sub metaserver_dialog { 919sub metaserver_dialog {
932 my $vbox = new CFPlus::UI::VBox; 920 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFPlus::UI::Table; 921 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 922 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 923
936 my $dialog = new CFPlus::UI::FancyFrame 924 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 925 title => "Server List",
938 name => 'metaserver_dialog', 926 name => 'metaserver_dialog',
939 x => 'center', 927 x => 'center',
940 y => 'center', 928 y => 'center',
941 z => 3, 929 z => 3,
… …
953} 941}
954 942
955sub server_setup { 943sub server_setup {
956 my $vbox = new CFPlus::UI::VBox; 944 my $vbox = new CFPlus::UI::VBox;
957 945
946 $vbox->add (new CFPlus::UI::FancyFrame
947 label => "Connection Settings",
958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 948 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
949 );
959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 950 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 951
961 { 952 {
962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 953 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 954
… …
1047 }, 1038 },
1048 ); 1039 );
1049 1040
1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1041 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1051 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1042 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1043 text => $CFG->{say_command},
1053 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. " 1044 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. "
1054 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1045 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1055 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1046 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1047 on_changed => sub {
1057 my ($self, $value) = @_; 1048 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1049 $CFG->{say_command} = $value;
1059 0 1050 0
1060 } 1051 }
1061 ); 1052 );
1062 1053
1054 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1055 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1056 state => $CFG->{show_tips},
1057 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1058 on_changed => sub {
1059 my ($self, $value) = @_;
1060 $CFG->{show_tips} = $value;
1061 0
1062 }
1063 );
1064
1063 $vbox->add (new CFPlus::UI::Label 1065 $vbox->add (new CFPlus::UI::FancyFrame
1064 text => "Server Info", 1066 label => "Server Info",
1065 fontsize => 1.2,
1066 padding_y => 8,
1067 fg => [1, 1, 0, 1],
1068 );
1069
1070 $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); 1067 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1068 );
1071 1069
1072 $vbox 1070 $vbox
1073} 1071}
1074 1072
1075sub message_window { 1073sub message_window {
1076 my $window = new CFPlus::UI::FancyFrame 1074 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1075 name => "message_window",
1078 title => "Messages", 1076 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1080 x => "max", 1078 x => "max",
1081 y => 0, 1079 y => 0,
… …
1131 window => $window, 1129 window => $window,
1132 input => $input, 1130 input => $input,
1133 }; 1131 };
1134 1132
1135 $window 1133 $window
1136}
1137
1138sub open_quit_dialog {
1139 unless ($QUIT_DIALOG) {
1140 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1141 x => "center",
1142 y => "center",
1143 z => 50,
1144 title => "Really Quit?",
1145 on_key_down => sub {
1146 my ($dialog, $ev) = @_;
1147 $ev->{sym} == 27 and $dialog->hide;
1148 }
1149 ;
1150
1151 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1152
1153 $vb->add (new CFPlus::UI::Label
1154 text => "You should find a savebed and apply it first!",
1155 max_w => $WIDTH * 0.25,
1156 ellipsize => 0,
1157 );
1158 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1159 $hb->add (new CFPlus::UI::Button
1160 text => "Ok",
1161 expand => 1,
1162 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1163 );
1164 $hb->add (new CFPlus::UI::Button
1165 text => "Quit anyway",
1166 expand => 1,
1167 on_activate => sub { exit },
1168 );
1169 }
1170
1171 $QUIT_DIALOG->show;
1172 $QUIT_DIALOG->grab_focus;
1173} 1134}
1174 1135
1175sub autopickup_setup { 1136sub autopickup_setup {
1176 my $table = new CFPlus::UI::Table; 1137 my $table = new CFPlus::UI::Table;
1177 1138
… …
1334 $PL_WINDOW->show; 1295 $PL_WINDOW->show;
1335 } 1296 }
1336} 1297}
1337 1298
1338sub player_window { 1299sub player_window {
1339 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1300 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1340 x => "center", 1301 x => "center",
1341 y => "center", 1302 y => "center",
1342 force_w => $WIDTH * 9/10, 1303 force_w => $WIDTH * 9/10,
1343 force_h => $HEIGHT * 9/10, 1304 force_h => $HEIGHT * 9/10,
1344 title => "Player", 1305 title => "Player",
… …
1386 1347
1387 my $refresh; 1348 my $refresh;
1388 $refresh = $BIND_UPD_CB = sub { 1349 $refresh = $BIND_UPD_CB = sub {
1389 $binding_list->clear (); 1350 $binding_list->clear ();
1390 1351
1352 return unless $PROFILE;
1353
1391 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1354 for my $mod (keys %{$PROFILE->{bindings}}) {
1392 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1355 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1393 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1356 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1394 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1357 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1395 1358
1396 my $lbl = join "; ", @$cmds; 1359 my $lbl = join "; ", @$cmds;
1397 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1360 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1398 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1361 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1399 $hb->add (new CFPlus::UI::Button 1362 $hb->add (new CFPlus::UI::Button
1400 text => "delete", 1363 text => "delete",
1401 tooltip => "Deletes the binding", 1364 tooltip => "Deletes the binding",
1402 on_activate => sub { 1365 on_activate => sub {
1403 $binding_list->remove ($hb); 1366 $binding_list->remove ($hb);
1404 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1367 delete $PROFILE->{bindings}{$mod}{$sym};
1405 0 1368 0
1406 }); 1369 });
1407 1370
1408 $hb->add (new CFPlus::UI::Button 1371 $hb->add (new CFPlus::UI::Button
1409 text => "edit", 1372 text => "edit",
1410 tooltip => "Edits the binding", 1373 tooltip => "Edits the binding",
1411 on_activate => sub { 1374 on_activate => sub {
1412 $::BIND_EDITOR->set_binding ( 1375 $::BIND_EDITOR->set_binding (
1413 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1376 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1414 sub { 1377 sub {
1415 my ($nmod, $nsym, $ncmds) = @_; 1378 my ($nmod, $nsym, $ncmds) = @_;
1416 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1379 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1417 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1380 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1418 $refresh->(); 1381 $refresh->();
… …
1433 } 1396 }
1434 } 1397 }
1435 }; 1398 };
1436 1399
1437 my $vb = new CFPlus::UI::VBox; 1400 my $vb = new CFPlus::UI::VBox;
1401 $vb->add (new CFPlus::UI::FancyFrame
1402 label => "Options",
1438 $vb->add (my $hb = new CFPlus::UI::HBox); 1403 child => (my $hb = new CFPlus::UI::HBox),
1404 );
1439 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire"); 1405 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1440 $hb->add (new CFPlus::UI::CheckBox 1406 $hb->add (new CFPlus::UI::CheckBox
1441 expand => 1, 1407 expand => 1,
1442 state => $CFG->{shift_fire_stop}, 1408 state => $CFG->{shift_fire_stop},
1443 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1409 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
… …
1445 my ($cbox, $value) = @_; 1411 my ($cbox, $value) = @_;
1446 $CFG->{shift_fire_stop} = $value; 1412 $CFG->{shift_fire_stop} = $value;
1447 0 1413 0
1448 }); 1414 });
1449 1415
1450 $vb->add ($binding_list); 1416 $vb->add (new CFPlus::UI::FancyFrame
1417 label => "Bindings",
1418 child => $binding_list);
1451 $vb->add (my $hb = new CFPlus::UI::HBox); 1419 $vb->add (my $hb = new CFPlus::UI::HBox);
1452 1420
1453 $hb->add (new CFPlus::UI::Button 1421 $hb->add (new CFPlus::UI::Button
1454 text => "record new", 1422 text => "record new",
1455 expand => 1, 1423 expand => 1,
… …
1488 1456
1489 $vb 1457 $vb
1490} 1458}
1491 1459
1492sub help_window { 1460sub help_window {
1493 my $win = new CFPlus::UI::FancyFrame 1461 my $win = new CFPlus::UI::Toplevel
1494 x => 'center', 1462 x => 'center',
1495 y => 'center', 1463 y => 'center',
1496 z => 2, 1464 z => 4,
1497 name => 'doc_browser', 1465 name => 'doc_browser',
1498 force_w => int $WIDTH * 7/8, 1466 force_w => int $WIDTH * 7/8,
1499 force_h => int $HEIGHT * 7/8, 1467 force_h => int $HEIGHT * 7/8,
1500 title => "Help Browser", 1468 title => "Help Browser",
1501 has_close_button => 1; 1469 has_close_button => 1;
1502 1470
1503 $win->add (my $vbox = new CFPlus::UI::VBox); 1471 $win->add (my $vbox = new CFPlus::UI::VBox);
1504 1472
1473 $vbox->add (new CFPlus::UI::FancyFrame
1474 label => "Navigation",
1505 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1475 child => (my $buttons = new CFPlus::UI::HBox),
1476 );
1506 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1477 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1507 expand => 1, fontsize => 0.8, padding_x => 4); 1478 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1508 1479
1509 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1480 my @history;
1510 $buttons->add (my $combo = new CFPlus::UI::Selector 1481 my @future;
1511 value => undef, 1482 my $curnode;
1512 options => [ 1483
1513 [intro => "Introduction"], 1484 my $load_node; $load_node = sub {
1514 [manual => "Main Manual"], 1485 my ($node, $para) = @_;
1515 [skill_help => "Skill Reference"], 1486
1516 [command_help => "Command Reference"], 1487 $buttons->clear;
1517 [dmcommand_help => "DM Commands"], 1488
1518 [COPYING => "License Terms"], 1489 $buttons->add (new CFPlus::UI::Button
1490 text => "⇤",
1491 tooltip => "back to the starting page",
1492 on_activate => sub {
1493 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1494 unshift @future, @history;
1495 @history = ();
1496 $load_node->(@{shift @future});
1497 },
1498 );
1499
1500 if (@history) {
1501 $buttons->add (new CFPlus::UI::Button
1502 text => "⋘",
1503 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1504 on_activate => sub {
1505 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1506 $load_node->(@{pop @history});
1507 },
1508 );
1519 ], 1509 }
1520 on_changed => sub {
1521 my ($self, $pod) = @_;
1522 1510
1511 if (@future) {
1512 $buttons->add (new CFPlus::UI::Button
1513 text => "⋙",
1514 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1515 on_activate => sub {
1516 push @history, [$curnode, $viewer->current_paragraph];
1517 $load_node->(@{shift @future});
1518 },
1519 );
1520 }
1521
1522 $buttons->add (new CFPlus::UI::Label text => " ");
1523
1524 my @path = CFPlus::Pod::full_path_of $node;
1525 pop @path; # drop current node
1526
1527 for my $node (@path) {
1528 $buttons->add (new CFPlus::UI::Button
1529 text => $node->{kw}[0],
1530 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1531 on_activate => sub {
1532 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1533 $load_node->($node);
1534 },
1535 );
1536 $buttons->add (new CFPlus::UI::Label text => "/");
1537 }
1538
1539 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1540
1541 $curnode = $node;
1542
1523 $viewer->clear; 1543 $viewer->clear;
1524 $viewer->add_paragraph (@{ CFPlus::Pod::pod_paragraphs $pod }); 1544 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1525 $viewer->set_offset (0); 1545 $viewer->scroll_to ($para);
1546 };
1526 1547
1548 $load_node->(CFPlus::Pod::find pod => "mainpage");
1549
1550 $CFPlus::Pod::goto_document = sub {
1551 my (@path) = @_;
1552
1553 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1554
1555 $load_node->((CFPlus::Pod::find @path)[0]);
1556 $win->show;
1557 };
1558
1559 $win
1560}
1561
1562sub open_string_query {
1563 my ($title, $cb, $txt, $tooltip) = @_;
1564 my $dialog = new CFPlus::UI::Toplevel
1565 x => "center",
1566 y => "center",
1567 z => 50,
1568 force_w => $WIDTH * 4/5,
1569 title => $title;
1570
1571 $dialog->add (
1572 my $e = new CFPlus::UI::Entry
1573 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1574 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1575 tooltip => $tooltip
1576 );
1577
1578 $e->grab_focus;
1579 $e->set_text ($txt) if $txt;
1580 $dialog->show;
1581}
1582
1583sub open_quit_dialog {
1584 unless ($QUIT_DIALOG) {
1585 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1586 x => "center",
1587 y => "center",
1588 z => 50,
1589 title => "Really Quit?",
1590 on_key_down => sub {
1591 my ($dialog, $ev) = @_;
1592 $ev->{sym} == 27 and $dialog->hide;
1527 0 1593 }
1594 ;
1595
1596 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1597
1598 $vb->add (new CFPlus::UI::Label
1599 text => "You should find a savebed and apply it first!",
1600 max_w => $WIDTH * 0.25,
1601 ellipsize => 0,
1602 );
1603 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1604 $hb->add (new CFPlus::UI::Button
1605 text => "Ok",
1606 expand => 1,
1607 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1608 );
1609 $hb->add (new CFPlus::UI::Button
1610 text => "Quit anyway",
1611 expand => 1,
1612 on_activate => sub { exit },
1613 );
1614 }
1615
1616 $QUIT_DIALOG->show;
1617 $QUIT_DIALOG->grab_focus;
1618}
1619
1620sub show_tip_of_the_day {
1621 # find all tips
1622 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1623
1624 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1625 $todindex = 0 if $todindex >= @tod;
1626 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1627
1628 # create dialog
1629 my $dialog;
1630
1631 my $close = sub {
1632 $dialog->destroy;
1633 };
1634
1635 $dialog = new CFPlus::UI::Toplevel
1636 x => "center",
1637 y => "center",
1638 z => 3,
1639 name => 'tip_of_the_day',
1640 force_w => int $WIDTH * 4/9,
1641 force_h => int $WIDTH * 2/9,
1642 title => "Tip of the day #" . (1 + $todindex),
1643 child => my $vbox = new CFPlus::UI::VBox,
1644 has_close_button => 1,
1645 on_delete => $close,
1646 ;
1647
1648 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1649 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1650 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1651
1652 $vbox->add (my $table = new CFPlus::UI::Table);
1653
1654 $table->add (0, 0, new CFPlus::UI::Button
1655 text => "Close",
1656 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>.",
1657 on_activate => $close,
1658 );
1659
1660 $table->add (2, 0, new CFPlus::UI::Button
1661 text => "Next",
1662 tooltip => "Show the next <b>Tip of the day</b>.",
1663 on_activate => sub {
1664 $close->();
1665 &show_tip_of_the_day;
1528 }, 1666 },
1529 on_visibility_change => sub {
1530 my ($self, $visible) = @_;
1531 return unless $visible;
1532 return if $self->{value};
1533 $self->set_value ("intro");
1534 0
1535 },
1536 ); 1667 );
1537 1668
1538 $win 1669 $dialog->show;
1539} 1670}
1540 1671
1541sub sdl_init { 1672sub sdl_init {
1542 CFPlus::SDL_Init 1673 CFPlus::SDL_Init
1543 and die "SDL::Init failed!\n"; 1674 and die "SDL::Init failed!\n";
… …
1590 force_x => 0, 1721 force_x => 0,
1591 force_y => "max", 1722 force_y => "max",
1592 child => $STATUSBOX, 1723 child => $STATUSBOX,
1593 )->show; 1724 )->show;
1594 1725
1595 CFPlus::UI::FancyFrame->new ( 1726 CFPlus::UI::Toplevel->new (
1596 title => "Map", 1727 title => "Map",
1597 name => "mapmap", 1728 name => "mapmap",
1598 x => 0, 1729 x => 0,
1599 y => $FONTSIZE + 8, 1730 y => $FONTSIZE + 8,
1600 border_bg => [1, 1, 1, 192/255], 1731 border_bg => [1, 1, 1, 192/255],
… …
1628 can_hover => 1, 1759 can_hover => 1,
1629 can_events => 1, 1760 can_events => 1,
1630 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1761 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1631 ; 1762 ;
1632 1763
1633 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1764 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1634 title => "Setup", 1765 title => "Setup",
1635 name => "setup_dialog", 1766 name => "setup_dialog",
1636 x => 'center', 1767 x => 'center',
1637 y => 'center', 1768 y => 'center',
1638 z => 2, 1769 z => 2,
… …
1902 output_sync => 1, 2033 output_sync => 1,
1903 output_count => 1, 2034 output_count => 1,
1904 pickup => 0, 2035 pickup => 0,
1905 inv_sort => "mtime", 2036 inv_sort => "mtime",
1906 default => "profile", # default profile 2037 default => "profile", # default profile
2038 show_tips => 1,
1907 ); 2039 );
1908 2040
1909 while (my ($k, $v) = each %DEF_CFG) { 2041 while (my ($k, $v) = each %DEF_CFG) {
1910 $CFG->{$k} = $v unless exists $CFG->{$k}; 2042 $CFG->{$k} = $v unless exists $CFG->{$k};
1911 } 2043 }
… …
1959 2091
1960 video_init; 2092 video_init;
1961 audio_init; 2093 audio_init;
1962} 2094}
1963 2095
2096show_tip_of_the_day if $CFG->{show_tips};
2097
1964Event::loop; 2098Event::loop;
1965#CFPlus::SDL_Quit; 2099#CFPlus::SDL_Quit;
1966#CFPlus::_exit 0; 2100#CFPlus::_exit 0;
1967 2101
1968END { CFPlus::SDL_Quit } 2102END { CFPlus::SDL_Quit }

Diff Legend

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