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.108 by elmex, Sun Aug 13 11:29:19 2006 UTC vs.
Revision 1.124 by root, Tue Nov 7 22:41:27 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
5 26
6# do things only needed for single-binary version (par) 27# do things only needed for single-binary version (par)
… …
8 if (%PAR::LibCache) { 29 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 30 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 31
11 while (my ($filename, $zip) = each %PAR::LibCache) { 32 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 33 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 34 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 35 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 36 unless -e "$ENV{PAR_TEMP}/$1";
16 } 37 }
17 } 38 }
18 39
… …
47 68
48$Event::Eval = 0; 69$Event::Eval = 0;
49$Event::DIED = sub { 70$Event::DIED = sub {
50 # TODO: display dialog box or so 71 # TODO: display dialog box or so
51 Carp::cluck $_[1];#d#TODO: remove when stable 72 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1]; 73 return;#d#
74 CFPlus::fatal ($_[1]);
53}; 75};
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 76
66my $MAX_FPS = 60; 77my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 78my $MIN_FPS = 5; # unused as of yet
68 79
69our $META_SERVER = "crossfire.real-time.com:13326"; 80our $META_SERVER = "crossfire.real-time.com:13326";
… …
71our $LAST_REFRESH; 82our $LAST_REFRESH;
72our $NOW; 83our $NOW;
73 84
74our $CFG; 85our $CFG;
75our $CONN; 86our $CONN;
87our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 88our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 89
78our $WANT_REFRESH; 90our $WANT_REFRESH;
79our $CAN_REFRESH; 91our $CAN_REFRESH;
80 92
… …
146 158
147sub debug { 159sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 160 $DEBUG_STATUS->set_text ($_[0]);
149} 161}
150 162
163sub message {
164 my ($para) = @_;
165
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}
173
151sub destroy_query_dialog { 174sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 175 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 176 if $_[0]{query_dialog};
154} 177}
155 178
156# server query dialog 179# server query dialog
157sub server_query { 180sub server_query {
158 my ($conn, $flags, $prompt) = @_; 181 my ($conn, $flags, $prompt) = @_;
159 182
160 $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame 183 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
161 x => "center", 184 x => "center",
162 y => "center", 185 y => "center",
163 title => "Server Query", 186 title => "Server Query",
164 child => my $vbox = new CFPlus::UI::VBox, 187 child => my $vbox = new CFPlus::UI::VBox,
165 ; 188 ;
… …
222 ); 245 );
223 246
224 unshift @dialog, new CFPlus::UI::Label 247 unshift @dialog, new CFPlus::UI::Label
225 max_w => $::WIDTH * 0.4, 248 max_w => $::WIDTH * 0.4,
226 ellipsise => 0, 249 ellipsise => 0,
227 markup => 250 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 ; 251 ;
236 252
237 } elsif ($prompt =~ /roll new stats/) { 253 } elsif ($prompt =~ /roll new stats/) {
238 if (my $stat = delete $conn->{stat_change_with}) { 254 if (my $stat = delete $conn->{stat_change_with}) {
239 $conn->send ("reply $stat"); 255 $conn->send ("reply $stat");
… …
320 } 336 }
321 337
322 unshift @dialog, new CFPlus::UI::Label 338 unshift @dialog, new CFPlus::UI::Label
323 max_w => $::WIDTH * 0.4, 339 max_w => $::WIDTH * 0.4,
324 ellipsise => 0, 340 ellipsise => 0,
325 markup => 341 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 ; 342 ;
332 } 343 }
333 344
334 push @dialog, my $entry = new CFPlus::UI::Entry 345 push @dialog, my $entry = new CFPlus::UI::Entry
335 on_changed => sub { 346 on_changed => sub {
… …
364 status "logging in..."; 375 status "logging in...";
365 376
366 $LOGIN_BUTTON->set_text ("Logout"); 377 $LOGIN_BUTTON->set_text ("Logout");
367 $SETUP_DIALOG->hide; 378 $SETUP_DIALOG->hide;
368 379
380 $PROFILE = $CFG->{profile}{default};
381
369 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
370 383
371 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 384 my ($host, $port) = split /:/, $PROFILE->{host};
372 385
373 $MAP = new CFPlus::Map $mapsize, $mapsize; 386 $MAP = new CFPlus::Map;
374 387
375 $CONN = eval { 388 $CONN = eval {
376 new CFPlus::Protocol 389 new CFPlus::Protocol
377 host => $host, 390 host => $host,
378 port => $port || 13327, 391 port => $port || 13327,
379 user => $CFG->{profile}{default}{user}, 392 user => $PROFILE->{user},
380 pass => $CFG->{profile}{default}{password}, 393 pass => $PROFILE->{password},
381 mapw => $mapsize, 394 mapw => $mapsize,
382 maph => $mapsize, 395 maph => $mapsize,
396
397 client => "cfplus $CFPlus::VERSION $] $^O",
383 398
384 map_widget => $MAPWIDGET, 399 map_widget => $MAPWIDGET,
385 logview => $LOGVIEW, 400 logview => $LOGVIEW,
386 statusbox => $STATUSBOX, 401 statusbox => $STATUSBOX,
387 map => $MAP, 402 map => $MAP,
… …
622 (new CFPlus::UI::Empty expand => 1), 637 (new CFPlus::UI::Empty expand => 1),
623 (my $hb = new CFPlus::UI::HBox), 638 (my $hb = new CFPlus::UI::HBox),
624 ], 639 ],
625 ); 640 );
626 641
627 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', 642 $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', 643 $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', 644 $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', 645 $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 646
636 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 647 $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, 648 $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 649
641 $GAUGES = { 650 $GAUGES = {
642 exp => $exp, win => $win, range => $rng, 651 exp => $exp, win => $win, range => $rng,
643 food => $fg, mana => $mg, hp => $hg, grace => $gg 652 food => $fg, mana => $mg, hp => $hg, grace => $gg
644 }; 653 };
… …
681 expand => 1, 690 expand => 1,
682 scroll_y => 1 691 scroll_y => 1
683 ); 692 );
684 $r->add (my $vb = new CFPlus::UI::VBox); 693 $r->add (my $vb = new CFPlus::UI::VBox);
685 694
695 $vb->add (new CFPlus::UI::FancyFrame
696 label => "Player",
697 child => (my $pi = new CFPlus::UI::VBox),
698 );
699
686 $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 700 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
687 can_hover => 1, can_events => 1, 701 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."); 702 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, 703 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
690 can_hover => 1, can_events => 1, 704 can_hover => 1, can_events => 1,
691 tooltip => "The map you are currently on (if supported by the server)."); 705 tooltip => "The map you are currently on (if supported by the server).");
692 706
693 $vb->add (my $hb0 = new CFPlus::UI::HBox); 707 $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, 708 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
695 can_hover => 1, can_events => 1, 709 can_hover => 1, can_events => 1,
696 tooltip => "The weight of the player including all inventory items."); 710 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, 711 $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, 712 can_hover => 1, can_events => 1,
699 tooltip => "The weight limit: you cannot carry more than this."); 713 tooltip => "The weight limit: you cannot carry more than this.");
700 714
715 $vb->add (new CFPlus::UI::FancyFrame
716 label => "Primary/Secondary Statistics",
701 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); 717 child => (my $hb = new CFPlus::UI::HBox expand => 1),
718 );
702 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); 719 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
703 720
704 my $color2 = [1, 1, 0]; 721 my $color2 = [1, 1, 0];
705 722
706 for ( 723 for (
… …
727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 744 $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, 745 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => "#stat_$label"); 746 align => -1, text => $label, tooltip => "#stat_$label");
730 } 747 }
731 748
749 $vb->add (new CFPlus::UI::FancyFrame
750 label => "Resistancies",
732 $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); 751 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
752 );
733 753
734 my $row = 0; 754 my $row = 0;
735 my $col = 0; 755 my $col = 0;
736 756
737 my %resist_names = ( 757 my %resist_names = (
… …
931sub metaserver_dialog { 951sub metaserver_dialog {
932 my $vbox = new CFPlus::UI::VBox; 952 my $vbox = new CFPlus::UI::VBox;
933 my $table = new CFPlus::UI::Table; 953 my $table = new CFPlus::UI::Table;
934 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); 954 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
935 955
936 my $dialog = new CFPlus::UI::FancyFrame 956 my $dialog = new CFPlus::UI::Toplevel
937 title => "Server List", 957 title => "Server List",
938 name => 'metaserver_dialog', 958 name => 'metaserver_dialog',
939 x => 'center', 959 x => 'center',
940 y => 'center', 960 y => 'center',
941 z => 3, 961 z => 3,
… …
953} 973}
954 974
955sub server_setup { 975sub server_setup {
956 my $vbox = new CFPlus::UI::VBox; 976 my $vbox = new CFPlus::UI::VBox;
957 977
978 $vbox->add (new CFPlus::UI::FancyFrame
979 label => "Connection Settings",
958 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 980 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
981 );
959 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 982 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
960 983
961 { 984 {
962 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 985 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
963 986
… …
1047 }, 1070 },
1048 ); 1071 );
1049 1072
1050 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1073 $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 1074 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1052 text => $CFG->{say_command}, 1075 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. " 1076 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1054 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1077 . "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.", 1078 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1056 on_changed => sub { 1079 on_changed => sub {
1057 my ($self, $value) = @_; 1080 my ($self, $value) = @_;
1058 $CFG->{say_command} = $value; 1081 $CFG->{say_command} = $value;
1059 0 1082 0
1060 } 1083 }
1061 ); 1084 );
1062 1085
1086 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1087 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1088 state => $CFG->{show_tips},
1089 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1090 on_changed => sub {
1091 my ($self, $value) = @_;
1092 $CFG->{show_tips} = $value;
1093 0
1094 }
1095 );
1096
1063 $vbox->add (new CFPlus::UI::Label 1097 $vbox->add (new CFPlus::UI::FancyFrame
1064 text => "Server Info", 1098 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); 1099 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1100 );
1071 1101
1072 $vbox 1102 $vbox
1073} 1103}
1074 1104
1075sub message_window { 1105sub message_window {
1076 my $window = new CFPlus::UI::FancyFrame 1106 my $window = new CFPlus::UI::Toplevel
1077 name => "message_window", 1107 name => "message_window",
1078 title => "Messages", 1108 title => "Messages",
1079 border_bg => [1, 1, 1, 1], 1109 border_bg => [1, 1, 1, 1],
1080 x => "max", 1110 x => "max",
1081 y => 0, 1111 y => 0,
… …
1131 window => $window, 1161 window => $window,
1132 input => $input, 1162 input => $input,
1133 }; 1163 };
1134 1164
1135 $window 1165 $window
1136}
1137
1138sub open_string_query {
1139 my $cb = $_[1];
1140 my $dialog = new CFPlus::UI::FancyFrame
1141 x => "center",
1142 y => "center",
1143 z => 50,
1144 force_w => $WIDTH * 4/5,
1145 title => $_[0];
1146
1147 $dialog->add (
1148 my $e = new CFPlus::UI::Entry
1149 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1150 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1151 );
1152
1153 $e->grab_focus;
1154 $dialog->show;
1155}
1156
1157sub open_quit_dialog {
1158 unless ($QUIT_DIALOG) {
1159 $QUIT_DIALOG = new CFPlus::UI::FancyFrame
1160 x => "center",
1161 y => "center",
1162 z => 50,
1163 title => "Really Quit?",
1164 on_key_down => sub {
1165 my ($dialog, $ev) = @_;
1166 $ev->{sym} == 27 and $dialog->hide;
1167 }
1168 ;
1169
1170 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1171
1172 $vb->add (new CFPlus::UI::Label
1173 text => "You should find a savebed and apply it first!",
1174 max_w => $WIDTH * 0.25,
1175 ellipsize => 0,
1176 );
1177 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1178 $hb->add (new CFPlus::UI::Button
1179 text => "Ok",
1180 expand => 1,
1181 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1182 );
1183 $hb->add (new CFPlus::UI::Button
1184 text => "Quit anyway",
1185 expand => 1,
1186 on_activate => sub { exit },
1187 );
1188 }
1189
1190 $QUIT_DIALOG->show;
1191 $QUIT_DIALOG->grab_focus;
1192} 1166}
1193 1167
1194sub autopickup_setup { 1168sub autopickup_setup {
1195 my $table = new CFPlus::UI::Table; 1169 my $table = new CFPlus::UI::Table;
1196 1170
… …
1353 $PL_WINDOW->show; 1327 $PL_WINDOW->show;
1354 } 1328 }
1355} 1329}
1356 1330
1357sub player_window { 1331sub player_window {
1358 my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame 1332 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1359 x => "center", 1333 x => "center",
1360 y => "center", 1334 y => "center",
1361 force_w => $WIDTH * 9/10, 1335 force_w => $WIDTH * 9/10,
1362 force_h => $HEIGHT * 9/10, 1336 force_h => $HEIGHT * 9/10,
1363 title => "Player", 1337 title => "Player",
… …
1405 1379
1406 my $refresh; 1380 my $refresh;
1407 $refresh = $BIND_UPD_CB = sub { 1381 $refresh = $BIND_UPD_CB = sub {
1408 $binding_list->clear (); 1382 $binding_list->clear ();
1409 1383
1384 return unless $PROFILE;
1385
1410 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1386 for my $mod (keys %{$PROFILE->{bindings}}) {
1411 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1387 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1412 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1388 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1413 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1389 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1414 1390
1415 my $lbl = join "; ", @$cmds; 1391 my $lbl = join "; ", @$cmds;
1416 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1392 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1417 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1393 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1418 $hb->add (new CFPlus::UI::Button 1394 $hb->add (new CFPlus::UI::Button
1419 text => "delete", 1395 text => "delete",
1420 tooltip => "Deletes the binding", 1396 tooltip => "Deletes the binding",
1421 on_activate => sub { 1397 on_activate => sub {
1422 $binding_list->remove ($hb); 1398 $binding_list->remove ($hb);
1423 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1399 delete $PROFILE->{bindings}{$mod}{$sym};
1424 0 1400 0
1425 }); 1401 });
1426 1402
1427 $hb->add (new CFPlus::UI::Button 1403 $hb->add (new CFPlus::UI::Button
1428 text => "edit", 1404 text => "edit",
1429 tooltip => "Edits the binding", 1405 tooltip => "Edits the binding",
1430 on_activate => sub { 1406 on_activate => sub {
1431 $::BIND_EDITOR->set_binding ( 1407 $::BIND_EDITOR->set_binding (
1432 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1408 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1433 sub { 1409 sub {
1434 my ($nmod, $nsym, $ncmds) = @_; 1410 my ($nmod, $nsym, $ncmds) = @_;
1435 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1411 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1436 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1412 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1437 $refresh->(); 1413 $refresh->();
… …
1452 } 1428 }
1453 } 1429 }
1454 }; 1430 };
1455 1431
1456 my $vb = new CFPlus::UI::VBox; 1432 my $vb = new CFPlus::UI::VBox;
1433 $vb->add (new CFPlus::UI::FancyFrame
1434 label => "Options",
1457 $vb->add (my $hb = new CFPlus::UI::HBox); 1435 child => (my $hb = new CFPlus::UI::HBox),
1436 );
1458 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire"); 1437 $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1459 $hb->add (new CFPlus::UI::CheckBox 1438 $hb->add (new CFPlus::UI::CheckBox
1460 expand => 1, 1439 expand => 1,
1461 state => $CFG->{shift_fire_stop}, 1440 state => $CFG->{shift_fire_stop},
1462 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", 1441 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
… …
1464 my ($cbox, $value) = @_; 1443 my ($cbox, $value) = @_;
1465 $CFG->{shift_fire_stop} = $value; 1444 $CFG->{shift_fire_stop} = $value;
1466 0 1445 0
1467 }); 1446 });
1468 1447
1469 $vb->add ($binding_list); 1448 $vb->add (new CFPlus::UI::FancyFrame
1449 label => "Bindings",
1450 child => $binding_list);
1470 $vb->add (my $hb = new CFPlus::UI::HBox); 1451 $vb->add (my $hb = new CFPlus::UI::HBox);
1471 1452
1472 $hb->add (new CFPlus::UI::Button 1453 $hb->add (new CFPlus::UI::Button
1473 text => "record new", 1454 text => "record new",
1474 expand => 1, 1455 expand => 1,
… …
1507 1488
1508 $vb 1489 $vb
1509} 1490}
1510 1491
1511sub help_window { 1492sub help_window {
1512 my $win = new CFPlus::UI::FancyFrame 1493 my $win = new CFPlus::UI::Toplevel
1513 x => 'center', 1494 x => 'center',
1514 y => 'center', 1495 y => 'center',
1515 z => 2, 1496 z => 4,
1516 name => 'doc_browser', 1497 name => 'doc_browser',
1517 force_w => int $WIDTH * 7/8, 1498 force_w => int $WIDTH * 7/8,
1518 force_h => int $HEIGHT * 7/8, 1499 force_h => int $HEIGHT * 7/8,
1519 title => "Help Browser", 1500 title => "Help Browser",
1520 has_close_button => 1; 1501 has_close_button => 1;
1521 1502
1522 $win->add (my $vbox = new CFPlus::UI::VBox); 1503 $win->add (my $vbox = new CFPlus::UI::VBox);
1523 1504
1505 $vbox->add (new CFPlus::UI::FancyFrame
1506 label => "Navigation",
1524 $vbox->add (my $buttons = new CFPlus::UI::HBox); 1507 child => (my $buttons = new CFPlus::UI::HBox),
1508 );
1525 $vbox->add (my $viewer = new CFPlus::UI::TextScroller 1509 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1526 expand => 1, fontsize => 0.8, padding_x => 4); 1510 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1527 1511
1528 $buttons->add (new CFPlus::UI::Label text => "Choose a document to display: "); 1512 my @history;
1529 $buttons->add (my $combo = new CFPlus::UI::Selector 1513 my @future;
1530 value => undef, 1514 my $curnode;
1531 options => [ 1515
1532 [intro => "Introduction"], 1516 my $load_node; $load_node = sub {
1533 [manual => "Main Manual"], 1517 my ($node, $para) = @_;
1534 [skill_help => "Skill Reference"], 1518
1535 [command_help => "Command Reference"], 1519 $buttons->clear;
1536 [dmcommand_help => "DM Commands"], 1520
1537 [COPYING => "License Terms"], 1521 $buttons->add (new CFPlus::UI::Button
1522 text => "⇤",
1523 tooltip => "back to the starting page",
1524 on_activate => sub {
1525 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1526 unshift @future, @history;
1527 @history = ();
1528 $load_node->(@{shift @future});
1529 },
1530 );
1531
1532 if (@history) {
1533 $buttons->add (new CFPlus::UI::Button
1534 text => "⋘",
1535 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1536 on_activate => sub {
1537 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1538 $load_node->(@{pop @history});
1539 },
1540 );
1538 ], 1541 }
1539 on_changed => sub {
1540 my ($self, $pod) = @_;
1541 1542
1543 if (@future) {
1544 $buttons->add (new CFPlus::UI::Button
1545 text => "⋙",
1546 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1547 on_activate => sub {
1548 push @history, [$curnode, $viewer->current_paragraph];
1549 $load_node->(@{shift @future});
1550 },
1551 );
1552 }
1553
1554 $buttons->add (new CFPlus::UI::Label text => " ");
1555
1556 my @path = CFPlus::Pod::full_path_of $node;
1557 pop @path; # drop current node
1558
1559 for my $node (@path) {
1560 $buttons->add (new CFPlus::UI::Button
1561 text => $node->{kw}[0],
1562 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1563 on_activate => sub {
1564 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1565 $load_node->($node);
1566 },
1567 );
1568 $buttons->add (new CFPlus::UI::Label text => "/");
1569 }
1570
1571 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1572
1573 $curnode = $node;
1574
1542 $viewer->clear; 1575 $viewer->clear;
1543 $viewer->add_paragraph (CFPlus::Pod::section pod => $pod); 1576 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1544 $viewer->set_offset (0); 1577 $viewer->scroll_to ($para);
1578 };
1545 1579
1580 $load_node->(CFPlus::Pod::find pod => "mainpage");
1581
1582 $CFPlus::Pod::goto_document = sub {
1583 my (@path) = @_;
1584
1585 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1586
1587 $load_node->((CFPlus::Pod::find @path)[0]);
1588 $win->show;
1589 };
1590
1591 $win
1592}
1593
1594sub open_string_query {
1595 my ($title, $cb, $txt, $tooltip) = @_;
1596 my $dialog = new CFPlus::UI::Toplevel
1597 x => "center",
1598 y => "center",
1599 z => 50,
1600 force_w => $WIDTH * 4/5,
1601 title => $title;
1602
1603 $dialog->add (
1604 my $e = new CFPlus::UI::Entry
1605 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1606 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1607 tooltip => $tooltip
1608 );
1609
1610 $e->grab_focus;
1611 $e->set_text ($txt) if $txt;
1612 $dialog->show;
1613}
1614
1615sub open_quit_dialog {
1616 unless ($QUIT_DIALOG) {
1617 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1618 x => "center",
1619 y => "center",
1620 z => 50,
1621 title => "Really Quit?",
1622 on_key_down => sub {
1623 my ($dialog, $ev) = @_;
1624 $ev->{sym} == 27 and $dialog->hide;
1546 0 1625 }
1626 ;
1627
1628 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1629
1630 $vb->add (new CFPlus::UI::Label
1631 text => "You should find a savebed and apply it first!",
1632 max_w => $WIDTH * 0.25,
1633 ellipsize => 0,
1634 );
1635 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1636 $hb->add (new CFPlus::UI::Button
1637 text => "Ok",
1638 expand => 1,
1639 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1640 );
1641 $hb->add (new CFPlus::UI::Button
1642 text => "Quit anyway",
1643 expand => 1,
1644 on_activate => sub { exit },
1645 );
1646 }
1647
1648 $QUIT_DIALOG->show;
1649 $QUIT_DIALOG->grab_focus;
1650}
1651
1652sub show_tip_of_the_day {
1653 # find all tips
1654 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1655
1656 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1657 $todindex = 0 if $todindex >= @tod;
1658 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1659
1660 # create dialog
1661 my $dialog;
1662
1663 my $close = sub {
1664 $dialog->destroy;
1665 };
1666
1667 $dialog = new CFPlus::UI::Toplevel
1668 x => "center",
1669 y => "center",
1670 z => 3,
1671 name => 'tip_of_the_day',
1672 force_w => int $WIDTH * 4/9,
1673 force_h => int $WIDTH * 2/9,
1674 title => "Tip of the day #" . (1 + $todindex),
1675 child => my $vbox = new CFPlus::UI::VBox,
1676 has_close_button => 1,
1677 on_delete => $close,
1678 ;
1679
1680 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683
1684 $vbox->add (my $table = new CFPlus::UI::Table);
1685
1686 $table->add (0, 0, new CFPlus::UI::Button
1687 text => "Close",
1688 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1689 on_activate => $close,
1690 );
1691
1692 $table->add (2, 0, new CFPlus::UI::Button
1693 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub {
1696 $close->();
1697 &show_tip_of_the_day;
1547 }, 1698 },
1548 on_visibility_change => sub {
1549 my ($self, $visible) = @_;
1550 return unless $visible;
1551 return if $self->{value};
1552 $self->set_value ("intro");
1553 0
1554 },
1555 ); 1699 );
1556 1700
1557 $win 1701 $dialog->show;
1558} 1702}
1559 1703
1560sub sdl_init { 1704sub sdl_init {
1561 CFPlus::SDL_Init 1705 CFPlus::SDL_Init
1562 and die "SDL::Init failed!\n"; 1706 and die "SDL::Init failed!\n";
… …
1609 force_x => 0, 1753 force_x => 0,
1610 force_y => "max", 1754 force_y => "max",
1611 child => $STATUSBOX, 1755 child => $STATUSBOX,
1612 )->show; 1756 )->show;
1613 1757
1614 CFPlus::UI::FancyFrame->new ( 1758 CFPlus::UI::Toplevel->new (
1615 title => "Map", 1759 title => "Map",
1616 name => "mapmap", 1760 name => "mapmap",
1617 x => 0, 1761 x => 0,
1618 y => $FONTSIZE + 8, 1762 y => $FONTSIZE + 8,
1619 border_bg => [1, 1, 1, 192/255], 1763 border_bg => [1, 1, 1, 192/255],
… …
1647 can_hover => 1, 1791 can_hover => 1,
1648 can_events => 1, 1792 can_events => 1,
1649 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1793 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1650 ; 1794 ;
1651 1795
1652 $SETUP_DIALOG = new CFPlus::UI::FancyFrame 1796 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1653 title => "Setup", 1797 title => "Setup",
1654 name => "setup_dialog", 1798 name => "setup_dialog",
1655 x => 'center', 1799 x => 'center',
1656 y => 'center', 1800 y => 'center',
1657 z => 2, 1801 z => 2,
… …
1921 output_sync => 1, 2065 output_sync => 1,
1922 output_count => 1, 2066 output_count => 1,
1923 pickup => 0, 2067 pickup => 0,
1924 inv_sort => "mtime", 2068 inv_sort => "mtime",
1925 default => "profile", # default profile 2069 default => "profile", # default profile
2070 show_tips => 1,
1926 ); 2071 );
1927 2072
1928 while (my ($k, $v) = each %DEF_CFG) { 2073 while (my ($k, $v) = each %DEF_CFG) {
1929 $CFG->{$k} = $v unless exists $CFG->{$k}; 2074 $CFG->{$k} = $v unless exists $CFG->{$k};
1930 } 2075 }
… …
1974# } 2119# }
1975# my $t2 = Time::HiRes::time; 2120# my $t2 = Time::HiRes::time;
1976# warn $t2-$t1; 2121# warn $t2-$t1;
1977# } 2122# }
1978 2123
2124 $startup_done->();
2125
1979 video_init; 2126 video_init;
1980 audio_init; 2127 audio_init;
1981} 2128}
2129
2130show_tip_of_the_day if $CFG->{show_tips};
1982 2131
1983Event::loop; 2132Event::loop;
1984#CFPlus::SDL_Quit; 2133#CFPlus::SDL_Quit;
1985#CFPlus::_exit 0; 2134#CFPlus::_exit 0;
1986 2135

Diff Legend

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